Add fix for #148186.

Package-Manager: portage-2.1.2_pre1

4 files changed, 50 insertions, 31 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 2d405a113722..5f58fd645852 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.113 2006/09/18 21:34:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.114 2006/09/23 12:27:12 vapier Exp $
+
+  23 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch,
+  libsdl-1.2.11.ebuild:
+  Add fix for #148186.
 
   18 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> libsdl-1.2.11.ebuild:
   Stable on amd64 wrt bug #145470.
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index a35e6576c104..1e72b979fed0 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -61,6 +61,10 @@ AUX libsdl-1.2.11-libcaca.patch 17046 RMD160 b06396c3ebf3b6d8dc5b11080b3f0295a06
 MD5 67b4fcd3cdd7d3e806c957d7452cf6d0 files/libsdl-1.2.11-libcaca.patch 17046
 RMD160 b06396c3ebf3b6d8dc5b11080b3f0295a06bff67 files/libsdl-1.2.11-libcaca.patch 17046
 SHA256 5833a12a3f6fd3fe2b95ccd830d7a16a08c5cc25aeb0f68839cc1bd3e1d17105 files/libsdl-1.2.11-libcaca.patch 17046
+AUX libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch 448 RMD160 a2bf6975aaada6920913b3232c58d5b2b2aa22fe SHA1 5a377ac2231c7b180797053f838b6ec2a5037c3a SHA256 3c571f5740093d2db2e8397d676c6d6f229fa856c0d15a1f23a0a12331d5883b
+MD5 c2b0aa8ea5c72ceda6ff565036240136 files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch 448
+RMD160 a2bf6975aaada6920913b3232c58d5b2b2aa22fe files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch 448
+SHA256 3c571f5740093d2db2e8397d676c6d6f229fa856c0d15a1f23a0a12331d5883b files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch 448
 AUX libsdl-1.2.11-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 SHA1 01c8d54cb8a22ea2a1e898b3ca39f9baca07dc98 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015
 MD5 2d9bced29ca7e5c69410ce1e3ff58e09 files/libsdl-1.2.11-sdl-config.patch 780
 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 files/libsdl-1.2.11-sdl-config.patch 780
@@ -137,10 +141,10 @@ DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 S
 DIST SDL-1.2.7.tar.gz 2470936 RMD160 2e19851fca8dac81c8d07cb39b8757aa54093023 SHA1 1a840c50668f230df9e9163ef1a282d9f3355383 SHA256 f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd
 DIST SDL-1.2.8.tar.gz 2602449 RMD160 91aa02f6b52792b3ec7f5478bcaebda1542980dc SHA1 26f2104a60a28914b809d3cb77d5790bfdfd024c SHA256 6508abb6068df597896da4e926606bb80c0b03ebfb8cf0017471fdb41307125a
 DIST SDL-1.2.9.tar.gz 2688179 RMD160 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7 SHA1 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1 SHA256 d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
-EBUILD libsdl-1.2.11.ebuild 4765 RMD160 0347226ab0d0efd9e8b20244ca00164622d3cabc SHA1 b5f824249ace5b3e7b2de084de1a78355de59ec0 SHA256 3cc76a849f155e0cc624383397d0d68c92266cf86f428375551a156a26d24ce1
-MD5 dea29b77f58c63666779178269330632 libsdl-1.2.11.ebuild 4765
-RMD160 0347226ab0d0efd9e8b20244ca00164622d3cabc libsdl-1.2.11.ebuild 4765
-SHA256 3cc76a849f155e0cc624383397d0d68c92266cf86f428375551a156a26d24ce1 libsdl-1.2.11.ebuild 4765
+EBUILD libsdl-1.2.11.ebuild 4731 RMD160 340e9e1174bcac84f4a8ed049989286fbf233ab0 SHA1 24bcf168d19ae96d473c6d8e4fb792eb9995b05c SHA256 b5d7586377cfbf3931bb26e1e318b4934c751a5042aae17c39abb7d732a82709
+MD5 1fce503260fad54e202cc6682fefc62b libsdl-1.2.11.ebuild 4731
+RMD160 340e9e1174bcac84f4a8ed049989286fbf233ab0 libsdl-1.2.11.ebuild 4731
+SHA256 b5d7586377cfbf3931bb26e1e318b4934c751a5042aae17c39abb7d732a82709 libsdl-1.2.11.ebuild 4731
 EBUILD libsdl-1.2.7-r3.ebuild 4269 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e SHA1 61c2d2c90e4e31551fac4c557823b4b25016a557 SHA256 1eb38d7e30a20096b1480a62a6a759a436fa4b40688dbd2ca86da0e434a1fc05
 MD5 5c56de3cfb83340e0d889828dd372194 libsdl-1.2.7-r3.ebuild 4269
 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e libsdl-1.2.7-r3.ebuild 4269
