Update xmame to 0.95.

Changes since 0.90 includes:
- Everything from MAME 0.95 (http://x.mame.net/changes-mame.html) and
  MESS 0.95 (http://x.mame.net/changes-mess.html).
- Forcing Xv to use YV12 ("-force-yuv 2") no longer causes rotated
  games to segfault.  Fixes Bugzilla bug 679.
- Fixed the aspect ratio of the MESS SuperVision driver so that it's
  quadratic.  (PeT)
- Fixed several problems with the front-end "-list" commands: The MESS
  commands could segfault, some commands' headers were misaligned, and
  "-listpalettesize" was causing the ROM list to print.
- Worked around or fixed a double-free on exit in xmess.
- Fixed a segfault on startup that occurred when four or more joysticks
  devices were found.
- The SDL joystick driver now works with multiple joysticks attached.
- The SDL sound driver should produce much better output.  Also fixed a
  potential deadlock.

3 files changed, 28 insertions, 14 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index f1aff0d5bb2..df79215938d 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.125 2005/01/29 21:52:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.126 2005/04/02 20:56:28 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.90
+DISTNAME=		xmame-0.95
 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 72d79a6c2fb..b99c873a23a 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.61 2005/02/23 18:49:22 agc Exp $
+$NetBSD: distinfo,v 1.62 2005/04/02 20:56:28 kristerw Exp $
 
-SHA1 (xmame-0.90.tar.bz2) = 75b39e499953ef9321b77d0293f069dbc7463f07
-RMD160 (xmame-0.90.tar.bz2) = d0e76049fc3a4c8c37873ec568585dbc75eb7357
-Size (xmame-0.90.tar.bz2) = 15113067 bytes
+SHA1 (xmame-0.95.tar.bz2) = 0cebbe165a95c5600ae9ed13670cbbdcecb4ae78
+RMD160 (xmame-0.95.tar.bz2) = e01b061c6f372d991caafc23dc89909624ceb303
+Size (xmame-0.95.tar.bz2) = 15460834 bytes
 SHA1 (patch-aa) = b9f486be58b306a815269f859c1031d24c966df1
-SHA1 (patch-ab) = be758f3dd91930a84dc798a40163fc8b970de56e
+SHA1 (patch-ab) = dd21329b7e1a05bc7ea12b5a98a05d502dc36656
 SHA1 (patch-ae) = 26c68fff67e3146638cef7e366b57c928274f562
diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab
index 3b8c2a812ff..e61711a4a18 100644
--- a/emulators/xmame/patches/patch-ab
+++ b/emulators/xmame/patches/patch-ab
@@ -1,18 +1,32 @@
-$NetBSD: patch-ab,v 1.30 2004/11/27 01:30:40 kristerw Exp $
+$NetBSD: patch-ab,v 1.31 2005/04/02 20:56:28 kristerw Exp $
 
---- src/unix/unix.mak.orig	Mon Nov 22 00:09:03 2004
-+++ src/unix/unix.mak	Mon Nov 22 00:12:39 2004
-@@ -545,11 +545,11 @@
+--- src/unix/unix.mak.orig	2005-04-02 20:38:46.000000000 +0200
++++ src/unix/unix.mak	2005-04-02 20:50:17.000000000 +0200
+@@ -258,7 +258,7 @@
+ 	$(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \
+ 	$(INCLUDES) $(INCLUDE_PATH)
+ 
+-MY_LIBS = $(LIBS) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz
++MY_LIBS = $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz -lexpat
+ 
+ ifdef SEPARATE_LIBM
+ MY_LIBS += -lm
+@@ -578,15 +578,15 @@
  
  romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB)
  	$(CC_COMMENT) @echo 'Linking $@...'
 -	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz $(LIBS) -o $@
++	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz -o $@
  
- chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB)
+ chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/cdrom.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB)
  	$(CC_COMMENT) @echo 'Linking $@...'
 -	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz $(LIBS) -o $@
++	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz -o $@
  
  xml2info: $(OBJ)/xml2info.o $(EXPAT)
  	$(CC_COMMENT) @echo 'Linking $@...'
+-	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lexpat -lz -o $@
+ 
+ dat2html: $(DAT2HTML_OBJS)
+ 	$(CC_COMMENT) @echo 'Compiling $@...'