Update xmame to version 0.59.1.

Changes since xmame-0.58.3 include:
- Everything from MAME 0.59.
- Set some more sensible defaults for the various path settings in
  fileio.c (e.g., XMAMEROOT/samples for samplepath).
- Fixed a segfault in psikyosh games.  (David Haywood)

5 files changed, 5 insertions, 112 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index dcccf88cea3..07564890e54 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2002/03/19 22:33:41 kristerw Exp $
+# $NetBSD: Makefile,v 1.70 2002/03/27 20:44:30 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.58.3
+DISTNAME=		xmame-0.59.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index bde94a3cab5..fbdbab872a1 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.21 2002/03/19 22:33:41 kristerw Exp $
+$NetBSD: distinfo,v 1.22 2002/03/27 20:44:31 kristerw Exp $
 
-SHA1 (xmame-0.58.3.tar.bz2) = 134592d3a2ee1533551c7c26faef4460bec83be0
-Size (xmame-0.58.3.tar.bz2) = 5376091 bytes
+SHA1 (xmame-0.59.1.tar.bz2) = c2a37d3001c93cf5a8175b994386c7e45ba4fae9
+Size (xmame-0.59.1.tar.bz2) = 5472519 bytes
 SHA1 (patch-aa) = be131167296c50e3aea55da46288dfc16bf3ad8e
-SHA1 (patch-ab) = b6bb3acba452b91c8b9dd946531e9195d5d196fb
-SHA1 (patch-ac) = 08dda8c365c9891e1f54ef622325015a38cb9758
 SHA1 (patch-ae) = ccc133c1a597a4f9f4eee3d189fc917c60d2e958
-SHA1 (patch-af) = 7f23cba358e2a802ffe22332e42df44bb84cbfbc
diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab
deleted file mode 100644
index ac8c972f30f..00000000000
--- a/emulators/xmame/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2002/01/06 22:09:32 kristerw Exp $
---- src/unix/unix.mak.orig	Sun Jan  6 03:44:58 2002
-+++ src/unix/unix.mak	Sun Jan  6 19:01:36 2002
-@@ -214,7 +214,16 @@
- endif
- ifdef JOY_USB
- CONFIG += -DUSB_JOYSTICK
-+ifeq ($(ARCH), netbsd)
-+ifeq ($(shell test -f /usr/include/usbhid.h && echo have_usbhid), have_usbhid)
-+CONFIG += -DHAVE_USBHID_H
-+MY_LIBS += -lusbhid
-+else
- MY_LIBS += -lusb
-+endif
-+else
-+MY_LIBS += -lusb
-+endif
- endif
- 
- ifdef EFENCE
diff --git a/emulators/xmame/patches/patch-ac b/emulators/xmame/patches/patch-ac
deleted file mode 100644
index 508c48eece1..00000000000
--- a/emulators/xmame/patches/patch-ac
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2002/01/06 22:09:32 kristerw Exp $
---- src/unix/joystick-drivers/joy_usb.c.orig	Wed Jan  2 03:45:55 2002
-+++ src/unix/joystick-drivers/joy_usb.c	Sun Jan  6 22:17:55 2002
-@@ -21,7 +21,11 @@
- #endif
- 
- #if defined(__ARCH_netbsd)
-+#ifdef HAVE_USBHID_H
-+#include <usbhid.h>
-+#else
- #include <usb.h>
-+#endif
- #elif defined(__ARCH_freebsd)
- #include <libusb.h>
- #endif
-@@ -69,7 +73,7 @@
- 
- static int joy_initialize_hid(int i)
- {
--  int size, is_joystick, report_id;
-+  int size, is_joystick, report_id = 0;
-   struct hid_data *d;
-   struct hid_item h;
-   report_desc_t rd;
-@@ -82,7 +86,19 @@
- 
-   priv_joy_data[i].hids = NULL;
- 
-+#ifdef HAVE_USBHID_H
-+  if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0)
-+    {
-+      fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno));
-+      return FALSE;
-+    }
-+
-+  size = hid_report_size(rd, hid_input, report_id);
-+  priv_joy_data[i].offset = 0;
-+#else
-   size = hid_report_size(rd, hid_input, &report_id);
-+  priv_joy_data[i].offset = (report_id != 0);
-+#endif
-   if ((priv_joy_data[i].data_buf = malloc(size)) == NULL)
-     {
-       fprintf(stderr_file, "error: couldn't malloc %d bytes\n", size);
-@@ -90,10 +106,14 @@
-       return FALSE;
-     }
-   priv_joy_data[i].dlen = size;
--  priv_joy_data[i].offset = (report_id != 0);
- 
-   is_joystick = 0;
-+#ifdef HAVE_USBHID_H
-+  for (d = hid_start_parse(rd, 1 << hid_input, report_id);
-+       hid_get_item(d, &h); )
-+#else
-   for (d = hid_start_parse(rd, 1 << hid_input); hid_get_item(d, &h); )
-+#endif
-     {
-       int axis, usage, page, interesting_hid;
- 
diff --git a/emulators/xmame/patches/patch-af b/emulators/xmame/patches/patch-af
deleted file mode 100644
index 784c4365149..00000000000
--- a/emulators/xmame/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.5 2002/02/20 17:21:00 mycroft Exp $
---- src/unix/video-drivers/xf86_dga2.c.orig	Wed Feb  6 03:33:31 2002
-+++ src/unix/video-drivers/xf86_dga2.c	Wed Feb 20 17:14:59 2002
-@@ -405,9 +405,17 @@
- 	while(XDGAGetViewportStatus(display, xf86ctx.screen))
- 		;
- 
--	memset(xf86ctx.base_addr, 0,
--	       xf86ctx.device->mode.bytesPerScanline
--	       * xf86ctx.device->mode.imageHeight);
-+	if (xf86ctx.device->mode.flags & XDGASolidFillRect) {
-+		XDGAFillRectangle(display, xf86ctx.screen, 0, 0, 
-+			DisplayWidth(display, xf86ctx.screen),
-+			DisplayHeight(display, xf86ctx.screen),
-+			BlackPixel(display, xf86ctx.screen));
-+		XDGASync(display, xf86ctx.screen);
-+	} else {
-+		memset(xf86ctx.base_addr, 0,
-+		       xf86ctx.device->mode.bytesPerScanline
-+		       * xf86ctx.device->mode.imageHeight);
-+	}
- 
- 	effect_init2(bitmap_depth, depth, xf86ctx.width);
-