Marked ~ppc64; bug #68112

4 files changed, 48 insertions, 32 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 66512ef37164..f2c039ec5384 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.232 2004/11/11 03:36:50 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.233 2004/11/14 09:51:36 corsair Exp $
+
+  14 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  +files/mplayer-1.0_pre5-r4-ppc64.patch, mplayer-1.0_pre5-r4.ebuild:
+  Marked ~ppc64 (bug #68112) and added ppc64 patch.
 
   11 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
   Copied midentify to /usr/bin for emovix for bug #58580.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 9a4bf9fb1cee..8ee57b5da91a 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,42 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 da6edbc2886d732d4aed2b0beb98cb7f ChangeLog 43168
+MD5 2d1683a7044d7bee635f3e4dd08c79ac ChangeLog 43337
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 c014768260e641ecce0e0101976f95b7 mplayer-1.0_pre4-r7.ebuild 12233
 MD5 7f21528ccfbe447640072fedef9ed751 mplayer-1.0_pre5-r2.ebuild 14058
 MD5 ce04980bd31a5121057431003181a885 mplayer-1.0_pre5-r3.ebuild 14889
-MD5 25cf97ce5946738fb2e66bae2bd732d8 mplayer-1.0_pre5-r4.ebuild 16341
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510
-MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 a08907cb01a91f6767fc85f114617d1a mplayer-1.0_pre5-r4.ebuild 16470
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
+MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r3 440
-MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
-MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
 MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
 MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
+MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
+MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
+MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
+MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
+MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
-MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
-MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBkt5hFdQwWVoAgN4RAoYsAJ0f+3g9QeuPaZssvbKqf62qWavV/ACg/kvc
-et+GldW7vQgToRVmuiuIx/8=
-=brP0
------END PGP SIGNATURE-----
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-r4-ppc64.patch b/media-video/mplayer/files/mplayer-1.0_pre5-r4-ppc64.patch
new file mode 100644
index 000000000000..b400e76c3105
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre5-r4-ppc64.patch
@@ -0,0 +1,13 @@
+diff -Nur MPlayer-1.0pre5.orig/configure MPlayer-1.0pre5/configure
+--- MPlayer-1.0pre5.orig/configure	2004-11-14 12:26:04.826628654 +0900
++++ MPlayer-1.0pre5/configure	2004-11-14 12:42:46.021422901 +0900
+@@ -445,7 +445,7 @@
+       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
+       ia64) host_arch=ia64 ;;
+       x86_64|amd64) host_arch=x86_64 ;;
+-      macppc|ppc) host_arch=ppc ;;
++      macppc|ppc|ppc64) host_arch=ppc ;;
+       alpha) host_arch=alpha ;;
+       sparc*) host_arch=sparc ;;
+       parisc*|hppa*|9000*) host_arch=hppa ;;
+
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
index 78a4f35b497c..6c94f92adde4 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r4.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-r4.ebuild,v 1.23 2004/11/11 03:36:50 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.24 2004/11/14 09:51:36 corsair Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -86,7 +86,7 @@ SLOT="0"
 LICENSE="GPL-2"
 #KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa ~sparc"
 #agriffis - uncomment this when ia64 is ready - Chris
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~hppa ~sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~hppa ~sparc ~ppc64"
 
 src_unpack() {
 
@@ -159,6 +159,8 @@ src_unpack() {
 	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
 	# Doesn't break if bio2jack is in
 	epatch ${FILESDIR}/${P}-bio2jack.patch
+
+	use ppc64 && epatch ${FILESDIR}/${P}-r4-ppc64.patch
 }
 
 linguas_warn() {
@@ -380,10 +382,16 @@ src_compile() {
 	myconf="${myconf} $(use_enable mmx)"
 	myconf="${myconf} $(use_enable mmx2)"
 	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable altivec)"
 	myconf="${myconf} $(use_enable debug)"
 	myconf="${myconf} $(use_enable nls i18n)"
 
+	if use ppc64
+	then
+		myconf="${myconf} --disable-altivec"
+	else
+		myconf="${myconf} $(use_enable altivec)"
+	fi
+
 	if use real
 	then
 		if [ -d /usr/$(get_libdir)/real ]