Update to 0.115.

sdlmame/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/04/04 16:07:54 dillo Exp $
+# $NetBSD: Makefile,v 1.8 2007/05/09 19:07:59 dillo Exp $
 #
 
-DISTNAME=		sdlmame0114
-PKGNAME=		sdlmame-0.114
+DISTNAME=		sdlmame0115
+PKGNAME=		sdlmame-0.115
 CATEGORIES=		emulators
 MASTER_SITES=		http://rbelmont.mameworld.info/
 EXTRACT_SUFX=		.zip

sdlmame/distinfo

@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.3 2007/04/04 16:07:54 dillo Exp $
+$NetBSD: distinfo,v 1.4 2007/05/09 19:07:59 dillo Exp $
 
-SHA1 (sdlmame0114.zip) = c17bc208aabe635207508b86d657eea4bebf10a3
-RMD160 (sdlmame0114.zip) = af024162037f1fd1bbdd4a210f4f84d9160732e5
-Size (sdlmame0114.zip) = 15225632 bytes
-SHA1 (patch-aa) = 3d034f3060588da28a4a70e5a6aecd2c6f8239ab
-SHA1 (patch-ab) = 094e0f7346f71f5aaea769e4f5bad4eb29c59936
-SHA1 (patch-ac) = 433d19e802b8e156f0e82c11b16432b9e5fb5666
-SHA1 (patch-ad) = 1aa138324b9f8c5fc0ca93751bd024fc05003b47
-SHA1 (patch-ae) = b127f2232696aa3af8fb7d48309ee4514cde2170
-SHA1 (patch-af) = a6d43ca9a2a97ef99ca4daa9dddbfcc964c29341
-SHA1 (patch-ag) = 2f3c58dc8ef9c80ab488900e61b8ac1e7a18bf52
+SHA1 (sdlmame0115.zip) = 3d5aefc2dfc9f75126a730171b57a0c345d2572e
+RMD160 (sdlmame0115.zip) = e19368a63d69757be989e535e1cbcd10d4fc99fc
+Size (sdlmame0115.zip) = 15310275 bytes
+SHA1 (patch-aa) = c77f9df2876117c73be2cc3650677ed75847e54d
+SHA1 (patch-ac) = ad60dcd0836b4a84df1cf79460c6af05e638112e
+SHA1 (patch-ad) = 3e97c968efcbb441e79db47c3b720aef0e394541
+SHA1 (patch-ae) = fe49e16708ff7ef5402b93bbba24995ca57e50ed
+SHA1 (patch-af) = 38310199e8146aff59c7f23702acc87dfec78c78
+SHA1 (patch-ag) = faff46f49d41c279d9f0c9ee1b0b08667dfafd2a

sdlmame/patches/patch-aa

@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/04/04 16:07:54 dillo Exp $
+$NetBSD: patch-aa,v 1.4 2007/05/09 19:07:59 dillo Exp $
 
---- makefile.orig	2007-03-30 09:03:29.000000000 +0200
+--- makefile.orig	2007-04-27 16:14:59.000000000 +0200
 +++ makefile
-@@ -64,10 +64,10 @@ SUBARCH = linux
+@@ -64,10 +64,10 @@ SUBARCH = unix
  # DEBUG = 1    
   
  # uncomment next line to use DRC MIPS3 engine
@@ -24,8 +24,8 @@ $NetBSD: patch-aa,v 1.3 2007/04/04 16:07:54 dillo Exp $
  # AMD64 = 1
  # G4 = 1
  # G5 = 1
-@@ -173,9 +173,9 @@ endif
- 
+@@ -183,9 +183,9 @@ EXE = .exe
+ endif
  
  # compiler, linker and utilities
 -AR = @ar
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/04 16:07:54 dillo Exp $
  MD = -mkdir
  RM = @rm -f
  
-@@ -191,7 +191,7 @@ MESS=1
+@@ -201,7 +201,7 @@ MESS=1
  endif
  
  # by default, don't compile for a specific target CPU
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/04 16:07:54 dillo Exp $
  ARCH = 
  
  # architecture-specific builds get extra options
-@@ -253,15 +253,7 @@ SRC = src
+@@ -263,15 +263,7 @@ SRC = src
  # compile-time definitions
  #-------------------------------------------------
  
@@ -63,13 +63,16 @@ $NetBSD: patch-aa,v 1.3 2007/04/04 16:07:54 dillo Exp $
  
  ifdef PTR64
  DEFS += -DPTR64
-@@ -313,25 +305,24 @@ CFLAGS += $(ARCH) \
- 	-Wstrict-prototypes \
- 	-Wundef \
+@@ -325,26 +317,26 @@ CFLAGS += $(ARCH) \
  	-Wformat-security \
--	-Wwrite-strings \
--	-Wdeclaration-after-statement
-+	-Wwrite-strings
+ 	-Wwrite-strings
+ 
+-ifneq ($(SUBARCH),os2)
+-CFLAGS += -Wdeclaration-after-statement
+-endif
++#ifneq ($(SUBARCH),os2)
++#CFLAGS += -Wdeclaration-after-statement
++#endif
  
  ifneq ($(OPTIMIZE),0)
  CFLAGS += -DNDEBUG $(ARCH) -fno-strict-aliasing
@@ -97,7 +100,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/04 16:07:54 dillo Exp $
  
  ifdef MAP
  MAPFLAGS = -Wl,-Map,$(NAME).map
