Patch from William Page for bug #171293

(Portage version: 2.1.3_rc2)

4 files changed, 100 insertions, 1 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index ed25bbbe7cf1..cb74d4d781db 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.31 2007/03/07 16:49:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.32 2007/06/16 18:08:58 nyhm Exp $
+
+*visualboyadvance-1.7.2-r2 (16 Jun 2007)
+
+  16 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/visualboyadvance-1.7.2-uninit.patch,
+  +visualboyadvance-1.7.2-r2.ebuild:
+  Patch from William Page for bug #171293
 
   07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   files/visualboyadvance:
diff --git a/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7.2-r2 b/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7.2-r2
new file mode 100644
index 000000000000..ae894e56796f
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7.2-r2
@@ -0,0 +1,3 @@
+MD5 cc02339e3fd8efd9f23121b0a2f81fd8 VisualBoyAdvance-src-1.7.2.tar.gz 1410762
+RMD160 44f94a4f270f2cda25879681c52892f6978caf99 VisualBoyAdvance-src-1.7.2.tar.gz 1410762
+SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7 VisualBoyAdvance-src-1.7.2.tar.gz 1410762
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch
new file mode 100644
index 000000000000..235c6f536fdb
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch
@@ -0,0 +1,13 @@
+diff -ru /root/VisualBoyAdvance-1.7.2/src/gtk/window.cpp VisualBoyAdvance-1.7.2/src/gtk/window.cpp
+--- /root/VisualBoyAdvance-1.7.2/src/gtk/window.cpp	2004-05-14 00:31:58.000000000 +1000
++++ VisualBoyAdvance-1.7.2/src/gtk/window.cpp	2007-03-17 14:57:22.000000000 -0500
+@@ -91,7 +91,8 @@
+   m_iFilterIBMin    (FirstFilterIB),
+   m_iFilterIBMax    (LastFilterIB),
+   m_iJoypadMin      (1),
+-  m_iJoypadMax      (4)
++  m_iJoypadMax      (4),
++  m_poKeymap        (NULL)
+ {
+   m_poXml            = _poXml;
+   m_poFileOpenDialog = NULL;
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..188cb8d13221
--- /dev/null
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/06/16 18:08:58 nyhm Exp $
+
+inherit eutils flag-o-matic games
+
+DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
+HOMEPAGE="http://vba.ngemu.com/"
+SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gtk mmx nls"
+
+RDEPEND="media-libs/libpng
+	media-libs/libsdl
+	gtk? (
+		>=x11-libs/gtk+-2.4
+		>=dev-cpp/gtkmm-2.4
+		>=dev-cpp/libglademm-2.4
+	)
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	mmx? ( dev-lang/nasm )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/VisualBoyAdvance-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e 's:$(localedir):/usr/share/locale:' \
+		-e 's:$(datadir)/locale:/usr/share/locale:' \
+		$(find . -name 'Makefile.in*') \
+		|| die "sed failed"
+
+	cat >> src/i386/2xSaImmx.asm <<-EOF
+		%ifidn __OUTPUT_FORMAT__,elf
+		section .note.GNU-stack noalloc noexec nowrite progbits
+		%endif
+	EOF
+
+	epatch \
+		"${FILESDIR}"/${PV}-homedir.patch \
+		"${FILESDIR}"/${PV}-gcc34.patch \
+		"${FILESDIR}"/${PV}-gcc41.patch \
+		"${FILESDIR}"/${P}-uninit.patch
+}
+
+src_compile() {
+	# -O3 causes GCC to behave badly and hog memory, bug #64670.
+	replace-flags -O3 -O2
+
+	# Removed --enable-c-core as it *should* determine this based on arch
+	egamesconf \
+		--disable-dependency-tracking \
+		$(use_with mmx) \
+		$(use_enable gtk gtk 2.4) \
+		$(use_enable nls) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README README-win.txt
+	if use gtk ; then
+		newicon src/gtk/images/vba-64.png ${PN}.png
+		make_desktop_entry gvba VisualBoyAdvance
+	fi
+	prepgamesdirs
+}