[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: metadata.xml ChangeLog ffmpeg-9999-r1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/08/04 09:18:52

  Modified:             metadata.xml ChangeLog ffmpeg-9999-r1.ebuild
  Log:
  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)

Revision  Changes    Path
1.14                 media-video/ffmpeg/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/metadata.xml?r1=1.13&r2=1.14

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml	9 Jul 2009 13:43:14 -0000	1.13
+++ metadata.xml	4 Aug 2009 09:18:52 -0000	1.14
@@ -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>



1.305                media-video/ffmpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.305&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.305&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.304&r2=1.305

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- ChangeLog	27 Jul 2009 06:24:43 -0000	1.304
+++ ChangeLog	4 Aug 2009 09:18:52 -0000	1.305
@@ -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@g.o> 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@g.o> ffmpeg-9999-r1.ebuild:
   Set svn revision



1.16                 media-video/ffmpeg/ffmpeg-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild?r1=1.15&r2=1.16

Index: ffmpeg-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ffmpeg-9999-r1.ebuild	27 Jul 2009 06:24:43 -0000	1.15
+++ ffmpeg-9999-r1.ebuild	4 Aug 2009 09:18:52 -0000	1.16
@@ -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 @@
 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 @@
 	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 @@
 	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"