summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-09-06 16:40:05 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-09-06 16:40:05 +0000
commit13504d5fbb34fcb107ba65544e13b94ef5cfee56 (patch)
tree219e6e9039326ae52614f93fc2b988f54496c5a1 /media-libs/opencv
parentVersion bump. (diff)
downloadhistorical-13504d5fbb34fcb107ba65544e13b94ef5cfee56.tar.gz
historical-13504d5fbb34fcb107ba65544e13b94ef5cfee56.tar.bz2
historical-13504d5fbb34fcb107ba65544e13b94ef5cfee56.zip
OpenCV-2.4.5 only works with CUDA 5.0 or lower, bug 483634
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0x84AD142F
Diffstat (limited to 'media-libs/opencv')
-rw-r--r--media-libs/opencv/ChangeLog5
-rw-r--r--media-libs/opencv/Manifest30
-rw-r--r--media-libs/opencv/opencv-2.4.5.ebuild4
3 files changed, 21 insertions, 18 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 5405f20d2478..e92100501074 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.101 2013/09/04 18:43:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.102 2013/09/06 16:39:48 dilfridge Exp $
+
+ 06 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.5.ebuild:
+ OpenCV-2.4.5 only works with CUDA 5.0 or lower, bug 483634
*opencv-2.4.6.1 (04 Sep 2013)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 658fbf758ff1..719e11766658 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,24 +7,24 @@ AUX opencv-2.4.3-gcc47.patch 835 SHA256 bb64b8af632b67293d1c8024b3786162fccc9f4e
AUX opencv-2.4.5-javamagic.patch 1140 SHA256 1a3fd6918982909dc1de4258cc386139f7005617032cb457d5ea521f0b4d2ad5 SHA512 f283529bc6482203b2ffdf57aafcdf80351eaf8d09c07c6f14991e5d6bc25679dab31f3dd0475b1eee32f9ba8636e9ba96755b90c96de7059c8f69c0d43746aa WHIRLPOOL a483809bfe0ca11a299757bd1ec42ada5fc1d415eb366f9e2d05a6e8a30dec6b8d8baf662da0041632e23b3ed0d4f90e612fb15ede0e126c09e9a98da7a9621c
DIST opencv-2.4.5.tar.gz 81884985 SHA256 d30beecf4b57977fbd1635af54c5ab3fc00113e9e59a9d58081732260fe06292 SHA512 2e0ab19203cc5d3a4d83633ee9762441d0d12128752edecb351b3c4abddc1714baf4b320b161f8b58e771933506bfa5a192d394a3b6b5b63d914923c6a767a08 WHIRLPOOL 117551edab5837a9382a6d84dec7f84fb693485e3cad7c08d38158baa22951381eb4958caaaa910dcef6ee2b78a0a494d732d0cac88cd18f1f6ebc2d30e3ddf0
DIST opencv-2.4.6.1.tar.gz 80762052 SHA256 ae7cfd859476b6cc05246949ddcb165fb284eaf9a6d814b2976dc21088778aa0 SHA512 0e04ce40f749cceb1305f0d8f22241fcdef4aa2a158ea490516a0fa0ce7d7ff137ef5932a1ed0b8258324793662042a464d92477faf0c6087d6fdb95e5f31720 WHIRLPOOL baaad3a037c61bd6b08aec3a5194f4fb2cdda8f90a59ecfb2b72f7b3fdaa11deffcef52d728e3ce49d3d40d584063a9dbd975a870d6e6bafedbfe7df4838e413
-EBUILD opencv-2.4.5.ebuild 5174 SHA256 d5e0c53f98ec79923ae8297d60f81cb69ee715b4023c02a9a060f4750eb2656f SHA512 c3e59e2c519f07e322a72bdea385c316ef75c6a5a65b218489c8b39859d1e3ccc3fd6af47fa3c29671a52d86f5973efcf0419aeb80b5745a046360cd2218bc41 WHIRLPOOL d0cf8de6a12cc746dfafdcb449eb6d41e3db0b110fead0982e8228e5e311154c827beabf7cd23198fd9d535899036d2780a1320dd58a3537ec695cbade2e93fe
+EBUILD opencv-2.4.5.ebuild 5174 SHA256 9947ef216eb778c4db530afa7c0c73ecfaf007d4195f652c552038e4d1afac92 SHA512 95b2cc6cf749046e66c783d3a13e0b098e4044c9741a9cd336c189bfcc454f2d1a554c33df3c0e71111e16601cb1cafe5db3f37839abc118a68d2755d296c916 WHIRLPOOL e9e9e2aec05fcaabacd7e973094591eac839e8cfd42a18bfd2567c047f33006a18191dd313e2e3244ee8e2cf6aa087701cd640d9caaf43c81e74a71f2a08e52e
EBUILD opencv-2.4.6.1.ebuild 5180 SHA256 8dd5be4bb1110ca3053d1884385dbe1f5fd85b5a578ba03ae9c0c6049b2f8ccc SHA512 2d1dca4daa44f94c80b5f9fcc29c5fe6faf8dd980cddd8e37ed5419391710143376235f3e56b52397cc1d0cfa85d5525952c1bfb0764057cb7f634da96557989 WHIRLPOOL 785fb7dd867c10bff29f8e46979db474e10f0e30f106d8b5bd5dbe614a45a6468ef3ef5299fc9ca0d6a9c0fe17c353c9ba3f322d85b712a001ac3888ee6af9ab
-MISC ChangeLog 17444 SHA256 d993b0a30ceaedad4848257f98f46896f42dcc384d26ec1e27eacf96f7e32be3 SHA512 9ace11996431f833cf2a9293c73413adbfb932436f70137a06a4e14d20e491b1b081ccfe767617e9be83a82befd30379e1dadbcae1327b7f6098c0839c79a8f2 WHIRLPOOL 59811e737e5cbf6f1df4dc4b91a1107360fb859a6296dfb7423553db7f8adaa1b3615132903517232c2a92e53dd4fbf9d49a4b474f38c0281dde06738601b8db
+MISC ChangeLog 17584 SHA256 5e2a644508b3d3764250544037b681fe691a46a07dcd20ca3f3ed98dd6be6900 SHA512 d658685976da406399feb508b92ea4d49a5aff967ba5ae11fffa28df5fa27c6c944d4c8cf08b8bfed1b2214319c6e1905db28a83a4be2f3d858476ac45e280ab WHIRLPOOL 65579daa155daf8311aa2dfd7c3b73e1002a54ad7eb790c7727e88796e24683424502c102c0f4e4950c6d6bb9a7ba9bdf61da2aa7d0931581abccc5157f82576
MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCAAGBQJSJ399AAoJEJS/30SErRQvQxgP/0cKob3+i/5zIXBOZA68ZWak
-zgXFdtOiNdAoykZGtftbQOlOvGnsk5DjT9fz+povCXwijk6fmCVZ5/HqgZB0besq
-mKAwqwAYw58IFnxMiKQ4hk+ymziwlsYz9lXDCAxBkQnhwvyy3xoI/QwDaLeN///9
-E3un+e0W3MTQl0mzPO3P5yooXCGcqDrkTMamO4DNMt6q1NFXhOrOCdUIBMNXtc34
-cL1X30+XyOFNSGWvUSglgcrNCdC90SbEbsuGwhdoKdMrs2twDiNfOmuyf+A0+10H
-A6qFVBWuWcqYx4wnKxCW+xanK4XYhLcGuUV2aDSTFYOf+38QEU8qb1yId4o80Hi5
-pSy0LdFKkH+ISi5dwgh9AcZbLISF8KU0Aa2rL5BbG3YRjYhM7UYZEjR/vCo/Y0VH
-3Zd/5IAiCEngiXwnF2z1JNcVLBnTGLbE4XMso7fIj1ogMuH4L4bMhRMxxN711q1M
-e5Hls5vXj9Acve1sIBZaLozPJPpU7RzSy9tEzya0RQfPNoWNTyc31HFZrI79sbPO
-b9fNGRnct1dUfHvx1muL33PW7I3V7YKX7SqTlgJEhvCxhwcMvf0urGWCEF0vB9Db
-SwGDcc4lO5lfqk5lUG3BS6KY2XICcktnTov7wMIsAZNDbVBNPomlF7POS/AAh80U
-YQ+S+zexsfx7ekoYXdRF
-=LzHx
+iQIcBAEBCAAGBQJSKgWEAAoJEJS/30SErRQvGPcP/0KWPQJB+xuN/DSqgvk5APBU
+g3R6ZeoSXrxBkANoPjoGaADIM+mhWK4tLoogoHCGaQs3JzXeaxa3r2CASetO6gNE
+i0rNAwPS4OPfTccqRYM8/89+3AexRM3do0pg69n/NBPchgZgqBymydb37WKSlsut
+L29klpDSc9/KSp8M/RQr+8SSdKCSztEC0gC8iyqTsCBar+XEOVDjB6u5d3AeQSRo
+oZt05yxM9wsR+WnptTNSJSr7HVvYpe7+V8kuCbGLix3gYVnZNnzNCPvef6G7uU7Y
+SQfqJKf5VU9Qe+XFs0d0jKyW5EKKJp02UeZi3xkGZz0jFESazerV0oxQrWi5LwX3
+vj0UU1w7X/k/5+92hpm3Ni+7AvV90vVVbqNCZmtwaAKuIvdQGaFvOLk+PG53zoIi
+/a41Vnk8koUZk1AnCzWjwS9Vxh7L5+wHJQtlIQzLdh63bmjQC2FaEtPKdT9MpwPh
+w67S92obJr1FDZ87yDY2yh30XKpKWYOOhm91OnQLMWxK1+LMkwtjLSDi94MLzESa
+iFESJHi0S2OoOzvezdJkIFdVs3vo3cyBcy+MwPQsLnhFmZuZwyAlpO1yiiIsztYO
+S6QPTmNlsX9u0Dv1r2tT1gTeC0rB6zJEPVVUImP0AdJr2fQ/cEq8gG5CmU5JlBgA
+fj8nKfNnQipXTVl8aDUI
+=aAmM
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.4.5.ebuild b/media-libs/opencv/opencv-2.4.5.ebuild
index 294407945854..f4a977017e39 100644
--- a/media-libs/opencv/opencv-2.4.5.ebuild
+++ b/media-libs/opencv/opencv-2.4.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.5.ebuild,v 1.6 2013/08/27 20:33:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.5.ebuild,v 1.7 2013/09/06 16:39:49 dilfridge Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
@@ -20,7 +20,7 @@ RDEPEND="
app-arch/bzip2
dev-python/numpy
sys-libs/zlib
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 )
+ cuda? ( <dev-util/nvidia-cuda-toolkit-5.5 )
eigen? ( dev-cpp/eigen:2 )
ffmpeg? ( virtual/ffmpeg )
gstreamer? (