Fix for gcc-4.1, bug #132147

Package-Manager: portage-2.1_rc3-r1

5 files changed, 66 insertions, 19 deletions

diff --git a/games-emulation/ps2emu-gssoft/ChangeLog b/games-emulation/ps2emu-gssoft/ChangeLog
index a65276cd6bcc..c1d20daba0c8 100644
--- a/games-emulation/ps2emu-gssoft/ChangeLog
+++ b/games-emulation/ps2emu-gssoft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/ps2emu-gssoft
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ChangeLog,v 1.10 2006/02/11 04:42:20 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ChangeLog,v 1.11 2006/05/29 21:10:32 tupone Exp $
+
+  29 May 2006; <Tupone@gentoo.org> +files/ps2emu-gssoft-0.9-gcc41.patch,
+  ps2emu-gssoft-0.9.ebuild:
+  Fix for gcc-4.1, bug #132147 by me, thanks to Mark Loeser for patch
 
   11 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   ps2emu-gssoft-0.6.1.ebuild, ps2emu-gssoft-0.9.ebuild:
diff --git a/games-emulation/ps2emu-gssoft/Manifest b/games-emulation/ps2emu-gssoft/Manifest
index 279d84584349..228d16070df6 100644
--- a/games-emulation/ps2emu-gssoft/Manifest
+++ b/games-emulation/ps2emu-gssoft/Manifest
@@ -1,24 +1,46 @@
-MD5 5e5f7883491edead5d3ac326cedeb15f ChangeLog 1083
-RMD160 c21b5fcc2dc6952c7a5b94e52d1a09707937986d ChangeLog 1083
-SHA256 bdd194be3939ebbbca5318314b528cca3adaecbc6132c6101ce487fd31854b8e ChangeLog 1083
-MD5 a1009be2d1e95d9ceaacdb2f481c82fc files/digest-ps2emu-gssoft-0.6.1 60
-RMD160 bc022154d3c57b5c7121f1cdc4f84b75d63c4927 files/digest-ps2emu-gssoft-0.6.1 60
-SHA256 7117ec5d31b146d82a25e0beec0f45f3221dde929558956629291b2b5eb7473e files/digest-ps2emu-gssoft-0.6.1 60
-MD5 630aac09a02e38ccd4fd77073b968dae files/digest-ps2emu-gssoft-0.9 58
-RMD160 1bebd396d7f6e93dce559d20b5eb42ad9840e4bf files/digest-ps2emu-gssoft-0.9 58
-SHA256 3b25abd4d37bb890c6c26166f3117e333a30f0e23f46a6a8161af0475fa746bb files/digest-ps2emu-gssoft-0.9 58
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ps2emu-gssoft-0.9-PIC.patch 554 RMD160 854943eab71fed38cb367f4ff6f655692da04a83 SHA1 5562fe26ed55ef3d0b81134cf407a18c3bee351f SHA256 5e1f03862df794438c58a0fc060be38323d73dfa02b72b6ad776b5d25b87e756
 MD5 5d3e3ce50ad2715a4711030edf18b7b3 files/ps2emu-gssoft-0.9-PIC.patch 554
 RMD160 854943eab71fed38cb367f4ff6f655692da04a83 files/ps2emu-gssoft-0.9-PIC.patch 554
 SHA256 5e1f03862df794438c58a0fc060be38323d73dfa02b72b6ad776b5d25b87e756 files/ps2emu-gssoft-0.9-PIC.patch 554
