[patch] updated patch

mplayer-9999.ebuild_1.diff (text/plain), 3.55 KB, created by Nikoli on 2010-06-02 16:11:11 UTC

--- /usr/portage/media-video/mplayer/mplayer-9999.ebuild	2010-06-01 08:36:33.000000000 +0400
+++ mplayer-9999.ebuild	2010-06-02 20:06:43.000000000 +0400
@@ -62,6 +62,8 @@
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="
 	sys-libs/ncurses
+	app-arch/bzip2
+	sys-libs/zlib
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )
@@ -142,7 +144,7 @@
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
+	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
@@ -228,7 +230,13 @@
 }
 
 src_unpack() {
-	[[ ${PV} = *9999* ]] && subversion_src_unpack || unpack ${A}
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+
+		cd "${WORKDIR}"
+	else
+		unpack ${A}
+	fi
 
 	if ! use truetype; then
 		unpack font-arial-iso-8859-1.tar.bz2 \
@@ -291,7 +299,6 @@
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use bidi || myconf+=" --disable-fribidi"
-	use encode || myconf+=" --disable-mencoder"
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
@@ -394,15 +401,10 @@
 	##########
 	# Codecs #
 	##########
-	# Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-musepack"
-
-	use a52 || myconf+=" --disable-liba52"
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
-	use dv || myconf+=" --disable-libdv"
-	use lzo || myconf+=" --disable-liblzo"
 	if ! use mp3; then
 		myconf+="
 			--disable-mp3lame
@@ -410,7 +412,10 @@
 			--disable-mp3lib
 		"
 	fi
-	use bs2b || myconf+=" --disable-libbs2b"
+	uses="a52 bs2b dv lzo"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
 	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
 	# Disable opencore-amr with bindist
 	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
@@ -435,25 +440,17 @@
 		"
 	fi
 	# Encoding
+	uses="faac x264 xvid toolame twolame"
 	if use encode; then
-		uses="faac x264 xvid toolame twolame"
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
 		use faac || myconf+=" --disable-faac-lavc"
 	else
-		myconf+="
-			--disable-faac-lavc
-			--disable-faac
-			--disable-x264
-			--disable-xvid
-			--disable-x264-lavc
-			--disable-xvid-lavc
-			--disable-twolame
-			--disable-toolame
-		"
-		uses="faac x264 xvid toolame twolame"
+		myconf+=" --disable-mencoder"
+		myconf+="--disable-faac-lavc"
 		for i in ${uses}; do
+			myconf+=" --disable-${i}"
 			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
 		done
 	fi
@@ -606,6 +603,7 @@
 		--disable-xss
 		--disable-xv
 		--disable-xvmc
+		--disable-x11
 		"
 		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
 		for i in ${uses}; do
@@ -640,14 +638,14 @@
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do
-			hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i"
+			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
 		done
 		if [[ -z $BUILT_DOCS ]]
 		then
 			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
 		else
 			for i in ${BUILT_DOCS} ; do
-				emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate html docs for $i"
+				emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}"
 			done
 		fi
 	fi