Add various useflags, default-enabled, for the useful small programs in the tools subdirectory.

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

4 files changed, 38 insertions, 17 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 93a6e446d97d..6d5d3237a1d8 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.525 2012/02/19 13:56:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.526 2012/02/28 21:01:41 aballier Exp $
+
+  28 Feb 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  Add various useflags, default-enabled, for the useful small programs in the
+  tools subdirectory.
 
   19 Feb 2012; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.9.1.ebuild:
   remove old
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d4b0f9a47c6a..c4bcbfed702c 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,13 +6,13 @@ DIST ffmpeg-0.10.tar.bz2 5778962 RMD160 a60568d4e8bd1a44a2c986e0648cfacba766bcd4
 DIST ffmpeg-0.7.8.tar.bz2 4530406 RMD160 8f69a6bc5caaba4e3d440c2d5dc96a946454a52c SHA1 df4983c028a61d4bf3baceab3bae535b91b8928a SHA256 548197968e69b732c12b2cad3173eb6933a9573a7b1f5b29be36d31b9977c9f3
 EBUILD ffmpeg-0.10.ebuild 8269 RMD160 69cf831e39a2aeb0194178faf5459bf2de66eaa1 SHA1 be8c04d54302cbcd3a530090196640b1e4908697 SHA256 0b62eda7478179120c425f99dc405e5f77b3d4b7f50b8de6dfb6f3fcac0c351e
 EBUILD ffmpeg-0.7.8.ebuild 8434 RMD160 ee37ec983306aaa4bf464a6bcccd7072c8490052 SHA1 7712cefb7ac062070f1d367d250204e95ea9e709 SHA256 f295745280616cc04724889e2d5b02a9648321e572c256e959989610c0b774e3
-EBUILD ffmpeg-9999.ebuild 8297 RMD160 9c384c76c9a8c5448c55637c6fe573a6bbfdceb5 SHA1 41abd3c02353c970f749f4b64efe2ab178508e84 SHA256 a92d61d0ce69cb4c8fa5c61b28821b3f48989a948ef22929e088f7306461d035
-MISC ChangeLog 75021 RMD160 1fac36d339db346f54357240ef41c506581dee89 SHA1 a0241318654c100034dc2f317ef182fffa44e4e1 SHA256 2e340848b5b88ab2129103b9395be20a7cf9abb2f510f5b7e94ab8c75ca8d62d
-MISC metadata.xml 3055 RMD160 8da30df01250ecefc4caa65e0df8af536aab2324 SHA1 efb4535b9ef0bbd87bcc5c881a76170b469d6c5b SHA256 68c21bdc0dbf3313287078e56ef3d42915da1c2bfb0362760c2f7ca0ec9a6456
+EBUILD ffmpeg-9999.ebuild 8431 RMD160 12db58220c9324e648fa8d038cf96087b01c9112 SHA1 5d6ce4f381af8373fb529fcc0cd4b8e78fb1ddd4 SHA256 b9eecac55ae39d7731f7855e4f404055f6ac929ae951fd0e62536f025895b080
+MISC ChangeLog 75210 RMD160 b724bd2e3e2bb738a8b66d291dd017fc39e5c364 SHA1 627b00f4131bdc930b5e3a52746e326d1c93e87b SHA256 18ed9c868a27c990e62e3ec7add0ba48c7135549fef755bcb0630b4708acf327
+MISC metadata.xml 3810 RMD160 dce494da2bdf7e44d6f04c64e16a81462f76da9c SHA1 c1f7db2dd35dcd180819217f1ca31593282e1c9c SHA256 1f9035b39801d8fab247462abeb85edf997cd3acbd2b47a49fa92419df93e606
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9A/4EACgkQvFcC4BYPU0pdpQCdHU6TLL5rFnnQK2iCme6gvoIa
-Fz8An00h+rDF3Hmb8LwT1ttle2UMd/M+
-=2MVk
+iEYEARECAAYFAk9NQLsACgkQvFcC4BYPU0o/7gCgpTePnmn8L6feOi0VhMv1O525
+kiYAoKQCw1BNZqsXKEclcyDo0e4me+4V
+=fI9y
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index a7a553916be7..0a1c49c0a679 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.78 2012/01/28 12:19:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.79 2012/02/28 21:01:41 aballier Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@ IUSE="
 	aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug
 	dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
 	jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio
-	+qt-faststart rtmp schroedinger sdl speex static-libs test theora threads
+	rtmp schroedinger sdl speex static-libs test theora threads
 	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
 	"
 
@@ -44,6 +44,12 @@ for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
 done
 
+FFTOOLS="aviocat cws2fws ffeval graph2dot ismindex pktdumper qt-faststart trasher"
+
+for i in ${FFTOOLS}; do
+	IUSE="${IUSE} +$i"
+done
+
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
@@ -249,10 +255,11 @@ src_configure() {
 src_compile() {
 	emake
 
-	if use qt-faststart; then
-		tc-export CC
-		emake -C tools qt-faststart
-	fi
+	for i in ${FFTOOLS} ; do
+		if use $i ; then
+			emake tools/$i
+		fi
+	done
 }
 
 src_install() {
@@ -261,9 +268,11 @@ src_install() {
 	dodoc Changelog README INSTALL
 	dodoc -r doc/*
 
-	if use qt-faststart; then
-		dobin tools/qt-faststart
-	fi
+	for i in ${FFTOOLS} ; do
+		if use $i ; then
+			dobin tools/$i
+		fi
+	done
 }
 
 src_test() {
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 8327a1ff65b3..c91c38927fce 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -14,23 +14,30 @@
 	<flag name="ass">Enables <pkg>media-libs/libass</pkg> based subtitle renderer.</flag>
     <flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
+	<flag name="aviocat">Install aviocat: cat's an URL to another one, useful for dumping streams.</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 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="cws2fws">Install cws2fws: converts cws files (Macromedia Flash, compressed) to fws ones (Macromedia Flash, uncompressed).</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="ffeval">Install ffeval: A simple expression evalutor.</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
+	<flag name="graph2dot">Install graph2dot: A tool to convert a libavfilter graph to a dot file.</flag>
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
+	<flag name="ismindex">Install ismindex: A tool for creating smooth streaming manifests.</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>
 	<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
     <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
+	<flag name="pktdumper">Install pktdumper: Dumps packets as demuxed by libavformat.</flag>
 	<flag name="qt-faststart">Build and install qt-faststart application</flag>
     <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
-    <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+    <flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+	<flag name="trasher">Install trasher: Writes burts of random data into a file. Great for testing error robustness/resilience/concealment.</flag>
 	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
 	<flag name="vdpau">Enables VDPAU decoders (requires nVidia video cards and binary nvidia-drivers to offload CPU processing to video card)</flag>
 	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>