CVS commit: pkgsrc/emulators/mame

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Mar 31 20:39:45 UTC 2023

Modified Files:
        pkgsrc/emulators/mame: Makefile PLIST distinfo
Added Files:
        pkgsrc/emulators/mame/patches: patch-scripts_toolchain.lua

Log Message:
mame: update to 0.253.

It’s time for MAME 0.253, but before we start talking about all
the exciting updates, there are a couple of things that will affect
people compiling or packaging MAME. Firstly, libc++ 6 is no longer
supported. You can still compile with clang 6, but you’ll need to
use libc++ 7 or later, or GNU libstdc++ 7 or later, for the C++
standard library. Secondly, MAME now requires Lua compiled as C++
to work correctly. This prevents the use of Lua libraries from
Linux distribution package repositories, as they are compiled as
C. (The technical reason for this change is that MAME requires C++
stack frames to be unwound correctly, including destructor calls,
when Lua errors are raised from C++ code. Using Lua compiled as C
will cause resource leaks.)

We’ve updated to Lua 5.4, which comes with an all-new garbage
collector, giving better performance. This should have minimal
impact on people writing scripts and plugins. Two of the biggest
visible changes are that unpack has been replaced with table.unpack
and the deprecated bitlib has been removed. While we’re talking
about Lua, we’d like to draw your attention to the new MAME Goodies
repository, where we’ll be adding additional content for use with
MAME. So far, there are two plugins. One of them is sure to be
useful for fans of Konami’s arcade rhythm games. They also serve
as example code for people looking to learn about some of the things
you can do with MAME’s Lua scripting capabilities.

The long-rumoured microcode-based Motorola 68000 CPU core is finally
here! It’s already delivering results, with a number of previously
out-of-reach Atari ST demos now running. We’ve done some intensive
testing, but there are probably still regressions lurking. Let us
know if one of your favourite 68k-based games flakes out on you.

One of the more interesting systems to be dumped and emulated this
month is Akazukin, a 1983 arcade game where you shoot wolves preying
on a defenceless girl. There’s also a game bearing the rather
generic title Heroes, an early version of Data East’s Mutant Fighter.
We’ve added a few more electronic toys to play with, including Race
Time from Bandai, Punch Your Lights Out from Tiger, and a trio of
backgammon and chess games from Tryom. If you’re in a more serious
mood, the Brother LW-30 and LW-840ic dedicated word processors are
now supported. The Sony NWS-3410 UNIX workstation is now working
(albeit without its frame buffer, so you’ll need to use a serial
terminal), as is the ironically named Vector 4 S-100 bus computer
(Vector Graphic never sold a system with vector graphics capabilities).

Building on the work in last month’s release, Hyper Neo Geo 64
games are looking better than ever. Numerous texturing and tilemap
issues have been resolved. Taito F3 video emulation has had several
effects fixed, with Land Maker in particular looking noticeably
better. Switching from video to sound, the KC 85 computer family
now has working audio output, some issues with looping and retriggered
samples on the Apple IIgs have been fixed, and fixes for PC Engine
CD audio playback issues have made some games go from crashing to
playable. More subtly, correcting audio chip clock frequencies has
fixed the pitch of sounds for several systems, including Snow Bros.
2 and Noboranka.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 pkgsrc/emulators/mame/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/emulators/mame/PLIST
cvs rdiff -u -r1.129 -r1.130 pkgsrc/emulators/mame/distinfo
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/emulators/mame/patches/patch-scripts_toolchain.lua

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/mame/Makefile
diff -u pkgsrc/emulators/mame/Makefile:1.165 pkgsrc/emulators/mame/Makefile:1.166
--- pkgsrc/emulators/mame/Makefile:1.165        Wed Feb 22 11:15:21 2023
+++ pkgsrc/emulators/mame/Makefile      Fri Mar 31 20:39:45 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.165 2023/02/22 11:15:21 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2023/03/31 20:39:45 wiz Exp $
 
