diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-05-29 21:10:32 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-05-29 21:10:32 +0000 |
| commit | f5316a48fd8e581df756adbd5504799d5a635315 (patch) | |
| tree | 6fc7fcff3c1de9e55d85dd5d2a7ad3b5b4db14fa /games-emulation | |
| parent | Stable on SPARC wrt bug #132213. (diff) | |
| download | gentoo-2-f5316a48fd8e581df756adbd5504799d5a635315.tar.gz gentoo-2-f5316a48fd8e581df756adbd5504799d5a635315.tar.bz2 gentoo-2-f5316a48fd8e581df756adbd5504799d5a635315.zip | |
Fix for gcc-4.1, bug #132147
(Portage version: 2.1_rc3-r1)
Diffstat (limited to 'games-emulation')
4 files changed, 29 insertions, 4 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/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() { |