add iec61883 useflag

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

4 files changed, 29 insertions, 20 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1057402683db..46fb6cea9a54 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.566 2012/06/23 17:10:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.567 2012/07/06 14:04:26 aballier Exp $
+
+  06 Jul 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  add iec61883 useflag
 
   23 Jun 2012; Raúl Porcel <armin76@gentoo.org> ffmpeg-0.10.3.ebuild:
   alpha/ia64/sparc stable wrt #420305
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 85c6ba6e6f75..7ba9950a6078 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX freiordl.patch 611 RMD160 e11a21202acaae10e9c1f626c271c59cd85828db SHA1 3a434ef85cd32d9cf5be4acccdfe6a9d1f98e4bd SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf
-DIST ffmpeg-0.10.2.tar.bz2 5780204 RMD160 b9dd617935e106e4a1980167bdb7ec8d76d3f2f7 SHA1 743f44a71f93b14c9b26ca2424b0da8457cef4be SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
-DIST ffmpeg-0.10.3.tar.bz2 5855494 RMD160 1fa566eb75489ed48faf8f818561399b3d426791 SHA1 4fb6f682dbc1b4ea54178040d515fc3a4c05d415 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f
-DIST ffmpeg-0.11.1.tar.bz2 6073253 RMD160 f6eab5ffc87b98ca24bea7f83e85ff6a1e2e8711 SHA1 bf01742be60c2e6280371fc4189d5d28933f1a56 SHA256 b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96
-EBUILD ffmpeg-0.10.2.ebuild 8564 RMD160 89df828b340708504578244bcb5334fced20bb49 SHA1 34527cc5a4f4d3a63df90f1ed0dcf18be9c2eff5 SHA256 0863c34956e6e78ffa4cc04d186635ef1668bf38d32cad7a19531992b7bd0c9f
-EBUILD ffmpeg-0.10.3.ebuild 8578 RMD160 92460b4e8c2b22371848887252e99e262bfa2d66 SHA1 8f62bf0e40ea938afadb3a8f26b5eedc3f7f8107 SHA256 5797f12e7de6830f1cb272f0651afcd0814fd683e242a0f76b100a3b009b0dbb
-EBUILD ffmpeg-0.11.1.ebuild 8716 RMD160 fc82612537f2d7b247d1c97291724e70aaa7fb01 SHA1 e82acbac3efa06fca44b4bc993f5126ab3306478 SHA256 6f9178733e9bdb4b3646ff458908c1e6534448c5b18936d36d2366561b2fb4c9
-EBUILD ffmpeg-9999.ebuild 8715 RMD160 05bc22903406cd0d614598731da975e9d9d8ee88 SHA1 843a3ade2690d73a963dee6e11cad15ae89b7609 SHA256 69e5fbdbc5242f9f80e55ae6ba6952d426afe475ee5421c852317e6027082c52
-MISC ChangeLog 80431 RMD160 ebb9611f509fcb74d52886340e0350cc567d85fb SHA1 345598688dafb6addfc5c5b59cd4dd2fca30153f SHA256 00e5c2fca08248634e6539eaf01e5412c547a561b58f2bd38fb0b77edf94005e
-MISC metadata.xml 3177 RMD160 08166b91c8b85d90182a86c6d5ca88a8408d9eb5 SHA1 ca9a99c374925bb1b815fc9a199d8f8d3bdbc5ea SHA256 a6c9de251eeaf950e299837cc05a3e43c5bbc835a33f4a8efd0223dd0aa965b9
+AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
+DIST ffmpeg-0.10.2.tar.bz2 5780204 SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
+DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f SHA512 41509b736b3158f3b77620bddee509c07d16d239feb881644a1cdbd97a0ea5e2a8cb469c47b2f19c03518dbed8388ab20684f095e023c97f1a6d0b4765f73e64 WHIRLPOOL 7cb9ebf16ec0ee4680876db86a4aa579819055451d546a7dfadf0b8b18c7930036d8670446c75ef2fa51c6ba2a1ed8e7dd1351459caf0023f72825900d901fb2
+DIST ffmpeg-0.11.1.tar.bz2 6073253 SHA256 b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96
+EBUILD ffmpeg-0.10.2.ebuild 8564 SHA256 0863c34956e6e78ffa4cc04d186635ef1668bf38d32cad7a19531992b7bd0c9f SHA512 164a6a5a4afe80fcd54a22c4bf6847fe35985a4c951d924a06dbcc12463d08439fb18e4477977484350f52c3c308a2c68cc9e44661401247dde9b17e99b9e305 WHIRLPOOL 4fd9d9f60ae98ca7ddb6217618d15775b5ed8642e6efe33ddc44968bf4f9692162b49cc6d77fce5bc3cb534f8e49e7585019db7c5954694ad6e8ef4d745edbe7
+EBUILD ffmpeg-0.10.3.ebuild 8578 SHA256 5797f12e7de6830f1cb272f0651afcd0814fd683e242a0f76b100a3b009b0dbb SHA512 20b4e7b3413a3aa07cdba9b642af27dfdbca0b2f51850e4a997d3e510a54bdab15fb66037c1a98311c640ae9ca0044ab13fbba7b838da3a37953e84eb58ea8ae WHIRLPOOL 34d37f153fcd6484ece67efc537bb525268d6368c6e2bccce3fa30ee684e9111865379a645c35896aba510484038d3d4b8d3282929bcc03ca15f9957dd715bfd
+EBUILD ffmpeg-0.11.1.ebuild 8716 SHA256 6f9178733e9bdb4b3646ff458908c1e6534448c5b18936d36d2366561b2fb4c9 SHA512 4c119409042a129b127cf68329f9db1de3ab52846d10d4109e0216cb7dcad8ebcae5f76ded359586f2935d47dfc9e6e70080018387840c97dfda14a6be8500cc WHIRLPOOL b77973499eef30a1a2745aff847ce12d4161dd97113b2835b1dd99919cc67162cf4b1036069b1afe17eb3913742c8912dfbcf4b1314157dc9b96038972d61a22
+EBUILD ffmpeg-9999.ebuild 8841 SHA256 5689bb4705a0c2c62456be6dfd13e7c7d58fe7de71dff07ee52e3bc96deffbbf SHA512 c37f78d16f2f55051cfd836e2b2bcd79a855a8b6e120d8c3d0fa7bc6160f22a5102890eae0221e9a0d399ba55edfc9165ff9566ae8c01ec4c91dc1ca68f5e7fe WHIRLPOOL 8dfbab0b612c1feb02a1208bf01cf027cff89a379db447742927cd4203a34bf1b069fc80381426433c52e9234304be22c234ba2cc1e3a2748716e36a0e42f934
+MISC ChangeLog 80544 SHA256 fa535dbf5b145e379eea4d4e57033eb39031e9ef9e146a2bc775b81d2654cc29 SHA512 804c67c6df376e27e528c95b8e80cb24a3741842192e9bf11e3a41114f90a707ae9b75c1609c5a9bdd51f123f3b62c003ffaee119e21ce5d1e2794434e286010 WHIRLPOOL 06a46f3359043c95fe127d2123c4e756f1a9c0cf2ac6bad81c725e928fafa69421f986e985a376a4f77475c29b22df2bbe9dba65c944d64ad8ce6c0f64798e58
+MISC metadata.xml 3290 SHA256 3a4e779069b4c55e1e8b6177c45831682f943f16b1d58779d5a2ae664b81e8d3 SHA512 b344e8006a5ef2e946daa31d2c6465ca5b1900d5036e3f95d8e38c78d9952dc0d6570a38119113e9f7cb0ad1a28c3ae68870c540aa1695021348f98b7705ee90 WHIRLPOOL a664f4e47c8b6bbab3e27d282b1990194c447632fdc62fe4a0f60d0ee46becc4ef22b4aa4ea50fb5f9d0e31999dbc51a5d5634e5369f253b956e8cf2b1d8600a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/l+HQACgkQuQc30/atMkAO5QCfQ4woFs7N4BI5uD001Bx8eG/v
-bXIAnj7vUm+OVyt1Cf7Y4Kc3Um80j9dQ
-=ZAt1
+iEYEARECAAYFAk/28HAACgkQvFcC4BYPU0oxbQCdEEvs3CyU3vLXpmL3T0qvPiXx
+erAAn0cOcvL+Q3nlEVw57ociN23MIpBK
+=dyU6
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 69c502532bf8..f522c1a228ba 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-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/ffmpeg/ffmpeg-9999.ebuild,v 1.96 2012/06/17 04:56:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.97 2012/07/06 14:04:26 aballier Exp $
 
 EAPI="4"
 
@@ -31,9 +31,10 @@ fi
 IUSE="
 	aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
 	cpudetection debug doc +encode faac fontconfig frei0r gnutls gsm
-	+hardcoded-tables ieee1394 jack jpeg2k libass libv4l modplug mp3 network
-	openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs
-	test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
+	+hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libv4l modplug mp3
+	network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex
+	static-libs	test theora threads truetype v4l vaapi vdpau vorbis vpx X x264
+	xvid +zlib
 	"
 
 # String for CPU features in the useflag[:configure_option] form
@@ -71,6 +72,7 @@ RDEPEND="
 	frei0r? ( media-plugins/frei0r-plugins )
 	gnutls? ( >=net-libs/gnutls-2.12.16 )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
@@ -156,7 +158,9 @@ src_configure() {
 	fi
 
 	# libavdevice options
-	use cdio && myconf="${myconf} --enable-libcdio"
+	for i in cdio iec61883 ; do
+		use ${i} && myconf="${myconf} --enable-lib${i}"
+	done
 	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 b203bb34f42d..51e8381d02a8 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -23,6 +23,7 @@
 	<flag name="faac">Use external faac 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="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</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">Enables mmx2 support</flag>
     <flag name="network">Enables network streaming support</flag>