diff options
author | wiz <wiz@pkgsrc.org> | 2009-11-13 14:45:25 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2009-11-13 14:45:25 +0000 |
commit | 3694e7e6cdb245ddd944bb6d849536bc665a8dcb (patch) | |
tree | 23edc2fbbe9611f5386dcbdba99c2e3cf5a391e5 /emulators | |
parent | 9141d0af89803928e940bfc1c4fc4915d7b3a884 (diff) | |
download | pkgsrc-3694e7e6cdb245ddd944bb6d849536bc665a8dcb.tar.gz |
Update to 0.135: All the best new stuff from MAME 0.135!
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/sdlmame/Makefile | 4 | ||||
-rw-r--r-- | emulators/sdlmame/distinfo | 14 | ||||
-rw-r--r-- | emulators/sdlmame/patches/patch-ab | 14 | ||||
-rw-r--r-- | emulators/sdlmame/patches/patch-ac | 13 | ||||
-rw-r--r-- | emulators/sdlmame/patches/patch-ad | 20 |
5 files changed, 37 insertions, 28 deletions
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile index a76226c18f1..b4afd53e4dc 100644 --- a/emulators/sdlmame/Makefile +++ b/emulators/sdlmame/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2009/09/20 10:03:58 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2009/11/13 14:45:25 wiz Exp $ # # Don't update to 0.XXXuN, those are development snapshots. -DISTNAME= sdlmame0134 +DISTNAME= sdlmame0135 PKGNAME= ${DISTNAME:S/0/-0./} COMMENT= Multiple Arcade Machine Emulator, SDL port diff --git a/emulators/sdlmame/distinfo b/emulators/sdlmame/distinfo index 6627427d296..f2d5e144185 100644 --- a/emulators/sdlmame/distinfo +++ b/emulators/sdlmame/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2009/09/20 10:03:58 wiz Exp $ +$NetBSD: distinfo,v 1.9 2009/11/13 14:45:25 wiz Exp $ -SHA1 (sdlmame0134.zip) = 562760edf0abebd87d005e3fac614919802abfdf -RMD160 (sdlmame0134.zip) = 8dcc9a6351631bae4ccf1eab0aa6cae557802d77 -Size (sdlmame0134.zip) = 18230792 bytes +SHA1 (sdlmame0135.zip) = c4e81bb8f244ba21c080e8221800cff4d74bf3e1 +RMD160 (sdlmame0135.zip) = d212b8cdfc01240b28e0384b8ea53938996e419a +Size (sdlmame0135.zip) = 18450537 bytes SHA1 (patch-aa) = 93dd00e02110e8257f3fe0c18a94d7f7ca594352 -SHA1 (patch-ab) = a7471766661974f7f092bede9d37d18a48d8499c -SHA1 (patch-ac) = 54de6042993dee19e0438d1ce1126be91bc594d1 -SHA1 (patch-ad) = b12160915cad1d0a8a0ee784553b1b9f207d069b +SHA1 (patch-ab) = 3cc161845baae6ebcdab42fbd19f74e2ee3d4cb1 +SHA1 (patch-ac) = e97e7b730305aa2d10363cfd65f8e2b30f2fc292 +SHA1 (patch-ad) = 8d6312b593343eb2e5b29f177376c8fa243d8293 SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38 SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da diff --git a/emulators/sdlmame/patches/patch-ab b/emulators/sdlmame/patches/patch-ab index 704434b3cc5..46a119a8e9f 100644 --- a/emulators/sdlmame/patches/patch-ab +++ b/emulators/sdlmame/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.3 2009/09/01 15:19:13 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2009/11/13 14:45:25 wiz Exp $ ---- src/osd/sdl/sdlsync.c.orig 2008-12-12 05:55:30 +0200 -+++ src/osd/sdl/sdlsync.c -@@ -586,15 +586,28 @@ int osd_thread_adjust_priority(osd_threa +--- src/osd/sdl/sdlsync_tc.c.orig 2009-10-25 05:54:58.000000000 +0000 ++++ src/osd/sdl/sdlsync_tc.c +@@ -341,15 +341,28 @@ int osd_thread_adjust_priority(osd_threa int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask) { --#if !defined(NO_THREAD_COOPERATIVE) && !defined(NO_AFFINITY_NP) -+#if !defined(NO_THREAD_COOPERATIVE) && !defined(NO_AFFINITY_NP) && !defined(__DragonFly__) +-#if !defined(NO_AFFINITY_NP) ++#if !defined(NO_AFFINITY_NP) && !defined(__DragonFly__) +#if defined(__NetBSD__) + cpuset_t *cmask; +#else @@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.3 2009/09/01 15:19:13 wiz Exp $ if (thread == NULL) lthread = pthread_self(); -@@ -605,10 +618,15 @@ int osd_thread_cpu_affinity(osd_thread * +@@ -360,10 +373,15 @@ int osd_thread_cpu_affinity(osd_thread * { /* Not available during link in all targets */ fprintf(stderr, "error %d setting cpu affinity to mask %08x", errno, mask); diff --git a/emulators/sdlmame/patches/patch-ac b/emulators/sdlmame/patches/patch-ac index 03b2c7a5555..c0158724901 100644 --- a/emulators/sdlmame/patches/patch-ac +++ b/emulators/sdlmame/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.1 2009/09/01 15:20:19 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2009/11/13 14:45:25 wiz Exp $ ---- src/emu/mamecore.h.orig 2009-09-01 14:40:54.000000000 +0000 +--- src/emu/mamecore.h.orig 2009-11-01 00:44:54.000000000 +0000 +++ src/emu/mamecore.h +@@ -9,7 +9,7 @@ + + ***************************************************************************/ + +-#pragma once ++ + + #ifndef __MAMECORE_H__ + #define __MAMECORE_H__ @@ -333,6 +333,10 @@ DECL_NORETURN void CLIB_DECL fatalerror_ INLINE FUNCTIONS ***************************************************************************/ diff --git a/emulators/sdlmame/patches/patch-ad b/emulators/sdlmame/patches/patch-ad index 2410d6af771..8e03f235236 100644 --- a/emulators/sdlmame/patches/patch-ad +++ b/emulators/sdlmame/patches/patch-ad @@ -1,17 +1,17 @@ -$NetBSD: patch-ad,v 1.1 2009/09/01 15:20:06 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2009/11/13 14:45:25 wiz Exp $ ---- src/mame/machine/n64.c.orig 2009-07-20 12:03:20.000000000 +0000 +--- src/mame/machine/n64.c.orig 2009-11-01 00:44:54.000000000 +0000 +++ src/mame/machine/n64.c -@@ -1065,7 +1065,7 @@ static UINT8 pif_ram[0x40]; - static UINT8 pif_cmd[0x40]; - static UINT32 si_dram_addr = 0; +@@ -1474,7 +1474,7 @@ static UINT32 si_dram_addr = 0; static UINT32 si_pif_addr = 0; + static UINT32 si_pif_addr_rd64b = 0; + static UINT32 si_pif_addr_wr64b = 0; -static UINT32 si_status = 0; +static UINT32 mame_si_status = 0; static UINT8 eeprom[512]; static UINT8 mempack[0x8000]; -@@ -1475,7 +1475,7 @@ static void pif_dma(running_machine *mac +@@ -1884,7 +1884,7 @@ static void pif_dma(running_machine *mac } } @@ -20,8 +20,8 @@ $NetBSD: patch-ad,v 1.1 2009/09/01 15:20:06 wiz Exp $ signal_rcp_interrupt(machine, SI_INTERRUPT); } -@@ -1487,7 +1487,7 @@ READ32_HANDLER( n64_si_reg_r ) - return si_dram_addr; +@@ -1896,7 +1896,7 @@ READ32_HANDLER( n64_si_reg_r ) + //return si_dram_addr; case 0x18/4: // SI_STATUS_REG - return si_status; @@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.1 2009/09/01 15:20:06 wiz Exp $ } return 0; } -@@ -1514,7 +1514,7 @@ WRITE32_HANDLER( n64_si_reg_w ) +@@ -1925,7 +1925,7 @@ WRITE32_HANDLER( n64_si_reg_w ) break; case 0x18/4: // SI_STATUS_REG @@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.1 2009/09/01 15:20:06 wiz Exp $ clear_rcp_interrupt(space->machine, SI_INTERRUPT); break; -@@ -1624,7 +1624,7 @@ MACHINE_RESET( n64 ) +@@ -2036,7 +2036,7 @@ MACHINE_RESET( n64 ) memset(pif_cmd, 0, sizeof(pif_cmd)); si_dram_addr = 0; si_pif_addr = 0; |