From 91177ee2450b21399433a2032dc4e34a3be0b24a Mon Sep 17 00:00:00 2001
From: kristerw <kristerw>
Date: Sun, 26 Aug 2001 21:39:33 +0000
Subject: Update xmame to 0.54.1.

Changes since 0.53.1:
- Everything from MAME 0.54.
- Fixed a compile error in the xgl target caused by a change in the
  core.  (Sven Goethel)
- Applied a patch that fixes CPS2 games.  (Aaron Giles)
---
 emulators/xmame/Makefile         |  4 ++--
 emulators/xmame/distinfo         |  7 +++----
 emulators/xmame/patches/patch-am | 44 ----------------------------------------
 3 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 emulators/xmame/patches/patch-am

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 1abe9fef27f..32909d88165 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2001/08/19 21:12:44 kristerw Exp $
+# $NetBSD: Makefile,v 1.51 2001/08/26 21:39:33 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.53.1
+DISTNAME=		xmame-0.54.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 f6d425e6d90..2f042992bbc 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2001/08/19 21:12:44 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2001/08/26 21:39:33 kristerw Exp $
 
-SHA1 (xmame-0.53.1.tar.bz2) = 0599a96873eba88b12a7393c1ba46c46aea5c79b
-Size (xmame-0.53.1.tar.bz2) = 5117252 bytes
+SHA1 (xmame-0.54.1.tar.bz2) = e5aad89ace564515f87c87b2214ad7009b93630f
+Size (xmame-0.54.1.tar.bz2) = 5134346 bytes
 SHA1 (patch-aa) = 12378648c0158c91dae233b84a2543090e5b7839
 SHA1 (patch-ae) = e4dc55f21759f50b0c48816314ebdc4039d2490f
-SHA1 (patch-am) = 27908ecd35407621eae4c777de3079279f58176e
diff --git a/emulators/xmame/patches/patch-am b/emulators/xmame/patches/patch-am
deleted file mode 100644
index d8979ec6290..00000000000
--- a/emulators/xmame/patches/patch-am
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-am,v 1.3 2000/07/13 20:54:04 martin Exp $
---- src/cpuintrf.c.orig	Fri Jun 23 12:05:01 2000
-+++ src/cpuintrf.c	Thu Jul 13 00:02:05 2000
-@@ -126,13 +126,34 @@
- #define LOG(x)
- #endif
- 
--#define CPUINFO_SIZE	(5*sizeof(int)+4*sizeof(void*)+2*sizeof(double))
-+/*
-+ * The filler object and the CPUINFO_* defs have various problems. (1) If
-+ * there is a hole at the end of the struct, the first few bytes of filler
-+ * won't extend the size. This is the case if the last object isn't one with
-+ * the maximum alignment restriction. (2) The calculation of CPUINFO_SIZE
-+ * ignores internal holes added by the compiler for field alignment. That
-+ * can be fixed by reordering fields, but then you get problem #1.
-+ */
-+
-+typedef struct cpuinfo_test_struct
-+{
-+	struct cpu_interface *intf; 	/* pointer to the interface functions */
-+	int iloops; 			/* number of interrupts remaining this frame */
-+	int totalcycles;		/* total CPU cycles executed */
-+	int vblankint_countdown;	/* number of vblank callbacks left until we interrupt */
-+	int vblankint_multiplier;	/* number of vblank callbacks per interrupt */
-+	void *vblankint_timer;		/* reference to elapsed time counter */
-+	double vblankint_period;	/* timing period of the VBLANK interrupt */
-+	void *timedint_timer;		/* reference to this CPU's timer */
-+	double timedint_period; 	/* timing period of the timed interrupt */
-+	int save_context;		/* need to context switch this CPU? yes or no */
-+	void *context;			/* dynamically allocated context buffer */
-+	UINT8 filler[0];		/* make the array aligned to next power of 2 */
-+} cpuinfo_test;
-+
- /* How do I calculate the next power of two from CPUINFO_SIZE using a macro? */
--#ifdef __LP64__
--#define CPUINFO_ALIGN	(128-CPUINFO_SIZE)
--#else
--#define CPUINFO_ALIGN	(64-CPUINFO_SIZE)
--#endif
-+
-+#define CPUINFO_ALIGN ((sizeof(cpuinfo_test) > 64 ? 128 : 64) - sizeof(cpuinfo_test))
- 
- struct cpuinfo
- {
-- 
cgit v1.2.3