-@@ -475,7 +466,7 @@ $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(
+@@ -494,7 +486,7 @@ $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(
  # always recompile the version string
  	$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
  	@echo Linking $@...

sdlmame/patches/patch-ab

@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/03/06 15:26:12 dillo Exp $
-
---- src/osd/sdl/sdlmisc.c.orig	2007-02-13 02:41:33.000000000 +0100
-+++ src/osd/sdl/sdlmisc.c
-@@ -161,10 +161,11 @@ void fprint_colums(FILE *f, const char *
- 
- void *osd_alloc_executable(size_t size)
- {
--#ifdef SDLMAME_LINUX 
-+#ifndef MAP_ANONYMOUS
-+#define MAP_ANONYMOUS	MAP_ANON
-+#endif
-+#if defined(SDLMAME_LINUX) || defined(SDLMAME_FREEBSD)
- 	return (void *)mmap(0, size, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_SHARED, 0, getpagesize());
--#elif defined(SDLMAME_FREEBSD)
--        return (void *)mmap(0, size, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, 0, getpagesize());
- #elif defined(SDLMAME_WIN32)
- 	return VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
- #elif SDLMAME_MACOSX

sdlmame/patches/patch-ac

@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2007/04/04 16:07:54 dillo Exp $
+$NetBSD: patch-ac,v 1.4 2007/05/09 19:07:59 dillo Exp $
 
---- src/emu/cpu/cpu.mak.orig	2007-04-02 23:49:42.000000000 +0200
+--- src/emu/cpu/cpu.mak.orig	2007-05-06 18:50:36.000000000 +0200
 +++ src/emu/cpu/cpu.mak
-@@ -986,7 +986,7 @@ $(CPUOBJ)/m68000/m68kops.c: $(CPUOBJ)/m6
+@@ -1001,7 +1001,7 @@ $(CPUOBJ)/m68000/m68kops.c: $(CPUOBJ)/m6
  # rule to build the generator
  $(CPUOBJ)/m68000/m68kmake$(EXE): $(CPUOBJ)/m68000/m68kmake.o $(LIBOCORE)
  	@echo Linking $@...

sdlmame/patches/patch-ad

@@ -1,22 +1,22 @@
-$NetBSD: patch-ad,v 1.2 2007/03/06 15:26:12 dillo Exp $
+$NetBSD: patch-ad,v 1.3 2007/05/09 19:07:59 dillo Exp $
 
---- src/osd/sdl/sdlfile.c.orig	2007-03-05 01:23:53.000000000 +0100
+--- src/osd/sdl/sdlfile.c.orig	2007-05-03 18:09:34.000000000 +0200
 +++ src/osd/sdl/sdlfile.c
-@@ -248,7 +248,7 @@ mame_file_error osd_read(osd_file *file,
+@@ -252,7 +252,7 @@ file_error osd_read(osd_file *file, void
  {
  	UINT32 result;
  
--#if defined(SDLMAME_MACOSX) || defined(SDLMAME_FREEBSD)
-+#if defined(SDLMAME_MACOSX) || defined(SDLMAME_FREEBSD) || defined(__NetBSD__)
+-#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD)
++#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD) || defined(__NetBSD__)
  	result = pread(file->handle, buffer, count, offset);
  	if (!result)
- #elif defined(SDLMAME_LINUX)
-@@ -276,7 +276,7 @@ mame_file_error osd_write(osd_file *file
+ #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2)
+@@ -280,7 +280,7 @@ file_error osd_write(osd_file *file, con
  {
  	UINT32 result;
  
--#if defined(SDLMAME_MACOSX) || defined(SDLMAME_FREEBSD)
-+#if defined(SDLMAME_MACOSX) || defined(SDLMAME_FREEBSD) || defined(__NetBSD__)
+-#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD)
++#if defined(SDLMAME_DARWIN) || defined(SDLMAME_FREEBSD) || defined(__NetBSD__)
  	result = pwrite(file->handle, buffer, count, offset);
  	if (!result)
- #elif defined(SDLMAME_LINUX)
+ #elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2)

sdlmame/patches/patch-ae

@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2007/03/06 15:26:12 dillo Exp $
+$NetBSD: patch-ae,v 1.2 2007/05/09 19:07:59 dillo Exp $
 
---- src/osd/sdl/sdldir.c.orig	2007-02-04 03:06:36.000000000 +0100
+--- src/osd/sdl/sdldir.c.orig	2007-04-27 17:16:56.000000000 +0200
 +++ src/osd/sdl/sdldir.c
-@@ -23,6 +23,7 @@
+@@ -26,6 +26,7 @@
  #include <string.h>
  #define __USE_BSD	// to get DT_xxx on Linux
  #undef _POSIX_C_SOURCE  // to get DT_xxx on OS X

sdlmame/patches/patch-af

@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2007/04/04 16:07:54 dillo Exp $
+$NetBSD: patch-af,v 1.3 2007/05/09 19:07:59 dillo Exp $
 
---- src/tools/tools.mak.orig	2007-04-02 23:49:40.000000000 +0200
+--- src/tools/tools.mak.orig	2007-05-06 18:50:35.000000000 +0200
 +++ src/tools/tools.mak
 @@ -49,7 +49,7 @@ FILE2STROBJS = \
  

sdlmame/patches/patch-ag

@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2007/04/04 16:07:54 dillo Exp $
+$NetBSD: patch-ag,v 1.3 2007/05/09 19:07:59 dillo Exp $
 
---- src/osd/sdl/sdl.mak.orig	2007-03-17 02:14:13.000000000 +0100
+--- src/osd/sdl/sdl.mak.orig	2007-04-27 17:16:56.000000000 +0200
 +++ src/osd/sdl/sdl.mak
-@@ -134,5 +134,5 @@ TESTKEYSOBJS = \
+@@ -128,5 +128,5 @@ TESTKEYSOBJS = \
  
  testkeys$(EXE): $(TESTKEYSOBJS) 
  	@echo Linking $@...