diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-10-26 23:36:36 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-26 23:36:36 +0000 |
| commit | 3fb51f0ed5ab63478150dfb038bd9a675e993849 (patch) | |
| tree | 873f0a867e6607449cc17cad6dfa2c88f11ec54a /media-video/ffmpeg | |
| parent | old (diff) | |
| download | gentoo-2-3fb51f0ed5ab63478150dfb038bd9a675e993849.tar.gz gentoo-2-3fb51f0ed5ab63478150dfb038bd9a675e993849.tar.bz2 gentoo-2-3fb51f0ed5ab63478150dfb038bd9a675e993849.zip | |
Fix x264 dep for old snapshot.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index d9f12a229a75..5f75121d5688 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,6 @@ # 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.322 2009/10/26 12:04:29 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.323 2009/10/26 23:36:36 ssuominen Exp $ *ffmpeg-0.5_p20373 (26 Oct 2009) @@ -11,7 +11,8 @@ 22 Oct 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: bump deps on x264 - 22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild: + 22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.5-r1.ebuild, + ffmpeg-0.5_p19928.ebuild: Fix media-libs/x264 depend wrt #290080, thanks to Diego E. 'Flameeyes' Pettenò for reporting. diff --git a/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild index a5f46f89a7e2..972303427267 100644 --- a/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.5_p19928.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_p19928.ebuild,v 1.4 2009/09/26 21:52:02 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19928.ebuild,v 1.5 2009/10/26 23:36:36 ssuominen Exp $ EAPI=2 SCM="" @@ -44,7 +44,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 ) mp3? ( media-sound/lame ) 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.20090923 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) faad? ( >=media-libs/faad2-2.6.1 ) zlib? ( sys-libs/zlib ) |