diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-05-03 13:41:58 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-05-03 13:41:58 +0000 |
| commit | 4b3cfc31454800befdb98f82986a520bd4159deb (patch) | |
| tree | 6ba961ae8050b0b3d38aa655137dddfec64bd927 /media-video/ffmpeg | |
| parent | stable ppc64, bug 268185 (diff) | |
| download | gentoo-2-4b3cfc31454800befdb98f82986a520bd4159deb.tar.gz gentoo-2-4b3cfc31454800befdb98f82986a520bd4159deb.tar.bz2 gentoo-2-4b3cfc31454800befdb98f82986a520bd4159deb.zip | |
Update deps for USE="lame" w.r.t. bug 265830.
(Portage version: 2.2_rc28/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-r1.ebuild | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index f17d9166d712..205d3af6bae5 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # 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.283 2009/05/02 01:29:15 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.284 2009/05/03 13:41:58 loki_val Exp $ + + 03 May 2009; Peter Alfredsen <loki_val@gentoo.org> ffmpeg-0.5-r1.ebuild: + Update deps for USE="lame" w.r.t. bug 265830. *ffmpeg-9999-r1 (02 May 2009) diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild index 29a146fb7ed4..442bbd97596a 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.4 2009/04/04 15:05:05 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.5 2009/05/03 13:41:58 loki_val Exp $ EAPI=1 @@ -24,7 +24,12 @@ RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 ) alsa? ( media-libs/alsa-lib ) encode? ( faac? ( media-libs/faac ) - mp3? ( media-sound/lame ) + mp3? ( + || ( + >=media-sound/lame-3.98.2-r1 + <media-sound/lame-3.98 + ) + ) vorbis? ( media-libs/libvorbis media-libs/libogg ) theora? ( media-libs/libtheora media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20081006 ) |