diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-09-15 07:24:27 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-09-15 07:24:27 +0000 |
| commit | cfbcf93086ea5faadcfeb986b70cd9eba9506980 (patch) | |
| tree | 3d9025496d3b8f795ee7ab5961969c1ee78dd6cf /media-video/ffmpeg | |
| parent | Fix build with autoconf 2.64, bug #282900 (diff) | |
| download | historical-cfbcf93086ea5faadcfeb986b70cd9eba9506980.tar.gz historical-cfbcf93086ea5faadcfeb986b70cd9eba9506980.tar.bz2 historical-cfbcf93086ea5faadcfeb986b70cd9eba9506980.zip | |
Fix dependencies on x264 for 0.5, it doesn't detect the latest version, bug #284937
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.5-r1.ebuild | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 4cac4191e5b3..27b288396b34 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.310 2009/09/07 08:52:08 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.311 2009/09/15 07:24:27 aballier Exp $ + + 15 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.5-r1.ebuild: + Fix dependencies on x264 for 0.5, it doesn't detect the latest version, + bug #284937 07 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.5_p19787.ebuild, ffmpeg-9999-r1.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 02e78356dcf9..4de36c43a6ef 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -3,15 +3,15 @@ Hash: SHA1 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a DIST ffmpeg-0.5_p19787.tar.bz2 3058617 RMD160 521fbaeb8cf332fb255688b106ab6e3a030f19c3 SHA1 2117cd07423dc54eca15bc54b31fa67d6c926ea6 SHA256 7610ee7a13586ce087a2fa2c8f7345914f5bed7aec4ad213ca004f45791a66d2 -EBUILD ffmpeg-0.5-r1.ebuild 6549 RMD160 7d3dc6f710b1944022c6a607737ea8be4e0b7385 SHA1 23b88211d4e61f9b49c7b8a3a1f85ed1616cf1b8 SHA256 83d0453256174cd98f8d7fbc0c8fca48f1b0ddd681e5345a796af1c0350668d9 +EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 7b4886e169d964dbc6ea0c359f88c0ca012ee566 SHA1 cdc465ae82fb16d934d1dedfd4fecb7cbc0f9da3 SHA256 a24f663123ef9dff8b5ff41ac8fc7eb946149b4518476b095a44dc5ce5061732 EBUILD ffmpeg-0.5_p19787.ebuild 7587 RMD160 54d32e2b9ecc78992674240aae4e54dc32efa72d SHA1 e1086c9987661e27f534cb7f10be0e8e1e0cf83d SHA256 0a02d131afd89beec529638a39564f7048f160712ea639e8a91a5ecdb051e836 EBUILD ffmpeg-9999-r1.ebuild 7544 RMD160 2e271d4e4370cae71f0e5311a7e7db0993dfd848 SHA1 86433b0951c95ce1346500c141b74ecdb6f25eae SHA256 12cf64b360ee9cbae0ed68cb673f119dc6ca808f2bdb3950aca2891d352fb314 -MISC ChangeLog 47272 RMD160 d83b7dbbd46d2bddd9f7236d824ace723045d3a0 SHA1 a5f98733f5a74bbcd95c187abe0023eb70b1364e SHA256 5b7306b37ea956822dbed715f7eb05be9ca6605e792f024e5d69f97989e4e37c +MISC ChangeLog 47435 RMD160 24ea29c16ca68ea892d971801193a6447b756f92 SHA1 59186cd96a1d708b532b18c71cd605e1a5764321 SHA256 6c7160934616cf37ca0489678de081dcaa9cd2d6d5326aa54d18624ccf58b11e MISC metadata.xml 1789 RMD160 84a7ab72fdc26957a4040bf7d6b1f7a823b38e17 SHA1 8c8db893db07715bec78bd1b36c385c85b4fe3a0 SHA256 f250a28df71c2fb2b067cd6b274c4f36d4df33fee77ebb2a35d1e57fcf38a1ca -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkqkyb4ACgkQvFcC4BYPU0ojGACfbozO+S2ZU/L7Z92RkCrDvT7U -QxYAni4jk+chD5RlFILD5CNd5/uTdWer -=+HED +iEYEARECAAYFAkqvQTEACgkQvFcC4BYPU0qjagCfepqPa68uFB3BvIuYye8M4mQL +7Z4AoLMh6fEGdPbwimupGi6Q7kHE2Ltv +=KEri -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild index ece802a2543e..16800dabefd6 100644 --- a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.15 2009/07/09 13:43:14 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.16 2009/09/15 07:24:27 aballier Exp $ EAPI=2 @@ -38,7 +38,7 @@ RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 ) ) vorbis? ( media-libs/libvorbis media-libs/libogg ) theora? ( media-libs/libtheora[encode] media-libs/libogg ) - x264? ( >=media-libs/x264-0.0.20081006 ) + x264? ( >=media-libs/x264-0.0.20081006 <=media-libs/x264-0.0.20090629 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) faad? ( >=media-libs/faad2-2.6.1 ) zlib? ( sys-libs/zlib ) |