Update live ebuild, cleanup various parts. Line up some changes from ffmpeg.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

3 files changed, 84 insertions, 48 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index c63baf00991d..c1cf2d3b4d44 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.75 2012/05/13 11:03:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.76 2012/05/13 19:48:17 scarabeus Exp $
+
+  13 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild,
+  metadata.xml:
+  Update live ebuild, cleanup various parts. Line up some changes from ffmpeg.
 
   13 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.8.1.ebuild:
   Delete security affected version.
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index c0eead188780..1458120d4d3a 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.38 2012/05/05 08:58:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.39 2012/05/13 19:48:17 scarabeus Exp $
 
 EAPI=4
 
@@ -27,13 +27,16 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
-	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
-	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
-	  oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs
-	  test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE=" aac aacplus alsa ass amr bindist bluray  +bzip2 cdio celt cpudetection
+	custom-cflags debug doc +encode faac fontconfig frei0r +gpl gsm
+	+hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network
+	openal openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis
+	vpx X x264 xvid +zlib"
 
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis"
 
 for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
@@ -43,46 +46,70 @@ RDEPEND="
 	!media-video/ffmpeg
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
+	ass? ( media-libs/libass )
+	bluray? ( media-libs/libbluray )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
-	dirac? ( media-video/dirac )
+	celt? ( >=media-libs/celt-0.11.1 )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
+		aacplus? ( media-libs/libaacplus )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
 		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode]
+			media-libs/libogg
+		)
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20111017 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
-	truetype? ( media-libs/freetype )
+	fontconfig? ( media-libs/fontconfig )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	libv4l? ( media-libs/libv4l )
+	modplug? ( media-libs/libmodplug )
+	openal? ( >=media-libs/openal-1.1 )
+	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	ssl? ( openssl? ( dev-libs/openssl )
-		   !openssl? ( net-libs/gnutls ) )
+	ssl? (
+		openssl? ( dev-libs/openssl )
+		!openssl? ( net-libs/gnutls )
+	)
 	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
+	truetype? ( media-libs/freetype:2 )
 	vaapi? ( x11-libs/libva )
 	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+	)
 	zlib? ( sys-libs/zlib )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
-	dirac? ( virtual/pkgconfig )
 	doc? ( app-text/texi2html )
+	fontconfig? ( virtual/pkgconfig )
+	ieee1394? ( virtual/pkgconfig )
+	libv4l? ( virtual/pkgconfig )
 	mmx? ( dev-lang/yasm )
 	rtmp? ( virtual/pkgconfig )
 	schroedinger? ( virtual/pkgconfig )
+	ssl? ( virtual/pkgconfig )
 	test? ( net-misc/wget )
+	truetype? ( virtual/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
 "
 
@@ -91,11 +118,11 @@ DEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl )
-			  rtmp? ( network )
-			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
-
-RESTRICT="test"
+REQUIRED_USE="bindist? ( !aacplus !faac !openssl )
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+	test? ( encode zlib )
+"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
@@ -128,7 +155,7 @@ src_configure() {
 
 	if use ssl; then
 		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
-					|| myconf+=" --enable-gnutls"
+			|| myconf+=" --enable-gnutls"
 	fi
 
 	use custom-cflags && myconf+=" --disable-optimizations"
@@ -144,11 +171,12 @@ src_configure() {
 
 	# Encoders
 	if use encode; then
+		use aacplus && myconf+=" --enable-nonfree"
+		use faac && myconf+=" --enable-nonfree"
 		use mp3 && myconf+=" --enable-libmp3lame"
 		use amr && myconf+=" --enable-libvo-amrwbenc"
-		use faac && myconf+=" --enable-libfaac --enable-nonfree"
 		use aac && myconf+=" --enable-libvo-aacenc"
-		uses="theora vorbis x264 xvid"
+		uses="aacplus faac theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
 		done
@@ -159,7 +187,9 @@ src_configure() {
 	# libavdevice options
 	use cdio && myconf+=" --enable-libcdio"
 	use ieee1394 && myconf+=" --enable-libdc1394"
+	use openal && myconf+=" --enable-openal"
 	use pulseaudio && myconf+=" --enable-libpulse"
+
 	# Indevs
 	# v4l1 is gone since linux-headers-2.6.38
 	myconf+=" --disable-indev=v4l"
@@ -168,20 +198,24 @@ src_configure() {
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
+	use libv4l && myconf="${myconf} --enable-libv4l2"
 	# Outdevs
 	for i in alsa oss ; do
 		use ${i} || myconf+=" --disable-outdev=${i}"
 	done
 	# libavfilter options
-	use frei0r && myconf+=" --enable-frei0r"
+	use ass && myconf+=" --enable-libass"
 	use truetype &&  myconf+=" --enable-libfreetype"
+	for i in frei0r fontconfig ; do
+		use ${i} && myconf+=" --enable-${i}"
+	done
 
 	# Threads; we only support pthread for now but ffmpeg supports more
 	use threads && myconf+=" --enable-pthreads"
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm dirac rtmp schroedinger speex vpx"
+	uses="bluray celt gsm modplug rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
@@ -252,22 +286,25 @@ src_configure() {
 
 	cd "${S}"
 	./configure \
-		--prefix="$EPREFIX"/usr \
-		--libdir="$EPREFIX"/usr/$(get_libdir) \
-		--shlibdir="$EPREFIX"/usr/$(get_libdir) \
-		--mandir="$EPREFIX"/usr/share/man \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
 		--enable-shared \
 		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
 
 src_compile() {
+	local i
+
 	emake
 
 	if use tools; then
-		tc-export CC
-		local i
 		for i in ${TOOLS}; do
 			emake tools/${i}
 		done
@@ -301,14 +338,6 @@ pkg_postinst() {
 }
 
 src_test() {
-	local i tests
-	if use encode; then
-		tests="codectest lavftest seektest"
-		for i in ${tests}; do
-			LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-				emake ${i}
-		done
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
+	LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake -j1 fate
 }
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index 9a9e1188b56b..85b256372e8f 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -11,21 +11,24 @@
 		instruction set, present in modern AMD CPUs.  (Check for
 		3dnowext in /proc/cpuinfo to know whether your CPU supports it).
 	</flag>
+	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
+	<flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
 	<flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
+	<flag name="ass">Enables <pkg>media-libs/libass</pkg> based subtitle renderer.</flag>
 	<flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
+	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
+	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></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
-		(notice: the resulting binaries are unredistributable).</flag>
-	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
+	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
-	<flag name="gpl">Build all GPL licensed code. Without this flag set the
-		package is build under LGPL license.</flag>
-	<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>
+	<flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
+	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
 	<flag name="mmxext">Enable mmx2 support.</flag>
 	<flag name="network">Enable network streaming support.</flag>
+	<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>
 	<flag name="pulseaudio">Enable pulseaudio input support.</flag>
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
 	<flag name="qt-faststart">Build and install qt-faststart application.</flag>