Fix libavutil usage

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

4 files changed, 21 insertions, 27 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 3c0422d3e985..e6a693d4b23d 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.58 2011/11/13 14:36:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.59 2011/11/14 04:53:45 lu_zero Exp $
+
+  14 Nov 2011; Luca Barbato <lu_zero@gentoo.org> opencv-2.3.1a.ebuild,
+  +files/opencv-2.3.1a-libav-0.7.patch:
+  Fix libavutil usage
 
   13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild:
   Does not work with libav-0.8_pre, bug 384021
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5e2daf978c52..1386c13168d5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,35 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
 AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861
 AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c
 AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
 AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
 AUX opencv-2.3.1a-convert_sets_to_options.patch 9798 RMD160 6265ae4e223def1b5e199f665c740951bdabc78e SHA1 64142f43079ef5d5a4cf91f8ad58f9a744ea6de9 SHA256 fef051756bac47ec68fed3468a5d7d339ab21ae325a21482554f34f9b19f1e08
+AUX opencv-2.3.1a-libav-0.7.patch 415 RMD160 cc9ae832bb72e0ecb09ad25356cb6bcc9ee5e084 SHA1 b1021d451c0949edd0da8dd05c88e2a433c33bbb SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099
 AUX opencv-2.3.1a-libsuffix.patch 1949 RMD160 55ef74fec3ec29aa9b7c7af98b6a2a3be186141e SHA1 7dc609754bbf0de85e0b48ff4622b80b9a70f4c7 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44
 AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2ec75 SHA1 6efd881f96c4464d825616dd6c556867cb085402 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207
 DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
 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 4188 RMD160 617a44a91a85bc429e5e4e1ba84b0a799c8b07b5 SHA1 97d6acbe02c9725afb523af9fc7734785f884cf4 SHA256 94c8984a78bb4f598d80bbe940f5e257e6ef4acb7a88f23c6e9d001c8831d995
-MISC ChangeLog 10482 RMD160 7f703a5c744515dbb71404945cf14be92d3cd7b9 SHA1 498a08e756bbb907a020b189b6e8b9f1e3711741 SHA256 8f3e9ff3ac47421ec3af498dd7d5d6549f039aba4e46dacb92a2c76eb1567b74
+EBUILD opencv-2.3.1a.ebuild 4179 RMD160 0ba8dbaa4ac15f06ac41fdd76cf8ae41ace4bb03 SHA1 dd2e9163aee5e402154eaae66a410c175e8c4dca SHA256 44497a217fe2cee268c51e1341ee0e1daff5b5a8fe7aa7cbc3c2be1c163896f8
+MISC ChangeLog 10614 RMD160 5f20099079ef57cc3145be2bf5300a752c7aad23 SHA1 95013ec39b33a831bf2b35b2d30b8c315c9e94f8 SHA256 92dfe22912ea1707dd0ee09e523a8534820ff281db0e0efa8ce721f437d0ed7d
 MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-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/files/opencv-2.3.1a-libav-0.7.patch b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
new file mode 100644
index 000000000000..59090703d149
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
@@ -0,0 +1,10 @@
+--- OpenCV-2.3.1.orig/modules/highgui/src/cap_ffmpeg_impl.hpp	2011-11-14 05:33:37.000000000 +0100
++++ OpenCV-2.3.1/modules/highgui/src/cap_ffmpeg_impl.hpp	2011-11-14 05:33:18.000000000 +0100
+@@ -104,6 +104,7 @@
+ #endif
+ #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
+   #include <libavcodec/avcodec.h>
++  #include <libavutil/mathematics.h>
+ #endif
+ #if defined(HAVE_LIBSWSCALE_SWSCALE_H)
+   #include <libswscale/swscale.h>
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
index 53026a71283d..b30e15ab4ed0 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.2 2011/11/13 14:36:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.3 2011/11/14 04:53:45 lu_zero Exp $
 
 EAPI=3
 
@@ -24,9 +24,7 @@ RDEPEND="
 	sys-libs/zlib
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 	eigen? ( dev-cpp/eigen:2 )
-	ffmpeg? (
-		|| ( media-video/ffmpeg <=media-video/libav-0.7.9999 )
-	)
+	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? (
 		media-libs/gstreamer
 		media-libs/gst-plugins-base
@@ -63,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-convert_sets_to_options.patch"
 	"${FILESDIR}/${P}-libsuffix.patch"
 	"${FILESDIR}/${P}-nocaps.patch"
+	"${FILESDIR}/${P}-libav-0.7.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"