diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-06-18 06:47:20 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-06-18 06:47:20 +0000 |
| commit | ee5c7788a12b116e51928eeb15e3f1498d84b4db (patch) | |
| tree | 3b3e1adf257010e94f28911bb2c864aebe8e3d0e /media-video | |
| parent | Bug #320295: version bump. (diff) | |
| download | gentoo-2-ee5c7788a12b116e51928eeb15e3f1498d84b4db.tar.gz gentoo-2-ee5c7788a12b116e51928eeb15e3f1498d84b4db.tar.bz2 gentoo-2-ee5c7788a12b116e51928eeb15e3f1498d84b4db.zip | |
Sort IUSE and make zlib enabled by default, by Nikoli <nikoli@lavabit.com>, bug #324453
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999-r1.ebuild | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 2e0baae2e0a0..839ab46174fe 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # 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.356 2010/06/16 10:10:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.357 2010/06/18 06:47:20 aballier Exp $ + + 18 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: + Sort IUSE and make zlib enabled by default, by Nikoli + <nikoli@lavabit.com>, bug #324453 *ffmpeg-0.6 (16 Jun 2010) diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 46a2cdcef56b..7ab3891596e8 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.39 2010/06/18 06:41:22 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.40 2010/06/18 06:47:20 aballier Exp $ EAPI="2" @@ -30,11 +30,10 @@ if [[ ${PV} == *9999* ]]; then else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi -IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac - doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test - theora threads x264 xvid network zlib sdl X mp3 amr - oss pic rtmp schroedinger +hardcoded-tables bindist v4l v4l2 - speex +ssse3 jpeg2k vaapi vdpau vpx" +IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags +debug dirac doc +encode faac faad 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" VIDEO_CARDS="nvidia" |