Hard-disable ipp in -r0 to ease stabilization, create -r10 with ipp support

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 192 insertions, 20 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 7e8b8a94bc99..53e86cde875b 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.28 2011/04/30 19:23:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.29 2011/04/30 19:37:06 dilfridge Exp $
+
+*opencv-2.2.0-r10 (30 Apr 2011)
+
+  30 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencv-2.2.0.ebuild, +opencv-2.2.0-r10.ebuild:
+  Hard-disable ipp in -r0 to ease stabilization, create -r10 with ipp
+  support
 
 *opencv-2.2.0 (30 Apr 2011)
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index e1cd334cb5a3..380116a4347b 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -19,23 +19,24 @@ DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db2
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
 EBUILD opencv-2.0.0.ebuild 2341 RMD160 95014760a935f3f421219f11af4b9f472c8ff11e SHA1 5ddf2e3492ee55d8c476a9f11a9da68881b4eb69 SHA256 a0a42ef185d9252339bf3010224ac21effbf6efaa59900c0021af07b4bea2097
 EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
-EBUILD opencv-2.2.0.ebuild 4172 RMD160 c7f35159dfe407a247526ae16dfa679d69bad859 SHA1 7e6cf02ddfb5a8889eb2bd42808cc05d1bb4bde3 SHA256 b2d8dd67f0d1ed6ccdf90d0b4fe69e0ae4b45280964ad5305871edb90ca78943
-MISC ChangeLog 5318 RMD160 1fd1a0fadda71097691c16e6712c7f18f00dd15e SHA1 5e2a37f9c57c9c720172bdc56491a055b51bf332 SHA256 dabf0e849ce3d633e826d38e7d34b2740bc570693625aeed3dae30a2b7882b2f
+EBUILD opencv-2.2.0-r10.ebuild 4176 RMD160 74e67b11b2302152dccb51e59b5069bfd0d03799 SHA1 abc1dbef2e3ed93dfe755b4b753dc13add15be23 SHA256 8f40c02814199b7cb5ff8f50451f145fb38ac39f8852c61ab2eb10c10e405eec
+EBUILD opencv-2.2.0.ebuild 4132 RMD160 64bb51d729258410f25d0005b659a8f6b51b6e86 SHA1 f6beb277026f637db10744f5c2516f5f77f4b275 SHA256 4c1dc3b27a58b1a6c85e14d9655fc9eb7cad4dad5457d6f961629bf745a0ff75
+MISC ChangeLog 5538 RMD160 2f11d46a51da9a1264f69d053c7c9add8c3ae7c0 SHA1 f8f3588beefaaf427f95a9eddc5fc1461d72054d SHA256 c2c049b9596e0af92356072ad2db8e5fd5ce0c62648edd32e191c03359f6ed1b
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNvGIkAAoJENwGBM22xffe2IUP/jZJO5SbpX3EGCW0KYhKOcjf
-MUJlXBRpoG07k3ltQqH1thGbGSUgN5Ur8Qz9qXtxeNtHk5Ub6x5qiYqJgDiWh2We
-5mrGetZfBP0zn+M84j1Na4jnBQLvaUdfMmwP5VeZpD6xEL3qH8vpjIpGP2fJOtwz
-cuGdS44VnBrVxzhYtt2nrFLxcuGlYvhF2Sf3qWV5kfolC1H+mHyN6A4UXUTc7hau
-XO41Hcn634l8Nr4Z2UtOtC1eiLn9h4kX8s76vSnWVzqf1TdMwdBasbYK7n7b70Aq
-pcRG/2iZi8rpnBvW7PZnFC/VRRj1Iv2nn+YeAKUrozrqomByLREMnxiYfA+AbEGu
-7i0RSOqKWDEsePX2ya3dlkqMXOXbHc0uc6DdfsCXzMdmgcY9avUB/HiTph6PBZya
-BRFT/GFrHalrKWoCcTW3NETPvd6a/LyNmraGMZhNCJZT3Ndd6nyYfKemVSjCmAyJ
-rpjblkGuyzSrhrcV3LzzGxeLLN4rZpz0cGY0E5P800ug0u4CjNxSL7/XZd2ZB54a
-4Sge66w+AxrUycpR7qcLPuu6PKytK8d7HyC701PN76/0imGJ6kkoKzTvPgfuh5K8
-ocD8Ag21YXfjemmqZ4Ke6gCGDZK/Azk/1DA3tmRinOgTutgQBjAMfbMyz/1cRuwA
-OiFhwVe2Fo3azYIj/Lev
-=GmF9
+iQIcBAEBCgAGBQJNvGVyAAoJENwGBM22xffeO5cP/3EbucbNiiBebnytK3c3aVVe
+tLIhrC2eAy1nkqYEP3pUggOgaRzI47NhmTQzzds9h+KsUj6wd2mbqqb92pYyELLZ
++LSkvujvvOU1X7cU5k9tihPuYEUqZx56C0WCllxHNgK8RAGOyW6q11WX/0LZjd92
+0f41WePfxF16An0SZI+GToqZPBwb97GK/SUVomVaKfobNYQ8JzkFoc4RPPIfDYAE
+FfZBnu7qfwrbKuE5h+lMta3HxfNNSowQyHQAMl7372B/bLNjViFynA2FULu3v2sS
+3NsQIGlwQHjk20u9MuL6Quveu/cywOVRVxUC5T+vhCc3WWJMoQN+kNNIUqL3i4kC
+k8KKqUMBexIP4rWca4c5d2ocNK9GhK10VVHES1Hnq9+jFFHO3A3ngjGUbYaeBe5g
+XYsc0xL6EuyoNZIuRFPTXSPdIMlcdlQQEGC7Ut7l6Isq+S7W1S0VPGBkRocMXyMC
+1BdcIv1qm37ul/TpVe6wmRamFVg1tsL0QP4bbF95wtoxn5Mes/xooE0F9xxb7e4o
+AfQ9Trx85WO/UHo8dnrawsxH2CRu9jMjCyM+RjQwjG1DxmNLdAVrE3pHW67YSPwU
+HO6eQVDGydk5WTRNMmEm3cIKl739jFsjOMjqGw1Lh0a4KTNKwt/JkEUNZpDkTYU2
+1vpbsC+OJ0BlPpIIBTZm
+=Jx9e
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
new file mode 100644
index 000000000000..da43ef12187b
--- /dev/null
+++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.1 2011/04/30 19:37:06 dilfridge Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+HOMEPAGE="http://opencv.willowgarage.com"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
+
+# all tests fail, needs further investigation, bug 296681 - dilfridge
+RESTRICT=test
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libf2c
+	sys-libs/zlib
+	>=sci-libs/clapack-3.2.1-r4
+	sci-libs/flann
+	virtual/lapack
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	eigen? ( dev-cpp/eigen:2 )
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		media-libs/gstreamer
+		media-libs/gst-plugins-base
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	ipp? ( sci-libs/ipp )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	python? ( dev-python/numpy )
+	qt4? (
+		x11-libs/qt-gui:4
+		opengl? ( x11-libs/qt-opengl:4 )
+	)
+	tiff? ( media-libs/tiff )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[-nodot] )
+	dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-convert_sets_to_options.patch"
+	"${FILESDIR}/${P}-ffmpeg01.patch"
+	"${FILESDIR}/${P}-ffmpeg02.patch"
+	"${FILESDIR}/${P}-gcc46.patch"
+	"${FILESDIR}/${P}-libpng1.5.patch"
+	"${FILESDIR}/${P}-numpy.patch"
+	"${FILESDIR}/${P}-ptrcvcapture.patch"
+	"${FILESDIR}/${P}-use_system_libs.patch"
+	"${FILESDIR}/${P}-v4l_2.6.38.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build doc DOXYGEN_DOCS)
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_enable sse SSE)
+		$(cmake-utils_use_enable sse2 SSE2)
+		$(cmake-utils_use_enable sse3 SSE3)
+		$(cmake-utils_use_enable ssse3 SSSE3)
+		$(cmake-utils_use_use ipp)
+		$(cmake-utils_use_with ieee1394 1394)
+		$(cmake-utils_use_with cuda)
+		$(cmake-utils_use_with eigen)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with gstreamer)
+		$(cmake-utils_use_with gtk)
+		$(cmake-utils_use_with jpeg2k JASPER)
+		$(cmake-utils_use_with openexr)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4 QT)
+		$(cmake-utils_use_with opengl QT_OPENGL)
+		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_with v4l V4L)
+		$(cmake-utils_use_with xine)
+	)
+
+	if use python && use examples; then
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+	else
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+	fi
+
+	# things we want to be hard off or not yet figured out
+	#    UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881
+	mycmakeargs+=(
+		"-DUSE_OMIT_FRAME_POINTER=OFF"
+		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+		"-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+		"-DBUILD_LATEX_DOCS=OFF"
+		"-DENABLE_POWERPC=OFF"
+		"-DBUILD_PACKAGE=OFF"
+		"-DENABLE_PROFILING=OFF"
+		"-DUSE_O2=OFF"
+		"-DUSE_O3=OFF"
+		"-DUSE_FAST_MATH=OFF"
+		"-DENABLE_SSE41=OFF"
+		"-DENABLE_SSE42=OFF"
+		"-DWITH_PVAPI=OFF"
+		"-DWITH_UNICAP=OFF"
+		"-DWITH_TBB=OFF"
+	)
+
+	# things we want to be hardly enabled not worth useflag
+	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DBUILD_SHARED_LIBS=ON"
+		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
+	cmake-utils_src_test
+}
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index f9f0cdd5ed21..204a75bd6858 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.1 2011/04/30 19:23:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.2 2011/04/30 19:37:06 dilfridge Exp $
 
 EAPI=3
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
 
 # all tests fail, needs further investigation, bug 296681 - dilfridge
 RESTRICT=test
@@ -43,7 +43,6 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	ipp? ( sci-libs/ipp )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng )
 	python? ( dev-python/numpy )
@@ -106,7 +105,7 @@ src_configure() {
 		$(cmake-utils_use_enable sse2 SSE2)
 		$(cmake-utils_use_enable sse3 SSE3)
 		$(cmake-utils_use_enable ssse3 SSSE3)
-		$(cmake-utils_use_use ipp)
+		-DUSE_ipp=OFF
 		$(cmake-utils_use_with ieee1394 1394)
 		$(cmake-utils_use_with cuda)
 		$(cmake-utils_use_with eigen)