diff options
author | wiz <wiz> | 2016-03-04 12:47:13 +0000 |
---|---|---|
committer | wiz <wiz> | 2016-03-04 12:47:13 +0000 |
commit | 45144457f9b0e387e1f247ea25ebd70a4284769b (patch) | |
tree | 9109c219f0e9602ae5da4038aa8e7c687e24f361 /emulators | |
parent | 1dd02448b387fd1235ef7c50767347e022b77409 (diff) | |
download | pkgsrc-45144457f9b0e387e1f247ea25ebd70a4284769b.tar.gz |
Update mame to 0.171.
0.171
-------
MAMETesters Bugs Fixed
----------------------
- 06137: [Crash/Freeze] (maygay1bsw.c) Many sets in maygay1bsw.cpp: Several games
are crashing while "initializing.." (Osso)
- 06135: [Interface] ROM-less games cannot be started from internal UI
- 02327: [Graphics] (megasys1.c) chimerab: Priorty PROM is missing. (David Haywood)
- 06134: [Misc.] all games with LED outputs: ledutil no longer works (micko)
- 06139: [Color/Palette] (x68k.c) x68k [akumajo]: Some elements turn blue (crazyc)
Source Changes
--------------
-New video chip support : Thomson EF9364 / Sescosem SFF96364 [Jean-Francois DEL NERO]
-Pyon Pyon Jump: [Roberto Fresca]
Create derivative machine driver.
Hooked the V9938 Yamaha VDP.
Added the DIP switches bank #1
Hooked the system input ports.
Added support for Yamaha YM2149.
Decoupled the YM2149 data read.
Correct bankswitching.
Added sound latch & output port.
Version added to the game description.
Proper inputs + DIP switches support.
Second CPU IRQ ack. Promoted to working.
OKI M5205 ADPCM samples support.
-pulsarlb: Added extra bios [Robbbert]
-Modernized sound volume setting code in various Atari drivers [AJR]
-Fixed F3 soft-reset on Arkanoid sets with MCU [Lord Nightmare]
-osdmini: Fixes build issues [Stuart Carnie]
-Replaced osd_lock with std::mutex [Miodrag Milanovic]
-Software list entries can now supply slot option defaults [AJR]
-i8271: Unload head after programmed revolutions [Nigel Barnes]
-apple2: Fix parallel card ACK handling, Print Shop almost works with
the lx810l now. [R. Belmont]
-Nibble driver: Rewrote the whole driver. Added video hardware,
preliminary machine driver and memory map. Decoded the graphics.
[Roberto Fresca]
-Made anonymous timer non-anonymous in arkanoid.cpp, fixes savestates
for the sets using the original Taito MCU code [Lord Nightmare]
-Allow load/saved state slots to be bound to joystick buttons [Victor Vasiliev]
-Dumped "Dead or Alive 2 (Rev A)", match existent set, fix game and EPRROM names
[Smitdogg, The Dumping Union]
-Dumped "King of Fighters XI" EN, match JP one, add notes [Brizzo]
-Substantial improvements to Web Audio sound backend for Emscripten
port. [Grant Galitz]
-disound: Don't crash on state load when the mixer is disabled by lack
of inputs (misconfiguration or missing samples) [O. Galibert]
-Initial import of MEWUI to MAME [Maurizio Petrarota]
-External DATs grouped into a single view. [Maurizio Petrarota]
-New video chip support: Thomson EF9364 / Sescosem SFF96364 [Jean-Francois DEL NERO]
-z80.cpp: Added a debug mechanism for /WAIT pin assertion mechanism
(enable with STALLS_ON_WAIT_ASSERT in CPU core), and hooked it up to
Night Gal driver as a quick example. [Angelo Salese]
-Make octal flag part of address_space/address_space_config [AJR]
-Added unknown NAOMI development(?) board BOOT ROM [coolmod]
-Initial support for BGFX [Ryan Holtz, Dario Manesku, Branimir Karadic, Miodrag Milanovic]
-Significant speed improvements to the BGFX renderer. [Ryan Holtz]
-Added basic JSON-based single-pass shader effect support to BGFX renderer. [Ryan Holtz]
-Added hat trick hero 93 PALs [Alex Cmaylo]
-catnmous: graphical improvements [Vernimark, Vas Crabb]
* Redumped Cat and Mouse colour sprite ROM as the correct size
* Implement sprite ROM banking
* Improve colour palette using resistor values from board photographs
-laserbat: fix inadvertently swapped TMS organ chip clocks (fixes music) [Vas Crabb]
-Make Zaccaria 1B11107 and 1B11142 boards devices and share common parts [Vas Crabb]
-apple1: Completely rewrote the driver in modern idioms. All
functionality should be the same. [R. Belmont]
-Descrambled the ROM on the Xerox NoteTaker, and mapped it in the
correct areas to make it start to boot. [Lord Nightmare]
-Xerox NoteTaker: Corrected CPU Clock speed, and map at least some of RAM
[Lord Nightmare]
-electron: Added cassette softlist and implemented BREAK key [Nigel Barnes]
-Xerox NoteTaker: Corrected RAM amount. Attached the pic8259 interrupt
controller, though no interrupts are attached to that yet. Added
documentation of i/o writes during the boot process. [Lord Nightmare]
-vigilant.cpp: Added video timing PROM. [Pasky, caius]
-Videosnaps patch (additional file to write: gamename.inp.timecode) [Michele Fochi]
Added new options:
* [no]exit_after_playback (default=no)
* [no]record_input (default=no) Added new UI shortcut to save current
timecode (default F12) Translated variable names and comments to
english language
-Sord m5 driver update [Ales Dlabac]
added support for RAM expansions EM-5,64KBI,64KBF,64KRX
added m5p_brno mod Sord m5+1024kB
ramdisk+cp/m 2 cart slots
-Moon Light (Set 2): Fix the program ROM addressing. This fix the
corrupt graphics in the double-Up feature. [Roberto Fresca]
-Moved JANGOU_BLITTER into a device [Angelo Salese]
-NCS8105 ADCX opcode is actually an ADDX, fixes gfx garbage in
nightgal.cpp [Angelo Salese]
-Corrected ROM labels and removed endian-swap during descramble for
notetaker in favor of loading ROMs the other way round. Add ROM
locations. [Lord Nightmare]
-Xerox NoteTaker: Implement ROM/RAM overlay as per schematics.
Documented Address map and part of I/O map. [Lord Nightmare]
-Note that one of the buccaneers proms matches the vigilante video sync
prom [caius, David Haywood]
-Moon Light: Rearranged and split by program. This generated new sets
due to the hidden extra programs in the program ROMs. [Roberto Fresca]
-Xerox NoteTaker: Added the IO Processor firmware v1.50 as an alt bios
after typing it from the assembly source listing on bitsavers. Added
two PROMs as NO_DUMP. Updated comments and history a bit, but needs
further improvement. [Lord Nightmare]
-Updated Xerox NoteTaker documentation and history section, with cited
sources. [Lord Nightmare]
-Cherry Master v1.10: Fixed inputs / DIP switches. [Roberto Fresca]
-Xerox NoteTaker: Finished documenting the I/O CPU's I/O ports, updated
history documentation a bit more [Lord Nightmare]
-Figured out algorithm and replaced SnowBoard Championship lookup
table with proper emulation of device [Samuel Neves & Peter
Wilhelmsen]
-chihiro.c: Redumped "Sega Network Taisen Mahjong MJ 2 (Rev G)" [ANY]
Re-parented set
-mitchell.cpp: Dumped a blockjoy board and noted a rom label difference
[Andrea Palazzetti]
-snotec.xml: Added 3 new cart dumps. [TeamEurope]
-Extended LUA API [Jeffrey Clark]
-Support for the AMPAL18P8 to the jedutil tool. [Kevin Eshbach]
-Improved cross compile support [Jeffrey Clark]
-Hp9845: Added tape driver [F. Ulivi]
-r9751: Add more DMA registers for serial and floppy [Brandon Munger]
-slapstic: One small step toward slapstic modernization [AJR]
* Make chip number part of device configuration, not init param
* Correct mainpcb slapstic number in racedrivpan
* Remove many unused slapstics
-c64_cart.xml, c128_cart.xml: Added some diagnostic carts.
[World of Jani]
-COM5016/COM8116 Baud Generator: Added a bunch more divisor tables and
notes [Lord Nightmare]
-Apollo changes: [Hans Ostermeyer]
* Unified logging format in associated devices
* Use correct raw video modes
-Xerox NoteTaker: Finished IOCPU memory map documentation. Hooked up the two
UARTS. Begin hookup of the screen/CRTC. Fixed an issue with writes to
ROM-mapped areas shadowing to RAM. Added 960KHz xtal for the keyboard UART.
[Lord Nightmare]
-AY-3-1015 UART: Fixed two swapped pin functions. [Lord Nightmare]
-Added multi-language support for MAME [Miodrag Milanovic]
-sq1: Much-improved LCD and front panel button support.
[Parduz, R. Belmont]
-weddingr: better input port descriptions [Vas Crabb]
-Added Chinese Simplified and Chinese Traditional translation [YuiFAN]
-Added German translation [Raf Tacker]
-Added Japanese translation [Fujix]
-Added Italian translation [Angelo Salese,Antonio Paradossi,Fabio Priuli]
-Added Portuguese (Brazil) translation [Ashura-X]
-pacman.cpp, meadwttl.cpp: small fix of game years for Novomatic's Cannon
Ball and Meadows' Meadows 4 in 1, respectively, to synchronize with
history.dat [Antonio Paradossi]
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/mame/Makefile | 15 | ||||
-rw-r--r-- | emulators/mame/PLIST | 7 | ||||
-rw-r--r-- | emulators/mame/distinfo | 16 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h | 12 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_libuv_src_unix_netbsd.c | 14 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake | 33 | ||||
-rw-r--r-- | emulators/mame/patches/patch-3rdparty_luv_src_dns.c | 24 | ||||
-rw-r--r-- | emulators/mame/patches/patch-scripts_src_3rdparty.lua | 20 |
8 files changed, 126 insertions, 15 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index dee346073ee..624d26044b4 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2016/01/27 13:59:19 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2016/03/04 12:47:13 wiz Exp $ -DISTNAME= mame-0.170 +DISTNAME= mame-0.171 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/} GITHUB_TAG= ${DISTNAME:S/-//S/.//} @@ -31,8 +31,15 @@ EXTRACT_USING= bsdtar # 0.141 has too many conversion warnings MAKE_ENV= NOWERROR=1 +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# also needs kvm and I didn't find the right place to add it in the build system +MAKE_ENV+= LDOPTS="-Wl,-R${BUILDLINK_PREFIX.flac}/lib -L${BUILDLINK_PREFIX.flac}/lib -lpthread -lkvm" +.else # mongoose needs libpthread but somehow doesn't link against it MAKE_ENV+= LDOPTS="-Wl,-R${BUILDLINK_PREFIX.flac}/lib -L${BUILDLINK_PREFIX.flac}/lib -lpthread" +.endif # use pkgsrc packages for expat, zlib, jpeg, flac, lua, sqlite3 MAKE_ENV+= USE_SYSTEM_LIB_EXPAT=1 @@ -87,6 +94,10 @@ MAKE_ENV+= BIGENDIAN=1 PYTHON_FOR_BUILD_ONLY= yes PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 0.151 +post-extract: + # will be chosen in preference to /usr/include/signal.h, but does not provide kill() + ${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h + pre-build: # problems with mame-specific png.h ${RM} -f ${WRKDIR}/.buildlink/include/png* diff --git a/emulators/mame/PLIST b/emulators/mame/PLIST index 30ec626a36a..c07c32c0385 100644 --- a/emulators/mame/PLIST +++ b/emulators/mame/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2016/01/27 13:59:19 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2016/03/04 12:47:13 wiz Exp $ bin/castool bin/chdman bin/floptool @@ -30,6 +30,7 @@ man/man6/mame.6 man/man6/mess.6 share/doc/mame/SDL.txt share/doc/mame/config.txt +share/doc/mame/emscripten.txt share/doc/mame/floppy.txt share/doc/mame/hlsl.txt share/doc/mame/imgtool.txt @@ -163,6 +164,7 @@ share/mame/hash/dps1.xml share/mame/hash/ec1841.xml share/mame/hash/einstein.xml share/mame/hash/electron_cart.xml +share/mame/hash/electron_cass.xml share/mame/hash/ep64_cart.xml share/mame/hash/ep64_cass.xml share/mame/hash/ep64_flop.xml @@ -170,6 +172,7 @@ share/mame/hash/epson_cpm.xml share/mame/hash/exl100.xml share/mame/hash/famicom_cass.xml share/mame/hash/famicom_flop.xml +share/mame/hash/fidel_scc.xml share/mame/hash/fm77av.xml share/mame/hash/fm7_cass.xml share/mame/hash/fm7_disk.xml @@ -220,6 +223,7 @@ share/mame/hash/iq151_flop.xml share/mame/hash/jaguar.xml share/mame/hash/juicebox.xml share/mame/hash/jupace_cass.xml +share/mame/hash/k28m2.xml share/mame/hash/kayproii.xml share/mame/hash/kc_cart.xml share/mame/hash/kc_cass.xml @@ -234,6 +238,7 @@ share/mame/hash/lynx.xml share/mame/hash/m20.xml share/mame/hash/m5_cart.xml share/mame/hash/m5_cass.xml +share/mame/hash/m5_flop.xml share/mame/hash/mac_flop.xml share/mame/hash/mac_hdd.xml share/mame/hash/mbc200.xml diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index 0169fa4b92e..27e98bd7e69 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,8 +1,12 @@ -$NetBSD: distinfo,v 1.47 2016/01/27 13:59:19 wiz Exp $ +$NetBSD: distinfo,v 1.48 2016/03/04 12:47:13 wiz Exp $ -SHA1 (mame-0.170.tar.gz) = 6546ba65ae1dc3599f5ad681077027453efabb45 -RMD160 (mame-0.170.tar.gz) = 2f475cef97e9460dd89671a5b91d467a6411bbd3 -SHA512 (mame-0.170.tar.gz) = 1e43215c4e363afe552a1dfbd1dea8dd8fea337329b6a1e280923fee1063a9ef1a39f9a86adcf3170623a32aa98be9a2b87a3aa570e3203a4671c99ffee034dc -Size (mame-0.170.tar.gz) = 91312016 bytes +SHA1 (mame-0.171.tar.gz) = 53a6c72b2b8c11e72e622c14cb4d2ec710c1dbd5 +RMD160 (mame-0.171.tar.gz) = 7f0468d0240f3dd7f927eb135925d7ad78a66464 +SHA512 (mame-0.171.tar.gz) = 0d15261d6eea983258f6d747f63f159fcba440f0b7f098e5bebd7cefa5cef1e0189e41858df40bbfd0c2e4cb8820a967e7c291632d817fa5d5d29489c51553da +Size (mame-0.171.tar.gz) = 98456350 bytes SHA1 (patch-3rdparty_bgfx_examples_common_font_font__manager.cpp) = e39b2dff553505531adb5f0a31b0a22306b8e2e4 -SHA1 (patch-3rdparty_bx_include_bx_thread.h) = d67bebfd2a9c75e5631185ee932bc5fea3208fe1 +SHA1 (patch-3rdparty_bx_include_bx_thread.h) = 779c8b750a3ae5d50d12c6430678ada64a4b82ed +SHA1 (patch-3rdparty_libuv_src_unix_netbsd.c) = 63d2378c19cbbcb71d7540e088c3bdf5940f4dc6 +SHA1 (patch-3rdparty_luv_deps_uv.cmake) = 619cebcb8013139d765c2dfe2bcf7b5b86f50681 +SHA1 (patch-3rdparty_luv_src_dns.c) = 44d480e34971362ee696191c267dbac08005ec0f +SHA1 (patch-scripts_src_3rdparty.lua) = 306917af65da601667ffc9ffaf7b8092a2d03ef7 diff --git a/emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h b/emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h index 343845b72ff..46e673246a9 100644 --- a/emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h +++ b/emulators/mame/patches/patch-3rdparty_bx_include_bx_thread.h @@ -1,13 +1,13 @@ -$NetBSD: patch-3rdparty_bx_include_bx_thread.h,v 1.1 2016/01/27 13:59:19 wiz Exp $ +$NetBSD: patch-3rdparty_bx_include_bx_thread.h,v 1.2 2016/03/04 12:47:13 wiz Exp $ Adapt to calling convention on NetBSD. ---- 3rdparty/bx/include/bx/thread.h.orig 2016-01-27 07:12:00.000000000 +0000 +--- 3rdparty/bx/include/bx/thread.h.orig 2016-02-24 07:02:17.000000000 +0000 +++ 3rdparty/bx/include/bx/thread.h -@@ -150,7 +150,11 @@ namespace bx - #if BX_PLATFORM_OSX || BX_PLATFORM_IOS - pthread_setname_np(_name); - #elif (BX_PLATFORM_LINUX && defined(__GLIBC__)) || BX_PLATFORM_BSD +@@ -159,7 +159,11 @@ namespace bx + prctl(PR_SET_NAME,_name, 0, 0, 0); + # endif // defined(__GLIBC__) ... + #elif BX_PLATFORM_BSD +#ifdef __NetBSD__ + pthread_setname_np(m_handle, "%s", (void *)_name); +#else diff --git a/emulators/mame/patches/patch-3rdparty_libuv_src_unix_netbsd.c b/emulators/mame/patches/patch-3rdparty_libuv_src_unix_netbsd.c new file mode 100644 index 00000000000..b22ebb1242d --- /dev/null +++ b/emulators/mame/patches/patch-3rdparty_libuv_src_unix_netbsd.c @@ -0,0 +1,14 @@ +$NetBSD: patch-3rdparty_libuv_src_unix_netbsd.c,v 1.1 2016/03/04 12:47:13 wiz Exp $ + +--- 3rdparty/libuv/src/unix/netbsd.c.orig 2016-02-24 07:02:17.000000000 +0000 ++++ 3rdparty/libuv/src/unix/netbsd.c +@@ -18,6 +18,9 @@ + * IN THE SOFTWARE. + */ + ++/* needs kernel internal types */ ++#define _KMEMUSER 1 ++ + #include "uv.h" + #include "internal.h" + diff --git a/emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake b/emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake new file mode 100644 index 00000000000..1028cb3fbb0 --- /dev/null +++ b/emulators/mame/patches/patch-3rdparty_luv_deps_uv.cmake @@ -0,0 +1,33 @@ +$NetBSD: patch-3rdparty_luv_deps_uv.cmake,v 1.1 2016/03/04 12:47:13 wiz Exp $ + +--- 3rdparty/luv/deps/uv.cmake.orig 2016-02-24 07:02:17.000000000 +0000 ++++ 3rdparty/luv/deps/uv.cmake +@@ -138,6 +138,14 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeB + ) + endif() + ++## NetBSD ++if("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD") ++ set(SOURCES ${SOURCES} ++ ${LIBUVDIR}/src/unix/kqueue.c ++ ${LIBUVDIR}/src/unix/freebsd.c ++ ) ++endif() ++ + ## Linux + if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") + add_definitions( +@@ -187,6 +195,13 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeB + ) + endif() + ++if("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD") ++ target_link_libraries(uv ++ pthread ++ kvm ++ ) ++endif() ++ + if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") + target_link_libraries(uv + pthread diff --git a/emulators/mame/patches/patch-3rdparty_luv_src_dns.c b/emulators/mame/patches/patch-3rdparty_luv_src_dns.c new file mode 100644 index 00000000000..82e8d172eef --- /dev/null +++ b/emulators/mame/patches/patch-3rdparty_luv_src_dns.c @@ -0,0 +1,24 @@ +$NetBSD: patch-3rdparty_luv_src_dns.c,v 1.1 2016/03/04 12:47:13 wiz Exp $ + +Only use existing defines. + +--- 3rdparty/luv/src/dns.c.orig 2016-02-24 07:02:17.000000000 +0000 ++++ 3rdparty/luv/src/dns.c +@@ -150,13 +150,17 @@ static int luv_getaddrinfo(lua_State* L) + if (lua_toboolean(L, -1)) hints->ai_flags |= AI_ADDRCONFIG; + lua_pop(L, 1); + ++#if defined(AI_V4MAPPED) + lua_getfield(L, 3, "v4mapped"); + if (lua_toboolean(L, -1)) hints->ai_flags |= AI_V4MAPPED; + lua_pop(L, 1); ++#endif + ++#if defined(AI_ALL) + lua_getfield(L, 3, "all"); + if (lua_toboolean(L, -1)) hints->ai_flags |= AI_ALL; + lua_pop(L, 1); ++#endif + + lua_getfield(L, 3, "numerichost"); + if (lua_toboolean(L, -1)) hints->ai_flags |= AI_NUMERICHOST; diff --git a/emulators/mame/patches/patch-scripts_src_3rdparty.lua b/emulators/mame/patches/patch-scripts_src_3rdparty.lua new file mode 100644 index 00000000000..938ecb40438 --- /dev/null +++ b/emulators/mame/patches/patch-scripts_src_3rdparty.lua @@ -0,0 +1,20 @@ +$NetBSD: patch-scripts_src_3rdparty.lua,v 1.3 2016/03/04 12:47:13 wiz Exp $ + +--- scripts/src/3rdparty.lua.orig 2016-02-24 07:02:17.000000000 +0000 ++++ scripts/src/3rdparty.lua +@@ -1153,6 +1153,15 @@ project "uv" + MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", + } + end ++ if _OPTIONS["targetos"]=="netbsd" then ++ files { ++ MAME_DIR .. "3rdparty/libuv/src/unix/netbsd.c", ++ MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", ++ } ++ links { ++ "kvm", ++ } ++ end + + if (_OPTIONS["SHADOW_CHECK"]=="1") then + removebuildoptions { |