[gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/

["Andreas K. Huettel" <dilfridge@gentoo.org>]

commit:     0b7982014453db83c96419cdcfef028b7c242e57
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun May 15 17:04:51 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 15 17:04:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0b798201

[media-libs/opencv] Resync with tree

(Portage version: 2.1.9.49/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

---
 media-libs/opencv/ChangeLog                        |    4 ++
 media-libs/opencv/Manifest                         |   31 ++++++++++---------
 ...cv-2.2.0-r11.ebuild => opencv-2.2.0-r10.ebuild} |    2 +-
 ...opencv-2.2.0-r11.ebuild => opencv-2.2.0.ebuild} |   21 +++----------
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 48f596f..715cabb 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $
 
+  15 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.2.0.ebuild,
+  +opencv-2.2.0-r10.ebuild, -opencv-2.2.0-r11.ebuild:
+  Resync with tree
+
   14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -files/opencv-2.0.0-libpng14.patch, -opencv-2.1.0.ebuild,
   -files/opencv-2.1.0-mmap.patch, -files/opencv-2.1.0-multilib.patch,

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a49724d..bb80aac 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -13,23 +13,24 @@ AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b5
 AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216e5d696bc103 SHA1 ba0ac15a4f60a7b875b9e28e51a2e41b1ba26fb9 SHA256 f83725b7b7fe8e47e98269abc803bb678cd0566646735d78f3e82c3f70b872de
 AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-EBUILD opencv-2.2.0-r11.ebuild 4395 RMD160 7361fd58b4e154b542fe496fed43bd2e14c4e75e SHA1 7da9bbf9507e995a63e47b5b9c54a661f2e19c85 SHA256 bea812d01c231f072ab830d798a219ad9636139bf4ddbf826e54ca71c7764db7
-MISC ChangeLog 6624 RMD160 fa16a02153451bde0ba1b62172bee8b99d5d229f SHA1 975220ba665a5be7bc522367b887e5fdddae73ce SHA256 c171ef14bd84813dfc4c142910943a3a4ffc608c907f47c3fd3b283c5f5354bd
+EBUILD opencv-2.2.0-r10.ebuild 4395 RMD160 3a6f2fc6752ec38e83da63e7b3b63f67810801e6 SHA1 203ffcc7dfd013c963f494515e0cda12f334f133 SHA256 b301eb7e0e4b3cb2e738c583a326f8a3192ecac1a70139cee07ee4de9ec92da2
+EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
+MISC ChangeLog 6777 RMD160 99152d0a8c39bfdc2172815430e389f7b10ad7ee SHA1 fff5bfa89df9ffd63715bd7c0adc2ed5e64dc723 SHA256 b5b4b430a0ab2b31b07a5ae006dfb171558962f9eeca2f9b1b2a98caaf189b4f
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNztIYAAoJENwGBM22xffe2zcQAKZNfYBsHSC331qR0LSzmd1L
-vpmI5bBwbTTe/cRUvM/wZhQCXHP9sWm33g3EsoAmwUBeu6zGXQagjaFPY5pix2Xx
-qJSbL4zqseNBWQdrvfhFOtGQgIBzrZwJoibF/LBWns88JgOR0Fgs9FCRK071BfPZ
-GrB38qgRUcaBIdV9qsnSL4igv2hYLlJkQnTo9Blth+UET3S44jhocjOEuA3MxvxN
-T3Lhy/YcVblbOu9iu4+I/rewzh7Te6m6XDFRfL/eogd7LlSwylsk66nfWJ5iVLVp
-H84kBMoU8CIVnTo23u8UH8St2HA5tkbaIglupy3OqX/HRqs48rlscZxb5Ved+4tj
-k3hDk8jahkG4FDRP1usXldpMx6AwQvvwVFm+eRleFp55a05QM5W7qpzWy9W7HYNu
-xUX0tDUtaEElwPO6haKdMz8EVTwBagPb6g8Z+Ze8V8FXY3HuSRzSThPUzJQf4RQU
-3Sh6eRobCYQ4yXh0tlGgdqFeQrAU0nowIm8gqnsdFZmYX3+At4nGxDPqGasHAcw1
-d+vW3LDFxUXLaOTopYij+pWaWxe0k9j61WCrwhzPvsV+LqB/iWeWLaE9q63vMyXv
-cFZrTJy1oQ3YMEkYUXyhFPKMC0kZZxCC/9t/1Z7Qq/kDEpqQKphdK1uXnU0b+ScN
-qgU9rkbFOigPU/Ra6PQn
-=fwXD
+iQIcBAEBCgAGBQJN0AezAAoJENwGBM22xffeaeQP/2F4KDaJ729a9HyPRqOu+CN+
+vFgQCcgSOuIPb2GzpHRGS0Y9BXxZ7jhchGKqqfsTxp+P2cVmXsTonyYwwrcUTKNR
+3uKJvda1EodZb+1ySZSqsQcrejX1ekzHDn3kbRyj6dPvY4rt6rDVy15PhsLmlOqn
+8kCclAKzUXISyTLVayNHxHsNjutU68XMPxUwvEJaOTY5+ivYw5y6qkDw3NSlRRhC
+e80TIKc3PujpUAJcq9llVWi4xgYz7Ic7FKPEpwxz2TKUrij7kjvAzqcn/FVHuJ12
+aOCMyvqDlILhOP+rmSsBvyzvEGUL5yl5Bn8nl1nXzNyv5XzaJ52ADsNC8R+HKq7y
+AuTjw1vTIsla3lLxn4VyXrVX8Uktc6DcCNtwSfX3lh1+5clwEVfJleyBHhH0UHLM
+seDSv9Ipj8RLfPUocubl31z5WhFiMK75kMO2EZ0InxTLxyvC/XcleIOlEK8K0vtG
+0rPS+qqnDnwLoQSSnH4qSx7EkbURAgTwOgqg6wrGIurU93Bul+cn10gDXvoEDpul
+BNPXbZdzPmKB6Gxw3xbh19A8aGaKqH8dOovY95OjHuUG5hWg/i19eR39dh2Em6mK
+58KvyfDzbVtm4ROfWmeNa+D0OCFqjA5FqzIkLVozdfPWqmbTmwtNEpvck0EQ1sv7
+h6hzL67BAHcvndXJJdw+
+=Wonr
 -----END PGP SIGNATURE-----

