Revision bump to drop USE="ipp" for 2.3.0 stabilization.

Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64

4 files changed, 191 insertions, 22 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 523bf3d4e0bf..49b48007017c 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2011/09/26 22:38:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.49 2011/10/06 22:32:26 ssuominen Exp $
+
+*opencv-2.3.0-r1 (06 Oct 2011)
+
+  06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> opencv-2.3.0.ebuild,
+  +opencv-2.3.0-r1.ebuild:
+  Revision bump to drop USE="ipp" for 2.3.0 stabilization.
 
   26 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild:
   Disable cuda support if >=gcc-4.5, bug 383847
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 27977a8e973c..8d96f404c6f2 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
 AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
@@ -27,23 +27,18 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
 EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5
 EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da
 EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0.ebuild 4241 RMD160 ac9599e90fb48cde195fb71650275ce0068d3972 SHA1 3a9d9d0a927b8a1bd8a35832f163198d847a02b8 SHA256 65365f73d09d5e435240e2db253bbe23bf779101cc939f7f27720baa454b0d08
-MISC ChangeLog 8353 RMD160 fba19db70831337a5e0017a1cbbc1b304cf58760 SHA1 a59245bccd77358c34f76054a69c7a50dc6246e1 SHA256 1c054393e39854fb2c3a0fddd06832129df3dc885e5760127f9d06e98e7ca344
+EBUILD opencv-2.3.0-r1.ebuild 4244 RMD160 b9699b3568e57e1e84bbdec1ff2017b6634b76a8 SHA1 0cd9e0dc22858a3ee218fd72f29bfda40f52b888 SHA256 4fb55a63a5c7bbec94068cc07d1cf7748139b9058abee7b47ab14430959cadf4
+EBUILD opencv-2.3.0.ebuild 4201 RMD160 f97b957e567042bbc3933be3827f3971d9afeed7 SHA1 0c619be99b6b08cb9016a347c3a22ab319e54e2d SHA256 dacbb1d432acbe4e91968f0c2df555bafb7aebb99c7fde9ca2336f6fcb6595ec
+MISC ChangeLog 8547 RMD160 db99ae5dfd5dbc6d71cd71564431748395355517 SHA1 a799931a45775a265f11e3c482a256069a8cd0be SHA256 061548aa3df6fb0af9f43a15c93ab76f707ebbab692505f8b099bb8880be3e83
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOgP73AAoJENwGBM22xffekHwP/1F11UW2gExJ51X7T+JXIn52
-3i8UnfMroyow/J41ZfS856yosG78WKUGKccQAx8aZrBv8T6Cs+ESla9D6LumLPHp
-CmeH5qTVOJl3xf8VjanqHRtf5GxqzaWkcSrBxavoizF0nPtLUfOcKXC8rHyaTF0F
-k5HdDVCI9jWEY+h9DZh5O7Wo8L9pJ5M8EU8tJcnCngnr19XujGpVPytI9OV7EM+n
-sA+u/AbdXokIwOowCJUkbY6vtlIqjQK+q1PJV9r8SD5IYd/4x/Q6u6X8wxMGQVBB
-WWyLt7H1U2W7QIG39Y6c5sBGnsi2pcFY2y2tdhX/7cBnluHwpH5eKmatre9bLIT2
-6i9aecmjsYfAuDOzfBVSHUBGjG6ff7WEn9GyfQqRrArgc0rWvSt/zyFfUuBjWgMg
-N2/vOaPBZA/jaB43aQGngiTZo5Fo/Yqq07XMCADL0Q39SR4RpmGabUAtmYONDfVG
-nja5B/M/kq8r03tueqeJvB/cUxjuFu7zOaZSQS0Hm8Mf6DA4YLKgPqq0wAiaqaBX
-Y/ngakXL9+MPOIozzoLJA6dbq7bFFBoXUHPwdb7ugkWrCDBBJLRgoq3uZ8G1xYqA
-uD3333jwL70pmlauSBhODAmcR0qJdKEezDp/9yUZgNlFbZ+RwlUIVVlKFjl/x+a5
-DJ79Td0REqSf+nHo3OVX
-=Wpol
+iQEcBAEBAgAGBQJOjiyjAAoJEEdUh39IaPFNTMgIAIry4ZcwXQPd2G3VARdQ3vWg
+3nCFmWL2OJKzzoQIY2Z+I1t0MjzzPoyuHKxm7Rtfkfw2zkpi4HAiXvFh9sVl9cS0
+KZKUa1HiSkA6ZF14gWnR8LXktY1S9sUGAj/lZg1Q/vvWJJikwi4FHIPHg2dmDjiS
+Hep9ZRCZGsOV74GK1EeBRPdvtZvt+BeaqfED7mZnLiX5PJi0ynZ8UAcvLSfGu0pE
+kPRpMFXyyLqh9BclsMkMixxIrG8G6zVmk5+/xKGIMr8/lQbdWiSaT0MMKyYmApyh
+kjzqbmeMEyXZQkGFf26HRLjyn4uGi+Gc3SSXulqXCH54+P9r2chriAvSwJLQlrk=
+=Ne6a
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.0-r1.ebuild b/media-libs/opencv/opencv-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..63be83dceccb
--- /dev/null
+++ b/media-libs/opencv/opencv-2.3.0-r1.ebuild
@@ -0,0 +1,169 @@
+# 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.3.0-r1.ebuild,v 1.1 2011/10/06 22:32:26 ssuominen Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils fortran-2 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 ~ppc ~x86"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	sci-libs/flann
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+	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? ( virtual/latex-base )
+	dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch"
+	"${FILESDIR}/${PN}-2.3.0-ffmpeg.patch"
+	"${FILESDIR}/${PN}-2.3.0-numpy.patch"
+	"${FILESDIR}/${PN}-2.3.0-symlink.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	# include missing zlib.h for libpng>1.5. Bug #383571
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
+	# 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 DOCS)
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+		$(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_with ipp)
+		$(cmake-utils_use_with ieee1394 1394)
+		$(cmake-utils_use_with eigen)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with gstreamer)
+		$(cmake-utils_use_with gtk)
+		$(cmake-utils_use_with jpeg)
+		$(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 cuda; then
+		if [ "$(gcc-version)" > "4.4" ]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
+			mycmakeargs+=( "-DWITH_CUDA=OFF" )
+		else
+			mycmakeargs+=( "-DWITH_CUDA=ON" )
+		fi
+	else
+		mycmakeargs+=( "-DWITH_CUDA=OFF" )
+	fi
+
+	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: https://bugs.gentoo.org/show_bug.cgi?id=175881
+	# openni: ???
+	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"
+		"-DWITH_OPENNI=OFF"
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DBUILD_SHARED_LIBS=ON"
+		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# hardcode cuda paths
+	mycmakeargs+=(
+		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 0d41961db7ef..73f3d0514894 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.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.3.0.ebuild,v 1.4 2011/09/26 22:38:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.5 2011/10/06 22:32:26 ssuominen Exp $
 
 EAPI=3
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
 
 RDEPEND="
 	app-arch/bzip2
@@ -37,7 +37,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 )
@@ -97,7 +96,7 @@ src_configure() {
 		$(cmake-utils_use_enable sse2 SSE2)
 		$(cmake-utils_use_enable sse3 SSE3)
 		$(cmake-utils_use_enable ssse3 SSSE3)
-		$(cmake-utils_use_with ipp)
+		-DWITH_IPP=OFF
 		$(cmake-utils_use_with ieee1394 1394)
 		$(cmake-utils_use_with eigen)
 		$(cmake-utils_use_with ffmpeg)