From c3f4544ef68f77646d085b12d98656b5e600841a Mon Sep 17 00:00:00 2001 From: mycroft Date: Sat, 3 Apr 1999 21:45:16 +0000 Subject: 0.35b8.1 --- emulators/xmame/Makefile | 6 ++-- emulators/xmame/files/md5 | 4 +-- emulators/xmame/patches/patch-aa | 60 ++++++++++++++++++---------------------- emulators/xmame/patches/patch-ab | 12 -------- emulators/xmame/patches/patch-ae | 15 ++-------- emulators/xmame/patches/patch-af | 13 --------- emulators/xmame/patches/patch-ag | 13 --------- emulators/xmame/patches/patch-ah | 35 +++++++++-------------- emulators/xmame/patches/patch-ai | 13 +++++++++ emulators/xmame/patches/patch-aj | 13 +++++++++ emulators/xmame/patches/patch-ak | 18 ++++++++++++ emulators/xmame/patches/patch-al | 37 +++++++++++++++++++++++++ 12 files changed, 129 insertions(+), 110 deletions(-) delete mode 100644 emulators/xmame/patches/patch-ab delete mode 100644 emulators/xmame/patches/patch-af delete mode 100644 emulators/xmame/patches/patch-ag create mode 100644 emulators/xmame/patches/patch-ai create mode 100644 emulators/xmame/patches/patch-aj create mode 100644 emulators/xmame/patches/patch-ak create mode 100644 emulators/xmame/patches/patch-al (limited to 'emulators') diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 42a7bb9997a..2e1bfe41baf 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 1999/02/20 22:48:28 hubertf Exp $ +# $NetBSD: Makefile,v 1.30 1999/04/03 21:45:16 mycroft Exp $ # -DISTNAME= xmame-0.34b8.1 +DISTNAME= xmame-0.35b8.1 CATEGORIES= emulators games x11 MASTER_SITES= http://xmame.retrogames.com/download/ EXTRACT_SUFX= .tgz @@ -40,7 +40,7 @@ NETBSD_DGA= no post-patch: (cd ${WRKSRC}/doc && ${SED} 's|@ROMPATH@|${ROMPATH}|;s|@SPOOLDIR@|${SPOOLDIR}|' xmamerc.dist >xmamerc) - (cd ${WRKSRC}/src/unix && ${MV} netbsd_i386.c netbsd.c) + (cd ${WRKSRC}/src/unix/sound-drivers && ${MV} netbsd_i386.c netbsd.c) do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} xmame.${DISPLAY_METHOD} ${PREFIX}/bin/xmame) diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5 index 321c8d2d1c1..42397aa92db 100644 --- a/emulators/xmame/files/md5 +++ b/emulators/xmame/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.9 1998/12/15 10:34:34 mycroft Exp $ +$NetBSD: md5,v 1.10 1999/04/03 21:45:16 mycroft Exp $ -MD5 (xmame-0.34b8.1.tgz) = 25de139b1146c9e69ba7c291d0c8d294 +MD5 (xmame-0.35b8.1.tgz) = 8a50509b653cfb1202b4859febc6fede diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa index 2e25dea30c0..7554414b763 100644 --- a/emulators/xmame/patches/patch-aa +++ b/emulators/xmame/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ +$NetBSD: patch-aa,v 1.18 1999/04/03 21:45:16 mycroft Exp $ ---- makefile.unix.orig Sun Dec 6 04:26:46 1998 -+++ makefile.unix Tue Dec 15 04:06:03 1998 +--- 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... @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ # else ... # MAKE=/usr/people/jantonio/bin/gmake -@@ -105,18 +105,18 @@ +@@ -109,14 +109,14 @@ # *** Select destination directory for your compiled program , manual page # and binary distribution ( if you want to... ) # ( only needed to install, not to compile... ) @@ -21,21 +21,15 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ +MANDIR = ${PREFIX}/man/man6 DISTDIR = /home/ftp/pub/emulators/$(NAME) - # *** Where the ROM source tree ? --ROMPATH = \"/usr/games/lib/$(NAME)\" -+ROMPATH = \"${PREFIX}/share/$(NAME)\" + # *** xmameroot, this is the default rompath, place where the highscores are + # stored, global rc location etc. Since most of these are configurable through + # the rc-file anyway, there are no longer seperate defines for each. +-XMAMEROOT = /usr/games/lib/$(NAME) ++XMAMEROOT = ${PREFIX}/share/$(NAME) - # *** Where to store high scores ? --SDIR = \"/usr/games/lib/$(NAME)\" -+SDIR = \"${PREFIX}/share/$(NAME)\" - # *** Where resides global configuration file ? --MRC = \"/usr/games/lib/$(NAME)/$(NAME)rc\" -+MRC = \"${PREFIX}/share/$(NAME)/$(NAME)rc\" - - # *** Where is cheat.dat ? - CHEATFILE = \"/usr/games/lib/$(NAME)/cheat.dat\" -@@ -145,7 +145,9 @@ + ############################################################################## +@@ -139,7 +139,9 @@ # JSLIB = -lXi # On iX86 based OS's, if supported, you can use standard joystick driver @@ -46,7 +40,7 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ # Linux FM-TOWNS game PAD joystick emulation support # Thanks to Osamu Kurati for provided patch -@@ -165,8 +167,8 @@ +@@ -159,8 +161,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. @@ -57,7 +51,7 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 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 -@@ -245,16 +247,18 @@ +@@ -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 @@ -80,7 +74,7 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ # *** If you have the XIL library (Solaris 2.5.1 and higher), uncomment # the following lines: -@@ -265,8 +269,8 @@ +@@ -259,8 +263,8 @@ # X11INC = -I/usr/include/X11 # X11LIB = -L/usr/lib/X11 # standard location for XFree86 @@ -91,7 +85,7 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ # for Sun systems # X11INC = -I/usr/openwin/include # X11LIB = -L/usr/openwin/lib -@@ -283,11 +287,11 @@ +@@ -277,11 +281,11 @@ # OpenGL include path @@ -105,7 +99,7 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ # OpenGL libs -@@ -320,11 +324,12 @@ +@@ -314,11 +318,12 @@ ######## Alpha/Linux # ARCH = linux_alpha ######## ix86/Linux @@ -120,20 +114,20 @@ $NetBSD: patch-aa,v 1.17 1998/12/15 10:34:34 mycroft Exp $ ######## Sparc/SunOS ( no sound ) # ARCH = sunos ######## ix86/Solaris -@@ -364,7 +369,11 @@ - DEFS.linux_alpha = -Dlinux -DLSB_FIRST -DAXP_ASM -DACORN - DEFS.linux_i386 = -Dlinux -DLSB_FIRST -DX86_ASM - DEFS.FREEBSD = -DLSB_FIRST -DX86_ASM -Dlinux -DFREEBSD_SOUND_WORKAROUND --DEFS.netbsd_i386 = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO +@@ -360,7 +365,11 @@ + 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 +ifeq (${MACHINE},i386) -+DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO ++DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD +else -+DEFS.netbsd = -DLSB_FIRST -DACORN -DNETBSD -DUSE_AUDIO ++DEFS.netbsd = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD +endif - DEFS.sunos = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN - DEFS.solaris = -Dsun -DACORN - DEFS.solaris_i386 = -DLSB_FIRST -Dsun -Dsolaris -@@ -389,12 +398,14 @@ + 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 @@ LIBS.irix_al = -laudio LIBS.aix = -lUMSobj LIBS.unixware7 = -lsocket diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab deleted file mode 100644 index 53f19015994..00000000000 --- a/emulators/xmame/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.5 1998/08/29 19:41:59 frueauf Exp $ - ---- src/unix/Makefile.orig Sun Aug 23 17:31:13 1998 -+++ src/unix/Makefile Fri Aug 28 23:37:29 1998 -@@ -16,6 +16,7 @@ - - $(TARGET): $(OBJS) - ar -rcv $@ $(OBJS) -+ ranlib $@ - - $(OBJDIR)/%.o: %.c xmame.h sound.h - $(CC) -I../../src/ $(CFLAGS) -o $@ -c $< diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae index 3fb5e677dab..b22e378466d 100644 --- a/emulators/xmame/patches/patch-ae +++ b/emulators/xmame/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.6 1998/12/15 10:34:34 mycroft Exp $ +$NetBSD: patch-ae,v 1.7 1999/04/03 21:45:16 mycroft Exp $ ---- doc/xmamerc.dist.orig Fri Oct 23 08:41:44 1998 -+++ doc/xmamerc.dist Tue Dec 15 05:05:19 1998 +--- 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 @@ # Where does your Mame rom files reside? @@ -15,12 +15,3 @@ $NetBSD: patch-ae,v 1.6 1998/12/15 10:34:34 mycroft Exp $ # Where can xmame find the cheat database? cheatfile /usr/games/lib/xmame/CHEAT.DAT -@@ -77,7 +77,7 @@ - mouse 1 - - # Use joystick if available --joy 1 -+joytype 1 - - # Is your joystick analog? - analogstick 0 diff --git a/emulators/xmame/patches/patch-af b/emulators/xmame/patches/patch-af deleted file mode 100644 index 7a4e57de0ac..00000000000 --- a/emulators/xmame/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.3 1998/12/15 10:34:34 mycroft Exp $ - ---- src/unix/devices.c.orig Sun Dec 6 07:18:42 1998 -+++ src/unix/devices.c Tue Dec 15 04:10:00 1998 -@@ -13,7 +13,7 @@ - #include "xmame.h" - #include "devices.h" - --#if defined I386_JOYSTICK && !(defined netbsd_i386) -+#if defined I386_JOYSTICK && !(defined NETBSD) - #include - #ifdef JS_VERSION - #define I386NEW_JOYSTICK 1 diff --git a/emulators/xmame/patches/patch-ag b/emulators/xmame/patches/patch-ag deleted file mode 100644 index 35dfb6d432b..00000000000 --- a/emulators/xmame/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 1998/08/07 10:40:37 agc Exp $ - ---- src/unix/netbsd_i386.c.orig Fri Jun 5 07:00:43 1998 -+++ src/unix/netbsd_i386.c Sat Jul 4 07:42:09 1998 -@@ -5,7 +5,7 @@ - * Audio code is based on the solaris driver, by jantonio@dit.upm.es - */ - --#ifdef netbsd_i386 -+#ifdef NETBSD - - #include "xmame.h" - #include "sound.h" diff --git a/emulators/xmame/patches/patch-ah b/emulators/xmame/patches/patch-ah index fd9781442c6..0777a903736 100644 --- a/emulators/xmame/patches/patch-ah +++ b/emulators/xmame/patches/patch-ah @@ -1,31 +1,22 @@ -$NetBSD: patch-ah,v 1.1 1998/12/15 10:34:35 mycroft Exp $ +$NetBSD: patch-ah,v 1.2 1999/04/03 21:45:17 mycroft Exp $ ---- src/unix/joy_i386.c.orig Sun Dec 6 07:52:18 1998 -+++ src/unix/joy_i386.c Tue Dec 15 04:11:10 1998 -@@ -4,7 +4,7 @@ - #include "devices.h" +--- 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 +@@ -5,7 +5,7 @@ + #include /* specific joystick for PC clones */ -#ifdef netbsd_i386 +#ifdef NETBSD + #include - static struct joystick joy_data; - #else -@@ -77,7 +77,7 @@ - for(i=0;idata = 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) + { -- cgit v1.2.3