works fine with ffmpeg 0.9, updating dep

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/media-libs/ffmpegsource/ChangeLog b/media-libs/ffmpegsource/ChangeLog
index 0063a77d438376ad8db77b5edccbcfeb1d06f292..369e79d9aded152c8be7d7687dbb4d74e0f8cf9a 100644 (file)
--- a/media-libs/ffmpegsource/ChangeLog
+++ b/media-libs/ffmpegsource/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ffmpegsource
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.4 2011/12/10 15:17:59 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ChangeLog,v 1.5 2011/12/17 14:32:55 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org>
+  ffmpegsource-2.16.2.1_pre587.ebuild:
+  works fine with ffmpeg 0.9, updating dep
 
   10 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org>
   ffmpegsource-2.16.2.1_pre587.ebuild:

diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 762d4150c0d4435193daf5a5248d09304af57e47..a4fbcd7507887ded93a2dc0f91fa3384cd8017e7 100644 (file)
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ffmpegsource-2.16.2.1_pre587.tar.xz 334092 RMD160 36f1ee1ff9b377caa488e3f1f12cfc1a506840b0 SHA1 b1d5360cdc227710d171450f12fc8547b06581b0 SHA256 0664164838fe3642eddfdf4d0b34de6ddc0d61771084aca2943a64a64d036d77
 DIST ffms-2.16-src.tar.bz2 391101 RMD160 6aa08b3500f7145e88873006ba2bc083b36b1022 SHA1 0446375a2ec0cddee85de3b7b1c83eb5938ce8f1 SHA256 0a79d3937b901dbf3bff808e97340048a3e9c4841d893d47daab82be1bf3f7c1
-EBUILD ffmpegsource-2.16.2.1_pre587.ebuild 920 RMD160 44b5bc19004553b9f8e5e2b2a1707840a630b144 SHA1 a4e25c7da8227110a54268aed7b1b4effdce09df SHA256 46e01364fc0ccbdce07f16973a93522995f4c56b9f5163f8cbc29ba556f43728
+EBUILD ffmpegsource-2.16.2.1_pre587.ebuild 951 RMD160 98369daadd2d87052182a29d47f77ff53990469e SHA1 03bb6e897bdd1ee34340a51d9eb3989fa405bc13 SHA256 f9f5566ad90020ad6b0f1dfdd3b06822a6b34f2731baae823fca3244787d5434
 EBUILD ffmpegsource-2.16.ebuild 939 RMD160 b9070b8251fddc2acf068900a4f486882f3e30ae SHA1 4ffbcc2a1a7b30b4c3bacc4d5347f689775ad108 SHA256 3a0b869fd8972be98a9d1896c6cdcffe8dd96e32df703bff10613440cd7a827e
 EBUILD ffmpegsource-9999.ebuild 887 RMD160 f7f87589fb230e24cffc03bf0ac7c4a817df6639 SHA1 a375b9ddf60d9d8b33e3a8dec92530605da0424d SHA256 9bca226f9fb0ab541e70de693784d0a62a9dc061a0d4b6c44a8f5a0a4adbda0a
-MISC ChangeLog 1084 RMD160 b75d6d923341572c2fd15123e891671a68fdd108 SHA1 014b6344e926708236156b8d3a346dd2215f8988 SHA256 a9425a4801e654c7b2a81d3350442f126e6ff99577198c78963deabc6e0c9564
+MISC ChangeLog 1218 RMD160 ef3580fbe5c865e0001c8a55b7a4476aafc19950 SHA1 f170c5477c583545b027b428cff01b58bca03f4d SHA256 84c23fe5e1c27ea101a27a9f052cc7fe91beb9d1973dc15257621a1bfd2c1a00
 MISC metadata.xml 464 RMD160 291ea55b81c21ff883dfe92a3e6a3e5a740b0ca6 SHA1 f232a1920251c44e60b234d3c12239f2432ad8e7 SHA256 e3c146e53af83541b7043ebc4aa1671730b513a5e192abe815b2b90c9f002e67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk7sqB0ACgkQvFcC4BYPU0qsoQCfYWiCpNwK9ad2pi3i0MoWlOA7
+cz8Anj3F1LatZlMuRG/aDUHXtDqTIO37
+=QK6M
+-----END PGP SIGNATURE-----

diff --git a/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild
index a087fbd90bf0f62c2ccf0b732042258998ee47af..1745fe977266c618d6ca552e360e2a60a09cb14a 100644 (file)
--- a/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.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/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild,v 1.2 2011/12/10 15:17:59 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.16.2.1_pre587.ebuild,v 1.3 2011/12/17 14:32:55 aballier Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ IUSE="postproc static-libs"
 
 RDEPEND="
        sys-libs/zlib
-       >=media-video/libav-0.8_pre20111116
+       || ( >=media-video/ffmpeg-0.9 >=media-video/libav-0.8_pre20111116 )
 "
 DEPEND="${RDEPEND}
        dev-util/pkgconfig