diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-07-07 08:13:30 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-07-07 08:13:30 +0000 |
| commit | 48336e5c93a89053007f155c18599240390f20f1 (patch) | |
| tree | 8fe01281562a4a523eee13ecaebc1a0eed9f8c8f /media-video/ffmpeg | |
| parent | fixed hpux build (diff) | |
| download | gentoo-2-48336e5c93a89053007f155c18599240390f20f1.tar.gz gentoo-2-48336e5c93a89053007f155c18599240390f20f1.tar.bz2 gentoo-2-48336e5c93a89053007f155c18599240390f20f1.zip | |
Drop libamr support, its been removed upstream
(Portage version: 2.2_rc33/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-9999-r1.ebuild | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 2e3a7703e4da..97627774e94f 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.298 2009/07/04 08:20:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.299 2009/07/07 08:13:30 aballier Exp $ + + 07 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: + Drop libamr support, its been removed upstream 04 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: Reflect upstream changes for the way of disabling libavdevice in/outdevs diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 9067815f63d5..60acae504044 100644 --- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999-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-9999-r1.ebuild,v 1.7 2009/07/04 08:20:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.8 2009/07/07 08:13:30 aballier Exp $ EAPI=2 @@ -15,7 +15,7 @@ HOMEPAGE="http://ffmpeg.org/" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="+3dnow +3dnowext alsa altivec amr cpudetection custom-cflags debug dirac +IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test theora threads x264 xvid network zlib sdl X mp3 opencore-amrnb opencore-amrwb oss schroedinger +hardcoded-tables bindist v4l v4l2 @@ -42,8 +42,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) jack? ( media-sound/jack-audio-connection-kit ) - X? ( x11-libs/libX11 x11-libs/libXext ) - amr? ( media-libs/amrnb media-libs/amrwb )" + X? ( x11-libs/libX11 x11-libs/libXext )" DEPEND="${RDEPEND} >=sys-devel/make-3.81 @@ -109,14 +108,11 @@ src_configure() { fi if use bindist then - use amr && ewarn "libamr is nonfree and cannot be distributed; disabling amr support." use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support." else - use amr && myconf="${myconf} --enable-libamr-nb \ - --enable-libamr-wb" use faac && myconf="${myconf} --enable-libfaac" - { use faac || use amr ; } && myconf="${myconf} --enable-nonfree" + { use faac ; } && myconf="${myconf} --enable-nonfree" fi # CPU features |