Update to 0.36b16.1.

Includes new NetBSD audio code from kristerw.

5 files changed, 69 insertions, 139 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 94b302cc23e..678424b8187 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2000/03/13 22:23:15 soren Exp $
+# $NetBSD: Makefile,v 1.35 2000/03/14 11:42:47 soren Exp $
 #
 
-DISTNAME=		xmame-0.36b14.1
+DISTNAME=		xmame-0.36b16.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tgz
diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5
index 060cf58c8aa..b771c876752 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.12 2000/01/20 18:54:50 soren Exp $
+$NetBSD: md5,v 1.13 2000/03/14 11:42:50 soren Exp $
 
-#MD5 (xmame-0.36b8.1.tgz) = 86ab74d20d4106ae840812e63b094624
-MD5 (xmame-0.36b14.1.tgz) = 987958ace64913c738fb01469a532e4d
+MD5 (xmame-0.36b16.1.tgz) = 8c5ac1e7dc380f829e5ea628e8cfa342
diff --git a/emulators/xmame/files/patch-sum b/emulators/xmame/files/patch-sum
index 0a5de40d5bc..de5ea94dfe4 100644
--- a/emulators/xmame/files/patch-sum
+++ b/emulators/xmame/files/patch-sum
@@ -1,7 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/01/20 18:54:50 soren Exp $
+$NetBSD: patch-sum,v 1.5 2000/03/14 11:42:50 soren Exp $
 
-MD5 (patch-aa) = 77dfd5ade89baa55b61fa2e729bea347
-MD5 (patch-ae) = 6eacece1d254bc63a3a8baf9ad0e7901
-MD5 (patch-ah) = 25feadad02ed54f668d0928a4b3f7d62
-MD5 (patch-ai) = 622fcdcd6adf5896b002f867f97e3936
+MD5 (patch-aa) = 7e79227fefdaa738407dfff28609ce51
+MD5 (patch-ae) = dbd7f08769a7d8d73aa0bf8e0d14c2b0
 MD5 (patch-am) = af84ac7b8eebdb10f1895c16de59a4b5
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 4189923d268..686d025e9bf 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.21 2000/01/20 18:54:50 soren Exp $
-
---- makefile.unix.orig	Wed Jan 12 00:13:10 2000
-+++ makefile.unix	Thu Jan 20 19:24:51 2000
-@@ -131,14 +131,14 @@
+--- makefile.unix.orig	Fri Mar  3 10:16:40 2000
++++ makefile.unix	Tue Mar 14 12:02:51 2000
+@@ -142,14 +142,14 @@
  # *** Select destination directory for your compiled program , manual page
  # and binary distribution ( if you want to... )
  # ( only needed to install, not to compile... )
@@ -20,32 +18,19 @@ $NetBSD: patch-aa,v 1.21 2000/01/20 18:54:50 soren Exp $
  
  
  ##############################################################################
-@@ -161,7 +161,9 @@
+@@ -214,7 +214,7 @@
  # JSLIB   = -lXi
  
- # On iX86 based OS's, if supported, you can use standard joystick driver
+ # *** On iX86 based OS's, if supported, you can use standard joystick driver
 -# JSI386 = -DI386_JOYSTICK
-+ifeq (${NETBSD_JOYSTICK},yes)
 +JSI386 = -DI386_JOYSTICK
-+endif
  
- # Linux FM-TOWNS game PAD joystick emulation support
+ # *** Linux FM-TOWNS game PAD joystick emulation support
  # Thanks to Osamu Kurati for provided patch
-@@ -181,8 +183,8 @@
- # *** If your system supports query audio buffer size (like IRIX or Linux )
- # you might decide to use these feature. Otherwise, you should use a 
- # timer based audio code.
--S_TIM = -DDONTUSE_TIMER
--# S_TIM = -DUSE_TIMER
-+# S_TIM = -DDONTUSE_TIMER
-+S_TIM = -DUSE_TIMER
- 
- # *** When using timer, you should provide the frequency to generate audio sample
- # frames in your system. See readme.unix notes about these item
-@@ -267,8 +269,10 @@
+@@ -265,8 +265,10 @@
  MSHM	= -DUSE_MITSHM
  
