Changed patches.

8 files changed, 115 insertions, 144 deletions

diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 28a3c26f271..543fae0e018 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.19 1999/07/27 03:20:38 mycroft Exp $
+$NetBSD: patch-aa,v 1.20 1999/11/10 08:01:29 soren Exp $
 
---- makefile.unix.orig	Sat Mar 27 14:28:37 1999
-+++ makefile.unix	Sat Apr  3 14:19:27 1999
-@@ -39,7 +39,7 @@
- # GNU MAKE is MANDATORY !!!
- # so please give me the path...
- # if GNU make is "native" use this
--MAKE	= make
-+MAKE	= gmake
- # else ...
- # MAKE=/usr/people/jantonio/bin/gmake
- 
-@@ -109,14 +109,14 @@
+--- makefile.unix.orig	Fri Nov  5 18:26:11 1999
++++ makefile.unix	Wed Nov 10 08:42:32 1999
+@@ -131,14 +131,14 @@
  # *** Select destination directory for your compiled program , manual page
  # and binary distribution ( if you want to... )
  # ( only needed to install, not to compile... )
@@ -29,7 +20,7 @@ $NetBSD: patch-aa,v 1.19 1999/07/27 03:20:38 mycroft Exp $
  
  
  ##############################################################################
-@@ -139,7 +139,9 @@
+@@ -161,7 +161,9 @@
  # JSLIB   = -lXi
  
  # On iX86 based OS's, if supported, you can use standard joystick driver
@@ -40,7 +31,7 @@ $NetBSD: patch-aa,v 1.19 1999/07/27 03:20:38 mycroft Exp $
  
  # Linux FM-TOWNS game PAD joystick emulation support
  # Thanks to Osamu Kurati for provided patch
-@@ -159,8 +161,8 @@
+@@ -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.
@@ -51,17 +42,7 @@ $NetBSD: patch-aa,v 1.19 1999/07/27 03:20:38 mycroft Exp $
  
  # *** When using timer, you should provide the frequency to generate audio sample
  # frames in your system. See readme.unix notes about these item
-@@ -239,16 +241,18 @@
- # uncomment following section to support them ( you should have libxpm 
- # available :-) )
- # COMMENT IT if your are not compiling for normal x11
--# XPM	= -DHAS_XPM
--# XPMLIB	= -lXpm
-+XPM	= -DHAS_XPM
-+XPMLIB	= -lXpm
-  
- # *** If you don't have the MIT-Shared Memory X Extensions, comment the
- # following: ( Test if available by mean of xdpyinfo command )
+@@ -267,8 +269,10 @@
  MSHM	= -DUSE_MITSHM
  
  #if you are running xfree86 and wnat to use DGA, uncomment the following:
@@ -74,32 +55,18 @@ $NetBSD: patch-aa,v 1.19 1999/07/27 03:20:38 mycroft Exp $
  
  # *** If you have the XIL library (Solaris 2.5.1 and higher), uncomment
  # the following lines:
-@@ -259,8 +263,8 @@
+@@ -279,8 +283,8 @@
  # X11INC		= -I/usr/include/X11
  # X11LIB		= -L/usr/lib/X11
  # standard location for XFree86
 -X11INC		= -I/usr/X11R6/include
 -X11LIB		= -L/usr/X11R6/lib
-+X11INC		= -I${PREFIX}/include
-+X11LIB		= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
++X11INC			= -I${PREFIX}/include
++X11LIB			= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
  # for Sun systems
  # X11INC		= -I/usr/openwin/include
  # X11LIB		= -L/usr/openwin/lib
-@@ -277,11 +281,11 @@
- 
- # OpenGL include path
- 
--GLINCPATH= /usr/src/Mesa-3.0/include
-+GLINCPATH= ${PREFIX}/include
- 
- # OpenGL library path
- 
--GLLIBPATH= /usr/src/Mesa-3.0/lib
-+GLLIBPATH= ${PREFIX}/lib
- 
- # OpenGL libs
- 
-@@ -314,11 +318,12 @@
+@@ -305,13 +309,12 @@
  ######## Alpha/Linux
  # ARCH  = linux_alpha
  ######## ix86/Linux
