Fix for gcc-4.1

Package-Manager: portage-2.1_pre10-r2

5 files changed, 71 insertions, 10 deletions

diff --git a/games-emulation/pcsx/ChangeLog b/games-emulation/pcsx/ChangeLog
index 3e1dc92a4d66..81cc1360d62d 100644
--- a/games-emulation/pcsx/ChangeLog
+++ b/games-emulation/pcsx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/pcsx
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/ChangeLog,v 1.7 2005/09/26 17:45:44 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/ChangeLog,v 1.8 2006/05/02 20:09:09 tupone Exp $
+
+  02 May 2006; <Tupone@gentoo.org> +files/pcsx-1.5-gcc41.patch,
+  pcsx-1.5-r1.ebuild:
+  Fix for gcc-4.1
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> pcsx-1.5-r1.ebuild:
   Making games last on inherit line.
diff --git a/games-emulation/pcsx/Manifest b/games-emulation/pcsx/Manifest
index 46087a47d406..722b4b34fe11 100644
--- a/games-emulation/pcsx/Manifest
+++ b/games-emulation/pcsx/Manifest
@@ -1,6 +1,38 @@
-MD5 5f12d20914588ccb9c6f55f0211c9c04 pcsx-1.5-r1.ebuild 1613
-MD5 b555973676834b0339455b5bff2e89b6 ChangeLog 2126
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 fdf3d6afdc389182742ce8e378b17916 files/pcsx 1314
-MD5 5d4178cacae36906aaf26238d2f556b2 files/digest-pcsx-1.5-r1 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.5-gentoo.patch 365 RMD160 5d6c20591c1017c7ab17227c797a98ec71ce3d21 SHA1 cc97ee21b287f43ec27d099f6211b34ad57038ac SHA256 150ad420d192e8073ad2441d3f80aa8f3601a17388f9fd805871f6e81c8c75c0 size 365
 MD5 2f9732780627a19f6cf58f4f46ae93a4 files/1.5-gentoo.patch 365
+RMD160 5d6c20591c1017c7ab17227c797a98ec71ce3d21 files/1.5-gentoo.patch 365
+SHA256 150ad420d192e8073ad2441d3f80aa8f3601a17388f9fd805871f6e81c8c75c0 files/1.5-gentoo.patch 365
+AUX pcsx 1314 RMD160 8d7aafee605d29379085a7235a4c9c0476471540 SHA1 04fb005298002ed120a7dbcfaffcca953fed84a3 SHA256 2ffdaa6301ecd867cc2a40f080c212c667ba28a7a159baac953c39a695a7842f size 1314
+MD5 fdf3d6afdc389182742ce8e378b17916 files/pcsx 1314
+RMD160 8d7aafee605d29379085a7235a4c9c0476471540 files/pcsx 1314
+SHA256 2ffdaa6301ecd867cc2a40f080c212c667ba28a7a159baac953c39a695a7842f files/pcsx 1314
+AUX pcsx-1.5-gcc41.patch 655 RMD160 93add45c6ffc9de17f0ddfed9d6f8916449ae64f SHA1 ea6547c2b8c099a663a6989af395928b5486de9c SHA256 6ea18e4d66272760f51ec685b2c16ba4b756837123f774fe4c8f434be0635d52 size 655
+MD5 8223e33b5af7e6c6be3755e3f70c08d3 files/pcsx-1.5-gcc41.patch 655
+RMD160 93add45c6ffc9de17f0ddfed9d6f8916449ae64f files/pcsx-1.5-gcc41.patch 655
+SHA256 6ea18e4d66272760f51ec685b2c16ba4b756837123f774fe4c8f434be0635d52 files/pcsx-1.5-gcc41.patch 655
+DIST PcsxSrc-1.5.tgz 441651 RMD160 83e6425cb027c72b5b452b61f6b5a83992c5e065 SHA256 49656115a7ade50245e54314052d2a7be814f40c50f609427fe5320eba4435a9 size 441651
+EBUILD pcsx-1.5-r1.ebuild 1646 RMD160 80f47cf6cbd93338bb9240473f11941d9ecea016 SHA1 c9d7589ca6daf1d2d0066db87c8b64af44d56a87 SHA256 b4101846bf85f83c75458b1258a666455ad5163d0c83d47dda99126c1fe5d1d9 size 1646
+MD5 5028b3c11cb063b4d46924ca43316d8e pcsx-1.5-r1.ebuild 1646
+RMD160 80f47cf6cbd93338bb9240473f11941d9ecea016 pcsx-1.5-r1.ebuild 1646
+SHA256 b4101846bf85f83c75458b1258a666455ad5163d0c83d47dda99126c1fe5d1d9 pcsx-1.5-r1.ebuild 1646
+MISC ChangeLog 2229 RMD160 177ef2752194eb8b2b7a1db5ceadca9d708d2325 SHA1 a0b2a52775ff9ba82ce8a40784c52cb4f912bb48 SHA256 cbc39692d58e6006295dc463bec6e6e76ad6eef63d648ee6d44700b01f478104 size 2229
+MD5 95a8de1aafa2529b5981499b328242e4 ChangeLog 2229
+RMD160 177ef2752194eb8b2b7a1db5ceadca9d708d2325 ChangeLog 2229
+SHA256 cbc39692d58e6006295dc463bec6e6e76ad6eef63d648ee6d44700b01f478104 ChangeLog 2229
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 f24d038538f42e14f4d60cd7d4430351 files/digest-pcsx-1.5-r1 226
+RMD160 ff33efdb959a1871d267d5d673c73deeb6a15a8a files/digest-pcsx-1.5-r1 226
+SHA256 ae47836ce270ecbfb147562d16141c3499cf1c9a59fc5f4c1db0ad8ceceec8ae files/digest-pcsx-1.5-r1 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEV7xw2CTtIKiFlQIRAuJmAJ9Np6qRmzfTByyIwsOgMVSQ5fKcpgCguFz/
+ux8VFZxfOBxKft9SuTglJlA=
+=/sBm
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/pcsx/files/digest-pcsx-1.5-r1 b/games-emulation/pcsx/files/digest-pcsx-1.5-r1
index b3b5dc8f697b..95cebaca47cd 100644
--- a/games-emulation/pcsx/files/digest-pcsx-1.5-r1
+++ b/games-emulation/pcsx/files/digest-pcsx-1.5-r1
@@ -1 +1,3 @@
 MD5 591eaf198d3bb3da45a30e4fdffec11c PcsxSrc-1.5.tgz 441651
