summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2011-11-13 14:36:29 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2011-11-13 14:36:29 +0000
commitd6583eb136f35e2096f07d1dc6e24418bcbe0c3b (patch)
tree4ed33b898b45ef30045f4f4dac77192022e97ec9 /media-libs/opencv
parentVersion bump, thanks to Andreas Sturmlechner for his help (diff)
downloadhistorical-d6583eb136f35e2096f07d1dc6e24418bcbe0c3b.tar.gz
historical-d6583eb136f35e2096f07d1dc6e24418bcbe0c3b.tar.bz2
historical-d6583eb136f35e2096f07d1dc6e24418bcbe0c3b.zip
Does not work with libav-0.8_pre, bug 384021
Package-Manager: portage-2.1.10.34/cvs/Linux x86_64
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.3.1a.ebuild6
3 files changed, 23 insertions, 18 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 25aabbaaf8ed..3c0422d3e985 100644
--- 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.57 2011/11/13 14:27:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.58 2011/11/13 14:36:29 dilfridge Exp $
+
+ 13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild:
+ Does not work with libav-0.8_pre, bug 384021
*opencv-2.3.1a (13 Nov 2011)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index bb1740ef6ef2..5e2daf978c52 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -13,23 +13,23 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
DIST OpenCV-2.3.1a.tar.bz2 32669613 RMD160 f2f459bf7c163acb90427db2b0b425ab8008cde5 SHA1 9784e6824c5f677fac82ae83a2f366743adb3299 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c
EBUILD opencv-2.3.0-r1.ebuild 4195 RMD160 46b13021e73b963663d136602ef024bbff53e080 SHA1 047df422d2f2d622ba55cb0efc03cccec31d8d00 SHA256 588aa6f79a4aa89af558cd9e527a341836b079c6e69886620baa280c8e307ff7
EBUILD opencv-2.3.0.ebuild 4147 RMD160 e554d1fd86ab5c143f6249bf5d33b75397a1cbf8 SHA1 f6166a850f807e40ee7e879145584eb746d6f8b8 SHA256 db1dfb92e5006f4bb8f0b4ea7297ad8bd22f1191e2a5f5e9444747790b22b7f7
-EBUILD opencv-2.3.1a.ebuild 4145 RMD160 14620430df491c33f12e1681bf5ab929260519d5 SHA1 0a456c1224570fd1897a8e7e0b7b3f1c46e5ba85 SHA256 5224940a84f61c11eb7c6d4eac9ad0ec95628a216f0a9694de2064193b1d7b74
-MISC ChangeLog 10355 RMD160 73384777e2c6a7401717ed74a815e9215fd1f212 SHA1 41f7edfc505f5fe948efce4ee710af40c5ef28b8 SHA256 59546503484f4ca342f2bbc88566480f9f009ccd8dd26813c05b6382de771112
+EBUILD opencv-2.3.1a.ebuild 4188 RMD160 617a44a91a85bc429e5e4e1ba84b0a799c8b07b5 SHA1 97d6acbe02c9725afb523af9fc7734785f884cf4 SHA256 94c8984a78bb4f598d80bbe940f5e257e6ef4acb7a88f23c6e9d001c8831d995
+MISC ChangeLog 10482 RMD160 7f703a5c744515dbb71404945cf14be92d3cd7b9 SHA1 498a08e756bbb907a020b189b6e8b9f1e3711741 SHA256 8f3e9ff3ac47421ec3af498dd7d5d6549f039aba4e46dacb92a2c76eb1567b74
MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOv9QoAAoJEEb+UGWnxTyHxrYQAIXINizYbTQaxXyUERuXJteV
-EjlhuuSpyJyIrkCk+Z1vw49AdpCPcio0yLP0yPGMGSzAAGF80Uej8LrAM8uJJchP
-x1eZgdUB/2olWdtCgIxJJPBaV2dgQtHoRrsrL0y/ObBPpcQ5VAgLQo6vWpW3Sqx2
-CHL5C2eZzPuuRFqp3381IERvf4l9sdqkItFjTN3LogDTo1bP9Ve5VVqjtr6HovPz
-qfPlyjXn97Xzxgmy912fTXMC1FIBXTfS+qd8zCKd22sOCd4tBqH36acKmyhERotE
-eNOV4BCzS0K4SGvTOCnX4Rq9erMn6PQtsEN4suS9+8Vbe7B2TetfxIuST0WScjRg
-LW93F0GFHIa66BkJkWr+FibSjAIqAZCx1sVx1kNaVuDlEf3eo0i0kgBNWCv/1V4r
-nMxApb30hrMOPZya2+PzVH72Wj/Z9KRa5/PESB4GArP5gPEzEvqfXhmXEwzcGwLH
-uL9AKVN7IsD6GSiJ3WuCTNcTuIKzQOWYeRtzDtk9feMt+vuU6Qb+wImRCB6c1KWj
-cguUAgujdefB1Q8NSAiUzVv+eIrJljrsLh3EMPemoA0zYjXNl6qgLimDQDV1EfgQ
-UiEUpWiGpn5OcE+BkhPbs8nSe38C4wLs5ikn4tk1+DKDIp5ktbuA7NHjaF/uKmtN
-e3jQqPt8GJAukuFqFpXs
-=/Fu8
+iQIcBAEBCgAGBQJOv9ZEAAoJEEb+UGWnxTyHQ1gQAIfSRBE2HsQ989yPD2jcoXXS
+d0uefg+a7x9RsElEdohcEiHERX7ZbK1Wx/TRnW20Sei4og/9o0W5GDaKTZO011B6
+YnFh7n5kVcGk0R41R1BTD+rrc9SswLuCMuZLVOHNGU/UPuFg77QgBxm67qgGCZtB
+vIrWwMkdiLoMfn9byWTH5lvdhW5WY8NuPqbjAi7BduETyU9BY5N2EevSfep7n0AL
+iRsy1+DbrB6DA2FIQCXUwGethHHn31cbO0la/EzqghoOImdbJc8Pu/frOJDnz08s
+dOt5U2Wvm0gvUwApbCgGRvkji394JKrGtCW3qg7H4bnqzuz6YZJNpy7SDk2pbNao
+o7jvlZV6bi8jtEyop58X/qk8yTBCFztlF3sfNFgkWZpJ55CV2OXeT7+ItlSjH7Yq
+P0ek6I0Gcgw8xEjiRccHRiduTm1LieDMcZhO3Y5HUzo+gdxmsgcldXVLYLiDbsoA
+rfazP7m8AFa2a6w0ePcpSvLV7DyHItuPIJpxumTdraBLDmF5vB6A5zf9SCHMAThK
+ZiJLGmXekGJ56iW875yGM1TTcLgT7ExWtWnAvxFApo4sjEv/WIbiVVF11mkTPABR
+G47Xe+PL5rG1F+SnZvC42Rll49h5DL2K46YoZNo/pP7mg8aP586LcMyjyAEmcIDn
+wmPbpZERcLO55UgGRtKw
+=/O8P
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
index b4eb279e8de7..53026a71283d 100644
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a.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.1a.ebuild,v 1.1 2011/11/13 14:27:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.2 2011/11/13 14:36:29 dilfridge Exp $
EAPI=3
@@ -24,7 +24,9 @@ RDEPEND="
sys-libs/zlib
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
eigen? ( dev-cpp/eigen:2 )
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? (
+ || ( media-video/ffmpeg <=media-video/libav-0.7.9999 )
+ )
gstreamer? (
media-libs/gstreamer
media-libs/gst-plugins-base