Moved x11 support/xv driver to X USE flag. Fixed gif needing deps on X11. Fixed small typo in the cachefill patch. Address issues mentioned in Bug #58086. Added locale support suggested in Bug #58082.

6 files changed, 100 insertions, 44 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c95e659d00ef..c791e243e238 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.173 2004/07/23 18:18:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.174 2004/07/24 05:25:28 chriswhite Exp $
+
+  24 Jul 2004; Chris White <chriswhite@gentoo.org> files/cachefill.patch,
+  +files/mplayer-1.0_pre5-r1-conf_locale.patch, mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Moved x11 support/xv driver to X USE flag. Fixed gif needing deps on X11.
+  Fixed small typo in the cachefill patch. Address issues mentioned in Bug
+  #58086.  Also adds locale fix patch for Bug #58082.
 
   23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mplayer-1.0_pre5-r1.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index efe5e9cad2e4..d02e9224c14b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,5 +1,6 @@
-MD5 ad108a13200495cfb675e742d80f502a ChangeLog 31048
+MD5 76bf8501bc02fd06a9897720792d64a7 ChangeLog 31389
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 4133680c64f8862635df0b49bef91e7a mplayers.diff 6397
 MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511
 MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375
 MD5 8fd3c8b66040b26bb9f3963b5fe96bb2 mplayer-1.0_pre3-r3.ebuild 11498
@@ -7,11 +8,14 @@ MD5 d40969fad743a58087e55fd5d27d3fcf mplayer-1.0_pre3-r4.ebuild 11799
 MD5 5d11f22039a718f19a725f676e614670 mplayer-1.0_pre3-r5.ebuild 11473
 MD5 1c2c6d32766ce3bf0974895533252491 mplayer-1.0_pre4-r1.ebuild 11659
 MD5 fbdd96b2a3f0f78bdc8cbded3bb3927b mplayer-1.0_pre4-r2.ebuild 11948
+MD5 89e25c012d996ce4b3ca4fe6f780a187 .mplayer-1.0_pre4-r4.ebuild.swp 16384
 MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
 MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
+MD5 fb5f198a34e47441a05b593a1b9d5ff2 mplayer-1.0_pre4-r6.ebuild 12921
 MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
-MD5 917db1eb81ce81527a7e2e5e018f819c mplayer-1.0_pre4-r6.ebuild 12540
-MD5 aa751f9e7587133190a122a65df74131 mplayer-1.0_pre5-r1.ebuild 12384
+MD5 ef75046eaf7bca8c60bae0ca81ef674f mplayer-1.0_pre5-r1.ebuild 12663
+MD5 a2c40342937c78b22d11cf6bdb74deda mplayer-1.0_pre5-r1.ebuild~ 12611
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
@@ -24,7 +28,7 @@ MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358
 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 b0c29f18a794b9299a45b80f70cb5325 files/cachefill.patch 6053
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
@@ -35,23 +39,23 @@ MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.pat
 MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
 MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
 MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
-MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
 MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 aaadaff9756ff85c9855b2bbd50da184 files/mplayer-1.0_pre4-gcc34-mtune.patch 3493
 MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
-MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
-MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
 MD5 ad254e1f8a5166ae1c5b53bc3c76ffd2 files/mplayer-1.0_pre5-yuv2rbg_kludge.patch 12585
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 d7d214ab46189ad1138a0a37eaa859d4 files/noenca.patch 289
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
+MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 158a7fb609f8e710f83562420737ccac files/cachefill.patch 6053
+MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358
 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
 MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826
-MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
diff --git a/media-video/mplayer/files/cachefill.patch b/media-video/mplayer/files/cachefill.patch
index 0dfc2c0dc63b..ec6e6c351b30 100644
--- a/media-video/mplayer/files/cachefill.patch
+++ b/media-video/mplayer/files/cachefill.patch
@@ -8,8 +8,8 @@ diff -Naur MPlayer-1.0pre4.orig/cfg-common.h MPlayer-1.0pre4/cfg-common.h
 -	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL},
 +	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 32, 262144, NULL},
  	{"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-+	{"cache-min", &stream_cache_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
-+	{"cache-prefill", &stream_cache_prefill_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
++	{"cache_min", &stream_cache_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
++	{"cache_prefill", &stream_cache_prefill_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
  #else
  	{"cache", "MPlayer was compiled WITHOUT cache2 support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
  #endif
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-r1-conf_locale.patch b/media-video/mplayer/files/mplayer-1.0_pre5-r1-conf_locale.patch
new file mode 100644
index 000000000000..8c035f958d24
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre5-r1-conf_locale.patch
@@ -0,0 +1,22 @@
+diff -r -u MPlayer-1.0pre5_orig/configure MPlayer-1.0pre5/configure
+--- MPlayer-1.0pre5_orig/configure	2004-07-23 18:06:56.422863704 +0200
++++ MPlayer-1.0pre5/configure	2004-07-23 18:08:05.252400024 +0200
+@@ -2079,15 +2079,15 @@
+     break
+   else
+     echo -n "$i not found, "
+-    _language=`echo $_language | sed "s/$i *//g"`
++    _language=`echo $_language | sed "s/\<$i\> *//g"`
+   fi
+ done
+ test -z "$_language" && _language=en
+ for i in $LANGUAGES ; do
+   if test -f "DOCS/man/$i/mplayer.1" ; then
+-    LANGUAGES=`echo $LANGUAGES | sed "s/$i *//2" | sed 's/ *$//'`
++    LANGUAGES=`echo $LANGUAGES | sed "s/\<$i\> *//2" | sed 's/ *$//'`
+   else
+-    LANGUAGES=`echo $LANGUAGES | sed "s/$i *//g" | sed 's/ *$//'`
++    LANGUAGES=`echo $LANGUAGES | sed "s/\<$i\> *//g" | sed 's/ *$//'`
+   fi
+ done
+ echores "using $_language (man pages: $LANGUAGES)"
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
index d8b4d39543e0..aaa81ebb313d 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild,v 1.4 2004/07/23 15:56:56 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild,v 1.5 2004/07/24 05:25:28 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -22,11 +22,7 @@ DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
-RDEPEND="xvid? (
-		ppc? ( >=media-libs/xvid-0.9.0 )
-		amd64? ( >=media-libs/xvid-0.9.0 )
-		x86? ( >=media-libs/xvid-0.9.0 )
-		)
+RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	x86? ( divx4linux? (  >=media-libs/divx4linux-20030428 )
 		 >=media-libs/win32codecs-0.60 )
 	aalib? ( media-libs/aalib )
@@ -35,7 +31,7 @@ RDEPEND="xvid? (
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
-	dvdread? ( media-libs/libdvdread )
+	dvd? ( dvdread? ( media-libs/libdvdread ) )
 	encode? ( media-sound/lame
 			>=media-libs/libdv-0.9.5 )
 	esd? ( media-sound/esound )
@@ -131,6 +127,9 @@ src_unpack() {
 	# bug #55936, patch from eradicator- fix caching problems.
 	epatch ${FILESDIR}/cachefill.patch
 
+	#bug #58082.  Fixes LANGUAGE variable issues
+	epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
+
 	#Setup the matrox makefile
 	if use matrox; then
 		get_kernel_info
@@ -154,11 +153,16 @@ src_unpack() {
 
 		mv ${WORKDIR}/svgalib_helper ${S}/libdha
 	fi
+
+	#Remove kernel-2.6 workaround as the problem it works around is
+	#fixed, and the workaround breaks sparc
+	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
 }
 
 src_compile() {
 
 	filter-flags -fPIE
+
 	local myconf=
 	################
 	#Optional features#
@@ -168,7 +172,8 @@ src_compile() {
 	myconf="${myconf} $(use_enable dvd mpdvdkit)"
 	myconf="${myconf} $(use_enable edl)"
 	myconf="${myconf} $(use_enable encode mencoder)"
-	myconf="${myconf} $(use_enable gtk gui) $(use_enable gtk x11) $(use_enable gtk xv) $(use_enable gtk vm)"
+	myconf="${myconf} $(use_enable gtk gui)"
+	myconf="${myconf} $(use_enable X x11) $(use_enable X xv) $(use_enable X vm)"
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
 	myconf="${myconf} $(use_enable lirc)"
@@ -188,7 +193,12 @@ src_compile() {
 	# Codecs #
 	########
 	myconf="${myconf} $(use_enable divx4linux)"
-	myconf="${myconf} $(use_enable gif)"
+	# gif support needs X11 libs, don't build it if there is no X support
+	if use X && use gif ; then
+		myconf="${myconf} --enable-gif"
+	else
+		myconf="${myconf} --disable-gif"
+	fi
 	myconf="${myconf} $(use_enable jpeg)"
 	myconf="${myconf} $(use_enable lzo liblzo)"
 	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
@@ -242,9 +252,9 @@ src_compile() {
 	myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)"
 	myconf="${myconf} $(use_enable altivec)"
 	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable mmx) $(use_enable mmx mmx2)"
+	myconf="${myconf} $(use_enable mmx) --disable-mmx2"
 	myconf="${myconf} $(use_enable nls i18n)"
-	myconf="${myconf} $(use_enable sse) $(use_enable sse sse2)"
+	myconf="${myconf} $(use_enable sse) --disable-sse2"
 
 	if [ -d /opt/RealPlayer9/Real/Codecs ]
 	then
@@ -293,11 +303,13 @@ src_compile() {
 		${myconf} || die
 
 		# config.mak doesn't set GIF_LIB so gif related source files fail
-		if use gif
+		if use gif && use X
 		then
-			sed -e "s:GIF_LIB =:GIF_LIB = -lgif:" -i config.mak
-		else
-			sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
+			if use gif ; then
+				sed -e "s:GIF_LIB =:GIF_LIB = -lgif:" -i config.mak
+			else
+				sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
+			fi
 		fi
 
 	einfo "Make"
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
index a4aa6928e7f8..177fa72d1e66 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.7 2004/07/23 18:18:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.8 2004/07/24 05:25:28 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -57,7 +57,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	samba? ( >=net-fs/samba-2.2.8a )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
-	!ia64? ( 
+	!ia64? (
 		theora? ( media-libs/libtheora )
 		live? ( =media-plugins/live-2004.03.27 )
 		)
@@ -117,6 +117,9 @@ src_unpack() {
 	#bug #55936, eradicator's cachefill patch.
 	epatch ${FILESDIR}/cachefill.patch
 
+	#bug #58082.  Fixes LANGUAGE variable issues
+	epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
+
 	#Setup the matrox makefile
 	if use matrox; then
 		get_kernel_info
@@ -159,7 +162,8 @@ src_compile() {
 	myconf="${myconf} $(use_enable dvd mpdvdkit)"
 	myconf="${myconf} $(use_enable edl)"
 	myconf="${myconf} $(use_enable encode mencoder)"
-	myconf="${myconf} $(use_enable gtk gui) $(use_enable gtk x11) $(use_enable gtk xv) $(use_enable gtk vm)"
+	myconf="${myconf} $(use_enable gtk gui)"
+	myconf="${myconf} $(use_enable X x11) $(use_enable X xv) $(use_enable X vm)"
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
 	myconf="${myconf} $(use_enable lirc)"
@@ -179,13 +183,18 @@ src_compile() {
 	# Codecs #
 	########
 	myconf="${myconf} $(use_enable divx4linux)"
-	myconf="${myconf} $(use_enable gif)"
+	# gif support needs X11 libs, don't build it if there is no X support
+	if use X && use gif ; then
+		myconf="${myconf} --enable-gif"
+	else
+		myconf="${myconf} --disable-gif"
+	fi
 	myconf="${myconf} $(use_enable jpeg)"
 	myconf="${myconf} $(use_enable lzo liblzo)"
 	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
 	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
 	myconf="${myconf} $(use_enable oggvorbis vorbis)"
-	if use ia64;  then
+	if use ia64; then
 		myconf="${myconf} --disable-theora"
 	else
 		myconf="${myconf} $(use_enable theora)"
@@ -233,9 +242,9 @@ src_compile() {
 	myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)"
 	myconf="${myconf} $(use_enable altivec)"
 	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable mmx) $(use_enable mmx mmx2)"
+	myconf="${myconf} $(use_enable mmx) --disable-mmx2"
 	myconf="${myconf} $(use_enable nls i18n)"
-	myconf="${myconf} $(use_enable sse) $(use_enable sse sse2)"
+	myconf="${myconf} $(use_enable sse) --disable-sse2"
 
 	if [ -d /opt/RealPlayer9/Real/Codecs ]
 	then
@@ -283,11 +292,13 @@ src_compile() {
 		${myconf} || die
 
 		# config.mak doesn't set GIF_LIB so gif related source files fail
-		if use gif
+		if use gif && use X
 		then
-			sed -e "s:GIF_LIB =:GIF_LIB = -lgif:" -i config.mak
-		else
-			sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
+			if use gif; then
+				sed -e "s:GIF_LIB =:GIF_LIB = -lgif:" -i config.mak
+			else
+				sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
+			fi
 		fi
 
 	einfo "Make"