summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-10-13 17:12:33 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-10-13 17:12:33 +0000
commit0e192ee1ec21d4ec150dd105ea5992d143ed4069 (patch)
tree30e71057b19584bf533df828e753006bae855efc /games-emulation
parentCleaning up stale ebuilds; tested on o2k and keyworded ~mips. (diff)
downloadgentoo-2-0e192ee1ec21d4ec150dd105ea5992d143ed4069.tar.gz
gentoo-2-0e192ee1ec21d4ec150dd105ea5992d143ed4069.tar.bz2
gentoo-2-0e192ee1ec21d4ec150dd105ea5992d143ed4069.zip
Added GCC 4.1 patch from Andre Ryan <andreryan908@gmail.com> and closing bug #135346.
(Portage version: 2.1.2_pre2-r8)
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/visualboyadvance/ChangeLog7
-rw-r--r--games-emulation/visualboyadvance/files/1.7.2-gcc41.patch27
-rw-r--r--games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild3
3 files changed, 35 insertions, 2 deletions
diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 1cfd2fa5103e..19b860613884 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-emulation/visualboyadvance
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.28 2006/09/29 15:10:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.29 2006/10/13 17:12:32 wolf31o2 Exp $
+
+ 13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ +files/1.7.2-gcc41.patch:
+ Added GCC 4.1 patch from Andre Ryan <andreryan908@gmail.com> and closing bug
+ #135346.
29 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-visualboyadvance-1.7.2.ebuild, visualboyadvance-1.7.2-r1.ebuild:
diff --git a/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch b/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch
new file mode 100644
index 000000000000..764e37652a69
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch
@@ -0,0 +1,27 @@
+diff -ru /root/VisualBoyAdvance-1.7.2/src/prof/prof.cpp VisualBoyAdvance-1.7.2/src/prof/prof.cpp
+--- /root/VisualBoyAdvance-1.7.2/src/prof/prof.cpp 2004-05-14 00:31:58.000000000 +1000
++++ VisualBoyAdvance-1.7.2/src/prof/prof.cpp 2006-06-03 13:49:41.000000000 +1000
+@@ -266,7 +266,7 @@
+ for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
+ if(profWrite8(fd, GMON_TAG_CG_ARC) ||
+ profWrite32(fd, (u32)frompc) ||
+- profWrite32(fd, (u32)tos[toindex].selfpc) ||
++ profWrite32(fd, (u32)(intptr_t)tos[toindex].selfpc) ||
+ profWrite32(fd, tos[toindex].count)) {
+ systemMessage(0, "mcount: arc");
+ fclose(fd);
+diff -ru /root/VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp
+--- /root/VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp 2004-05-14 00:13:14.000000000 +1000
++++ VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp 2006-06-03 13:49:57.000000000 +1000
+@@ -950,9 +950,9 @@
+ {
+ u32 address = 0;
+ if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
+- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
++ address = 0x2000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&workRAM[0]);
+ else
+- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
++ address = 0x3000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&internalRAM[0]);
+
+ if(size == 2)
+ printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
index e0fceeae3fd6..e5fafd25e269 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-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/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild,v 1.8 2006/09/29 15:10:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild,v 1.9 2006/10/13 17:12:32 wolf31o2 Exp $
inherit eutils games flag-o-matic
@@ -31,6 +31,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${PV}-homedir.patch"
epatch "${FILESDIR}/${PV}-gcc34.patch"
+ epatch "${FILESDIR}/${PV}-gcc41.patch"
}
src_compile() {