backport the asm fixes and don't hard-enable mmxext either

(Portage version: 2.1.2_pre3-r2)

9 files changed, 33 insertions, 29 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index dca7d6791bdc..c5b659787595 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.420 2006/10/25 10:15:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.421 2006/10/25 11:19:29 blubb Exp $
+
+  25 Oct 2006; Simon Stelling <blubb@gentoo.org> mplayer-1.0_pre8.ebuild,
+  mplayer-1.0_pre8-r1.ebuild, mplayer-1.0_rc1.ebuild:
+  backport the asm fixes and don't hard-enable mmxext either
 
   25 Oct 2006; Luca Barbato <lu_zero@gentoo.org>
   files/digest-mplayer-1.0_pre8, files/digest-mplayer-1.0_pre8-r1,
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre20060810 b/media-video/mplayer/files/digest-mplayer-1.0_pre20060810
index a54a25912f21..8f244bd64c58 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre20060810
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre20060810
@@ -4,9 +4,9 @@ SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-51
 MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre20061019 b/media-video/mplayer/files/digest-mplayer-1.0_pre20061019
index 5678eb3dbe4d..aa29f4fc7332 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre20061019
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre20061019
@@ -4,9 +4,9 @@ SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-51
 MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre8 b/media-video/mplayer/files/digest-mplayer-1.0_pre8
index ddd4b254a79a..fdbedbcd8111 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre8
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre8
@@ -1,6 +1,6 @@
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 f82bb2bc51b6cd5e5dd96f88f6f98582 MPlayer-1.0pre8.tar.bz2 8166628
 RMD160 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0 MPlayer-1.0pre8.tar.bz2 8166628
 SHA256 4e611138efb3709e650e3770bb3f33609f3fd04047932c830e52a02e0e97efcc MPlayer-1.0pre8.tar.bz2 8166628
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1 b/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1
index 16b289a74397..0cdfb93bfcda 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre8-r1
@@ -4,9 +4,9 @@ SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-51
 MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 f82bb2bc51b6cd5e5dd96f88f6f98582 MPlayer-1.0pre8.tar.bz2 8166628
 RMD160 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0 MPlayer-1.0pre8.tar.bz2 8166628
 SHA256 4e611138efb3709e650e3770bb3f33609f3fd04047932c830e52a02e0e97efcc MPlayer-1.0pre8.tar.bz2 8166628
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_rc1 b/media-video/mplayer/files/digest-mplayer-1.0_rc1
index ac5d4f5bd74a..d4d7d553684f 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_rc1
+++ b/media-video/mplayer/files/digest-mplayer-1.0_rc1
@@ -4,9 +4,9 @@ SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-51
 MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
-RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
-SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 6c0ba3226ed39980b3bf7740bef4a39a Blue-1.6.tar.bz2 281056
+RMD160 c16342d3131f01fbd294ff109b8ab31cef555d13 Blue-1.6.tar.bz2 281056
+SHA256 3a32b59bfc2c3c46acdead2ca65c592a696daaa42561dfcd45c10b8032de8c6d Blue-1.6.tar.bz2 281056
 MD5 18c05d88e22c3b815a43ca8d7152ccdc MPlayer-1.0rc1.tar.bz2 8414213
 RMD160 8cea02e832aec5d9e090829d61d0f131dcc177a2 MPlayer-1.0rc1.tar.bz2 8414213
 SHA256 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063 MPlayer-1.0rc1.tar.bz2 8414213
diff --git a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
index 46e5786d9100..b5fc16cd2a56 100644
--- a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.12 2006/10/06 12:43:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.13 2006/10/25 11:19:29 blubb Exp $
 
 inherit eutils flag-o-matic
 
