diff options
author | wiz <wiz@pkgsrc.org> | 2009-12-15 14:17:30 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2009-12-15 14:17:30 +0000 |
commit | fe0e00f70f0931a7ee1a6e2de97ef4dcb37026fe (patch) | |
tree | d4b06653fa138f9f12c6d09dfd3d5a55d8032450 /emulators | |
parent | b00bf26ae3b62537cf9a95f3c1d682af8c5a003c (diff) | |
download | pkgsrc-fe0e00f70f0931a7ee1a6e2de97ef4dcb37026fe.tar.gz |
Update to 0.135.
Changes in 0.135:
New System Drivers Supported (in no particular order):
------------------------------------------------------
- Philips CD-i [Harmony]
- Fujitsu FM Towns Car Marty (not working) [Barry Rodewald]
- Macintosh II (FDHD), IIx, IIcx, IIci, IIsi, LC, LC II, and
Classic II (not working) [R. Belmont]
- P8000 (not working) [Matt Knoth, Fabio Priuli]
- Sharp X68000 XVI and X68030 (not working). [Barry
Rodewald]
Systems Promoted from GAME_NOT_WORKING:
---------------------------------------
- Atari 800XL [Mariusz Wojcieszek]
- Beta [Curt Coder]
- Cosmicos [Curt Coder]
- Microbee 56k [Robbbert]
- Nokia MikroMikko 1 M6 [Curt Coder, Kara Trace]
- Philips CD-i [Harmony]
- Sony PocketStation [Harmony]
- TRS-80 Model 4 [Robbbert]
- TRS-80 Model 4P [Robbbert]
Skeleton drivers:
-----------------
- Amiga 3000
- Amstrad PenPad PDA 600
- Cosmicos
- Epson HX20
- NeXT
- Robotron A7150
- SGI IP6 4D/PI workstation
Changes in 0.134:
New System Drivers Supported (in no particular order):
------------------------------------------------------
- 4004 Nixie Tube Clock [Miodrag Milanovic]
- Busicom 141-PF [Miodrag Milanovic]
- Mikron-2 [Miodrag Milanovic]
- Nintendo Game Boy Advance [R. Belmont, Harmony]
- Tandy 1000RL [Wilbert Pol]
- DECTalk DTC-01 [Lord Nightmare]
- Ensoniq ESQ-1 (not working) [R. Belmont]
- Game Park GP32 (not working) [R. Belmont]
- Game Park Holdings GP2X (not working) [R. Belmont]
Systems Promoted from GAME_NOT_WORKING:
---------------------------------------
- Elektor Junior [Manfred Schneider]
- Elwro 800 Junior [Mariusz Wojcieszek]
- Sharp X1 / X1 Turbo [Angelo Salese]
Skeleton drivers:
-----------------
- HC-88
- Cobra / Cobra 80K
- Kaypro 4/plus88
- Kaypro 4 4-84
- Tatung Einstein 256
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/sdlmess/Makefile | 7 | ||||
-rw-r--r-- | emulators/sdlmess/PLIST | 4 | ||||
-rw-r--r-- | emulators/sdlmess/distinfo | 14 | ||||
-rw-r--r-- | emulators/sdlmess/patches/patch-aa | 21 | ||||
-rw-r--r-- | emulators/sdlmess/patches/patch-ab | 14 | ||||
-rw-r--r-- | emulators/sdlmess/patches/patch-ad | 20 |
6 files changed, 42 insertions, 38 deletions
diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile index 7a6d02687c3..7d6640dcd82 100644 --- a/emulators/sdlmess/Makefile +++ b/emulators/sdlmess/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2009/08/26 20:20:33 sno Exp $ +# $NetBSD: Makefile,v 1.7 2009/12/15 14:17:30 wiz Exp $ # -DISTNAME= sdlmess0133 -PKGNAME= sdlmess-0.133 -PKGREVISION= 1 +DISTNAME= sdlmess0135 +PKGNAME= sdlmess-0.135 COMMENT= Multi Emulator Super System, SDL port diff --git a/emulators/sdlmess/PLIST b/emulators/sdlmess/PLIST index 47c0e6579e4..cb82e1b0d3c 100644 --- a/emulators/sdlmess/PLIST +++ b/emulators/sdlmess/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:07 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/12/15 14:17:30 wiz Exp $ bin/castool bin/imgtool bin/mess @@ -267,6 +267,7 @@ share/doc/mess/sysinfo/x68000.htm share/doc/mess/sysinfo/z88.htm share/doc/mess/sysinfo/zx80.htm share/doc/mess/sysinfo/zx81.htm +share/mess/artwork/4004clk.zip share/mess/artwork/aim65.zip share/mess/artwork/amsterd.zip share/mess/artwork/avigo.zip @@ -282,6 +283,7 @@ share/mess/artwork/hp48gp.zip share/mess/artwork/hp48gx.zip share/mess/artwork/hp48s.zip share/mess/artwork/hp48sx.zip +share/mess/artwork/junior.zip share/mess/artwork/kim1.zip share/mess/artwork/ledoff.png share/mess/artwork/ledon.png diff --git a/emulators/sdlmess/distinfo b/emulators/sdlmess/distinfo index 649dce04b32..db99e9e8a61 100644 --- a/emulators/sdlmess/distinfo +++ b/emulators/sdlmess/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.7 2009/09/01 15:45:44 wiz Exp $ +$NetBSD: distinfo,v 1.8 2009/12/15 14:17:30 wiz Exp $ -SHA1 (sdlmess0133.zip) = dad382e9fc79e1a654e239dadb23b1c06dae685b -RMD160 (sdlmess0133.zip) = bf06910fc4fd9c4295d5722fcdb2cb1a16034edf -Size (sdlmess0133.zip) = 32501988 bytes -SHA1 (patch-aa) = 11e1ae9c7d184d34c90b9f05ecbe8fa2dfd6b181 -SHA1 (patch-ab) = a7471766661974f7f092bede9d37d18a48d8499c +SHA1 (sdlmess0135.zip) = 51a5685fceb2a170243c67f9a2955d22ff0d5705 +RMD160 (sdlmess0135.zip) = f4c0954e51c3f5208722e0daba7df7287faf958e +Size (sdlmess0135.zip) = 33723886 bytes +SHA1 (patch-aa) = 05b17c0478921c0cf31e1581b96fdd5506f0ed98 +SHA1 (patch-ab) = 3cc161845baae6ebcdab42fbd19f74e2ee3d4cb1 SHA1 (patch-ac) = 32503c6dcdeb9a0d082375a11f0e23bac53410db -SHA1 (patch-ad) = b12160915cad1d0a8a0ee784553b1b9f207d069b +SHA1 (patch-ad) = 8d6312b593343eb2e5b29f177376c8fa243d8293 SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38 SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da diff --git a/emulators/sdlmess/patches/patch-aa b/emulators/sdlmess/patches/patch-aa index c401313ecb7..c8aa1265af5 100644 --- a/emulators/sdlmess/patches/patch-aa +++ b/emulators/sdlmess/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2009/08/15 17:24:00 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2009/12/15 14:17:30 wiz Exp $ ---- makefile.orig 2009-06-20 02:00:06.000000000 +0000 +--- makefile.orig 2009-09-17 00:49:53.000000000 +0000 +++ makefile @@ -125,10 +125,10 @@ endif # BIGENDIAN = 1 @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.3 2009/08/15 17:24:00 wiz Exp $ # add -g if we need symbols, and ensure we have frame pointers ifdef SYMBOLS -@@ -331,15 +331,15 @@ CCOMFLAGS += -pg +@@ -331,18 +331,18 @@ CCOMFLAGS += -pg endif # add the optimization flag @@ -63,15 +63,18 @@ $NetBSD: patch-aa,v 1.3 2009/08/15 17:24:00 wiz Exp $ # and make all errors into warnings ifneq ($(OPTIMIZE),0) ifneq ($(TARGETOS),os2) + ifndef IA64 -CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) +#CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) else + endif + else -CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) +#CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) endif endif -@@ -369,7 +369,7 @@ endif +@@ -372,7 +372,7 @@ endif #------------------------------------------------- # add core include paths @@ -80,7 +83,7 @@ $NetBSD: patch-aa,v 1.3 2009/08/15 17:24:00 wiz Exp $ -I$(SRC)/$(TARGET) \ -I$(SRC)/$(TARGET)/includes \ -I$(OBJ)/$(TARGET)/layout \ -@@ -379,7 +379,7 @@ CCOMFLAGS += \ +@@ -382,7 +382,7 @@ CCOMFLAGS += \ -I$(SRC)/lib/util \ -I$(SRC)/osd \ -I$(SRC)/osd/$(OSD) \ @@ -89,7 +92,7 @@ $NetBSD: patch-aa,v 1.3 2009/08/15 17:24:00 wiz Exp $ #------------------------------------------------- -@@ -388,11 +388,11 @@ CCOMFLAGS += \ +@@ -391,11 +391,11 @@ CCOMFLAGS += \ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional # flags only used when linking the core emulator @@ -103,7 +106,7 @@ $NetBSD: patch-aa,v 1.3 2009/08/15 17:24:00 wiz Exp $ endif endif endif -@@ -407,7 +407,7 @@ endif +@@ -410,7 +410,7 @@ endif ifndef SYMBOLS ifndef PROFILE ifneq ($(TARGETOS),macosx) @@ -112,9 +115,9 @@ $NetBSD: patch-aa,v 1.3 2009/08/15 17:24:00 wiz Exp $ endif endif endif -@@ -557,7 +557,7 @@ $(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LI +@@ -561,7 +561,7 @@ $(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LI - $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE) + $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE) @echo Linking $@... - $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ + $(CC) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ diff --git a/emulators/sdlmess/patches/patch-ab b/emulators/sdlmess/patches/patch-ab index 5667586cabf..850b568d867 100644 --- a/emulators/sdlmess/patches/patch-ab +++ b/emulators/sdlmess/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.4 2009/08/15 17:24:00 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2009/12/15 14:17:30 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.4 2009/08/15 17:24:00 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/sdlmess/patches/patch-ad b/emulators/sdlmess/patches/patch-ad index 30c8e63257f..369d1a5516f 100644 --- a/emulators/sdlmess/patches/patch-ad +++ b/emulators/sdlmess/patches/patch-ad @@ -1,17 +1,17 @@ -$NetBSD: patch-ad,v 1.1 2009/09/01 15:45:44 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2009/12/15 14:17:30 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:45:44 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:45:44 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:45:44 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; |