From 5aa8d1dce5ce08b2174cf25db77b3f05c340f17b Mon Sep 17 00:00:00 2001 From: kristerw Date: Sat, 21 Feb 2004 00:06:36 +0000 Subject: Update xmess to 0.79.1 Changes since 0.78.1 includes: - Everything from MAME 0.79 (http://x.mame.net/changes-mame.html) and MESS 0.79 (http://x.mame.net/changes-mess.html). - Updated the ALSA DSP module to use the ALSA 1.0 API. (Shyouzou Sugitani) - Paths now allow a literal "$" if it's preceded by "\". (Andre Majorel) - Fixed a segfault that occurred when "-debug" was used with a rotated game. - The debugger window should no longer be blank for 32bpp games. - Fixed a bug in fix-comments.c that was causing it to mangle src/drivers/vendetta.c. - When XINPUT is defined in the makefile but no XInput devices are configured, the mouse is treated as a trackball. (Gerd Sussner) - The Xv YUV code should now work on big-endian platforms. (Maciej J. Woloszyk) - The trigger for the ACT LABS TV light gun now works; reloading now requires only one offscreen shot instead of two. (Joe) --- emulators/xmess/Makefile | 7 +- emulators/xmess/distinfo | 9 ++- emulators/xmess/patches/patch-aa | 31 ++++---- emulators/xmess/patches/patch-ab | 150 --------------------------------------- 4 files changed, 23 insertions(+), 174 deletions(-) delete mode 100644 emulators/xmess/patches/patch-ab (limited to 'emulators') diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index f523c781848..3c3456235f2 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.46 2004/02/18 13:33:41 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2004/02/21 00:06:36 kristerw Exp $ # -DISTNAME= xmame-0.78.1 -PKGNAME= xmess-0.78.1 -PKGREVISION= 1 +DISTNAME= xmame-0.79.1 +PKGNAME= xmess-0.79.1 CATEGORIES= emulators games x11 MASTER_SITES= http://x.mame.net/download/ EXTRACT_SUFX= .tar.bz2 diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo index 667094a2a40..c94686d9126 100644 --- a/emulators/xmess/distinfo +++ b/emulators/xmess/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.18 2004/02/19 19:28:29 kristerw Exp $ +$NetBSD: distinfo,v 1.19 2004/02/21 00:06:36 kristerw Exp $ -SHA1 (xmame-0.78.1.tar.bz2) = 8655bdbd437ef8948bca80f6449d921d39b8a329 -Size (xmame-0.78.1.tar.bz2) = 12148685 bytes -SHA1 (patch-aa) = cf7e599022fe0b3bc6f12d57c4c2d5ece7d82d0a -SHA1 (patch-ab) = 31527d0aa87580deef8d492ad48b8fd2dd7cc40f +SHA1 (xmame-0.79.1.tar.bz2) = 8348467534312325802f0ed6182bcd6eb2bfc8ed +Size (xmame-0.79.1.tar.bz2) = 12369791 bytes +SHA1 (patch-aa) = 0b9ffcb7c4305e7c349f229b2646acb31553d549 SHA1 (patch-ae) = f30af6853b77307126ad4a230d4237bc570a0ca4 diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa index abbda3e2e5c..fc64e2ab8d8 100644 --- a/emulators/xmess/patches/patch-aa +++ b/emulators/xmess/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.18 2003/05/27 12:43:16 kristerw Exp $ ---- makefile.unix.orig Mon May 26 22:09:26 2003 -+++ makefile.unix Tue May 27 14:07:48 2003 +$NetBSD: patch-aa,v 1.19 2004/02/21 00:06:36 kristerw Exp $ + +--- makefile.unix.orig Sat Feb 21 00:03:46 2004 ++++ makefile.unix Sat Feb 21 00:08:29 2004 @@ -33,7 +33,7 @@ ########################################################################### @@ -8,9 +9,9 @@ $NetBSD: patch-aa,v 1.18 2003/05/27 12:43:16 kristerw Exp $ -TARGET = mame +# TARGET = mame # TARGET = mess - # TARGET = neomame - # TARGET = cpmame -@@ -85,7 +85,7 @@ + # TARGET = mmsnd + # example for a tiny compile +@@ -88,7 +88,7 @@ # just as well. However, stay away from the `cc' Ultrix compiler if # possible. @@ -19,7 +20,7 @@ $NetBSD: patch-aa,v 1.18 2003/05/27 12:43:16 kristerw Exp $ # CC = cc # CC = icc # CC = c89 -@@ -97,7 +97,7 @@ +@@ -103,7 +103,7 @@ # If you want to use whatever CFLAGS are currently set in your # environment, then comment this out. @@ -28,16 +29,16 @@ $NetBSD: patch-aa,v 1.18 2003/05/27 12:43:16 kristerw Exp $ ########################################################################### -@@ -106,7 +106,7 @@ +@@ -112,7 +112,7 @@ ########################################################################### - # gcc on x86 + # GCC on x86 -CFLAGS = -O -Wall -Wno-unused +# CFLAGS = -O -Wall -Wno-unused - # gcc on x86 with some optimizations + # GCC on x86 with some optimizations # CFLAGS = -O2 -Wall -Wno-unused -mcpu=i686 -fomit-frame-pointer \ -@@ -397,7 +397,7 @@ +@@ -471,7 +471,7 @@ ########################################################################### # i386, GNU asm @@ -45,8 +46,8 @@ $NetBSD: patch-aa,v 1.18 2003/05/27 12:43:16 kristerw Exp $ +# MY_CPU = i386 # i386, no asm -- needed for the Intel C++ compiler, which does not fully - # understand gcc's inline assembly syntax, though you may still enable -@@ -429,7 +429,7 @@ + # understand GCC's inline assembly syntax, though you may still enable +@@ -506,7 +506,7 @@ ########################################################################### # Linux @@ -55,7 +56,7 @@ $NetBSD: patch-aa,v 1.18 2003/05/27 12:43:16 kristerw Exp $ # FreeBSD # ARCH = freebsd -@@ -560,7 +560,7 @@ +@@ -652,7 +652,7 @@ X11_MITSHM = 1 # Use Xv extension for hardware scaling. @@ -64,7 +65,7 @@ $NetBSD: patch-aa,v 1.18 2003/05/27 12:43:16 kristerw Exp $ # Enable XFree86 DGA. This also causes "make install" to set the suid bit # on the executable. -@@ -580,8 +580,8 @@ +@@ -674,8 +674,8 @@ # X11LIB = -L/usr/lib/X11 # Standard location for XFree86 diff --git a/emulators/xmess/patches/patch-ab b/emulators/xmess/patches/patch-ab deleted file mode 100644 index 706dc2be2cb..00000000000 --- a/emulators/xmess/patches/patch-ab +++ /dev/null @@ -1,150 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2004/02/19 19:28:29 kristerw Exp $ - ---- src/unix/config.c.orig 2003-12-26 16:29:16.000000000 -0700 -+++ src/unix/config.c 2004-01-21 22:08:24.000000000 -0700 -@@ -56,6 +56,13 @@ - static int specify_ram(struct rc_option *option, const char *arg, int priority); - #endif - -+/* OpenVMS doesn't support paths with a leading '.' character. */ -+#if defined(__DECC) && defined(VMS) -+# define PATH_LEADER -+#else -+# define PATH_LEADER "." -+#endif -+ - /* struct definitions */ - static struct rc_option opts[] = { - /* name, shortname, type, dest, deflt, min, max, func, help */ -@@ -275,39 +282,39 @@ - return OSD_NOT_OK; - - /* check that the required dirs exist, and create them if necessary */ -- snprintf(buffer, BUF_SIZE, "%s/.%s", home_dir, NAME); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s", home_dir, NAME); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "cfg"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "cfg"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "mem"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "mem"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "sta"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "sta"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "nvram"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "nvram"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "diff"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "diff"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "rc"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "rc"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "hi"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "hi"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s", home_dir, NAME, "inp"); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s", home_dir, NAME, "inp"); - if (check_and_create_dir(buffer)) - return OSD_NOT_OK; - -@@ -322,13 +329,13 @@ - snprintf(buffer, BUF_SIZE, "%s/%src", XMAMEROOT, NAME); - if(rc_load(rc, buffer, 1, 1)) - return OSD_NOT_OK; -- snprintf(buffer, BUF_SIZE, "%s/.%s/%src", home_dir, NAME, NAME); -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%src", home_dir, NAME, NAME); - if(rc_load(rc, buffer, 1, 1)) - return OSD_NOT_OK; - snprintf(buffer, BUF_SIZE, "%s/%s-%src", XMAMEROOT, NAME, DISPLAY_METHOD); - if(rc_load(rc, buffer, 1, 1)) - return OSD_NOT_OK; -- snprintf(buffer, BUF_SIZE, "%s/.%s/%s-%src", home_dir, NAME, NAME, -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/%s-%src", home_dir, NAME, NAME, - DISPLAY_METHOD); - if(rc_load(rc, buffer, 1, 1)) - return OSD_NOT_OK; -@@ -536,7 +543,7 @@ - drivers[game_index]->name); - if(rc_load(rc, buffer, 1, 1)) - return OSD_NOT_OK; -- snprintf(buffer, BUF_SIZE, "%s/.%s/rc/%src", home_dir, NAME, -+ snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s/rc/%src", home_dir, NAME, - drivers[game_index]->name); - if(rc_load(rc, buffer, 1, 1)) - return OSD_NOT_OK; -@@ -737,21 +744,49 @@ - #endif - - --/*============================================================ */ --/* logerror */ --/*============================================================ */ -+/*============================================================*/ -+/* vlogerror */ -+/*============================================================*/ - - extern FILE *errorlog; - --void logerror(const char *text, ...) -+static void vlogerror(const char *text, va_list arg) - { -- va_list arg; -- - if (errorlog) - { -- va_start(arg, text); - vfprintf(errorlog, text, arg); -- va_end(arg); - fflush(errorlog); - } - } -+ -+ -+/*============================================================*/ -+/* logerror */ -+/*============================================================*/ -+ -+void logerror(const char *text,...) -+{ -+ va_list arg; -+ -+ /* standard vfprintf stuff here */ -+ va_start(arg, text); -+ vlogerror(text, arg); -+ va_end(arg); -+} -+ -+ -+/*============================================================*/ -+/* osd_die */ -+/*============================================================*/ -+ -+void osd_die(const char *text,...) -+{ -+ va_list arg; -+ -+ /* standard vfprintf stuff here */ -+ va_start(arg, text); -+ vlogerror(text, arg); -+ va_end(arg); -+ -+ exit(-1); -+} -- cgit v1.2.3