Rename opencore-amrnb and opencore-amrwb to opencore-amr to keep it in sync with MPlayer.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 14 insertions, 9 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index a0561e9f147e..61b912a282dc 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.304 2009/07/27 06:24:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.305 2009/08/04 09:18:52 ssuominen Exp $
+
+  04 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-9999-r1.ebuild,
+  metadata.xml:
+  Rename opencore-amrnb and opencore-amrwb to opencore-amr to keep it in
+  sync with MPlayer.
 
   27 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
   Set svn revision
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 10bd1c30f20f..d4b7acdbe9b1 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.15 2009/07/27 06:24:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.16 2009/08/04 09:18:52 ssuominen Exp $
 
 EAPI=2
 
@@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS=""
 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
+	  theora threads x264 xvid network zlib sdl X mp3 opencore-amr
+	  oss schroedinger +hardcoded-tables bindist v4l v4l2
 	  speex +ssse3 jpeg2k vdpau"
 
 VIDEO_CARDS="nvidia"
@@ -43,8 +43,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 	dirac? ( media-video/dirac )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	opencore-amrnb? ( media-libs/opencore-amr )
-	opencore-amrwb? ( media-libs/opencore-amr )
+	opencore-amr? ( media-libs/opencore-amr )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -114,7 +113,9 @@ src_configure() {
 	use threads && myconf="${myconf} --enable-pthreads"
 
 	# Decoders
-	for i in faad dirac schroedinger speex opencore-amrnb opencore-amrwb ; do
+	use opencore-amr && myconf="${myconf} --enable-libopencore-amrwb
+		--enable-libopencore-amrnb"
+	for i in faad dirac schroedinger speex; do
 		use $i && myconf="${myconf} --enable-lib$i"
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 9ec480fea64e..bac10cedf19e 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -19,8 +19,7 @@
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
     <flag name="mmxext">Enables mmx2 support</flag>
     <flag name="network">Enables network streaming support</flag>
-    <flag name="opencore-amrnb">Enables Adaptive Multi-Rate Narrowband support vie opencore-amr.</flag>
-    <flag name="opencore-amrwb">Enables Adaptive Multi-Rate Wideband   support vie opencore-amr.</flag>
+    <flag name="opencore-amr">Enables Adaptive Multi-Rate format support</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
     <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
 	<flag name="vdpau">Enables VDPAU decoders (requires nVidia video cards to offload CPU processing to video card</flag>