summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Mavrinac <aaron@pygar.(none)>2009-10-04 17:05:56 -0400
committerAaron Mavrinac <aaron@pygar.(none)>2009-10-04 17:05:56 -0400
commitc3e1f4b4f467a0ebe144e3b28866c68941c1fcea (patch)
treec3c4aa87f7b730e95b06bbeed8d07ffeb1a741ec
parentVersion bump media-libs/opencv to 2.0.0. (diff)
downloadezod-c3e1f4b4f467a0ebe144e3b28866c68941c1fcea.tar.gz
ezod-c3e1f4b4f467a0ebe144e3b28866c68941c1fcea.tar.bz2
ezod-c3e1f4b4f467a0ebe144e3b28866c68941c1fcea.zip
media-libs/opencv: Added oldpython and octave USE flags for building
SWIG interfaces.
-rw-r--r--media-libs/opencv/ChangeLog3
-rw-r--r--media-libs/opencv/Manifest4
-rw-r--r--media-libs/opencv/opencv-2.0.0.ebuild17
3 files changed, 17 insertions, 7 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index aa15555..f5b1eaa 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Oct 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-2.0.0.ebuild:
+ Added oldpython and octave USE flags for building SWIG interfaces
+
*opencv-2.0.0 (01 Oct 2009)
01 Oct 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-2.0.0.ebuild:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index fa3b01a..479c75c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -4,7 +4,7 @@ AUX opencv-1.1.0_pre1-stereorectify.patch 1409 RMD160 0b317df1cb2a2b61be6e673b1b
DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
DIST opencv-1.1pre1.tar.gz 22301291 RMD160 d105a97f211637edbbac1eb21dca2b140b1f37be SHA1 4bc4bda92a250adcb82b236161d364c059021a43 SHA256 7e4f0026e5543c38afcf8a4298b1da2bace977499f99b885c925fc784783d812
EBUILD opencv-1.1.0_pre1.ebuild 2199 RMD160 f550df98b58a352cf06772eda1cb094cb04fe03f SHA1 598b691bb5932df387b1f7f3bb9fec05c7310400 SHA256 3bf985bc9040c62311b25ae1372fb3f71c6148b6ce215982f2c27001a89c7699
-EBUILD opencv-2.0.0.ebuild 1642 RMD160 1d79b4891b1e3a3846042994ea5c6266404b7c2f SHA1 d4cb6fdc526d2c7af6b8c85527cd20b97da74ec3 SHA256 d031bc1e0f7f9650552d8038f87fee0f9df84b813446cd6ceebc5f0b568deafd
+EBUILD opencv-2.0.0.ebuild 2053 RMD160 d179598258793ad6c7ccd1625fb8bbf9c33cb6ba SHA1 86b69038bbf758a4247f299aa750403ea0548d80 SHA256 651dbce33c3d38a3fcb89f6e3c26cb8b514ac4b08e8591196544a78bf9570656
EBUILD opencv-9999.ebuild 1656 RMD160 2d3a4827a7ee3ec37cdefd33dea90e8809bf6b67 SHA1 96b2cfba7be4b9f2739bd5e0ee05827f3736392a SHA256 09225ba786c2648a17be9d3a29316681841a171cc487dd5f5baa94f91e6bbbcf
-MISC ChangeLog 766 RMD160 5f9ceb2d8ce079724d8c0701c9c0f1f51fc68421 SHA1 e81ea71ca1a43bdb5cb38019c6a6bee3e7bc4515 SHA256 c395ce771849941cbb39e21cd443ec7d027c77e7a43a59b8646cf415403d3160
+MISC ChangeLog 907 RMD160 902274648ecfbb6095c6f6709daab79272cb839d SHA1 9a951fa5935fcae4743a138ae16ec254b85209a2 SHA256 8d88492a5a2f23b4c03d16a0041085f650d2efdea76f790b79ac94ed2c93dc1f
MISC metadata.xml 758 RMD160 bdfc7cd1bf469fe5951429333659946f377faa48 SHA1 812545f8fab4fc2304006b8ebc6bfcb1155cc519 SHA256 7468b2722153f29842e40153f877e1bd980ef617f46a3f438b686b2f1a9f1dea
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
index 7eb11e8..64d7c72 100644
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -12,9 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}library/OpenCV-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE="debug python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg png tiff v4l xine zlib"
+IUSE="debug python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg png tiff v4l xine
+zlib -oldpython -octave"
-COMMON_DEPEND="python? ( >=dev-lang/python-2.5 >=dev-lang/swig-1.3.30 )
+COMMON_DEPEND="python? ( >=dev-lang/python-2.5 )
ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 )
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
gstreamer? ( media-libs/gstreamer )
@@ -24,7 +25,9 @@ COMMON_DEPEND="python? ( >=dev-lang/python-2.5 >=dev-lang/swig-1.3.30 )
png? ( media-libs/libpng:1.2 )
tiff? ( media-libs/tiff )
xine? ( media-libs/xine-lib )
- zlib? ( sys-libs/zlib )"
+ zlib? ( sys-libs/zlib )
+ oldpython? ( >=dev-lang/python-2.5 >=dev-lang/swig-1.3.30 )
+ octave? ( sci-mathematics/octave >=dev-lang/swig-1.3.30 )"
DEPEND="${COMMON_DEPEND}
>=dev-util/cmake-2.6
@@ -36,8 +39,12 @@ MAKEOPTS="${MAKEOPTS} -j1"
S="${WORKDIR}/OpenCV-${PV}"
src_configure() {
- use python && mycmakeargs="${mycmakeargs} -DBUILD_PYTHON_SUPPORT=ON" \
- || mycmakeargs="${mycmakeargs} -DBUILD_PYTHON_SUPPORT=OFF"
+ use python && mycmakeargs="${mycmakeargs} -DBUILD_NEW_PYTHON_SUPPORT=ON" \
+ || mycmakeargs="${mycmakeargs} -DBUILD_NEW_PYTHON_SUPPORT=OFF"
+ use oldpython && mycmakeargs="${mycmakeargs} -DBUILD_SWIG_PYTHON_SUPPORT=ON" \
+ || mycmakeargs="${mycmakeargs} -DBUILD_SWIG_PYTHON_SUPPORT=OFF"
+ use octave && mycmakeargs="${mycmakeargs} -DBUILD_OCTAVE_SUPPORT=ON" \
+ || mycmakeargs="${mycmakeargs} -DBUILD_OCTAVE_SUPPORT=OFF"
mycmakeargs="${mycmakeargs} \
$(cmake-utils_use_with ieee1394 1394) \
$(cmake-utils_use_with ffmpeg) \