@@ -107,27 +74,35 @@ $NetBSD: patch-aa,v 1.19 1999/07/27 03:20:38 mycroft Exp $
 +# ARCH  = linux_i386
  ######## ix86/FreeBSD and ix86/BSDi
  # ARCH  = FREEBSD
- ######## ix86/NetBSD
+-######## ix86/NetBSD
 -# ARCH  = netbsd_i386
-+ARCH  = netbsd
-+MACHINE  = $(shell uname -m)
+-######## Alpha/NetBSD
+-# ARCH  = netbsd_alpha
++######## NetBSD
++ARCH	= netbsd
++MACHINE	= $(shell uname -m)
  ######## Sparc/SunOS ( no sound )
  # ARCH  = sunos
  ######## ix86/Solaris
-@@ -360,7 +365,11 @@
+@@ -362,8 +365,15 @@
  DEFS.linux_alpha   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__
  DEFS.linux_i386    = -DLSB_FIRST -DX86_ASM
  DEFS.FREEBSD       = -DLSB_FIRST -DX86_ASM
 -DEFS.netbsd_i386   = -DLSB_FIRST -DX86_ASM
+-DEFS.netbsd_alpha  = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__
 +ifeq (${MACHINE},i386)
-+DEFS.netbsd        = -DLSB_FIRST -DX86_ASM -DNETBSD
++DEFS.netbsd	   = -DLSB_FIRST -DX86_ASM -DNETBSD
++else
++ifeq (${MACHINE},alpha)
++DEFS.netbsd	   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__
 +else
-+DEFS.netbsd        = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD
++DEFS.netbsd	   = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD
++endif
 +endif
  DEFS.sunos	   = -DCLOCKS_PER_SEC=1000000 -DALIGN_INTS -DALIGN_SHORTS
  DEFS.solaris	   = -DALIGN_INTS -DALIGN_SHORTS
  DEFS.solaris_i386  = -DLSB_FIRST -Dsolaris
-@@ -385,12 +394,14 @@
+@@ -390,6 +400,7 @@
  LIBS.irix_al       = -laudio
  LIBS.aix           = -lUMSobj
  LIBS.unixware7	   = -lsocket
@@ -135,10 +110,12 @@ $NetBSD: patch-aa,v 1.19 1999/07/27 03:20:38 mycroft Exp $
  
  ##############################################################################
  # **** Architecture dependent cflags. Only change if you know what're you doing...
- ##############################################################################
- CFLAGS.linux_powerpc = -fsigned-char
- CFLAGS.aix	     = -I/usr/include/UMS -I/usr/lpp/som/include
-+CFLAGS.netbsd	     = -fstrength-reduce -funroll-loops -fomit-frame-pointer
+@@ -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...
diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae
index b22e378466d..295b1adde66 100644
--- a/emulators/xmame/patches/patch-ae
+++ b/emulators/xmame/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 1999/04/03 21:45:16 mycroft Exp $
+$NetBSD: patch-ae,v 1.8 1999/11/10 08:01:29 soren Exp $
 
---- doc/xmamerc.dist.orig	Sat Jan 30 09:30:48 1999
-+++ doc/xmamerc.dist	Sat Apr  3 13:57:15 1999
-@@ -23,10 +23,10 @@
+--- 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
@@ -15,3 +15,40 @@ $NetBSD: patch-ae,v 1.7 1999/04/03 21:45:16 mycroft Exp $
  
  # 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
diff --git a/emulators/xmame/patches/patch-ah b/emulators/xmame/patches/patch-ah
index 0777a903736..8927781b5b9 100644
--- a/emulators/xmame/patches/patch-ah
+++ b/emulators/xmame/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 1999/04/03 21:45:17 mycroft Exp $
+$NetBSD: patch-ah,v 1.3 1999/11/10 08:01:29 soren Exp $
 
---- src/unix/joystick-drivers/joy_i386.c.orig	Fri Mar 26 17:00:50 1999
-+++ src/unix/joystick-drivers/joy_i386.c	Sat Apr  3 14:03:42 1999
+--- src/unix/joystick-drivers/joy_i386.c.orig	Sat Oct  9 23:52:00 1999
++++ src/unix/joystick-drivers/joy_i386.c	Wed Nov 10 07:28:02 1999
 @@ -5,7 +5,7 @@
  #include <sys/ioctl.h>
  
