From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 18 Jun 2010 14:19:16 +0000 (+0000)
Subject: cosmetics patch by Nikoli <nikoli@lavabit.com>, bug #324453
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d84a84578f48cff875393599314b2240eaedcdd;p=gentoo.git

cosmetics patch by Nikoli <nikoli@lavabit.com>, bug #324453
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1ef2b4c7e2eb..8028b5023316 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,13 +7,13 @@ DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a
 EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
 EBUILD ffmpeg-0.6.ebuild 7808 RMD160 0b39b664e9bb620b87865541b4e3c698c86da286 SHA1 7723509cc581138f302be0ca4409327bf35c3aa2 SHA256 c9ae2bc6a3b87cf761e7a7503674f642bebd8394e0e4effd3ffc895bd04e563f
-EBUILD ffmpeg-9999-r1.ebuild 7850 RMD160 ce6d6f8708468dedc4dcfda71afce2b64b4958a6 SHA1 05553e68e438febdb28c1a4f1100054648349b58 SHA256 1894ed10c5dd571f73792352725e096559211f616d3d13b9f5d56ac7c343eeaa
+EBUILD ffmpeg-9999-r1.ebuild 7551 RMD160 9d32229bc943390647c5d94934009f45657bdca7 SHA1 a5fb0743e929ab76f829b4f0d5f14a8ce3c134d1 SHA256 6c9f300707b6d786a4c529f5b8a6ba194cdc708173fd61724b838df6e196ad38
 MISC ChangeLog 53566 RMD160 bf3bbe8093e793e907513b568359ed26bcdd4038 SHA1 756ba2a242f78853706236fcefd9467cf15b89ad SHA256 e78f2743e3c05110460cf9b5da3f008265e2995d329153cbcd1e1063053524dd
 MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwbc9gACgkQvFcC4BYPU0pGnACeJ0xvx6YgVfwAkPhvQ2rSCLsz
-r7cAoLFd1wYsTTNZ5Hng4d3GsDFlVmuv
-=v9kp
+iEYEARECAAYFAkwbgGoACgkQvFcC4BYPU0rFBwCgnfL6dXT3rBhMHXfvrEBzy8zU
++WUAn3oVB1PjdWut9Gfh0Uik3e3cRb/N
+=DmCu
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 75f894e68774..4097707d0afa 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.42 2010/06/18 06:57:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.43 2010/06/18 14:19:16 aballier Exp $
 
 EAPI="2"
 
@@ -95,22 +95,27 @@ src_configure() {
 	local myconf="${EXTRA_FFMPEG_CONF}"
 
 	# enabled by default
-	use debug || myconf="${myconf} --disable-debug"
-	use zlib || myconf="${myconf} --disable-zlib"
+	for i in debug doc network vaapi zlib; do
+		use ${i} || myconf="${myconf} --disable-${i}"
+	done
 	use sdl || myconf="${myconf} --disable-ffplay"
-	use network || myconf="${myconf} --disable-network"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
 
-	# enabled by default
+	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
+	#done
+	use video_cards_nvidia && use vdpau || myconf="${myconf} --disable-vdpau"
+
+	# Encoders
 	if use encode
 	then
 		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use vorbis && myconf="${myconf} --enable-libvorbis"
-		use theora && myconf="${myconf} --enable-libtheora"
-		use x264 && myconf="${myconf} --enable-libx264"
-		use xvid && myconf="${myconf} --enable-libxvid"
+		for i in theora vorbis x264 xvid; do
+			use ${i} && myconf="${myconf} --enable-lib${i}"
+		done
 		if use bindist
 		then
 			use faac && ewarn "faac is nonfree and cannot be distributed;
@@ -128,11 +133,11 @@ src_configure() {
 	for i in v4l v4l2 alsa oss jack ; do
 		use ${i} || myconf="${myconf} --disable-indev=${i}"
 	done
+	use X && myconf="${myconf} --enable-x11grab"
 	# Outdevs
 	for i in alsa oss ; do
 		use ${i} || myconf="${myconf} --disable-outdev=${i}"
 	done
-	use X && myconf="${myconf} --enable-x11grab"
 
 	# Threads; we only support pthread for now but ffmpeg supports more
 	use threads && myconf="${myconf} --enable-pthreads"
@@ -144,17 +149,9 @@ src_configure() {
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
 
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
-	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
-	#done
-	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
-	use vdpau || myconf="${myconf} --disable-vdpau"
-	use vaapi || myconf="${myconf} --disable-vaapi"
-
 	# CPU features
 	for i in mmx ssse3 altivec ; do
-		use ${i} ||  myconf="${myconf} --disable-${i}"
+		use ${i} || myconf="${myconf} --disable-${i}"
 	done
 	use mmxext || myconf="${myconf} --disable-mmx2"
 	use 3dnow || myconf="${myconf} --disable-amd3dnow"
@@ -181,9 +178,14 @@ src_configure() {
 	done
 
 	# Mandatory configuration
-	myconf="${myconf} --enable-gpl --enable-version3 --enable-postproc \
-			--enable-avfilter --enable-avfilter-lavf \
-			--disable-stripping"
+	myconf="
+		--enable-gpl
+		--enable-version3
+		--enable-postproc
+		--enable-avfilter
+		--enable-avfilter-lavf
+		--disable-stripping
+		${myconf}"
 
 	# cross compile support
 	if tc-is-cross-compiler ; then
@@ -203,7 +205,6 @@ src_configure() {
 
 	# Misc stuff
 	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-	use doc || myconf="${myconf} --disable-doc"
 
 	# Specific workarounds for too-few-registers arch...
 	if [[ $(tc-arch) == "x86" ]]; then