minor bug-fix for ppc

4 files changed, 41 insertions, 18 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index bdcc59440b94..7012e9d42b02 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.55 2003/04/09 22:06:21 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.56 2003/04/16 01:49:48 pylon Exp $
 
 *mplayer-0.90 (09 Apr 2003)
 
+  16 Apr 2003; Lars Weiler <pylon@gentoo.org> mplayer-0.90.ebuild,
+  files/mplayer-0.90-ppc-benh.patch:
+  No big change.
+  Added the mentioned patch in bug #18511 for the right order of the
+  ppc-processor-switch and some more ppc-related einfo-lines about the altivec
+  issue with DivX.
+
   09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90.ebuild :
   New version:
   - Add 'dvb' use flag (bug #13809), thanks to Juri Haberland <juri@koschikode.com>
diff --git a/media-video/mplayer/files/digest-mplayer-0.90 b/media-video/mplayer/files/digest-mplayer-0.90
index 3f296539f88c..70bf7d854e5b 100644
--- a/media-video/mplayer/files/digest-mplayer-0.90
+++ b/media-video/mplayer/files/digest-mplayer-0.90
@@ -1,3 +1,8 @@
+MD5 6c2dab3392aab51766253b416ad2a10c /files/default-skin.diff 396
+MD5 9e064190a914d26b0392a266753161ed /files/mplayer-0.90-ppc-benh.patch 2029
+MD5 059e03d1d2c965b04a5e53ed850de64a /files/mplayer-0.90_rc4-gtk2.patch 6183
+MD5 c2d65649f15837c5a326557ded4e47c5 /files/mplayer.desktop 119
+MD5 480f90da20ebf00d80e5dbdf5d88ef55 /mplayer-0.90.ebuild 10995
 MD5 9a9f294bbaab2071ecbc327f4e870be8 MPlayer-0.90.tar.bz2 3436463
 MD5 6c3f032ddf401ca522900291de03fee5 font-arial-iso-8859-1.tar.bz2 234810
 MD5 0f9a5d53f836e2d2d2bde207dc641044 font-arial-iso-8859-2.tar.bz2 222677
diff --git a/media-video/mplayer/files/mplayer-0.90-ppc-benh.patch b/media-video/mplayer/files/mplayer-0.90-ppc-benh.patch
index 5f00b9a554df..505d5420def8 100644
--- a/media-video/mplayer/files/mplayer-0.90-ppc-benh.patch
+++ b/media-video/mplayer/files/mplayer-0.90-ppc-benh.patch
@@ -46,10 +46,6 @@
 +      _march="-mcpu=604"
 +      _mcpu="-mtune=604"
 +    ;;
-+    7[45][50]*)
-+      _march="-mcpu=750"
-+      _mcpu="-mtune=750"
-+    ;;
 +    74[10]0*)
 +      _march="-mcpu=7400"
 +      _mcpu="-mtune=7400"
@@ -58,6 +54,10 @@
 +      _march="-mcpu=7450"
 +      _mcpu="-mtune=7450"
 +    ;;
++    7[45][50]*)
++      _march="-mcpu=750"
++      _mcpu="-mtune=750"
++    ;;
 +    82[46][50]*)
 +      _march="-mcpu=603e"
 +      _mcpu="-mtune=603e"
diff --git a/media-video/mplayer/mplayer-0.90.ebuild b/media-video/mplayer/mplayer-0.90.ebuild
index 4806654290c0..9cdc7695f413 100644
--- a/media-video/mplayer/mplayer-0.90.ebuild
+++ b/media-video/mplayer/mplayer-0.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90.ebuild,v 1.1 2003/04/09 22:06:21 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90.ebuild,v 1.2 2003/04/16 01:49:48 pylon Exp $
 
 IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb"
 
@@ -48,7 +48,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	arts? ( kde-base/arts )
 	nas? ( media-libs/nas )
 	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame 
+	encode? ( media-sound/lame
 	          >=media-libs/libdv-0.9.5 )
 	xmms? ( media-sound/xmms )
 	opengl? ( virtual/opengl )
@@ -98,13 +98,13 @@ src_unpack() {
 src_compile() {
 
 	use matrox && check_KV
-        
+
 	local myconf=""
 
 	use 3dnow \
 		|| myconf="${myconf} --disable-3dnow --disable-3dnowex"
 
-	use sse	\
+	use sse \
 		|| myconf="${myconf} --disable-sse --disable-sse2"
 
 	# Only disable MMX if 3DNOW or SSE is not in USE
@@ -115,10 +115,10 @@ src_compile() {
 	use X || use gtk \
 		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
 		                     --disable-xmga --disable-png"
-	
+
 	use jpeg \
 		|| myconf="${myconf} --disable-jpeg"
-	
+
 	use gif \
 		|| myconf="${myconf} --disable-gif"
 
@@ -160,7 +160,7 @@ src_compile() {
 
 	use esd \
 		|| myconf="${myconf} --disable-esd"
-		
+
 	use alsa \
 		|| myconf="${myconf} --disable-alsa"
 
@@ -196,7 +196,7 @@ src_compile() {
 	use dvb \
 		&& myconf="${myconf} --enable-dvb" \
 		|| myconf="${myconf} --disable-dvb"
-	
+
 	use nls \
 		&& myconf="${myconf} --enable-i18n" \
 		|| myconf="${myconf} --disable-i18n"
@@ -255,10 +255,10 @@ src_compile() {
 
 	# emake borks on fast boxes - Azarah (07 Aug 2002)
 	make all || die
-	
+
 	if [ -n "`use matrox`" ]
 	then
-		cd drivers 
+		cd drivers
 		make all || die
 	fi
 }
@@ -277,7 +277,7 @@ src_install() {
 	if [ -f ${S}/postproc/libpostproc.a ]
 	then
 		dolib ${S}/postproc/libpostproc.a
-		
+
 		if [ ! -f ${D}/usr/include/postproc/postprocess.h ]
 		then
 			insinto /usr/include/postproc
@@ -362,7 +362,7 @@ src_install() {
 	then
 		audio="oss"
 	fi
-	
+
 	# Note to myself:  do not change " into '
 	sed -e "s/^# vo=xv/vo=${video}/" \
 	    -e "s/^# ao=oss/ao=${audio}/" \
@@ -372,7 +372,7 @@ src_install() {
 	insinto /etc
 	doins ${T}/mplayer.conf
 	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-	
+
 	insinto /usr/share/mplayer
 	doins ${S}/etc/codecs.conf
 	doins ${S}/etc/input.conf
@@ -394,6 +394,17 @@ pkg_postinst() {
 		einfo "copy a truetype (.ttf) font to ~/.mplayer/subfont.ttf"
 	fi
 
+	if [ -n "`use ppc`" ]
+	then
+		echo
+		einfo "When you see only GREEN salad on your G4 while playing"
+		einfo "a DivX, you should recompile _without_ altivec enabled."
+		einfo "Furher information: http://bugs.gentoo.org/show_bug.cgi?id=18511"
+		echo
+		einfo "If everything functions fine with watching DivX and"
+		einfo "altivec enabled, please drop a comment on the mentioned bug!"
+	fi
+
 	depmod -a &>/dev/null || :
 }