diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-01-28 12:19:08 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-01-28 12:19:08 +0000 |
| commit | bf822f92d2ecbe725223135a3e1e11a7e4762ce1 (patch) | |
| tree | 60f277d77c6955e3d2e4bac439fbb710259a9a12 /media-video | |
| parent | old (diff) | |
| download | gentoo-2-bf822f92d2ecbe725223135a3e1e11a7e4762ce1.tar.gz gentoo-2-bf822f92d2ecbe725223135a3e1e11a7e4762ce1.tar.bz2 gentoo-2-bf822f92d2ecbe725223135a3e1e11a7e4762ce1.zip | |
avconv is gone in master
(Portage version: 2.2.0_alpha84/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.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 83ff8a8feef6..5c4e88ba48f7 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.521 2012/01/26 13:24:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.522 2012/01/28 12:19:08 aballier Exp $ + + 28 Jan 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + avconv is gone in master 26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.9.1.ebuild: Restore ~ppc and ~ppc64 keywording wrt #392269 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index ac282f13ce36..a7a553916be7 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.77 2011/12/17 14:08:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.78 2012/01/28 12:19:08 aballier Exp $ EAPI="4" @@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi IUSE=" - aac aacplus alsa amr ass avconv bindist +bzip2 cdio celt cpudetection debug + aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex static-libs test theora threads @@ -127,7 +127,7 @@ src_configure() { use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" use openssl && myconf="${myconf} --enable-openssl --enable-nonfree" - for i in gnutls avconv ; do + for i in gnutls ; do use $i && myconf="${myconf} --enable-$i" done |