+AUX ps2emu-gssoft-0.9-gcc41.patch 640 RMD160 c7617eb150e1d0c5a32c70d25600e563ec683912 SHA1 b4db948553676fe3b1416effd74462e4dbedafb2 SHA256 fe70655a16a07ccf8893fa8ee1b7d27cf89c66abab0b5e82b0cdc31a41523b17
+MD5 78a367955044c2de02cca32ee4bb3487 files/ps2emu-gssoft-0.9-gcc41.patch 640
+RMD160 c7617eb150e1d0c5a32c70d25600e563ec683912 files/ps2emu-gssoft-0.9-gcc41.patch 640
+SHA256 fe70655a16a07ccf8893fa8ee1b7d27cf89c66abab0b5e82b0cdc31a41523b17 files/ps2emu-gssoft-0.9-gcc41.patch 640
+AUX ps2emu-gssoft-0.9-gentoo.patch 850 RMD160 d4a634336944457e43557d0514969678eb104edb SHA1 ba7f8994e83a5028e342e36175ad58f209bda060 SHA256 d73b459ed0ef5f6d02935b1b6950500ce3f14b788e693a44399c8b1dd01ae173
 MD5 150b0f64695512493376ada8e4401757 files/ps2emu-gssoft-0.9-gentoo.patch 850
 RMD160 d4a634336944457e43557d0514969678eb104edb files/ps2emu-gssoft-0.9-gentoo.patch 850
 SHA256 d73b459ed0ef5f6d02935b1b6950500ce3f14b788e693a44399c8b1dd01ae173 files/ps2emu-gssoft-0.9-gentoo.patch 850
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
-SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+DIST GSsoft-0.61.tgz 199903
+DIST GSsoft0.9.rar 330468 RMD160 19e36024e3ff0976129c8498f14a1a5944a6e6d9 SHA1 29a4dc854c2e5c03e736d610a46a18c066361248 SHA256 811aa538d9845fa8ea4af5b4e248f34363922a9d3134ebdbc460ed1b7dc95afc
+EBUILD ps2emu-gssoft-0.6.1.ebuild 872 RMD160 f5376e7da8fcdf1f00179095644b6d01978c7a5a SHA1 f9c17f600cf31836a714fe7f90265b22b1af2ca5 SHA256 faef4c2fd7ad01a05248286d551d5ffa46eb0a23bb3b55dc25c05ed848381d75
 MD5 1cb237a91d6d99dfcaf537dee557d297 ps2emu-gssoft-0.6.1.ebuild 872
 RMD160 f5376e7da8fcdf1f00179095644b6d01978c7a5a ps2emu-gssoft-0.6.1.ebuild 872
 SHA256 faef4c2fd7ad01a05248286d551d5ffa46eb0a23bb3b55dc25c05ed848381d75 ps2emu-gssoft-0.6.1.ebuild 872
-MD5 d0edb3659e2f48ef3466da185481337d ps2emu-gssoft-0.9.ebuild 1053
-RMD160 79a14cf750078639a2b17fb3f2399da3826776e0 ps2emu-gssoft-0.9.ebuild 1053
-SHA256 9dded009b9f5e6274dfd0012d83e535cde53397c427af3c9664bec8418697b54 ps2emu-gssoft-0.9.ebuild 1053
+EBUILD ps2emu-gssoft-0.9.ebuild 1077 RMD160 5b79bd1e42ef8c96533dbb0f6f136fe1ae04a379 SHA1 17c24682af0510e09b966f40bf4841ae29c625ca SHA256 024ab5e15dd8af5c1a3004a1b86fedfc133bd939c950ac3653a410d6bab98a38
+MD5 41d0b36fc3a21c84893e18bb60d04eff ps2emu-gssoft-0.9.ebuild 1077
+RMD160 5b79bd1e42ef8c96533dbb0f6f136fe1ae04a379 ps2emu-gssoft-0.9.ebuild 1077
+SHA256 024ab5e15dd8af5c1a3004a1b86fedfc133bd939c950ac3653a410d6bab98a38 ps2emu-gssoft-0.9.ebuild 1077
+MISC ChangeLog 1248 RMD160 0863c86d9ddd897606a3bdba73acf7c9c252a2d2 SHA1 3c6d60bd4a2c69e4e5cbeddf8c60d7345a12507c SHA256 0d3d973d9f859c8de27f3e4213592e9886c8ac5e58cbf9a223241a8e14f08c6e
+MD5 e96583dff361f8ebbcb7baccf3b71047 ChangeLog 1248
+RMD160 0863c86d9ddd897606a3bdba73acf7c9c252a2d2 ChangeLog 1248
+SHA256 0d3d973d9f859c8de27f3e4213592e9886c8ac5e58cbf9a223241a8e14f08c6e ChangeLog 1248
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 a1009be2d1e95d9ceaacdb2f481c82fc files/digest-ps2emu-gssoft-0.6.1 60
+RMD160 bc022154d3c57b5c7121f1cdc4f84b75d63c4927 files/digest-ps2emu-gssoft-0.6.1 60
+SHA256 7117ec5d31b146d82a25e0beec0f45f3221dde929558956629291b2b5eb7473e files/digest-ps2emu-gssoft-0.6.1 60
+MD5 b85abc8c774162b0bd9a4c9e75ae39c5 files/digest-ps2emu-gssoft-0.9 220
+RMD160 72ca20c54f2350ec5739da312c221790a8cc6c8f files/digest-ps2emu-gssoft-0.9 220
+SHA256 68c24ec21ff57f575f514e6e7ca58821d4f357abf135b3b99045e7b1d0892aaf files/digest-ps2emu-gssoft-0.9 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEe2NU2CTtIKiFlQIRAk77AKCzbe2dsPmoj2BfJPdS1DQnBZlwHgCeLuSF
+YEmdEmo5X3pCKCIAkg4mtZI=
+=8B+S
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.9 b/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.9
index c99f621f0e20..4b376c931d54 100644
--- a/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.9
+++ b/games-emulation/ps2emu-gssoft/files/digest-ps2emu-gssoft-0.9
@@ -1 +1,3 @@
 MD5 ece45f6b9b0956d94e79984a5f024234 GSsoft0.9.rar 330468
