diff options
| author | Ladislav Hagara | 2011-06-30 11:24:58 +0200 |
|---|---|---|
| committer | Ladislav Hagara | 2011-06-30 11:24:58 +0200 |
| commit | 96bf3920a3641771f2ed02fc6c3289b0993d8c5b (patch) | |
| tree | d84662f8945203665a5ed51404f4599b70e16b8f | |
| parent | a069ba8658dc86300b62b6b3370854047c811b9c (diff) | |
| parent | 3b1882064a01d5253ec07f0be4333e5ace28f131 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
| -rwxr-xr-x | graphics-libs/opencv/DEPENDS | 2 | ||||
| -rwxr-xr-x | graphics-libs/opencv/DETAILS | 6 | ||||
| -rw-r--r-- | graphics-libs/opencv/HISTORY | 6 | ||||
| -rwxr-xr-x | graphics-libs/opencv/PRE_BUILD | 7 |
4 files changed, 10 insertions, 11 deletions
diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS index a819589fff..681b609800 100755 --- a/graphics-libs/opencv/DEPENDS +++ b/graphics-libs/opencv/DEPENDS @@ -23,4 +23,4 @@ optional_depends libucil '-DWITH_UNICAP=1' '-DWITH_UNICAP=0' 'video capture s optional_depends libraw1394 '-DWITH_1394=1' '-DWITH_1394=0' 'Firewire support' && optional_depends gtk+2 '-DWITH_GTK=1' '-DWITH_GTK=0' 'Gtk gui support' && optional_depends qt4 '-DWITH_QT=1' '-DWITH_QT=0' 'Qt gui support' && -optional_depends eigen2 '-DWITH_EIGEN2=1' '-DWITH_EIGEN2=0' 'Eigen2 matrix support' +optional_depends eigen2 '-DWITH_EIGEN=1' '-DWITH_EIGEN=0' 'Eigen2/3 matrix support' diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS index 88e4c757e8..ecc1c1b288 100755 --- a/graphics-libs/opencv/DETAILS +++ b/graphics-libs/opencv/DETAILS @@ -1,9 +1,9 @@ SPELL=opencv SPELLX=OpenCV - VERSION=2.2.0 - SOURCE_HASH=sha512:3eebb3cf2c5c86cb20cb32cc8b1ffa0f7aecce7b4ce076f1dca47f8d75ca902f00b2018305e6837e5329f80d67e50e1d82afb02eb56fc4cd9619cc2c3255ddd8 + VERSION=2.3.0rc + SOURCE_HASH=sha512:134093cdd0c95c6ef7160a68e3750ffe005534accc7e00e076e4a20fca3668fdfe1dba5ea0360e7120480a45ba5b5363362a6dca3da6df977e04449cae1740e7 SOURCE=$SPELLX-$VERSION.tar.bz2 -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION//rc} SOURCE_URL[0]=$SOURCEFORGE_URL/opencvlibrary/$SOURCE WEB_SITE=http://opencv.willowgarage.com/wiki/ LICENSE[0]=BSD diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY index 567407cd63..75019e7640 100644 --- a/graphics-libs/opencv/HISTORY +++ b/graphics-libs/opencv/HISTORY @@ -1,3 +1,9 @@ +2011-06-30 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.3.0rc + this builds with gcc-4.6.1 and ffmpeg-0.7.1 + * DEPENDS: change eigen flags + * PRE_BUILD: deleted + 2011-06-12 Treeve Jelbert <treeve@sourcemage.org> * PRE_BUILD: added, fix compile with gcc-4.7 diff --git a/graphics-libs/opencv/PRE_BUILD b/graphics-libs/opencv/PRE_BUILD deleted file mode 100755 index da010f238f..0000000000 --- a/graphics-libs/opencv/PRE_BUILD +++ /dev/null @@ -1,7 +0,0 @@ -default_pre_build && -cd $SOURCE_DIRECTORY && -# fix for gcc-4.7 -sed -i '/\<complex/a \ -#include <cstddef> -' modules/core/include/opencv2/core/core.hpp -#patch -p0 < $SPELL_DIRECTORY/xxx.diff |