@@ -11,12 +11,30 @@ $NetBSD: patch-ah,v 1.2 1999/04/03 21:45:17 mycroft Exp $
  
  #include <machine/joystick.h>
  typedef struct joystick joy_struct;
-@@ -183,7 +183,7 @@
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #else
+-#error "i386 style joystick only supported under linux & netbsd-i386, "
++#error "i386 style joystick only supported under linux & NetBSD, "
+ "patches to support other arch's should be easy and are welcome ;)"
+ #endif
+ 
+@@ -92,7 +92,7 @@
+                joytype = JOY_I386;
+             case JOY_I386:
+                joy_data[i].num_axis = 2;
+-#ifdef netbsd_i386
++#ifdef NETBSD
+                joy_data[i].num_buttons = 2;
+ #else
+                joy_data[i].num_buttons = JOY_BUTTONS;
+@@ -168,7 +168,7 @@
           continue;
        
        /* get value of buttons */
 -#ifdef netbsd_i386
 +#ifdef NETBSD
-       joydata[i].buttons[0] = joy_data.b1;
-       joydata[i].buttons[1] = joy_data.b2;
+       joy_data[i].buttons[0] = my_joy_data.b1;
+       joy_data[i].buttons[1] = my_joy_data.b2;
  #else
diff --git a/emulators/xmame/patches/patch-ai b/emulators/xmame/patches/patch-ai
index c418413d4a3..d1a8508f5cf 100644
--- a/emulators/xmame/patches/patch-ai
+++ b/emulators/xmame/patches/patch-ai
@@ -1,13 +1,14 @@
-$NetBSD: patch-ai,v 1.1 1999/04/03 21:45:17 mycroft Exp $
+$NetBSD: patch-ai,v 1.2 1999/11/10 08:01:29 soren Exp $
 
---- src/unix/Makefile.orig	Wed Mar 24 15:05:46 1999
-+++ src/unix/Makefile	Sat Apr  3 14:02:25 1999
-@@ -35,7 +35,7 @@
+--- src/unix/Makefile.orig	Fri Nov  5 18:26:11 1999
++++ src/unix/Makefile	Wed Nov 10 07:27:30 1999
+@@ -40,8 +40,7 @@
  SOUND_OBJS.linux_alpha   = $(SOUND_DIR)/oss.o
  SOUND_OBJS.linux_i386    = $(SOUND_DIR)/oss.o
  SOUND_OBJS.FREEBSD       = $(SOUND_DIR)/oss.o
--SOUND_OBJS.netbsd_i386   = $(SOUND_DIR)/netbsd_i386.o
+-SOUND_OBJS.netbsd_i386   = $(SOUND_DIR)/netbsd.o
+-SOUND_OBJS.netbsd_alpha  = $(SOUND_DIR)/netbsd.o
 +SOUND_OBJS.netbsd        = $(SOUND_DIR)/netbsd.o
  SOUND_OBJS.sunos         = $(SOUND_DIR)/nosound.o
