From 6bfac25194598f97df56c6a99167184f20e9ada9 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw>
Date: Fri, 2 Apr 2004 17:45:51 +0000
Subject: Make the package realize that amd64 is a LP64 architecture. Prevent
 crash when the requested display mode cannot be used. Bump PKGREVISION.

---
 emulators/xmame/Makefile         |  6 ++++--
 emulators/xmame/distinfo         |  3 ++-
 emulators/xmame/patches/patch-ab | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 emulators/xmame/patches/patch-ab

(limited to 'emulators')

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 8ff18fee39c..d2a10bb7d3b 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2004/03/31 04:39:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.108 2004/04/02 17:45:51 kristerw Exp $
 #
 
 DISTNAME=		xmame-0.80.1
+PKGREVISION=		1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -42,9 +43,10 @@ MAKE_FLAGS+=		SOUND_ESOUND=1
 MAME_DISP_METHOD?=	x11
 
 # Determine which CPU-specific code to use.
-.for MARCH in alpha m68k i386 ia64
+.for MARCH in alpha m68k i386 ia64 mips
 MAME_CPU.${MARCH}?=	${MARCH}
 .endfor
+MAME_CPU.x86_64?=	amd64
 .if !defined(MAME_CPU.${MACHINE_ARCH})
 .  include "../../mk/endian.mk"
 _MAME_CPU.big-endian=		risc
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index b55ab8c1c6e..a7416876ae4 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.46 2004/03/31 04:39:17 xtraeme Exp $
+$NetBSD: distinfo,v 1.47 2004/04/02 17:45:51 kristerw Exp $
 
 SHA1 (xmame-0.80.1.tar.bz2) = a45670eac5087fb9c697a1205bb14b7df9d7702b
 Size (xmame-0.80.1.tar.bz2) = 12460829 bytes
 SHA1 (patch-aa) = 0b9ffcb7c4305e7c349f229b2646acb31553d549
+SHA1 (patch-ab) = 2aea6b094792498939294a285e151bed6b4ab01e
 SHA1 (patch-ae) = df9ce91871bfcff611ff8f616482d4ff2e8204a3
diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab
new file mode 100644
index 00000000000..e285c2a1539
--- /dev/null
+++ b/emulators/xmame/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.23 2004/04/02 17:45:51 kristerw Exp $
+
+--- src/unix/video-drivers/x11_window.c.orig	2004-03-27 02:15:43.000000000 +0100
++++ src/unix/video-drivers/x11_window.c	2004-03-27 02:17:58.000000000 +0100
+@@ -912,8 +912,8 @@
+ 					/* else we have failed clean up before retrying without MITSHM */
+ 					shmdt ((char *) scaled_buffer_ptr);
+ 					scaled_buffer_ptr = NULL;
+-					XDestroyImage (image);
+-					image = NULL;
++					XFree(xvimage);
++					xvimage = NULL;
+ 				}
+ 			}
+ 			fprintf (stderr_file, "Failed\nReverting to normal XPutImage() mode\n");
-- 
cgit v1.2.3