Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 230 insertions, 1 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index c5a2c35086f5..df5417a952ed 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.21 2010/06/16 16:36:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.22 2010/07/27 19:19:28 ssuominen Exp $
+
+*opencv-2.1.0 (27 Jul 2010)
+
+  27 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> +opencv-2.1.0.ebuild,
+  +files/opencv-2.1.0-multilib.patch, metadata.xml:
+  Version bump.
 
   16 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   opencv-2.0.0-r1.ebuild:
diff --git a/media-libs/opencv/files/opencv-2.1.0-multilib.patch b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
new file mode 100644
index 000000000000..752ca6fe1ddd
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
@@ -0,0 +1,110 @@
+diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
+--- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt	2010-04-06 04:24:34.000000000 +0300
++++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt	2010-07-27 21:41:18.000000000 +0300
+@@ -89,8 +89,8 @@
+ INSTALL (
+     TARGETS flann  # flann_s
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib
++    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
++    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+ )
+ 
+ # INSTALL (
+diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
+--- OpenCV-2.1.0.orig/CMakeLists.txt	2010-04-06 04:24:37.000000000 +0300
++++ OpenCV-2.1.0/CMakeLists.txt	2010-07-27 21:56:58.000000000 +0300
+@@ -467,8 +467,8 @@
+ 

+     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")

+     if(UNIX)

+-        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

++        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

++        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

+     endif()

+     if(WIN32)

+         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)

+diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt	2010-04-06 04:24:40.000000000 +0300
++++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt	2010-07-27 21:42:00.000000000 +0300
+@@ -40,6 +40,6 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+     )
+diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt	2010-04-06 04:24:42.000000000 +0300
++++ OpenCV-2.1.0/src/cv/CMakeLists.txt	2010-07-27 21:44:32.000000000 +0300
+@@ -71,8 +71,8 @@
+ 

+ install(TARGETS ${the_target}

+     RUNTIME DESTINATION bin COMPONENT main

+-    LIBRARY DESTINATION lib COMPONENT main

+-    ARCHIVE DESTINATION lib COMPONENT main)

++    LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

++    ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

+ 

+ install(FILES ${lib_hdrs}

+     DESTINATION include/opencv

+diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt	2010-04-06 04:24:43.000000000 +0300
++++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt	2010-07-27 21:43:22.000000000 +0300
+@@ -76,8 +76,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${aux_hdrs_ext}
+         DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt	2010-07-27 21:44:51.000000000 +0300
+@@ -71,8 +71,8 @@
+ 

+ install(TARGETS ${the_target}

+     RUNTIME DESTINATION bin COMPONENT main

+-    LIBRARY DESTINATION lib COMPONENT main

+-    ARCHIVE DESTINATION lib COMPONENT main)

++    LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

++    ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

+ 

+ # install each module headers separately

+ install(FILES ${lib_hdrs}

+diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/highgui/CMakeLists.txt	2010-07-27 21:43:00.000000000 +0300
+@@ -282,8 +282,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${highgui_ext_hdrs}
+         DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt	2010-04-06 04:24:45.000000000 +0300
++++ OpenCV-2.1.0/src/ml/CMakeLists.txt	2010-07-27 21:43:42.000000000 +0300
+@@ -61,8 +61,8 @@
+ 

+ install(TARGETS ${the_target}

+ 	RUNTIME DESTINATION bin COMPONENT main

+-	LIBRARY DESTINATION lib COMPONENT main

+-	ARCHIVE DESTINATION lib COMPONENT main)

++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

+ 

+ install(FILES ${lib_hdrs}

+         DESTINATION include/opencv

diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 659343f098e7..0df9db5be4d3 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -15,6 +15,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
   <flag name="ipp">Enable Intel Integrated Primitive support</flag>
   <flag name="octave">Enable octave support</flag>
   <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
+  <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
   <flag name="deprecated">Enable deprecated (old) python support</flag>
 </use>
 </pkgmetadata>
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
new file mode 100644
index 000000000000..68d852851f23
--- /dev/null
+++ b/media-libs/opencv/opencv-2.1.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.1 2010/07/27 19:19:28 ssuominen Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils eutils flag-o-matic 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="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave openmp png python sse sse2 sse3 ssse3 test tiff v4l xine"
+
+RDEPEND="sys-libs/zlib
+	ipp? ( sci-libs/ipp )
+	python? ( deprecated? ( dev-lang/swig ) )
+	ieee1394? ( sys-libs/libraw1394
+		media-libs/libdc1394:2 )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	gstreamer? ( media-libs/gstreamer )
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg2k? ( media-libs/jasper )
+	jpeg? ( media-libs/jpeg )
+	png? ( >=media-libs/libpng-1.4 )
+	tiff? ( media-libs/tiff )
+	xine? ( media-libs/xine-lib )
+	octave? ( sci-mathematics/octave
+		dev-lang/swig )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test" #296681
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:share/opencv/doc:share/doc/${PF}:" \
+		CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-multilib.patch \
+		"${FILESDIR}"/${PN}-2.0.0-libpng14.patch
+}
+
+src_configure() {
+	append-cppflags -D__STDC_CONSTANT_MACROS #324259
+
+	mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		$(cmake-utils_use_build examples)
+		"-DBUILD_LATEX_DOCS=OFF"
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+		$(cmake-utils_use_build octave OCTAVE_SUPPORT)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use sse USE_SSE)
+		$(cmake-utils_use sse2 USE_SSE2)
+		$(cmake-utils_use sse3 USE_SSE3)
+		$(cmake-utils_use ssse3 USE_SSSE3)
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use_with ipp)
+		"-DUSE_O3=OFF"
+		$(cmake-utils_use_with ieee1394 1394)
+		$(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 jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with tiff)
+		"-DWITH_UNICAP=OFF"
+		$(cmake-utils_use_with v4l)
+		$(cmake-utils_use_with xine)
+		)
+
+	if use octave; then
+		mycmakeargs+=(
+			$(cmake-utils_use examples INSTALL_OCTAVE_EXAMPLES)
+			)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			$(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)
+			$(cmake-utils_use examples INSTALL_PYTHON_EXAMPLES)
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize opencv
+}
+		
+pkg_postrm() {
+	use python && python_mod_cleanup opencv
+}