Disable cuda support if >=gcc-4.5, bug 383847

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

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index fbd5f69f311182f8a23a42d56af556bf1e1dbc40..523bf3d4e0bf104514895b83346244110c3e0a8e 100644 (file)
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,9 @@
 # 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.47 2011/09/22 20:03:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.48 2011/09/26 22:38:16 dilfridge Exp $
+
+  26 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild:
+  Disable cuda support if >=gcc-4.5, bug 383847
 
   22 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild:
   Tests subdirectory has been removed from distribution

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a78a70f227f3b560844ac81d0317f24565adcb59..27977a8e973cab77043532445dec3ee47cd1f65c 100644 (file)
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -27,23 +27,23 @@ 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 3987 RMD160 988f117ac62ceb50e13383f32d5027a3edfcf4f8 SHA1 f797620a9425ce436e4ecc15dbe652d2ea5ad5e5 SHA256 2944d0382cf896d3cf3cba50e23978604483223a25514f628da8f1d378e32e22
-MISC ChangeLog 8226 RMD160 b25981010994053a045d364d1acaf719c79cbb3f SHA1 85479220e745d537ad8f50aa1b2fcc2748dcf14c SHA256 193aeccaa555f8c36aa1bb058f04579eb0916f77a3478a1f01047a51c6c61892
+EBUILD opencv-2.3.0.ebuild 4241 RMD160 ac9599e90fb48cde195fb71650275ce0068d3972 SHA1 3a9d9d0a927b8a1bd8a35832f163198d847a02b8 SHA256 65365f73d09d5e435240e2db253bbe23bf779101cc939f7f27720baa454b0d08
+MISC ChangeLog 8353 RMD160 fba19db70831337a5e0017a1cbbc1b304cf58760 SHA1 a59245bccd77358c34f76054a69c7a50dc6246e1 SHA256 1c054393e39854fb2c3a0fddd06832129df3dc885e5760127f9d06e98e7ca344
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOe5TRAAoJENwGBM22xffeWPYQAJSgVCSar3/CUU8Wj9KhyvG0
-ZU0iiWcCBdFRwOuQ2i41UEbogx9U1K6i0gKzThPvKMfcV2yOGe0HjdELQQ7LNNIC
-vWkjj6ETFmBLhyiKdST4GY6q6Qlg59ZrqBLftcpxrdHfEvyz7xcLOXoOWQeQSkRQ
-GAssTSKuFnRXZYuBZFRWTTOTTT9emTT5IwRca/fJR7CblYTT/hDEQT9YXzp+jPJA
-1FSUVtz66l7WluEm9oLnL4sX1oze6uxlJ9jeXf4XIFpROXvhYmodD5FLiduy0Prq
-iZAkTewMAR2XLg2m1mv3CU0Ej/l5+HjLj/3Xum4yUlAGE0y0c8Kmxzcql13Sd6Dx
-CaUR+pyhvlhgZkaUWK/cR77ZGdVMME+ctUNt71vqgQrS+glUKbhNpOKQLeeFHM6n
-vL726NRKzlSeNryK/N6wH84tPwwKaKFlLeC9/XVCM2LmFzVMMvz39YPvVyaFAq/9
-bhuYDP8ROK2SDJijR8NZCgFQLVcq6UgMwP4szW1rYgPE9t+vNqXV4S60ihDrL/To
-IGrQQ2oJQ+LBBAhgNvMM3Sx0HvXteSNqIkV6Zyk9iS/COBAkYwyPmtVLAN7nSYob
-XXHdKPtLjvYqKVdlIe6rUkOf1jwvldCDs1GMxS/hd2rLEFB+hdAt8n40SpPorK4A
-8naRd9lkf/zTPFl1/b8c
-=MtP0
+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
 -----END PGP SIGNATURE-----

diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 389fd7a74c5ff99f52203af33c50a9076f8c14f6..0d41961db7ef5512d352fe9958a768ad116bef05 100644 (file)
--- 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.3 2011/09/22 20:03:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.4 2011/09/26 22:38:16 dilfridge Exp $
 
 EAPI=3
 
@@ -99,7 +99,6 @@ src_configure() {
                $(cmake-utils_use_enable ssse3 SSSE3)
                $(cmake-utils_use_with 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)
@@ -115,6 +114,17 @@ src_configure() {
                $(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