-DISTNAME=      mame-0.252
+DISTNAME=      mame-0.253
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mamedev/}
 GITHUB_TAG=    ${DISTNAME:S/-//S/.//}
@@ -21,10 +21,9 @@ BUILD_DEPENDS+=              ${PYPKGPREFIX}-expat-[0
 
 USE_LANGUAGES=         c99 c++
 GCC_REQD+=             7
-USE_TOOLS+=            bsdtar gmake pkg-config
+USE_TOOLS+=            gmake pkg-config
 UNLIMIT_RESOURCES+=    datasize virtualsize
 MAKE_FILE=             makefile
-EXTRACT_USING=         bsdtar
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -48,6 +47,9 @@ MAKE_ENV+=    NOWERROR=1
 # on Darwin, avoid SDL2.framework
 MAKE_ENV+=     USE_LIBSDL=1
 
+# for c++ to get LLONG_MAX for luaconf.h
+CPPFLAGS.NetBSD+=      -D_NETBSD_SOURCE
+
 # use pkgsrc libraries
 # boost-header's asio.hpp is not compatible as of mame-0.251/boost 1.81.0
 #MAKE_ENV+=    USE_SYSTEM_LIB_ASIO=1
@@ -55,7 +57,6 @@ MAKE_ENV+=    USE_SYSTEM_LIB_EXPAT=1
 MAKE_ENV+=     USE_SYSTEM_LIB_ZLIB=1
 MAKE_ENV+=     USE_SYSTEM_LIB_JPEG=1
 MAKE_ENV+=     USE_SYSTEM_LIB_FLAC=1
-MAKE_ENV+=     USE_SYSTEM_LIB_LUA=1
 # use audio from SDL
 #MAKE_ENV+=    USE_SYSTEM_LIB_PORTAUDIO=1
 # no portmidi package exists yet
@@ -79,7 +80,6 @@ MAKE_ENV+=    TOOLS=1
 MAKE_ENV+=     BIGENDIAN=1
 .endif
 
-LUA_VERSIONS_ACCEPTED=         53
 PYTHON_FOR_BUILD_ONLY=         yes
 
 post-extract:
@@ -118,7 +118,6 @@ do-install:
 .include "../../graphics/glm/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/pugixml/buildlink3.mk"

Index: pkgsrc/emulators/mame/PLIST
diff -u pkgsrc/emulators/mame/PLIST:1.74 pkgsrc/emulators/mame/PLIST:1.75
--- pkgsrc/emulators/mame/PLIST:1.74    Wed Feb 22 11:15:21 2023
+++ pkgsrc/emulators/mame/PLIST Fri Mar 31 20:39:45 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.74 2023/02/22 11:15:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.75 2023/03/31 20:39:45 wiz Exp $
 bin/castool
 bin/chdman
 bin/floptool
@@ -205,8 +205,7 @@ share/mame/hash/coleco.xml
 share/mame/hash/compclr2_flop.xml
 share/mame/hash/compis.xml
 share/mame/hash/comx35_flop.xml
-share/mame/hash/conchess_plymate.xml
-share/mame/hash/conchess_standard.xml
+share/mame/hash/conchess.xml
 share/mame/hash/copera.xml
 share/mame/hash/cpc_cass.xml
 share/mame/hash/cpc_flop.xml
@@ -446,6 +445,7 @@ share/mame/hash/msx2_cass.xml
 share/mame/hash/msx2_flop.xml
 share/mame/hash/msx2p_flop.xml
 share/mame/hash/msx_softcard.xml
+share/mame/hash/msx_yamaha_minicart.xml
 share/mame/hash/msxr_flop.xml
 share/mame/hash/mt65_cass.xml
 share/mame/hash/mt65_rom.xml
@@ -488,6 +488,7 @@ share/mame/hash/nuon.xml
 share/mame/hash/octopus.xml
 share/mame/hash/ondra.xml
 share/mame/hash/orao.xml
+share/mame/hash/oric1_cass.xml
 share/mame/hash/orion_cart.xml
 share/mame/hash/orion_cass.xml
 share/mame/hash/orion_flop.xml
@@ -525,6 +526,7 @@ share/mame/hash/pcfx.xml
 share/mame/hash/pcw.xml
 share/mame/hash/pcw16.xml
 share/mame/hash/pcx_flop.xml
+share/mame/hash/pda600.xml
 share/mame/hash/pdp1_ptp.xml
 share/mame/hash/pecom_cass.xml
 share/mame/hash/pegasus_cart.xml
@@ -563,6 +565,7 @@ share/mame/hash/prof80.xml
 share/mame/hash/psi98.xml
 share/mame/hash/psion1.xml
 share/mame/hash/psion2.xml
+share/mame/hash/psion_ssd.xml
 share/mame/hash/psx.xml
 share/mame/hash/pt68k2.xml
 share/mame/hash/pv1000.xml

Index: pkgsrc/emulators/mame/distinfo
diff -u pkgsrc/emulators/mame/distinfo:1.129 pkgsrc/emulators/mame/distinfo:1.130
--- pkgsrc/emulators/mame/distinfo:1.129        Mon Feb 27 11:23:22 2023
+++ pkgsrc/emulators/mame/distinfo      Fri Mar 31 20:39:45 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.129 2023/02/27 11:23:22 wiz Exp $
+$NetBSD: distinfo,v 1.130 2023/03/31 20:39:45 wiz Exp $
 
-BLAKE2s (mame-0.252.tar.gz) = 522719e67c6ef14c09473ec63f099f4ba65198026a359c501af192449838be29
-SHA512 (mame-0.252.tar.gz) = 7f40141b851a9d6ede93d38e9ef0c9208fc635fe919f33cd879aaba4d0597f5c689cdf4cf48b2db328b9f17425f4bbde11a2cd175150a412cae583ef06bb2cd9
-Size (mame-0.252.tar.gz) = 206258807 bytes
+BLAKE2s (mame-0.253.tar.gz) = a3775d177193d3584e297f162e8b67251203505380548aa1a472ad3d2517cc06
+SHA512 (mame-0.253.tar.gz) = 0cd9a95ef7e79a3d870ad7dc8d4d857e7001e067d10449c94f1ed4e83eb9e930343d4f2fa2a33ce3fd980f8202ffcac2a776c333b8db337120958da8eaeb5dc7
+Size (mame-0.253.tar.gz) = 203177249 bytes
 SHA1 (patch-3rdparty_bx_src_thread.cpp) = 91d7aa74dbe5e8e73594580ce0c16846f4a0d7b1
 SHA1 (patch-3rdparty_genie_build_gmake.darwin_genie.make) = bb2e8c06d4b5f5869fb48e06390d5ca94a190056
 SHA1 (patch-makefile) = 343fac4d165438a26e2e8077216db1c6c46a5d1e
+SHA1 (patch-scripts_toolchain.lua) = df383dab4787f58348d62e1c5f25ddaa45eb8199

Added files:

Index: pkgsrc/emulators/mame/patches/patch-scripts_toolchain.lua
diff -u /dev/null pkgsrc/emulators/mame/patches/patch-scripts_toolchain.lua:1.6
--- /dev/null   Fri Mar 31 20:39:45 2023
+++ pkgsrc/emulators/mame/patches/patch-scripts_toolchain.lua   Fri Mar 31 20:39:45 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-scripts_toolchain.lua,v 1.6 2023/03/31 20:39:45 wiz Exp $
+
+Not for upstream.
+android toolchain value is not used in pkgsrc so this is good enough for now.
+https://github.com/mamedev/mame/issues/11049
+
+--- scripts/toolchain.lua.orig 2023-03-29 14:05:56.000000000 +0000
++++ scripts/toolchain.lua
+@@ -60,7 +60,8 @@ function androidToolchainRoot()
+               local hostTags = {
+                       windows = "windows-x86_64",
+                       linux   = "linux-x86_64",
+-                      macosx  = "darwin-x86_64"
++                      macosx  = "darwin-x86_64",
++                      bsd  = "netbsd-x86_64"
+               }
+               android.toolchainRoot = (os.getenv("ANDROID_NDK_HOME") or "") .. "/toolchains/llvm/prebuilt/" .. hostTags[os.get()]
+       end