Fix CUDA integration, bug 365509

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

3 files changed, 31 insertions, 18 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index f6d97fe8e977..75a954a74107 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2011/05/11 20:10:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.35 2011/05/15 16:42:14 dilfridge Exp $
+
+  15 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencv-2.2.0-r10.ebuild:
+  Fix CUDA integration, bug 365509
 
   11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> -opencv-2.0.0.ebuild,
   -files/opencv-2.0.0-multilib.patch:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 852dbaa56b49..ad314f35d2a3 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -17,24 +17,24 @@ AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81
 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
 EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
-EBUILD opencv-2.2.0-r10.ebuild 4234 RMD160 5863100749263ee45096a30b300a4a753a5e272c SHA1 05ebc58aa71df31760d56e31ec3d2b07119e267e SHA256 a0e505f8fbf5b5f2e3d2fa3ff8236e75c2f4ae4311bb54d94ae48454477a096b
+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 6203 RMD160 803557f473dceb15e64cd24e73529e2719ea462c SHA1 64416d4d413b3a57f6ca3a74e01a9ee89ed25e5b SHA256 7efa4601be6f6858a5ddaabbcb61ea676cdeca339b9b7f18c589a3acb20f1cd6
+MISC ChangeLog 6323 RMD160 6d0187e5373542f74075ec56287da98becc8bb6f SHA1 cd707727f713ac09c146aefdddcbf06d1331f3b8 SHA256 e9c07acf1d88d98a14c7b46efbe4326bcac9f81c234cd82c46fb58d97e5dd68d
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyvIcAAoJENwGBM22xffeuJUP/3nWqwo1gyPnIMMdWDOu30sH
-/feAJRp7CWIQ0f/9n0VRYCqKuRQTiNduy7mX9i+LorwhuqDjL0sgQxdmqCJHncgy
-LvHASCb+Hx2OHw2SAErOsEdQEAnJmJ/tLlDjN6YvLJVjjxKE/Wgxzdv/Ia15KlS9
-LmqhsuDq0V9gNsqbwKtAc1XmpBwmZVGv16LQUMVJhB4MK1Hz4h0X0HMKq07rPHjx
-f4CAClEXG6e39lH/Q7sM5JrgCbXdlO7rXiD7O0dcFzi2JDl1VkblaFeyrwkRU9Mh
-//btYX5hc2rwoNB69+sJWkQWhXVigEoWVuJrRRC9uVyiZyEsog0+5z2Gu0P2Tj8C
-9KfA2LcaqrznwMhq2dhlWUNyGDnj2Ly4P7rpiOtbnOkOd1UqmAhiHysptOQ/B3+H
-2yd3IujlYmYqdUL7c1kImvgrK51KhwD+s1hUBuuybvGErwXfGvouQHxdt+7NoARy
-C4mUZWh3FUdDQLvQTh0qFMHo0BmqACeCsZRKejmzDqmqIKS6P5z76d6Cz3f7gD1d
-6/I/fLxCuqal8ues99G5L5ybHm5Y/JfYpEjo1eaqm3zE/9FdlKHzxTNUlQdI3cWM
-NlPjVScpBhEfWLKFbL8j6Cf3M1Q3+NnHyq41vE67SmFr4zSe6n7J3I0lnLWF19Fq
-BNWJ7a+q95vHClDjYCrR
-=GAQs
+iQIcBAEBCgAGBQJN0AdDAAoJENwGBM22xffe8uYQAJvaapA1BOb+kS20TTxOSxw9
+qtvGg4zgu9AvN6NScsZoApOFRaTFNwkVMqNIcBKhCw2vKfP/9HxJvA6UDa/iZAEJ
+xF26ZK0embyVVEZgc6UWzGU0xfMHXWSDFctA+9taHj/ih9968zM27UBQD15kILbr
+yUmtDCkXLwL8fpfcawj3IJc3pQGdeME0tbnyFpxIUsJ7sS2qJNcLASILXwXx/nqa
+lbLqWiso4dw8cDkb6KxrI6N6k+12lywqf/RNrKNxzbObcdUhqb7co0bPbm9aRE7j
+6JsMchADn2E26F+MOkYDWKDXD2wySFYeWSm2yi7MxY6jJsix0HqCMGDxDaHfa90E
+nj5Gj1fhy1ZQiCPEfaNRJustrTZRmW7608tBOYTB4SlTF75md8Dhoh2994425LKJ
+emYdJO3BEook6CWg4jQAxX76jVdg/pI5SX7zwY7pEhjEvaJVvu6k4bHPSXBHclXM
+7LWpIJlTdDJh5TcSvDTN3VyrFkNfFKHtl9eGgHCIx/7Ie7TTIPMQC3axbAghA/jF
+xDCyD0j+CpD1ON5nAq7BEbr3Qjk95RQPjrLZoZfk5sw2SPaLFrfGCJzsXG8nrtC2
+Rt2YD/UXVvXnTGib+pcn51jQITmHsR5pQhYc9GUMv8yp+Byto3a80LIZQ9F4v4/q
+xatUtL6Pfy9ruZTQZc31
+=m+ms
 -----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
index 474bb64b9388..a0cab960f1cc 100644
--- a/media-libs/opencv/opencv-2.2.0-r10.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
 
@@ -30,7 +30,10 @@ RDEPEND="
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
 	virtual/lapack
-	cuda? ( dev-util/nvidia-cuda-toolkit )
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-3.2
+		>=dev-util/nvidia-cuda-npp-3.2
+	)
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? (
@@ -74,6 +77,7 @@ 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"
@@ -158,6 +162,11 @@ 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
 }