diff --git a/media-libs/opencv/opencv-2.2.0-r11.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
similarity index 98%
copy from media-libs/opencv/opencv-2.2.0-r11.ebuild
copy to media-libs/opencv/opencv-2.2.0-r10.ebuild
index 4cc6bc4..a0cab96 100644
--- a/media-libs/opencv/opencv-2.2.0-r11.ebuild
+++ b/media-libs/opencv/opencv-2.2.0-r10.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-r10.ebuild,v 1.2 2011/05/01 17:53:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.3 2011/05/15 16:42:14 dilfridge Exp $
 
 EAPI=3
 

diff --git a/media-libs/opencv/opencv-2.2.0-r11.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
similarity index 88%
rename from media-libs/opencv/opencv-2.2.0-r11.ebuild
rename to media-libs/opencv/opencv-2.2.0.ebuild
index 4cc6bc4..99f7d1d 100644
--- a/media-libs/opencv/opencv-2.2.0-r11.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-r10.ebuild,v 1.2 2011/05/01 17:53:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.6 2011/05/09 23:11:36 hwoarang Exp $
 
 EAPI=3
 
@@ -16,8 +16,8 @@ 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"
+KEYWORDS="amd64 x86"
+IUSE="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
@@ -30,10 +30,6 @@ RDEPEND="
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
 	virtual/lapack
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-3.2
-		>=dev-util/nvidia-cuda-npp-3.2
-	)
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? (
@@ -47,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 )
@@ -77,7 +72,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-ptrcvcapture.patch"
 	"${FILESDIR}/${P}-use_system_libs.patch"
 	"${FILESDIR}/${P}-v4l_2.6.38.patch"
-	"${FILESDIR}/${P}-findnpp.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"
@@ -112,9 +106,9 @@ 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)
+		-DWITH_cuda=OFF
 		$(cmake-utils_use_with eigen)
 		$(cmake-utils_use_with ffmpeg)
 		$(cmake-utils_use_with gstreamer)
@@ -162,11 +156,6 @@ src_configure() {
 		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
 	)
 
-	# hardcode cuda paths
-	mycmakeargs+=(
-		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-	)
-
 	cmake-utils_src_configure
 }