add cdio useflag

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

4 files changed, 20 insertions, 13 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index ea32564f6fa7..ec8ab4e53a4a 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.455 2011/09/17 16:48:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.456 2011/09/21 15:21:46 aballier Exp $
+
+  21 Sep 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  add cdio useflag
 
   17 Sep 2011; Raúl Porcel <armin76@gentoo.org> ffmpeg-0.7.4.ebuild:
   alpha/ia64/sparc stable wrt #382301
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f84f925eecdf..0394115eb9b7 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,13 +9,13 @@ EBUILD ffmpeg-0.7.3.ebuild 8288 RMD160 a8b52320bcdee95139496431f75ea9a05c480332
 EBUILD ffmpeg-0.7.4.ebuild 8290 RMD160 2cfe460ca592d3b250ff20184c17f65f2daf96a1 SHA1 43bbef54bf2a34815a0456e89a7ed96e834fd464 SHA256 72ced592c85085c444ed3611f5c9de3fe920c970db01150d8fb35d3102520e97
 EBUILD ffmpeg-0.8.2.ebuild 7830 RMD160 e4656d6311619f2f4fd09678df155a767facdef3 SHA1 5732d598d380e0fb9e22086fca403ba7479258fd SHA256 317a10414a0e56a62c358484c994cd4974574fc8e50c785d0c0de1e29ef951d7
 EBUILD ffmpeg-0.8.3.ebuild 7830 RMD160 47884592486b9b815d0df95dad8ea4e26ff3f1c3 SHA1 4f4821b15f620c89ca4849a15655783afd75118b SHA256 286d0cb270395742dd9b408ad423ef54333bbd5b16276720ae7187971960c392
-EBUILD ffmpeg-9999.ebuild 7943 RMD160 deb74cb744c267f91c2c73f2d4c0a5576f48aa2c SHA1 694c7c838918703a20a032b61b15d9d224076a6c SHA256 8335eda34bc16a16403cdc6564e7e88318e2f443b74c484b722f21f125f9af3a
-MISC ChangeLog 66408 RMD160 f8e479f07fd7832bf12f5f148196c00fcad71cdf SHA1 af7cbd81060bd9f3a6c245276ca4989cb4470ffe SHA256 f50ade74b30530fa742b83384621af1190f4b43f043c7c9b9de91d121274d4ea
-MISC metadata.xml 2557 RMD160 0278c4929e1bd11f10e3a6f4f0578ef8a82980b3 SHA1 422c3c91a871d2cdff5e01b346688b1358eb0d71 SHA256 ec87dac41c33172daab3f30011f6a7d3d5e7b543c3be855438304f8800a2efa6
+EBUILD ffmpeg-9999.ebuild 8025 RMD160 d011411425e34a268a8361f8bbff67e9679e031b SHA1 fb3fb3a770f571d6598b751b996ae868fc9e73fb SHA256 896da35882f117e1926bc347dd0256ee5a029fc3578440efab5b80f7a7df047d
+MISC ChangeLog 66517 RMD160 19e540bf9c07533c21fc6416c2b52b8797443e55 SHA1 f57f1598e396384ddab2e2f25a6edaa24626672f SHA256 f32b70bb6edb08596a70895a7a389a07769482b1c040fabbabcb85284ffdcb09
+MISC metadata.xml 2646 RMD160 53e3a45f432bde3b3a8719b423344974b8eb83dd SHA1 fe660027a1984dbabd737f7ae2b4b8114118eded SHA256 1f7636fccd557eff9ff6e820639081b2a53beb3b71b73c392708c2e6d18027cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk50z38ACgkQuQc30/atMkBGQwCfQUML9wfoN76gRpycj8ZH+DAM
-yLUAn3Nawn4478eAh68eV9FEK34NU8Ye
-=bCED
+iEYEARECAAYFAk56ARAACgkQvFcC4BYPU0onewCdGOnrGJ6U7CJUrleiCFLSxMut
+UO0An2buRoTAqOXot1Emtgn7hiW4387+
+=3vqY
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 6001a6babb3c..23c426cd42f5 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.53 2011/09/06 18:02:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.54 2011/09/21 15:21:46 aballier Exp $
 
 EAPI="4"
 
@@ -29,10 +29,10 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 IUSE="
-	aac alsa amr bindist +bzip2 celt cpudetection debug dirac doc +encode faac
-	frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openal oss pic
-	qt-faststart rtmp schroedinger sdl speex static-libs test theora threads
-	truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
+	aac alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode
+	faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openal
+	oss pic qt-faststart rtmp schroedinger sdl speex static-libs test theora
+	threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
 	"
 
 # String for CPU features in the useflag[:configure_option] form
@@ -47,6 +47,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
 	celt? ( >=media-libs/celt-0.11.1 )
 	dirac? ( media-video/dirac )
 	encode? (
@@ -131,6 +132,7 @@ src_configure() {
 	fi
 
 	# libavdevice options
+	use cdio && myconf="${myconf} --enable-libcdio"
 	use ieee1394 && myconf="${myconf} --enable-libdc1394"
 	use openal && myconf="${myconf} --enable-openal"
 	# Indevs
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 74cfe07c49c3..a9c5be50711a 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="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</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>