Make this work with xmame 0.87 by applying patches from Miguel Mendez

in PR 27090 (with a minor tweak for issues from yesterday's update
of the xmame pkg.)

This does also solve part of PR 27011.

Bump PKGREVISION.

4 files changed, 95 insertions, 5 deletions

diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index a3be2588458..9d5dfb1314e 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:12:59 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/07 21:13:23 kristerw Exp $
 #
 
 DISTNAME=	gxmame-0.34b
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gxmame/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	flynn@energyhq.es.eu.org
 HOMEPAGE=	http://gxmame.sourceforge.net/
 COMMENT=	Frontend for XMame using the GTK2 library
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		xmame-[0-9]*:../../emulators/xmame
+DEPENDS+=		xmame>=0.87:../../emulators/xmame
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/misc/gxmame/distinfo b/misc/gxmame/distinfo
index aa95f7e6ca5..b81b35c3a18 100644
--- a/misc/gxmame/distinfo
+++ b/misc/gxmame/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/23 09:02:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/11/07 21:13:23 kristerw Exp $
 
 SHA1 (gxmame-0.34b.tar.gz) = b727edd4b1ee0405c1e0bcfc1aa62eaa444c3846
 Size (gxmame-0.34b.tar.gz) = 996919 bytes
+SHA1 (patch-aa) = 0bf55d52837c8236045de84111475a0bf7ac4db0
+SHA1 (patch-ab) = 62b1b9fb02909cdc413a565bc81cb1d95e296e81
diff --git a/misc/gxmame/patches/patch-aa b/misc/gxmame/patches/patch-aa
new file mode 100644
index 00000000000..b90c41a8855
--- /dev/null
+++ b/misc/gxmame/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/11/07 21:13:23 kristerw Exp $
+
+--- src/mameio.c.orig	2003-11-26 10:38:21.000000000 +0100
++++ src/mameio.c	2004-09-30 16:49:42.000000000 +0200
+@@ -217,7 +217,7 @@
+ 		
+ 	/* Generate the list */
+ 	/* without including neither history nor mameinfo to have less to parse after*/
+-	opt=g_strdup_printf("%s -listinfo -%s /dev/null -%s /dev/null 2>/dev/null",
++	opt=g_strdup_printf("%s -listxml -%s /dev/null -%s /dev/null | xml2info 2>/dev/null",
+ 			current_exec->path,
+ 			available_options->mameinfo_file_option,
+ 			available_options->history_file_option);
diff --git a/misc/gxmame/patches/patch-ab b/misc/gxmame/patches/patch-ab
new file mode 100644
index 00000000000..b1a85591323
--- /dev/null
+++ b/misc/gxmame/patches/patch-ab
@@ -0,0 +1,75 @@
+$NetBSD: patch-ab,v 1.1 2004/11/07 21:13:23 kristerw Exp $
+
+--- src/options.c.orig	Thu Dec 18 20:03:13 2003
++++ src/options.c	Sun Nov  7 21:58:46 2004
+@@ -7137,7 +7137,7 @@
+ 	if (strcmp((g_strstrip(target->sound_mixer_plugin)),""))
+ 		sound_mixer_plugin = g_strdup_printf("-sound-mixer-plugin %s",target->sound_mixer_plugin);
+ 
+-	option_string = g_strdup_printf (" -%ssound "
++	option_string = g_strdup_printf (
+ 				"-%ssamples "
+ 				"%s "				/* fakesound */
+ 				"-samplefreq %i "
+@@ -7153,7 +7153,6 @@
+ 				"%s "				/* QNX audio_preferred */
+ 				"%s "				/* dsp_plugin */
+ 				"%s ",				/* sound_mixer_plugin */
+-				(target->sound)?"":"no",
+ 				(target->samples)?"":"no",
+ 				(target->fakesound)?"-fakesound":"",
+ 				target->samplefre,
+@@ -7297,9 +7296,6 @@
+ 						"%s "				/* vidix */
+ 						"%s "				/* newext */
+ 						"-%sxsync "
+-						"-%sprivatecmap "
+-						"-%sxil "
+-						"-%smtxil "
+ 						"%s ",				/* Video mode */
+ 						x11mode,
+ 						(target->cursor)?"":"no",
+@@ -7307,9 +7303,6 @@
+ 						vidix?vidix:"",
+ 						newext?newext:"",
+ 						(target->xsync)?"":"no",
+-						(target->privatecmap)?"":"no",
+-						(target->xil)?"":"no",
+-						(target->mtxil)?"":"no",
+ 						Video_Mode_option?Video_Mode_option:""
+ 						);
+ 		}
+@@ -7323,8 +7316,6 @@
+ 						"%s "				/* newext */
+ 						"-%sxsync "
+ 						"-%sprivatecmap "
+-						"-%sxil "
+-						"-%smtxil "
+ 						"%s ",				/* Video mode */
+ 						target->x11_mode,
+ 						(target->cursor)?"":"no",
+@@ -7334,8 +7325,6 @@
+ 						newext?newext:"",
+ 						(target->xsync)?"":"no",
+ 						(target->privatecmap)?"":"no",
+-						(target->xil)?"":"no",
+-						(target->mtxil)?"":"no",
+ 						Video_Mode_option?Video_Mode_option:""
+ 						);
+ 		}
+@@ -7578,7 +7567,6 @@
+ 	option_string = g_strdup_printf ("-joytype %i "
+ 				"-%sanalogstick "
+ 				"%s "					/* joy */
+-				"-%smouse "
+ 				"%s "
+ 				"-%susbpspad "
+ 				"-%srapidfire "
+@@ -7593,7 +7581,6 @@
+ 				target->joytype,
+ 				(target->analogstick)?"":"no",
+ 				joy?joy:"",
+-				(target->mouse)?"":"no",
+ 				(ctrlr)?ctrlr:"",
+ 				(target->usbpspad)?"":"no",
+ 				(target->rapidfire)?"":"no",