+RMD160 19e36024e3ff0976129c8498f14a1a5944a6e6d9 GSsoft0.9.rar 330468
+SHA256 811aa538d9845fa8ea4af5b4e248f34363922a9d3134ebdbc460ed1b7dc95afc GSsoft0.9.rar 330468
diff --git a/games-emulation/ps2emu-gssoft/files/ps2emu-gssoft-0.9-gcc41.patch b/games-emulation/ps2emu-gssoft/files/ps2emu-gssoft-0.9-gcc41.patch
new file mode 100644
index 000000000000..e8126271279b
--- /dev/null
+++ b/games-emulation/ps2emu-gssoft/files/ps2emu-gssoft-0.9-gcc41.patch
@@ -0,0 +1,18 @@
+diff -ur GSsoft0.9-orig/Src/Cache.c GSsoft0.9/Src/Cache.c
+--- GSsoft0.9-orig/Src/Cache.c	2006-05-12 21:57:05.000000000 -0400
++++ GSsoft0.9/Src/Cache.c	2006-05-12 22:02:06.000000000 -0400
+@@ -70,11 +70,12 @@
+ 		for (u=0; u<tex->tex0.tw; u+=8) {

+ 			mem = &vRamUL[getPixelAddress32(u, v, tex->tex0.tbp0, tex->tex0.tbw)];

+ #ifdef __GNUC__

++            u32 *temp = &mem[4];

+ 			__asm__ __volatile__ (

+ 				"movsd %1, %%xmm0\n"

+ 				"movhps %2, %%xmm0\n"

+ 				"movaps %%xmm0, %0\n"

+-				: "=m"(&ptr[0]) : "m"(&mem[0]), "m"(&mem[4])

++				: "=m"(&ptr[0]) : "m"(&mem[0]), "m"(temp)

+ 			);

+ #else

+ 			ptr[0] = mem[0]; ptr[1] = mem[1];

+
diff --git a/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild b/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild
index c2d7bdb9f383..4dbb64e5bce3 100644
--- a/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild
+++ b/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.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/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild,v 1.5 2006/02/11 04:42:20 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild,v 1.6 2006/05/29 21:10:32 tupone Exp $
 
 inherit eutils games
 
@@ -25,8 +25,9 @@ src_unpack() {
 	unrar x -idq "${DISTDIR}"/${A} || die
 	cd "${S}"
 	sed -i 's:-O2 -fomit-frame-pointer -ffast-math:$(OPTFLAGS):' Src/Linux/Makefile || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-PIC.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-PIC.patch \
+		"${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {