Add opencore-amr support, switch to GPL-3

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 31 insertions, 13 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 8f477ee28dce..57917a431876 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.295 2009/06/30 13:57:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.296 2009/07/03 19:31:42 aballier Exp $
+
+  03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild,
+  metadata.xml:
+  Add opencore-amr support, switch to GPL-3
 
   30 Jun 2009; Raúl Porcel <armin76@gentoo.org> ffmpeg-0.5-r1.ebuild:
   arm/ia64/sparc stable
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 71da1da80421..d9d20bee3124 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dceecdb5a1a174 SHA1 97262f1bc663c4bd4fdcb12e8572628174cceae6 SHA256 60af968bdcac2284799a2395d4d9cdcb5319493c91da231992f5f90cd663647a
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 EBUILD ffmpeg-0.4.9_p20090201.ebuild 6270 RMD160 9f5df63085a7c7851a3cae03b1a4429eaa60efc1 SHA1 63250edd4d6f7ecacf42b8a1ea176e3704bd85f2 SHA256 cb346a085c719dd5db7df5beebab4fd658777b4c2c7adc00a3cc4503d815bc3a
 EBUILD ffmpeg-0.5-r1.ebuild 6221 RMD160 185cd17de11fbd1a1dcfd012188bc3cb11a542b5 SHA1 f28aaa9a372e93e5ee989acf66a1d214f58f8f23 SHA256 e91f04a5a5b69699f4f2532f1df67ef6e89ba5b47fb706828a3388727963a726
-EBUILD ffmpeg-9999-r1.ebuild 6250 RMD160 7cdd42b0c64061b863fbed16dc76ab8401e94c05 SHA1 f3658af1b0c80249b583dbce4ade4bc45b60a226 SHA256 c295ca09123811fdfe0cb9a6ee760b741cad1c327e2b2df72ebe82183c402f5c
-MISC ChangeLog 44814 RMD160 6f2ff30c038b9d1782a49ac0dfcb67900edf5dee SHA1 a947d54413a50f5d5f58b479851a5ad30d908676 SHA256 2904b608df760fbb36dabed7937d7d83aa11f15ce1bd2f7d7d741157dbd3f157
-MISC metadata.xml 1590 RMD160 4406b7f1572453e744c3608424d7928f24b56724 SHA1 90be9582fad298ff5d1955583f8e79df9aac3433 SHA256 a247576d3fd88c780431a6e01654b3706b1b8e29f1d86aa2d1b695c3ae8b0b28
+EBUILD ffmpeg-9999-r1.ebuild 6302 RMD160 b226ef6b905ea1746c285e6397b501fec396325d SHA1 f77443fdb02e74ebadfb74f2b2d8cbf6f03f06ff SHA256 2dba1963c1288933091b7f74933018086d91f6fc5d017839b5dbf266d84bb1f2
+MISC ChangeLog 44951 RMD160 1cf66ad3b32c3c415e51b0fbb7180ca8b459cf99 SHA1 6051ab9c8afb298d8cedcdbdf343e68112e61ad6 SHA256 abc2279b0176b3c3c8698ffdc99eda2bba1dde5f5d558363351512066a7fc28a
+MISC metadata.xml 1798 RMD160 bf7be02af72b3455d18eda5253da7e8a4cb5b4fd SHA1 efe70dc4c31f732c793f3b1b6820d27bea0ebd1e SHA256 8253fdc43d056bdc3787a1d6884db1b1268b8c4565c69864da80245860f904fa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpOXL8ACgkQvFcC4BYPU0ptDACgxqjg3W2ghQgWgBhtDqeGD9jK
+J70AoLD+12jUPXndJr0OJTmTWMCy/tx6
+=IqXK
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 073e8545c9e1..55295d0de926 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.4 2009/06/10 09:08:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.5 2009/07/03 19:31:42 aballier Exp $
 
 EAPI=2
 
@@ -12,13 +12,14 @@ DESCRIPTION="Complete solution to record, convert and stream audio and video.
 Includes libavcodec. live svn"
 HOMEPAGE="http://ffmpeg.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="+3dnow +3dnowext alsa altivec amr 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 oss schroedinger
-	  +hardcoded-tables bindist v4l v4l2 speex +ssse3 jpeg2k"
+	  theora threads x264 xvid network zlib sdl X mp3 opencore-amrnb
+	  opencore-amrwb oss schroedinger +hardcoded-tables bindist v4l v4l2
+	  speex +ssse3 jpeg2k"
 
 RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 	alsa? ( media-libs/alsa-lib )
@@ -36,6 +37,8 @@ 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 )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -95,10 +98,9 @@ src_configure() {
 	use threads && myconf="${myconf} --enable-pthreads"
 
 	# Decoders
-	use faad && myconf="${myconf} --enable-libfaad"
-	use dirac && myconf="${myconf} --enable-libdirac"
-	use schroedinger && myconf="${myconf} --enable-libschroedinger"
-	use speex && myconf="${myconf} --enable-libspeex"
+	for i in faad dirac schroedinger speex opencore-amrnb opencore-amrwb ; do
+		use $i && myconf="${myconf} --enable-lib$i"
+	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
 	if use gsm; then
 		myconf="${myconf} --enable-libgsm"
@@ -141,7 +143,7 @@ src_configure() {
 	done
 
 	# Mandatory configuration
-	myconf="${myconf} --enable-gpl --enable-postproc \
+	myconf="${myconf} --enable-gpl --enable-version3 --enable-postproc \
 			--enable-avfilter --enable-avfilter-lavf \
 			--disable-stripping"
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index c15d1c6da5c7..d400ab284121 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -19,6 +19,8 @@
     <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="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="vhook">Enables video hooking support.</flag>