- #if you are running xfree86 and wnat to use DGA, uncomment the following:
+ # *** If you are running xfree86 and wnat to use DGA, uncomment the following:
 -# DGA     = -DUSE_DGA
 -# DGALIBS = -lXxf86dga -lXxf86vm
 +ifeq (${NETBSD_DGA},yes)
@@ -55,7 +40,7 @@ $NetBSD: patch-aa,v 1.21 2000/01/20 18:54:50 soren Exp $
  
  # *** If you have the XIL library (Solaris 2.5.1 and higher), uncomment
  # the following lines:
-@@ -279,8 +283,8 @@
+@@ -278,8 +280,8 @@
  # X11INC		= -I/usr/include/X11
  # X11LIB		= -L/usr/lib/X11
  # standard location for XFree86
@@ -66,56 +51,17 @@ $NetBSD: patch-aa,v 1.21 2000/01/20 18:54:50 soren Exp $
  # for Sun systems
  # X11INC		= -I/usr/openwin/include
  # X11LIB		= -L/usr/openwin/lib
-@@ -305,13 +309,12 @@
- ######## Alpha/Linux
- # ARCH  = linux_alpha
- ######## ix86/Linux
--ARCH  = linux_i386
-+# ARCH  = linux_i386
- ######## ix86/FreeBSD and ix86/BSDi
- # ARCH  = FREEBSD
--######## ix86/NetBSD
--# ARCH  = netbsd_i386
--######## Alpha/NetBSD
--# ARCH  = netbsd_alpha
-+######## NetBSD
-+ARCH	= netbsd
-+MACHINE	= $(shell uname -m)
- ######## Sparc/SunOS ( no sound )
- # ARCH  = sunos
- ######## ix86/Solaris
-@@ -362,8 +365,15 @@
- DEFS.linux_alpha   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
- DEFS.linux_i386    = -DLSB_FIRST -DX86_ASM  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
- DEFS.FREEBSD       = -DLSB_FIRST -DX86_ASM  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
--DEFS.netbsd_i386   = -DLSB_FIRST -DX86_ASM  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
--DEFS.netbsd_alpha  = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
-+ifeq (${MACHINE},i386)
-+DEFS.netbsd	   = -DLSB_FIRST -DX86_ASM -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
-+else
-+ifeq (${MACHINE},alpha)
-+DEFS.netbsd	   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
-+else
-+DEFS.netbsd	   = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
-+endif
-+endif
- DEFS.sunos	   = -DCLOCKS_PER_SEC=1000000 -DALIGN_INTS -DALIGN_SHORTS
- DEFS.solaris	   = -DALIGN_INTS -DALIGN_SHORTS
- DEFS.solaris_i386  = -DLSB_FIRST -Dsolaris
-@@ -390,6 +400,7 @@
- LIBS.irix_al       = -laudio
- LIBS.aix           = -lUMSobj
- LIBS.unixware7	   = -lsocket
-+LIBS.netbsd	   = -lm
- 
+@@ -321,11 +323,11 @@
  ##############################################################################
- # **** Architecture dependent cflags. Only change if you know what're you doing...
-@@ -401,6 +412,8 @@
- CFLAGS.next_sparc    = -traditional-cpp
- CFLAGS.macosx_i386   = -traditional-cpp
- CFLAGS.macosx_ppc    = -traditional-cpp
-+CFLAGS.netbsd	     = -fstrength-reduce -funroll-loops -fomit-frame-pointer \
-+							-fno-strict-aliasing
  
