diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-10-22 09:39:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-22 09:39:49 +0000 |
| commit | 6120f17035ce6852d857df52fd6dfab01fb6922e (patch) | |
| tree | e37b3e9ce42d2822f6341855637220c717ebff26 /media-video/ffmpeg | |
| parent | Fixed build issue with gcc-3.4.6, bug #248800, thank barthek for report. (diff) | |
| download | historical-6120f17035ce6852d857df52fd6dfab01fb6922e.tar.gz historical-6120f17035ce6852d857df52fd6dfab01fb6922e.tar.bz2 historical-6120f17035ce6852d857df52fd6dfab01fb6922e.zip | |
Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes' Pettenò for reporting.
Package-Manager: portage-2.2_rc46/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 | 14 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.5-r1.ebuild | 4 |
3 files changed, 9 insertions, 15 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 73ff531fef91..328748d4b66d 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.319 2009/09/28 22:51:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.320 2009/10/22 09:39:49 ssuominen Exp $ + + 22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild: + Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes' + Pettenò for reporting. 28 Sep 2009; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.5_p19787.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 6642013d3ac6..b45b645efc85 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a DIST ffmpeg-0.5_p19928.tar.bz2 3072838 RMD160 06dfcade8584f357f2f2ce46c3cb9ee688c1229c SHA1 5448a649f1f518c960affee1b539126f8bd91dda SHA256 69923188435c31ed546d955281c4ad5ca5f4eb7793227152bc2bfe98824e80bc -EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 7b4886e169d964dbc6ea0c359f88c0ca012ee566 SHA1 cdc465ae82fb16d934d1dedfd4fecb7cbc0f9da3 SHA256 a24f663123ef9dff8b5ff41ac8fc7eb946149b4518476b095a44dc5ce5061732 +EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 SHA1 1c2517f10be827668807cf051b7c595162534eb0 SHA256 84d0af467747bd359582c4e7e90e61edf6eb6857d87905228fc1411e7ce00630 EBUILD ffmpeg-0.5_p19928.ebuild 7602 RMD160 dfd06efce1b297ef3e100d0821bae1454eddf962 SHA1 5481e95cecb697265e215688a47628b048ceb8ac SHA256 dd3c448b3262aa431cf92175d935265e4d8ed50b0a541dc9a3594e251725606f EBUILD ffmpeg-9999-r1.ebuild 7625 RMD160 9bdbbe8a7c26103304fe2d3c699bb27349bb5845 SHA1 1bbb9d2ffb0e988feebfd719fda448a2815d924c SHA256 04db7bd6ba2a9c8f04d0c0cb505ceec8d6c4fd9552b78eaf5cb7ded655be98ab -MISC ChangeLog 48308 RMD160 7b4f40cf2b9fffcdfeee5838d21b7b99e325e42e SHA1 17101eedeef4867ba7ae137b7979f542fc46c633 SHA256 e655f94797f860dd3fd67f5d72ebc246a02ae6d8a4c1824df6deb6dba80910f2 +MISC ChangeLog 48485 RMD160 5c5bcb12abe9554a655dc45d4f429bdbd4b6726f SHA1 e5c81835faf328281e383920121212d4b3e5a6e9 SHA256 75045cf8535c02c1e907e894ff4c07ac4321c76b461761ea0c6e25d001232fee MISC metadata.xml 1876 RMD160 3fed4cfedd4cd693c1053bd4ea90c75260aa2815 SHA1 827e1fc2f346f5c8695d45c4697dbcd4fbc47462 SHA256 a2b6f4fce6ae13c3cdc007124cea38857942efeb7fac9779487d087b6068ca52 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrBPfMACgkQvFcC4BYPU0r7YwCfbTdvgj0Ksf5h9XuE96Mmskbj -X00An2jMs1iEwWdzAtJvVg1oxx4W18We -=sLbQ ------END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild index 16800dabefd6..7b3477a2d7ce 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.16 2009/09/15 07:24:27 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.17 2009/10/22 09:39:49 ssuominen 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 <=media-libs/x264-0.0.20090629 ) + x264? ( >=media-libs/x264-0.0.20081006 <media-libs/x264-0.0.20090923 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) faad? ( >=media-libs/faad2-2.6.1 ) zlib? ( sys-libs/zlib ) |