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 | 6f6758233c62a8e614188e926934964bb2fe88b7 (patch) | |
| tree | 21e66bc3e37b9254012bc33caf6284e8a13fb7d4 /media-video/ffmpeg | |
| parent | Fixed build issue with gcc-3.4.6, bug #248800, thank barthek for report. (diff) | |
| download | gentoo-2-6f6758233c62a8e614188e926934964bb2fe88b7.tar.gz gentoo-2-6f6758233c62a8e614188e926934964bb2fe88b7.tar.bz2 gentoo-2-6f6758233c62a8e614188e926934964bb2fe88b7.zip | |
Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes' Pettenò for reporting.
(Portage version: 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/ffmpeg-0.5-r1.ebuild | 4 |
2 files changed, 7 insertions, 3 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/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 ) |