simplify tests handling, add celt decoding support

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 18 insertions, 14 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index b0337cd4e4ef..63ddbf8bf88c 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.409 2011/04/13 12:49:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.410 2011/04/20 14:25:17 aballier Exp $
+
+  20 Apr 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  simplify tests handling, add celt decoding support
 
   13 Apr 2011; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.6.90_rc0.ebuild,
   -ffmpeg-0.6.90_rc0-r1.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 637340880b1f..bbd9cb247081 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,13 +9,13 @@ DIST ffmpeg-0.6_p25767.tar.bz2 4000052 RMD160 1463e744ca5f6e5535571efe19296f055b
 EBUILD ffmpeg-0.6.90_rc0-r2.ebuild 7945 RMD160 2e6f2473b90d3e74ce733797908172618cdc66d0 SHA1 b5101ab094a4d28a73f6997eaf5adc78aa0075b5 SHA256 8f3c607568ec7a3525f176460e645abf6989647a8783091bff3da4a1d07e7af5
 EBUILD ffmpeg-0.6.ebuild 7782 RMD160 7dcb53dfd7bed74aa95a6813cad6c55f9fc7f062 SHA1 92d32ee520b6125b1e825bb98f3731cdfb9918c8 SHA256 ba710a4af02900b36fc1ef8d4a60bfb9a216040b3974a2394c1e8e7cec5ef52c
 EBUILD ffmpeg-0.6_p25767.ebuild 7911 RMD160 d573b7275c7d72baf655b3ceadf136d43d2fd5ee SHA1 5e6a9b938d283187120148095ff8621d4bd82ad7 SHA256 387073c421106fa9a2f14e71cdba1524d87eebe5b1fb4ef505908dafb0cd0bf8
-EBUILD ffmpeg-9999.ebuild 8253 RMD160 2efc2dee48f43b32fdebc5a78afcf1610b832124 SHA1 a8cf525ddb58e82f9e8049ca835bdf3cdf5cdfd6 SHA256 1f500e5a913cde7c541c645de695b01d6b4995908aa1e6387b822a050c766815
-MISC ChangeLog 60595 RMD160 a1c001a7b039ae42b4ca0466c12a224d3d031092 SHA1 a92f94cfb45af02640797109642b924e62478088 SHA256 4252835fd3382a1df10f473bde590ba798d83bacaf3e658729fc05d23ca63402
-MISC metadata.xml 2402 RMD160 d1226017b36de2614eb29f742fef59b9cb9b3901 SHA1 2f00b54a5f1348fe84d455f04d81988282d91ecc SHA256 8494cfb404ca14fb828175b3fde3fff5b77a925473ee1c3b2028a7060d16907a
+EBUILD ffmpeg-9999.ebuild 8238 RMD160 26123a557860016d70d1c40195648dbed26dd292 SHA1 c246860cb2f6f61e1a55c0c9e7f64ac465a81fe6 SHA256 ba0908e6b40886a37d8dc34b1877921b2ba245fa8f467f92e3a2b0525ba094d6
+MISC ChangeLog 60737 RMD160 cff2d296b668c77a5a467e29ba2d36752e80a301 SHA1 c8a45cb55b81558c5519e6852d661ee54cc6c709 SHA256 863f5988bc2cc65cfd885c152a0005ad4a92ec6382ee6b105b45c1a878a03744
+MISC metadata.xml 2502 RMD160 7bae5e66cd6f15e3698d0a3cf08b5a3f653b4a25 SHA1 9d036b3eabb7a94a70a54d4c23d7efe0949817ff SHA256 fc5f64eea8d69b93f35e7c8a402d6322c46409e8cc5579a4b96f0fa50ea728ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2lm/EACgkQvFcC4BYPU0oxtwCePPYt+5efV0rSBaT9FLuJO4FS
-rykAnAvWLig1I61aOdd83jnN+hnLfmqG
-=NMcq
+iEYEARECAAYFAk2u7NIACgkQvFcC4BYPU0qFUACeNoZfzvY+3kYUsiDnar73LFwM
+eLMAn2utmhAdSY7XBdp3cj4EzIInYDJj
+=B45i
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 5417f2aad661..412f80d55a71 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-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/ffmpeg/ffmpeg-9999.ebuild,v 1.41 2011/04/13 12:40:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.42 2011/04/20 14:25:17 aballier Exp $
 
 EAPI="2"
 
@@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 IUSE="
-	+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 cpudetection
+	+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt 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 truetype v4l
@@ -46,6 +46,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
+	celt? ( >=media-libs/celt-0.11.1 )
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
@@ -156,7 +157,7 @@ src_configure() {
 
 	# Decoders
 	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-	for i in gsm dirac rtmp schroedinger speex vpx; do
+	for i in celt gsm dirac rtmp schroedinger speex vpx; do
 		use ${i} && myconf="${myconf} --enable-lib${i}"
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
@@ -267,10 +268,8 @@ src_install() {
 
 src_test() {
 	if use encode ; then
-		for t in codectest lavftest seektest ; do
-			LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-				emake ${t} || die "Some tests in ${t} failed"
-		done
+		LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+			emake test || die "Some tests failed"
 	else
 		ewarn "Tests fail without USE=encode, skipping"
 	fi
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 8bdce5ef664f..fbd7b3453384 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -13,6 +13,7 @@
     </flag>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
     <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
+	<flag name="celt">Adds Xiph CELT/Opus 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</flag>