@@ -157,10 +161,10 @@ EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c
 MD5 62041b7bb258830e75ef4464d7124598 libsdl-1.2.9.ebuild 4643
 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c libsdl-1.2.9.ebuild 4643
 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c libsdl-1.2.9.ebuild 4643
-MISC ChangeLog 17779 RMD160 c45626fa351bcbe2db8a65c9c58381e11e5fd47b SHA1 5e6baad0efac880fddd46cf167789a020a79e507 SHA256 4977c601be5cb6fa684b3416ae740c113bf056fb589be3078a2928700366dcf8
-MD5 ee1b7e95d68cfc1470d715cc2ce02e96 ChangeLog 17779
-RMD160 c45626fa351bcbe2db8a65c9c58381e11e5fd47b ChangeLog 17779
-SHA256 4977c601be5cb6fa684b3416ae740c113bf056fb589be3078a2928700366dcf8 ChangeLog 17779
+MISC ChangeLog 17946 RMD160 082cc33f32d8ecc1d5251e00afdd9a9e53533815 SHA1 6e344d01fa36ab284c17ba4d2d83f9b9a0a77d24 SHA256 1ba14e011cbfd61149cbd30fc3d3138df864953e01b8a9956b80ba3f37f5f032
+MD5 acd78b3bc14b529d8c8817cd5547f9fc ChangeLog 17946
+RMD160 082cc33f32d8ecc1d5251e00afdd9a9e53533815 ChangeLog 17946
+SHA256 1ba14e011cbfd61149cbd30fc3d3138df864953e01b8a9956b80ba3f37f5f032 ChangeLog 17946
 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
@@ -183,7 +187,7 @@ SHA256 8e70be29548aa63e313575f311c63363981a0fb40b69b689a923fd9b80fbeea7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFD1HmamhnQswr0vIRAtPwAKClcXDQxyqVYF+s1scrYDLbYbxO+gCdEIie
-Ajp8GdIc1INvgzW13pXYdEg=
-=o693
+iD8DBQFFFSgoamhnQswr0vIRAt34AKCKUHKfZFDk9bg3nJ3KxIn0hrmpLwCghYwE
+pTlOffY+nO0DzQ8A5gSgb9E=
+=RFPy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch b/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch
new file mode 100644
index 000000000000..22695aa4d7fd
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/148186
+
+--- src/video/SDL_blit_A.c
++++ src/video/SDL_blit_A.c
+@@ -1621,7 +1621,7 @@ BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * in
+ 
+ #if GCC_ASMBLIT
+ /* fast (as in MMX with prefetch) ARGB888->(A)RGB888 blending with pixel alpha */
+-inline static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info)
++static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info)
+ {
+ 	int width = info->d_width;
+ 	int height = info->d_height;
diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild
index 85a71804ee89..47c64aeca2bb 100644
--- a/media-libs/libsdl/libsdl-1.2.11.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11.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-libs/libsdl/libsdl-1.2.11.ebuild,v 1.12 2006/09/18 21:34:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.13 2006/09/23 12:27:12 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -24,17 +24,15 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	arts? ( kde-base/arts )
 	nas? (
 		media-libs/nas
-		|| ( (
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libX11 )
-		virtual/x11 ) )
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+	)
 	X? (
-		|| ( (
-			x11-libs/libXt
-			x11-libs/libXext
-			x11-libs/libX11 )
-		virtual/x11 ) )
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+	)
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
 	svga? ( >=media-libs/svgalib-1.4.2 )
@@ -43,15 +41,13 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
 	nas? (
-		|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto )
-		virtual/x11 ) )
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
 	X? (
-		|| ( (
-			x11-proto/xextproto
-			x11-proto/xproto )
-		virtual/x11 ) )
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
 	x86? ( dev-lang/nasm )"
 
 S=${WORKDIR}/SDL-${PV}
@@ -79,6 +75,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-libcaca.patch #40224
 	epatch "${FILESDIR}"/${P}-sdl-config.patch
 	epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917
+	epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186
 
 	# add yasm-compatible defines to nasm code (hopefully we
 	# can get this killed soonish)