added gtk compile fix with gcc3.4

Package-Manager: portage-2.0.51.19

4 files changed, 62 insertions, 13 deletions

diff --git a/games-emulation/mupen64-alsasnd/ChangeLog b/games-emulation/mupen64-alsasnd/ChangeLog
index 43b10f8c1e4a..8d69bd163797 100644
--- a/games-emulation/mupen64-alsasnd/ChangeLog
+++ b/games-emulation/mupen64-alsasnd/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for games-emulation/mupen64-alsasnd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.2 2004/06/24 22:31:15 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.3 2005/04/17 18:00:28 morfic Exp $
+
+  17 Apr 2005; Daniel Goller <morfic@gentoo.org> +files/0.4-gtk.patch,
+  mupen64-alsasnd-0.4.ebuild:
+  added gtk compile fix with gcc3.4, thanks to Bret Towe 
+  closes bug #84235 
 
 *mupen64-alsasnd-0.4 (27 Dec 2003)
 
   27 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
-  Initial import.  Ebuild submitted by Marcelo Góes <blueboard@terra.com.br> #32749.
+  Initial import.  Ebuild submitted by Marcelo Góes <blueboard@terra.com.br> #32749.
diff --git a/games-emulation/mupen64-alsasnd/Manifest b/games-emulation/mupen64-alsasnd/Manifest
index 79867923423f..5be9dbe79d1f 100644
--- a/games-emulation/mupen64-alsasnd/Manifest
+++ b/games-emulation/mupen64-alsasnd/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 546383f053680bb918c3179246ad5638 ChangeLog 410
+MD5 f7966508a01f0a4a8e7ff8f0268e1b17 mupen64-alsasnd-0.4.ebuild 1520
+MD5 a2d8ef0ecfdb522682b288e4f4bcb357 ChangeLog 590
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 945fa248ac68374d0dcde8d8b7647bbf mupen64-alsasnd-0.4.ebuild 1181
-MD5 49a9052e77c664f4a2c6b092c62b39f6 files/0.4-gentoo.patch 560
 MD5 658b03e564090a62ea13902273e73ae4 files/digest-mupen64-alsasnd-0.4 70
+MD5 49a9052e77c664f4a2c6b092c62b39f6 files/0.4-gentoo.patch 560
+MD5 15dd3b6cd3a33e7fcba000b2b38b9bd2 files/0.4-gtk.patch 1203
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBYG+aI1lqEGTUzyQRAh5CAKClT1BDf3oqt1ZtSnl4yEMbpGaMgQCgtaa1
-EA7ml+8gBo44KIxL02ENQDs=
-=1WrO
+iD8DBQFCYqW4UpKYMelfdYERAjnyAJ0SKdNGYrqXShnuvG+A6YViMY5KlgCdEBfl
+T9ZSAjw+BJU+I2RCiSGGuZA=
+=eaWm
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64-alsasnd/files/0.4-gtk.patch b/games-emulation/mupen64-alsasnd/files/0.4-gtk.patch
new file mode 100644
index 000000000000..32a80547a80e
--- /dev/null
+++ b/games-emulation/mupen64-alsasnd/files/0.4-gtk.patch
@@ -0,0 +1,33 @@
+--- alsa_plugin/Makefile.old	2005-02-28 20:54:40.718370614 -0800
++++ alsa_plugin/Makefile	2005-02-28 20:55:54.048853201 -0800
+@@ -4,6 +4,11 @@
+ 	GUILDFLAGS = `gtk-config --libs`
+ 	OBJECTS = gtk1_gui.o
+ endif
++ifeq ($(GRAPHICAL_INTERFACE),gtk2)
++	GUICFLAGS = -D_GTK2 `pkg-config --cflags gtk+-2.0`
++	GUILDFLAGS = `pkg-config --libs gtk+-2.0`
++	OBJECTS = gtk1_gui.o
++endif
+ ifeq ($(GRAPHICAL_INTERFACE),qt3)
+ 	GUICFLAGS = -DUSE_QT -I$(QTDIR)/include -I$(QTDIR)/mkspecs/linux-g++ -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT
+ 	GUILDFLAGS = -L$(QTDIR)/lib -lqt-mt
+@@ -46,7 +51,6 @@
+ 
+ $(PLUGIN): $(OBJECTS)
+ 	$(LD) $(LDFLAGS) -o $@ $(OBJECTS)
+-	strip --strip-all $@
+ 
+ instructions:
+ 	$(warning please copy $(PLUGIN) in the plugins/ folder of the emulator)
+--- alsa_plugin/gtk1_gui.cpp.old	2005-02-28 20:54:50.072190695 -0800
++++ alsa_plugin/gtk1_gui.cpp	2005-02-28 20:55:45.015049773 -0800
+@@ -56,7 +56,7 @@
+ 
+ void CreateGUIObject( Plugin_Graphical_Interface **GUI, Plugin_Audio_Driver *drv )
+ {
+-	( ( GTK1_Interface * )( *GUI ) ) = new GTK1_Interface( drv );
++	*GUI = dynamic_cast<Plugin_Graphical_Interface *>(new GTK1_Interface( drv ));
+ }
+ 
+ void DeleteGUIObject( Plugin_Graphical_Interface **GUI )
diff --git a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild
index c0f88a8db8c5..46c0e611d179 100644
--- a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild
+++ b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild,v 1.6 2004/10/03 21:30:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild,v 1.7 2005/04/17 18:00:28 morfic Exp $
 
 inherit games eutils
 
@@ -17,6 +17,7 @@ RESTRICT="fetch"
 DEPEND=">=media-libs/alsa-lib-0.9.0
 	|| (
 		gtk? ( =x11-libs/gtk+-1* )
+		gtk2? ( =x11-libs/gtk+-2* )
 		qt? ( >=x11-libs/qt-3 )
 	)"
 
@@ -28,15 +29,24 @@ pkg_nofetch() {
 	einfo "Then just put ${A} in ${DISTDIR} !"
 }
 
+pkg_setup() {
+	if ! use gtk && ! use gtk2 && ! use qt ; then
+		eerror "You must choose either gtk, gtk2 or qt as interface"
+		die "User Choice of Interface required"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-gentoo.patch"
+	epatch "${FILESDIR}/${PV}-gentoo.patch" || die "gentoo patch failed"
+	epatch "${FILESDIR}/${PV}-gtk.patch" || die "gtk patch failed"
 }
 
 src_compile() {
 	use qt && export GRAPHICAL_INTERFACE=qt3
 	use gtk && export GRAPHICAL_INTERFACE=gtk1
+	use gtk2 && export GRAPHICAL_INTERFACE=gtk2
 	emake || die "make failed"
 }