+RMD160 83e6425cb027c72b5b452b61f6b5a83992c5e065 PcsxSrc-1.5.tgz 441651
+SHA256 49656115a7ade50245e54314052d2a7be814f40c50f609427fe5320eba4435a9 PcsxSrc-1.5.tgz 441651
diff --git a/games-emulation/pcsx/files/pcsx-1.5-gcc41.patch b/games-emulation/pcsx/files/pcsx-1.5-gcc41.patch
new file mode 100644
index 000000000000..eff40e90f98d
--- /dev/null
+++ b/games-emulation/pcsx/files/pcsx-1.5-gcc41.patch
@@ -0,0 +1,22 @@
+--- PsxBios.c.old	2006-05-02 21:22:52.000000000 +0200
++++ PsxBios.c	2006-05-02 21:41:56.000000000 +0200
+@@ -2253,7 +2253,7 @@
+ 		if (ptr) psxRu32ref(base) = SWAPu32((u32)ptr - (u32)psxM); \
+ 		else psxRu32ref(base) = 0; \
+ 	} else { \
+-		if (psxRu32(base)) (u8*)ptr = (u8*)(psxM + psxRu32(base)); \
++		if (psxRu32(base)) *(u8**)&ptr = (u8*)(psxM + psxRu32(base)); \
+ 		else ptr = NULL; \
+ 	} \
+ 	base+=4;
+--- R3000A.h.old	2006-05-02 21:44:36.000000000 +0200
++++ R3000A.h	2006-05-02 21:45:07.000000000 +0200
+@@ -135,7 +135,7 @@
+ 
+ psxRegisters psxRegs;
+ 
+-#define _i32(x) (long)x
++#define _i32(x) *(long *)&x
+ #define _u32(x) x
+ 
+ #define _i16(x) (short)x
diff --git a/games-emulation/pcsx/pcsx-1.5-r1.ebuild b/games-emulation/pcsx/pcsx-1.5-r1.ebuild
index ffd8d40fdf6f..1f9dafff2890 100644
--- a/games-emulation/pcsx/pcsx-1.5-r1.ebuild
+++ b/games-emulation/pcsx/pcsx-1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/pcsx-1.5-r1.ebuild,v 1.7 2005/09/26 17:45:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx/pcsx-1.5-r1.ebuild,v 1.8 2006/05/02 20:09:08 tupone Exp $
 
 inherit eutils games
 
@@ -34,7 +34,8 @@ src_unpack() {
 
 	edos2unix `find -regex '.*\.[ch]'`
 
-	epatch ${FILESDIR}/${PV}-gentoo.patch
+	epatch ${FILESDIR}/${PV}-gentoo.patch \
+		"${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "s:Plugin/:${GAMES_LIBDIR}/psemu/plugins/:" \
 		-e "s:Bios/:${GAMES_LIBDIR}/psemu/bios/:" \