Add support for the Google/VisualOn encoders for aac and amrwb

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 14 insertions, 4 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 8609a7ef6a25..2ddeeddb89e6 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.9 2011/04/01 09:45:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.10 2011/04/11 13:30:23 lu_zero Exp $
+
+  11 Apr 2011; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
+  libav-9999.ebuild:
+  Add support for the Google/VisualOn encoders for aac and amrwb
 
   01 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.2.ebuild,
   libav-0.6.9999.ebuild:
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 7e935ea44268..2e58fcc75475 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.6 2011/03/30 09:25:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.7 2011/04/11 13:30:23 lu_zero Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -41,7 +41,9 @@ RDEPEND="
 	bzip2? ( app-arch/bzip2 )
 	dirac? ( media-video/dirac )
 	encode? (
+		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
+		!faac? ( aac? ( media-libs/vo-aacenc ) )
 		mp3? ( >=media-sound/lame-3.98.3 )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
@@ -110,7 +112,9 @@ src_configure() {
 	# Encoders
 	if use encode; then
 		use mp3 && myconf+=" --enable-libmp3lame"
+		use amr && myconf+=" --enable-libvo-amrwbenc --enable-version3"
 		use faac && myconf+=" --enable-libfaac --enable-nonfree"
+		use aac && myconf+=" --enable-libvo-aacenc --enable-version3"
 		uses="theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index 113c8c8e9857..312f40f1bb67 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -14,7 +14,9 @@
 	<flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
 	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
 	<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
-	<flag name="faac">Use external faac library for AAC encoding</flag>
+	<flag name="faac">Use external faac library for AAC encoding
+		(notice: the resulting binaries are unredistributable)</flag>
+	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
 	<flag name="mmxext">Enables mmx2 support</flag>