@@ -354,19 +354,19 @@ src_compile() {
 	# Advanced Options #
 	#################
 	# Platform specific flags, hardcoded on amd64 (see below)
-	use x86 && myconf="${myconf} $(use_enable 3dnow)"
-	use x86 && myconf="${myconf} $(use_enable 3dnowext)";
+	myconf="${myconf} $(use_enable 3dnow)"
+	myconf="${myconf} $(use_enable 3dnowext)";
 	use x86 && myconf="${myconf} $(use_enable sse)"
 	use x86 && myconf="${myconf} $(use_enable sse2)"
 	use x86 && myconf="${myconf} $(use_enable mmx)"
-	use x86 && myconf="${myconf} $(use_enable mmxext)"
+	myconf="${myconf} $(use_enable mmxext)"
 	use debug && myconf="${myconf} --enable-debug=3"
 
 	# mplayer now contains SIMD assembler code for amd64
 	# AMD64 Team decided to hardenable SIMD assembler for all users
 	# Danny van Dyk <kugelfang@gentoo.org> 2005/01/11
 	if use amd64; then
-		myconf="${myconf} --enable-3dnow --enable-3dnowext --enable-sse --enable-sse2 --enable-mmx --enable-mmxext"
+		myconf="${myconf} --enable-sse --enable-sse2 --enable-mmx"
 	fi
 
 	if use ppc64
diff --git a/media-video/mplayer/mplayer-1.0_pre8.ebuild b/media-video/mplayer/mplayer-1.0_pre8.ebuild
index d84bb66c6fe5..3cf49da37661 100644
--- a/media-video/mplayer/mplayer-1.0_pre8.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8.ebuild,v 1.22 2006/09/22 01:10:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8.ebuild,v 1.23 2006/10/25 11:19:29 blubb Exp $
 
 inherit eutils flag-o-matic
 
@@ -364,19 +364,19 @@ src_compile() {
 	# Advanced Options #
 	#################
 	# Platform specific flags, hardcoded on amd64 (see below)
-	use x86 && myconf="${myconf} $(use_enable 3dnow)"
-	use x86 && myconf="${myconf} $(use_enable 3dnowext)";
+	myconf="${myconf} $(use_enable 3dnow)"
+	myconf="${myconf} $(use_enable 3dnowext)";
 	use x86 && myconf="${myconf} $(use_enable sse)"
 	use x86 && myconf="${myconf} $(use_enable sse2)"
 	use x86 && myconf="${myconf} $(use_enable mmx)"
-	use x86 && myconf="${myconf} $(use_enable mmxext)"
+	myconf="${myconf} $(use_enable mmxext)"
 	use debug && myconf="${myconf} --enable-debug=3"
 
 	# mplayer now contains SIMD assembler code for amd64
 	# AMD64 Team decided to hardenable SIMD assembler for all users
 	# Danny van Dyk <kugelfang@gentoo.org> 2005/01/11
 	if use amd64; then
-		myconf="${myconf} --enable-3dnow --enable-3dnowext --enable-sse --enable-sse2 --enable-mmx --enable-mmxext"
+		myconf="${myconf} --enable-sse --enable-sse2 --enable-mmx"
 	fi
 
 	if use ppc64
diff --git a/media-video/mplayer/mplayer-1.0_rc1.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild
index 53cf59f2871c..c769ad00e2ef 100644
--- a/media-video/mplayer/mplayer-1.0_rc1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.2 2006/10/24 12:32:33 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.3 2006/10/25 11:19:29 blubb Exp $
 
 inherit eutils flag-o-matic
 
@@ -354,14 +354,14 @@ src_compile() {
 	use x86 && myconf="${myconf} $(use_enable sse)"
 	use x86 && myconf="${myconf} $(use_enable sse2)"
 	use x86 && myconf="${myconf} $(use_enable mmx)"
-	use x86 && myconf="${myconf} $(use_enable mmxext)"
+	myconf="${myconf} $(use_enable mmxext)"
 	use debug && myconf="${myconf} --enable-debug=3"
 
 	# mplayer now contains SIMD assembler code for amd64
 	# AMD64 Team decided to hardenable SIMD assembler for all users
 	# Danny van Dyk <kugelfang@gentoo.org> 2005/01/11
 	if use amd64; then
-		myconf="${myconf} --enable-sse --enable-sse2 --enable-mmx --enable-mmxext"
+		myconf="${myconf} --enable-sse --enable-sse2 --enable-mmx"
 	fi
 
 	if use ppc64