diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2011-05-01 17:59:49 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-05-01 17:59:49 +0000 |
| commit | d0da6d383bd028d05b43fbd2a21c01fe9494be17 (patch) | |
| tree | 8095c6cd980e69fde27294c26fd44b128c779806 /media-libs | |
| parent | actually there is circular still, use PDEPEND until I figure this out (diff) | |
| download | historical-d0da6d383bd028d05b43fbd2a21c01fe9494be17.tar.gz historical-d0da6d383bd028d05b43fbd2a21c01fe9494be17.tar.bz2 historical-d0da6d383bd028d05b43fbd2a21c01fe9494be17.zip | |
Disable cuda to ease stabilization
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/opencv/Manifest | 30 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.2.0.ebuild | 7 |
3 files changed, 23 insertions, 20 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index fcde9d9db272..2f32d7efb857 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.30 2011/05/01 17:53:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.31 2011/05/01 17:59:49 dilfridge Exp $ + + 01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> + opencv-2.2.0.ebuild: + Disable cuda to ease stabilization 01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild, diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index c237347c41f6..176ba70d3812 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -21,23 +21,23 @@ DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b EBUILD opencv-2.0.0.ebuild 2341 RMD160 95014760a935f3f421219f11af4b9f472c8ff11e SHA1 5ddf2e3492ee55d8c476a9f11a9da68881b4eb69 SHA256 a0a42ef185d9252339bf3010224ac21effbf6efaa59900c0021af07b4bea2097 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.ebuild 4190 RMD160 6d7346e9b96a4355bd06d91b7516a90e5ec41157 SHA1 f5faa6d2a9db683b4dcc1792b575d18a8374b872 SHA256 5269748cd44aeb217d43ac42aa860a5c8562ac84e3eeb4883537ae1adb35a652 -MISC ChangeLog 5750 RMD160 2d7574573c81815cf39745cd415ccc123c016211 SHA1 ca5fad2f346babcf69a45c8a9fa2afc07cb6c9f6 SHA256 c499d3b6fe905f5cb36cd2a5728ea2348b9182e7dcf6faadb2080699c91ef38e +EBUILD opencv-2.2.0.ebuild 4132 RMD160 06482b5cd2f593c84d61bd21d1cd2c1fe223bd99 SHA1 d5ba77cca28950d36b2f71a5053a81573a548148 SHA256 f1244a9b9b7bb30ab9c8e9b8ba555e3ddc3de4933b8e2459bc28411973da4fab +MISC ChangeLog 5868 RMD160 6f0d8a34afbd56b9bb54c0827287fdde4f15ade1 SHA1 94bbf4f7967959fe3d5c63050958393fd77a58dd SHA256 c612c8abde6a2637bd905fb7fa376b109ffe98b8826ae371b55d57cb766bff2c MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJNvZ69AAoJENwGBM22xffeP+4QAIegDo8Yp1x+JX4aPYYuPiVV -yR6jvtUSjCoved/u7cK7zcDhPC0tHg0Wg32/y/AbxLDSaBJKahzDOE1Ior3xzjr/ -puqwPhD05dR4hEvP0bd0biTL/2AbYAds2N9FJ25qazcTAd4j/LxRckFlhLe2PNmn -vPpXULC07/FZD6zNkbE32f5+iWM8nn1Ybl/f4975JDI3jfMiQ7wMUZNXS5DQOooN -+0F09HMlHMmcQbH/r8QPMbSDreYGD4Ilm32mZ3gXm3shtkbBUR5IpTClERXDhwPU -UVeJb3HVma7m7VfmUxc4FCUBELXud9rDswMxQTElCmCmx7wK7AK1QQfDcoEK1fmE -IOlje5g1Cd/VakNKWag/WYkDRjb/QHuhOwbIpYAWdOFu3vvU82SvL6JGYdxZL5Rw -b1mZ8LMIrqRIXY2554fXL7DhEhRd6bCoU0dPWbCEH8cZ3VdX3oTPSlQqhk44TzwN -TASUO9mgd/CxkCl1OVJTkQROiB/4mZi2PbfA9MUmkp78s5YrQFqXaLIs4Z/h7B16 -dAWSBaW7MsdoDATAXXhSpSTK8+zb06zoYs3WR/HvtZhxwZF5fYE2Eris7RZLd5AH -t4tvEJGtbuRKVwXO5N8r8y0CdqFXYM6lgX4kCjWs/mpIiNgo+9DN529iZemsArwW -l3UolrsamlhqsTlPp/3V -=0TXm +iQIcBAEBCgAGBQJNvaAgAAoJENwGBM22xffeeTgP/ip1saYWGdXeob0JY9ssh/Z7 +SGrvZP9vUTza7z6ZRhC7ESPPHMi+ea5HDZck3hlPtyR/jQSKvTZ31jM3ycULm4a0 +ntGAMFKxRHeJnLAOUU4IFQeO1NpJ3pKKE9WKU1xUwr43YrpNH7RREeJXju8ztFsY +cT7KcsnCS9JxiEBiYRrjzOqbUNdLlYSGNxdWy57AaI3R6ZCwKOB1D3etkG1uP3Oc +CXO02uhvak2qVbUVLsV/AbzgPDgaos6KebrEb+8AkNCijvSdkdxMfdEFHib1oLGW +LX4p/AYL3tMhDaPeeZ3FGzYlZgnp+dB9p94Q+dcle++U6fM+ne/ohnDh+zgzZiwU +t57cWO4BJP4MBsJ84DlDlVK8DieTlAH1yPE7cVWgyZoT1z0MQfEc/R1TAefiOiwe +KzbLNYP41TI4CPnUGV7PqjkguffOBiJH33732dvA/Ay3yYLvYDRIzw3vohgxAG14 +8R50zw6bGsbDzcaP1GqXWpPurLvv3Y3RjGJRAmhMdBCP9HI6nUr0I4xwOTPdUFII +MUuaLR1Tbwvtpf+DyUZSTdHm3fhngl5V1Wq8SunlmTELlCyZT/SYVUaKksz4grdJ +8FErl0Iprj37JIUGn6okk4GNf1PzKKigBvbvHpxfraow8ua9/SpkaIG7OiX6XbPy +Fqkd4SvSgBotIg6yuAY7 +=VQe5 -----END PGP SIGNATURE----- diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild index 5971bff4af1c..c713ac1aca05 100644 --- a/media-libs/opencv/opencv-2.2.0.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.ebuild,v 1.3 2011/05/01 17:53:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.4 2011/05/01 17:59:49 dilfridge Exp $ EAPI=3 @@ -17,7 +17,7 @@ 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 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" +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,7 +30,6 @@ RDEPEND=" >=sci-libs/clapack-3.2.1-r4 sci-libs/flann virtual/lapack - cuda? ( dev-util/nvidia-cuda-toolkit ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( @@ -109,7 +108,7 @@ src_configure() { $(cmake-utils_use_enable ssse3 SSSE3) -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) |