- SOUND_OBJS.solaris       = $(SOUND_DIR)/solaris.o $(SOUND_DIR)/lin2ulaw.o
- SOUND_OBJS.solaris_i386  = $(SOUND_DIR)/solaris_i386.o $(SOUND_DIR)/lin2ulaw.o
+ SOUND_OBJS.solaris       = $(SOUND_DIR)/solaris.o
+ SOUND_OBJS.solaris_i386  = $(SOUND_DIR)/solaris.o
diff --git a/emulators/xmame/patches/patch-aj b/emulators/xmame/patches/patch-aj
deleted file mode 100644
index 6b3a8147a0c..00000000000
--- a/emulators/xmame/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/04/03 21:45:17 mycroft Exp $
-
---- src/unix/sound-drivers/netbsd_i386.c.orig	Sat Apr  3 15:19:44 1999
-+++ src/unix/sound-drivers/netbsd_i386.c	Sat Apr  3 15:19:11 1999
-@@ -66,7 +66,7 @@
-       }
-     }
-   }
--  return (TRUE);
-+  return (OSD_OK);
- }
- 
- void sysdep_audio_close(void)
diff --git a/emulators/xmame/patches/patch-ak b/emulators/xmame/patches/patch-ak
deleted file mode 100644
index 117ad361873..00000000000
--- a/emulators/xmame/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/04/03 21:45:17 mycroft Exp $
-
---- src/unix/video-drivers/xf86_dga.c.orig	Sat Apr  3 15:46:22 1999
-+++ src/unix/video-drivers/xf86_dga.c	Sat Apr  3 15:46:13 1999
-@@ -243,11 +243,13 @@
- 		XStoreColor(display,xf86ctx.cmap,&color);
- 	}
- 
-+#if 0
- 	if(!XF86DGAInstallColormap(display,xf86ctx.screen,xf86ctx.cmap))
- 	{
- 		fprintf(stderr_file,"XF86DGAInstallColormap failed\n");
- 		return 1;
- 	}
-+#endif
- 
- 	return 0;
- }
diff --git a/emulators/xmame/patches/patch-al b/emulators/xmame/patches/patch-al
deleted file mode 100644
index b3046dbb806..00000000000
--- a/emulators/xmame/patches/patch-al
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-al,v 1.1 1999/04/03 21:45:17 mycroft Exp $
-
---- src/unix/video-drivers/x11_window.c.orig	Tue Mar 23 18:33:50 1999
-+++ src/unix/video-drivers/x11_window.c	Sat Apr  3 16:24:55 1999
-@@ -311,11 +311,6 @@
-             image->data = shm_info.shmaddr =
-                (char *) shmat (shm_info.shmid, 0, 0);
- 
--            /* Mark segment as deletable after we attach.  When all processes
--               detach from the segment (progam exits), it will be deleted. 
--               This way it won't be left in memory if we crash or something. */
--            shmctl(shm_info.shmid, IPC_RMID, NULL);
--
-             scaled_buffer_ptr = (unsigned char *) image->data;
-             if (!scaled_buffer_ptr)
-             {
-@@ -330,6 +325,7 @@
-             if (!XShmAttach (display, &shm_info))
-             {
-                fprintf (stderr_file, "\nError: failed to attach MITSHM block.\n");
-+               shmctl(shm_info.shmid, IPC_RMID, NULL);
-                return OSD_NOT_OK;
-             }
-             XSync (display, False);  /* be sure to get request processed */
-@@ -340,6 +336,12 @@
-                start_timer ();
- #endif
-             XSetErrorHandler (None);  /* Restore error handler to default */
-+
-+            /* Mark segment as deletable after we attach.  When all processes
-+               detach from the segment (progam exits), it will be deleted. 
-+               This way it won't be left in memory if we crash or something. */
-+            shmctl(shm_info.shmid, IPC_RMID, NULL);
-+
-             /* if use_mit_shm is still set we've succeeded */
-             if (use_mit_shm)
-             {
diff --git a/emulators/xmame/patches/patch-am b/emulators/xmame/patches/patch-am
index b00e7f14873..99da7ed1862 100644
--- a/emulators/xmame/patches/patch-am
+++ b/emulators/xmame/patches/patch-am
@@ -1,6 +1,8 @@
---- src/cpuintrf.c.orig	Fri Mar 26 10:03:35 1999
-+++ src/cpuintrf.c	Sun May  9 14:41:55 1999
-@@ -82,9 +82,34 @@
+$NetBSD: patch-am,v 1.2 1999/11/10 08:01:29 soren Exp $
+
+--- src/cpuintrf.c.orig	Thu Nov  4 09:13:49 1999
++++ src/cpuintrf.c	Wed Nov 10 07:26:25 1999
+@@ -94,13 +94,34 @@
  #define LOG(x)
  #endif
  
@@ -31,7 +33,11 @@
 +} cpuinfo_test;
 +
  /* How do I calculate the next power of two from CPUINFO_SIZE using a macro? */
--#define CPUINFO_ALIGN	(64-CPUINFO_SIZE)
+-#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))