- #############################################################################
- # **** Display dependent libs. Only change if you know what're you doing...
+ ### Linux 
+-ARCH  = linux
++# ARCH  = linux
+ ### FreeBSD
+ # ARCH  = freebsd
+ ### NetBSD
+-# ARCH  = netbsd
++ARCH	= netbsd
+ ### Solaris
+ # ARCH  = solaris
+ ### OpenStep
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index 295b1adde66..0ab96631555 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,54 +1,41 @@
-$NetBSD: patch-ae,v 1.8 1999/11/10 08:01:29 soren Exp $
-
---- doc/xmamerc.dist.orig	Tue Oct 12 16:17:14 1999
-+++ doc/xmamerc.dist	Wed Nov 10 07:13:42 1999
-@@ -23,16 +23,16 @@
- 
- # Where does your Mame rom files reside? 
- # This option can be overriden by MAMEDIR environment variable
--rompath		/usr/games/lib/xmame:/usr/local/lib/xmame
-+rompath		@ROMPATH@
- 
- # Also Mame needs a public-writable directory to store high scores
--spooldir        /usr/games/lib/xmame
-+spooldir        @SPOOLDIR@
- 
- # Where can xmame find the cheat database?
- cheatfile	/usr/games/lib/xmame/CHEAT.DAT
- 
- # What is your loved game? ( remember that mame defaults to "pacman" )
--defaultgame	galturbo
-+defaultgame	pacman
- 
- # Type here the name of the display where play xmame
- # overriden by DISPLAY environment variable. Not usefull in config file but...
-@@ -55,12 +55,12 @@
- # their default card. 
- # not every implementations supports this feature
- # Linux & most others:
--audiodevice	/dev/dsp
-+#audiodevice	/dev/dsp
- #audiodevice	/dev/dsp0
- #audiodevice	/dev/dsp1
- 
- # Sun & some others:
--#audiodevice	/dev/audio
-+audiodevice	/dev/audio
- 
- # select audio sample frequency ( 11050-44100 )
- # not every implementations supports this feature
-@@ -105,11 +105,11 @@
- # Define X and Y axis scale related to original bitmap. Default is 1,
- # since xmame-0.34b5.3 also used to scale vector games, vector games also
- # except values like 1.5 and even 0.5 these are rounded for normal games
--widthscale	2
--heightscale	2
-+#widthscale	2
-+#heightscale	2
- 
- #scale sets both widthscale and heightscale in one option
--#scale 2
-+scale		2
- 
- # We want autoframeskip ;)
- autoframeskip	1
+--- doc/xmamerc.dist.orig	Fri Mar  3 14:42:02 2000
++++ doc/xmamerc.dist	Tue Mar 14 12:41:39 2000
+@@ -3,15 +3,15 @@
+ ### Digital sound related ###
+ # dsp-driver            <NULL> (not set)
+ bufsize                 0.080000
+-timer                   0
++timer                   1
+ 
+ ### Sound mixer related ###
+ # sound-mixer-driver    <NULL> (not set)
+ 
+ ### Video Related ###
+ bpp                     0
+-heightscale             1.000000
+-widthscale              1.000000
++heightscale             2.000000
++widthscale              2.000000
+ autodouble              1
+ dirty                   1
+ scanlines               0
+@@ -61,7 +61,7 @@
+ samples                 1
+ samplefreq              22050
+ volume                  -3
+-# audiodevice           <NULL> (not set)
++audiodevice             /dev/audio0
+ # mixerdevice           <NULL> (not set)
+ 
+ ### Input Related ###
+@@ -70,8 +70,8 @@
+ mouse                   1
+ 
+ ### Fileio Related ###
+-rompath                 /usr/games/lib/xmame
+-spooldir                /usr/games/lib/xmame
++rompath                 @ROMPATH@
++spooldir                @SPOOLDIR@
+ screenshotdir           .
+ cheatfile               /usr/games/lib/xmame/cheat.dat
+ historyfile             /usr/games/lib/xmame/history.dat