diff options
| -rw-r--r-- | emulators/mame/Makefile | 5 | ||||
| -rw-r--r-- | emulators/mame/Makefile.common | 8 | ||||
| -rw-r--r-- | emulators/mame/distinfo | 11 | ||||
| -rw-r--r-- | emulators/mame/patches/patch-makefile | 15 | ||||
| -rw-r--r-- | emulators/mame/patches/patch-src_lib_util_astring.h | 22 | ||||
| -rw-r--r-- | emulators/mame/patches/patch-src_mame_machine_naomibd.c | 24 |
6 files changed, 13 insertions, 72 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 5d30714a642..f8f07a4554d 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2011/04/22 13:43:29 obache Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/22 21:40:25 wiz Exp $ # -DISTNAME= mame0142s +DISTNAME= mame0143s PKGNAME= ${DISTNAME:S/0/-0./:S/s$//} -PKGREVISION= 1 MASTER_SITES= http://mamedev.org/downloader.php?file=releases/ COMMENT= Multiple Arcade Machine Emulator diff --git a/emulators/mame/Makefile.common b/emulators/mame/Makefile.common index c3b08b5f841..f03e5794cdd 100644 --- a/emulators/mame/Makefile.common +++ b/emulators/mame/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2011/02/26 07:06:23 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2011/08/22 21:40:25 wiz Exp $ # # used by emulators/mame/Makefile # used by emulators/mess/Makefile @@ -36,6 +36,12 @@ MAKE_ENV= NOWERROR=1 MAKE_FLAGS+= BIGENDIAN=true .endif +SUBST_CLASSES+= exe +SUBST_SED.exe= -e 's,$$(PREFIX)$$(PREFIXSDL)$$(NAME)$$(SUFFIX)$$(SUFFIX64)$$(SUFFIXDEBUG)$$(SUFFIXPROFILE),$$(PREFIXSDL)$$(NAME)$$(SUFFIX)$$(SUFFIXDEBUG)$$(SUFFIXPROFILE),' +SUBST_FILES.exe= makefile +SUBST_STAGE.exe= post-patch +SUBST_MESSAGE.exe= Fixing executable name. + # mame source is double-zipped post-extract: cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index 12e9769bda3..32b192b2ab2 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.6 2011/04/21 20:42:44 wiz Exp $ +$NetBSD: distinfo,v 1.7 2011/08/22 21:40:25 wiz Exp $ -SHA1 (mame0142s.zip) = 6d70b7a2a15abfdb7955772844ac4c6eae50ced4 -RMD160 (mame0142s.zip) = 20b7fc0af868521462e8081021acbfbe98bea16d -Size (mame0142s.zip) = 17657289 bytes -SHA1 (patch-makefile) = 7117269c9818a1bf018c7d650a5fd64fc0ea3728 -SHA1 (patch-src_lib_util_astring.h) = 103db1d57f11f2df65eccd6957c551003e55a137 -SHA1 (patch-src_mame_machine_naomibd.c) = 7bc53bd57a6d75eae4e0d1d27b1b8cb7fd2fb4df +SHA1 (mame0143s.zip) = dd7cf43ec9f31321ee698facce3b2d3b21cebf15 +RMD160 (mame0143s.zip) = 0cfffdf5939fb740abdb030256011a8e6ca6ee54 +Size (mame0143s.zip) = 17902802 bytes diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile deleted file mode 100644 index 9eb0db62250..00000000000 --- a/emulators/mame/patches/patch-makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-makefile,v 1.5 2011/04/04 12:09:03 wiz Exp $ - -Pkgsrc-only patch. - ---- makefile.orig 2010-12-29 22:50:26.000000000 +0000 -+++ makefile -@@ -344,7 +349,7 @@ NAME = $(TARGET)$(SUBTARGET) - endif - - # fullname is prefix+name+suffix+suffix64+suffixdebug --FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE) -+FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE) - - # add an EXE suffix to get the final emulator name - EMULATOR = $(FULLNAME)$(EXE) diff --git a/emulators/mame/patches/patch-src_lib_util_astring.h b/emulators/mame/patches/patch-src_lib_util_astring.h deleted file mode 100644 index cc94f20d3a0..00000000000 --- a/emulators/mame/patches/patch-src_lib_util_astring.h +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_lib_util_astring.h,v 1.6 2011/04/21 20:42:44 wiz Exp $ - -To avoid confusion with the ctype macros of the same name. - ---- src/lib/util/astring.h.orig 2011-02-01 20:29:56.000000000 +0000 -+++ src/lib/util/astring.h -@@ -43,8 +43,15 @@ - #define __ASTRING_H__ - - #include <stdarg.h> -+#include <ctype.h> - #include "osdcomm.h" - -+#ifdef toupper -+#undef toupper -+#endif -+#ifdef tolower -+#undef tolower -+#endif - - /*************************************************************************** - TYPE DEFINITIONS diff --git a/emulators/mame/patches/patch-src_mame_machine_naomibd.c b/emulators/mame/patches/patch-src_mame_machine_naomibd.c deleted file mode 100644 index 2c9380d8462..00000000000 --- a/emulators/mame/patches/patch-src_mame_machine_naomibd.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_mame_machine_naomibd.c,v 1.1 2011/04/04 12:09:03 wiz Exp $ - -bswap16 is a macro on NetBSD. -Sent upstream. - ---- src/mame/machine/naomibd.c.orig 2011-03-29 08:50:06.000000000 +0000 -+++ src/mame/machine/naomibd.c -@@ -516,14 +516,14 @@ static void naomibd_m1_decode(naomibd_st - - // Streaming M2/M3 protection and decompression - --INLINE UINT16 bswap16(UINT16 in) -+INLINE UINT16 naomi_bswap16(UINT16 in) - { - return ((in>>8) | (in<<8)); - } - - static UINT16 naomibd_get_decrypted_stream(naomibd_state *naomibd) - { -- UINT16 wordn = bswap16(naomibd->prot.ptr[naomibd->prot.count++]); -+ UINT16 wordn = naomi_bswap16(naomibd->prot.ptr[naomibd->prot.count++]); - - naomibd->prot.aux_word = block_decrypt(naomibd->dc_gamekey, naomibd->dc_seqkey, naomibd->prot.seed++, wordn); - wordn = (naomibd->prot.last_word&~3) | (naomibd->prot.aux_word&3); |