Add patch to build on non-x86 arches

Package-Manager: portage-2.1.5_rc3

4 files changed, 42 insertions, 4 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 50e3f0b033aa..4b3ef3a88b39 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.567 2008/04/16 20:02:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.568 2008/04/17 04:00:47 beandog Exp $
+
+*mplayer-1.0_rc2_p26454-r2 (17 Apr 2008)
+
+  17 Apr 2008; Steve Dibb <beandog@gentoo.org>
+  +files/configure-unsetauto-v2.patch, -mplayer-1.0_rc2_p26454-r1.ebuild,
+  +mplayer-1.0_rc2_p26454-r2.ebuild:
+  Add patch to build on non-x86 arches
 
 *mplayer-1.0_rc2_p26454-r1 (16 Apr 2008)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c36368e9f356..c5ee25bda75b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,3 +1,4 @@
+AUX configure-unsetauto-v2.patch 432 RMD160 839bc77318496098ed62c196dfef0df6d3ab8067 SHA1 f5544282bcac772e2f68a3ca8e607c042fc340c0 SHA256 ed522d839d4711898f4ec997d9f0ccfc44b4d829bb9a1aae9cf689f515df9540
 AUX mplayer-1.0_rc2_p24929-pulse.patch 1217 RMD160 e6a164ce597e677642ec8f1840e90759deb45eac SHA1 62cae651ec5955db3c41313000a5abfe290eaeb0 SHA256 9f0d13c5cf723be3d9fcc88193b33f0eb2b9f0458c1ed1d8049df3bdecfcd33a
 AUX mplayer-1.0_rc2_p26454-makefile.patch 490 RMD160 7f4a3c34cba5947d45d337c58e446771219594ab SHA1 3cd41618575c4c508bbc973630b071b7bb20a392 SHA256 abbc5542de19ef4697f78cc521b6d17e13e74f98531e3d428f534954641ac93f
 DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8
@@ -14,6 +15,6 @@ EBUILD mplayer-1.0_rc2_p24929-r4.ebuild 15586 RMD160 9393ee4b0a1dc426b31ce13d29f
 EBUILD mplayer-1.0_rc2_p25993.ebuild 16066 RMD160 ef486cfb37d373bebc8ba93e134597ba41f9ea08 SHA1 0d3cc45f1cd0f27c78feb0a8bf15dbff3bf65c9e SHA256 34a9d7e65b4297d6e2c4b9e3feca3fd59cf04185ae167e9f14ce2afe79b0a71c
 EBUILD mplayer-1.0_rc2_p26258.ebuild 16334 RMD160 11cfd3073c7a36209a67f5fc91f2f7edeb7f4b7e SHA1 93d511486b4ecf532872d7789ac71411eafb8b52 SHA256 a70c943ec20405f7326dd8d66bcf84ea361aaf2745b25e79f5b8646e790f4e7c
 EBUILD mplayer-1.0_rc2_p26300-r1.ebuild 16428 RMD160 8d8e02c0061fdb61b6413cae318b7f8af40738a5 SHA1 e79f83fc2d3b811740dbf6c7c143a26dbc931bd1 SHA256 27ca7de839481dd2ca23b3e194917a165b2d28c9e763c80d5fd86cfecf6106b8
-EBUILD mplayer-1.0_rc2_p26454-r1.ebuild 16393 RMD160 532ffe3ac7b6418d3c0b595b0a76d797d3caa62b SHA1 52e1ab4ac32b4a794953042b0bd43b633c1fb831 SHA256 55c0c80c94d9c5a72e4065a774127780831d4e96891824c744631d98fd2e773f
-MISC ChangeLog 99994 RMD160 302d15ec2f3e14d759a33b773d636f18e7db8e61 SHA1 6d56cd5f16a6711e2737b57e078a70321f247354 SHA256 4c5ad352bc5ac9cddbba4a56d353f654d88273e462ed053f1449acb4e0bae88c
+EBUILD mplayer-1.0_rc2_p26454-r2.ebuild 16444 RMD160 4938a00a2bec410a5e6bcf796a8afd85b7efc442 SHA1 221e9aaf9bbaa064034167ddbeb9974ed3c5b39d SHA256 53521cc5e347c1a5e614e4e83bbcd345267f3098b8b44271165cf2338362afbe
+MISC ChangeLog 100234 RMD160 4f0d19590155b4ba0c1cfd2a3abd69ed0bf352ca SHA1 bbba6335169e3c941d9bf4f9e8dd81e1e1139db8 SHA256 bfd1b5e21aaa563bec4768bc6c717c39d6ffb01efbf35143a6d3f8cbd4348c4d
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/mplayer/files/configure-unsetauto-v2.patch b/media-video/mplayer/files/configure-unsetauto-v2.patch
new file mode 100644
index 000000000000..d8a86a6d5b39
--- /dev/null
+++ b/media-video/mplayer/files/configure-unsetauto-v2.patch
@@ -0,0 +1,29 @@
+Index: configure
+===================================================================
+--- configure	(revision 26439)
++++ configure	(working copy)
+@@ -2300,6 +2300,24 @@
+     _altivec=yes
+   fi
+ fi
++if ! x86 ; then
++  _mmx=
++  _3dnow=
++  _3dnowext=
++  _mmxext=
++  _sse=
++  _sse2=
++  _ssse3=
++  _cmov=
++fi
++if ! ppc ; then
++  _altivec=
++fi
++if ! arm ; then
++  _armv5te=
++  _armv6=
++  _iwmmxt=
++fi
+ 
+ 
+ echocheck "extern symbol prefix"
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p26454-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p26454-r2.ebuild
index 5b753939ba3e..8dcf5222b6e5 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p26454-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p26454-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p26454-r1.ebuild,v 1.1 2008/04/16 20:02:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p26454-r2.ebuild,v 1.1 2008/04/17 04:00:47 beandog Exp $
 
 EAPI="1"
 
@@ -180,6 +180,7 @@ src_unpack() {
 
 	#bug 217769
 	epatch "${FILESDIR}/mplayer-1.0_rc2_p26454-makefile.patch"
+	epatch "${FILESDIR}/configure-unsetauto-v2.patch"
 
 	# Fix hppa compilation
 	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"