diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-06-22 07:28:55 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-06-22 07:28:55 +0000 |
| commit | 9d1afe24d69ec0fb163c893914a2807409fdc8fa (patch) | |
| tree | 798f1eebc39129d52e400c4a56903596f88988e6 /media-video | |
| parent | x86 stable wrt security bug #324885 (diff) | |
| download | gentoo-2-9d1afe24d69ec0fb163c893914a2807409fdc8fa.tar.gz gentoo-2-9d1afe24d69ec0fb163c893914a2807409fdc8fa.tar.bz2 gentoo-2-9d1afe24d69ec0fb163c893914a2807409fdc8fa.zip | |
faad support has been removed
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999-r1.ebuild | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 839ab46174fe..3465c4cd08a3 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.357 2010/06/18 06:47:20 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.358 2010/06/22 07:28:55 aballier Exp $ + + 22 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: + faad support has been removed 18 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: Sort IUSE and make zlib enabled by default, by Nikoli diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 4097707d0afa..ab19015eef0f 100644 --- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.43 2010/06/18 14:19:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.44 2010/06/22 07:28:55 aballier Exp $ EAPI="2" @@ -31,7 +31,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags -debug dirac doc +encode faac faad gsm +hardcoded-tables ieee1394 jack jpeg2k +debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib" @@ -50,7 +50,6 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20100605 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) - faad? ( >=media-libs/faad2-2.6.1 ) zlib? ( sys-libs/zlib ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) @@ -144,7 +143,7 @@ src_configure() { # Decoders use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" - for i in gsm faad dirac rtmp schroedinger speex vpx; do + for i in gsm dirac rtmp schroedinger speex vpx; do use ${i} && myconf="${myconf} --enable-lib${i}" done use jpeg2k && myconf="${myconf} --enable-libopenjpeg" |