diff options
Diffstat (limited to 'emulators/mame')
-rw-r--r-- | emulators/mame/Makefile | 33 | ||||
-rw-r--r-- | emulators/mame/distinfo | 6 | ||||
-rw-r--r-- | emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.c | 6 | ||||
-rw-r--r-- | emulators/mame/files/patch-3rdparty_lzma_C_Sha256Opt.c | 4 | ||||
-rw-r--r-- | emulators/mame/files/patch-makefile | 10 | ||||
-rw-r--r-- | emulators/mame/files/patch-scripts_genie.lua | 34 | ||||
-rw-r--r-- | emulators/mame/files/patch-scripts_src_main.lua | 4 | ||||
-rw-r--r-- | emulators/mame/files/patch-scripts_src_osd_modules.lua | 26 | ||||
-rw-r--r-- | emulators/mame/pkg-plist | 17 |
9 files changed, 56 insertions, 84 deletions
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index c4cda0872bf7..201d86d0034c 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,12 +1,8 @@ PORTNAME= mame -DISTVERSION= 0.277 -PORTREVISION= 2 +DISTVERSION= 0.281 CATEGORIES= emulators games -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= b4e1f5f1b50fd3402232dd0385cac021ba488db6.patch:-p1 # Only link asmjit if native DRCs are built. - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= laurent.chardon@gmail.com COMMENT= MAME: a multi-purpose emulation framework WWW= https://mamedev.org/ @@ -25,7 +21,8 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= not yet ported to any architecture other than armv7, arm64, x86, and powerpc* BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-svg2pdfconverter>0:textproc/py-sphinxcontrib-svg2pdfconverter@${PY_FLAVOR} \ - asio>0:net/asio \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + asio130>0:net/asio130 \ genie:devel/genie \ glm>0:math/glm \ rapidjson>0:devel/rapidjson @@ -35,8 +32,8 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libutf8proc.so:textproc/utf8proc \ libzstd.so:archivers/zstd -USES= compiler:c++17-lang gmake jpeg llvm:min=16 localbase pkgconfig \ - python:build sdl shebangfix sqlite:3 xorg +USES= compiler:c++17-lang gmake jpeg llvm:min=16 localbase \ + pkgconfig python:build sdl sqlite:3 xorg USE_GITHUB= yes GH_ACCOUNT= mamedev @@ -82,6 +79,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= MAME +OPTIONS_DEFAULT+= ${ARCH:Mamd64:C/.+/SSE2/} OPTIONS_GROUP= EMULATORS EXTRATOOLS HARDWARE OPTIONS_GROUP_EMULATORS= MAME MAMENL MAMEVIRTUAL NLS QTDEBUGGER OPTIONS_GROUP_EXTRATOOLS= TOOLS @@ -89,9 +87,7 @@ OPTIONS_GROUP_HARDWARE= OPENMP SSE2 OPTIONS_RADIO= BUILDTYPE OPTIONS_RADIO_BUILDTYPE= DEBUG SIZE_OPTIMIZED_CFLAGS \ SPEED_OPTIMIZED_CFLAGS -.if !exists(/usr/include/omp.h) -OPTIONS_EXCLUDE= OPENMP -.endif +OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:C/.+/SSE2/} OPTIONS_SUB= yes BUILDTYPE_DESC= Application production type @@ -139,6 +135,7 @@ MAME_MAKE_ENV= ${_EMULATORS_MAKE_ENV} MAME_PLIST_SUB= MAMEDATA="" MAME_PLIST_SUB_OFF= MAMEDATA="@comment " NLS_USES= gettext-runtime +OPENMP_USES= compiler:openmp OPENMP_MAKE_ENV= OPENMP=1 OPENMP_MAKE_ENV_OFF= OPENMP=0 QTDEBUGGER_USES= qt:6 @@ -192,25 +189,25 @@ _TOOLS_MANUALS= -name *.1 -depth 1 -type f -and -not -type d -and -not \ .include <bsd.port.options.mk> .if ${ARCH:Maarch64} || ${ARCH:Mamd64} || ${ARCH:Mpowerpc64*} -MAKE_ENV+= PTR64=1 +MAKE_ENV+= PTR64=1 .endif .if ${ARCH} == aarch64 || ${ARCH} == armv7 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3rdparty_lzma_C_AesOpt.c +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3rdparty_lzma_C_AesOpt.c .endif # Compiling with -pg (PROFILE) causes the linker to run out of memory on i386, # build with less profiling data: .if ${ARCH:Mi386} -DEBUG_MAKE_ENV= PROFILER=1 +DEBUG_MAKE_ENV= PROFILER=1 .else -DEBUG_MAKE_ENV= PROFILE=1 +DEBUG_MAKE_ENV= PROFILE=1 .endif .if empty(PORT_OPTIONS:MMAME) && empty(PORT_OPTIONS:MMAMENL) && \ empty(PORT_OPTIONS:MMAMEVIRTUAL) -MAKE_ENV+= EMULATOR=0 -PLIST_SUB+= MAMEDATA="@comment " +MAKE_ENV+= EMULATOR=0 +PLIST_SUB+= MAMEDATA="@comment " .endif post-extract: diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index 7a33b39a0b9d..0f735deaf410 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1748505208 -SHA256 (mamedev-mame-0.277-mame0277_GH0.tar.gz) = 60055b19fc96306927257c5ffc265ecebcbe5c944cf98113d4d78f6304556c67 -SIZE (mamedev-mame-0.277-mame0277_GH0.tar.gz) = 209399226 +TIMESTAMP = 1759055187 +SHA256 (mamedev-mame-0.281-mame0281_GH0.tar.gz) = 8d648b43b0072b3efabc30290c1767a3c22a46ca3c4111a2f456b9f5d2a08319 +SIZE (mamedev-mame-0.281-mame0281_GH0.tar.gz) = 210289013 SHA256 (b4e1f5f1b50fd3402232dd0385cac021ba488db6.patch) = 431ce0bf9dff15632f8ed176b6ea8245c74089439f1af766a26ea4a140db1f92 SIZE (b4e1f5f1b50fd3402232dd0385cac021ba488db6.patch) = 2652 diff --git a/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.c b/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.c index 0845a73832cb..96e75eb9da56 100644 --- a/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.c +++ b/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.c @@ -1,6 +1,6 @@ ---- 3rdparty/lzma/C/CpuArch.c.orig 2023-05-30 17:50:57 UTC +--- 3rdparty/lzma/C/CpuArch.c.orig 2025-09-24 14:56:11 UTC +++ 3rdparty/lzma/C/CpuArch.c -@@ -417,6 +417,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP +@@ -762,6 +762,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP #include <sys/auxv.h> @@ -32,7 +32,7 @@ #define USE_HWCAP #ifdef USE_HWCAP -@@ -450,6 +475,7 @@ MY_HWCAP_CHECK_FUNC (SHA1) +@@ -795,6 +820,7 @@ MY_HWCAP_CHECK_FUNC (AES) MY_HWCAP_CHECK_FUNC (SHA2) MY_HWCAP_CHECK_FUNC (AES) diff --git a/emulators/mame/files/patch-3rdparty_lzma_C_Sha256Opt.c b/emulators/mame/files/patch-3rdparty_lzma_C_Sha256Opt.c index 525d4f9e96e0..eeafd8402ec6 100644 --- a/emulators/mame/files/patch-3rdparty_lzma_C_Sha256Opt.c +++ b/emulators/mame/files/patch-3rdparty_lzma_C_Sha256Opt.c @@ -1,6 +1,6 @@ ---- 3rdparty/lzma/C/Sha256Opt.c.orig 2023-05-30 17:50:57 UTC +--- 3rdparty/lzma/C/Sha256Opt.c.orig 2025-09-24 14:56:11 UTC +++ 3rdparty/lzma/C/Sha256Opt.c -@@ -212,7 +212,7 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[ +@@ -202,7 +202,7 @@ void Z7_FASTCALL Sha256_UpdateBlocks_HW(UInt32 state[8 #endif // USE_HW_SHA diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile index 5c87b1f66af7..53f4858b0d29 100644 --- a/emulators/mame/files/patch-makefile +++ b/emulators/mame/files/patch-makefile @@ -1,9 +1,9 @@ Remove redefinitions of toolchain, and hardcoded optimisations. Replace GENie build target with devel/genie binary. Add Clang ARM64 support. ---- makefile.orig 2023-10-23 15:53:41 UTC +--- makefile.orig 2025-09-24 14:56:11 UTC +++ makefile -@@ -448,9 +448,9 @@ ifneq ($(TARGETOS),asmjs) +@@ -430,9 +430,9 @@ ifneq ($(TARGETOS),asmjs) endif ifneq ($(TARGETOS),asmjs) @@ -16,7 +16,7 @@ endif #------------------------------------------------- -@@ -620,11 +620,6 @@ endif +@@ -578,11 +578,6 @@ endif SYMBOLS = 1 endif @@ -28,7 +28,7 @@ # set the symbols level ifdef SYMBOLS PARAMS += --SYMBOLS='$(SYMBOLS)' -@@ -1078,7 +1073,7 @@ endif +@@ -1042,7 +1037,7 @@ endif NEW_GIT_VERSION := unknown endif @@ -37,7 +37,7 @@ ifeq ($(TARGET),$(SUBTARGET_FULL)) FULLTARGET := $(TARGET) -@@ -1412,6 +1407,11 @@ $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: make +@@ -1376,6 +1371,11 @@ $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: make $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE) $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE) diff --git a/emulators/mame/files/patch-scripts_genie.lua b/emulators/mame/files/patch-scripts_genie.lua deleted file mode 100644 index 857219cdad87..000000000000 --- a/emulators/mame/files/patch-scripts_genie.lua +++ /dev/null @@ -1,34 +0,0 @@ - Reduce noise from build logs, and remove duplicate use of - -fno-strict-aliasing. Move a hard coded linktime optimisation to be covered by - the same OPTIMIZE conditional used elsewhere. - ---- scripts/genie.lua.orig 2023-11-15 01:11:29 UTC -+++ scripts/genie.lua -@@ -804,7 +804,6 @@ if _OPTIONS["OPTIMIZE"] then - if _OPTIONS["OPTIMIZE"] then - buildoptions { - "-O".. _OPTIONS["OPTIMIZE"], -- "-fno-strict-aliasing" - } - if _OPTIONS["OPT_FLAGS"] then - buildoptions { -@@ -1168,7 +1167,6 @@ configuration { "asmjs" } - } - linkoptions { - "-Wl,--start-group", -- "-O" .. _OPTIONS["OPTIMIZE"], - "-s USE_SDL=2", - "-s USE_SDL_TTF=2", - "--memory-init-file 0", -@@ -1187,6 +1185,11 @@ configuration { "asmjs" } - "--embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/bgfx@artwork/bgfx", - "--embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png", - } -+ if _OPTIONS["OPTIMIZE"] then -+ linkoptions { -+ "-O".. _OPTIONS["OPTIMIZE"], -+ } -+ end - if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then - linkoptions { - "-g" .. _OPTIONS["SYMLEVEL"], diff --git a/emulators/mame/files/patch-scripts_src_main.lua b/emulators/mame/files/patch-scripts_src_main.lua index 391ffc7f10fb..0bb6d887d409 100644 --- a/emulators/mame/files/patch-scripts_src_main.lua +++ b/emulators/mame/files/patch-scripts_src_main.lua @@ -1,8 +1,8 @@ Remove suffixes from mame binary for debug/profile builds. ---- scripts/src/main.lua.orig 2023-11-14 03:17:20 UTC +--- scripts/src/main.lua.orig 2025-09-24 14:56:11 UTC +++ scripts/src/main.lua -@@ -58,13 +58,13 @@ end +@@ -71,13 +71,13 @@ end configuration { "Release" } targetsuffix "" if _OPTIONS["PROFILE"] then diff --git a/emulators/mame/files/patch-scripts_src_osd_modules.lua b/emulators/mame/files/patch-scripts_src_osd_modules.lua index 2d5699969a93..c752c9d1668b 100644 --- a/emulators/mame/files/patch-scripts_src_osd_modules.lua +++ b/emulators/mame/files/patch-scripts_src_osd_modules.lua @@ -1,26 +1,26 @@ Enable the build to find Qt-6. ---- scripts/src/osd/modules.lua.orig 2023-10-23 15:53:41 UTC +--- scripts/src/osd/modules.lua.orig 2025-09-24 14:56:11 UTC +++ scripts/src/osd/modules.lua -@@ -378,7 +378,7 @@ function qtdebuggerbuild() +@@ -405,7 +405,7 @@ function qtdebuggerbuild() MOC = "moc" else if _OPTIONS["QT_HOME"]~=nil then -- MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null") -+ MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/libexec/qt6/moc --version 2>/dev/null") - if (MOCTST=='') then - MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/libexec/moc --version 2>/dev/null") - if (MOCTST=='') then -@@ -388,7 +388,7 @@ function qtdebuggerbuild() - MOC = _OPTIONS["QT_HOME"] .. "/libexec/moc" +- local MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null") ++ local MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/libexec/qt6/moc --version 2>/dev/null") + if MOCTST=='' then + local qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS") + if not string.starts(qt_host_libexecs,"/") then +@@ -419,7 +419,7 @@ function qtdebuggerbuild() + MOC = qt_host_libexecs .. "/moc" end else - MOC = _OPTIONS["QT_HOME"] .. "/bin/moc" + MOC = _OPTIONS["QT_HOME"] .. "/libexec/qt6/moc" end else - MOCTST = backtick("which moc-qt5 2>/dev/null") -@@ -430,7 +430,7 @@ function qtdebuggerbuild() + local MOCTST = backtick("which moc-qt5 2>/dev/null") +@@ -461,7 +461,7 @@ function qtdebuggerbuild() else if _OPTIONS["QT_HOME"]~=nil then buildoptions { @@ -29,8 +29,8 @@ } else buildoptions { -@@ -500,9 +500,9 @@ function osdmodulestargetconf() - } +@@ -540,9 +540,9 @@ function osdmodulestargetconf() + end else if _OPTIONS["QT_HOME"]~=nil then - local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_VERSION")) diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist index 7236f88f8a3e..5ab30d4a8657 100644 --- a/emulators/mame/pkg-plist +++ b/emulators/mame/pkg-plist @@ -879,6 +879,7 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/b2m.xml %%MAMEDATA%%%%DATADIR%%/hash/basf7100.xml %%MAMEDATA%%%%DATADIR%%/hash/bbc_cass.xml +%%MAMEDATA%%%%DATADIR%%/hash/bbc_vsm.xml %%MAMEDATA%%%%DATADIR%%/hash/bbc_flop_32016.xml %%MAMEDATA%%%%DATADIR%%/hash/bbc_flop_6502.xml %%MAMEDATA%%%%DATADIR%%/hash/bbc_flop_68000.xml @@ -975,6 +976,7 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/dragon_flex.xml %%MAMEDATA%%%%DATADIR%%/hash/dragon_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/dragon_os9.xml +%%MAMEDATA%%%%DATADIR%%/hash/duelmast_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/e01_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/easy_karaoke_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/ec1841.xml @@ -1010,6 +1012,7 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/fmtowns_flop_misc.xml %%MAMEDATA%%%%DATADIR%%/hash/fmtowns_flop_orig.xml %%MAMEDATA%%%%DATADIR%%/hash/fp1100_cass.xml +%%MAMEDATA%%%%DATADIR%%/hash/gaelco_ds5002fp_rom.xml %%MAMEDATA%%%%DATADIR%%/hash/galaxy.xml %%MAMEDATA%%%%DATADIR%%/hash/gamate.xml %%MAMEDATA%%%%DATADIR%%/hash/gameboy.xml @@ -1022,6 +1025,7 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/gba_ereader.xml %%MAMEDATA%%%%DATADIR%%/hash/gbcolor.xml %%MAMEDATA%%%%DATADIR%%/hash/gcslottv.xml +%%MAMEDATA%%%%DATADIR%%/hash/generic_flop_525.xml %%MAMEDATA%%%%DATADIR%%/hash/ggm.xml %%MAMEDATA%%%%DATADIR%%/hash/gimix.xml %%MAMEDATA%%%%DATADIR%%/hash/gj4000.xml @@ -1070,6 +1074,7 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/ibm6580.xml %%MAMEDATA%%%%DATADIR%%/hash/ibmpcjr_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/ibmpcjr_flop.xml +%%MAMEDATA%%%%DATADIR%%/hash/ibmpcjx.xml %%MAMEDATA%%%%DATADIR%%/hash/icanguit.xml %%MAMEDATA%%%%DATADIR%%/hash/icanpian.xml %%MAMEDATA%%%%DATADIR%%/hash/intellect02.xml @@ -1207,9 +1212,11 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/myvision.xml %%MAMEDATA%%%%DATADIR%%/hash/mz2000_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/mz2000_flop.xml -%%MAMEDATA%%%%DATADIR%%/hash/mz2200_cass.xml -%%MAMEDATA%%%%DATADIR%%/hash/mz2500.xml +%%MAMEDATA%%%%DATADIR%%/hash/mz2500_flop.xml +%%MAMEDATA%%%%DATADIR%%/hash/mz5500_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/mz700_cass.xml +%%MAMEDATA%%%%DATADIR%%/hash/mz80b_cass.xml +%%MAMEDATA%%%%DATADIR%%/hash/mz80b_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/mz800_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/n64.xml %%MAMEDATA%%%%DATADIR%%/hash/n64_lodgenet.xml @@ -1248,8 +1255,10 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/partner_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/partner_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/pasogo.xml +%%MAMEDATA%%%%DATADIR%%/hash/pasopia7_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/pasopia_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/pb2000c.xml +%%MAMEDATA%%%%DATADIR%%/hash/pc100_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/pc1000.xml %%MAMEDATA%%%%DATADIR%%/hash/pc1512_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/pc1512_hdd.xml @@ -1368,6 +1377,7 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/sgx.xml %%MAMEDATA%%%%DATADIR%%/hash/singingstarkaraoke_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/sitcom.xml +%%MAMEDATA%%%%DATADIR%%/hash/smartcycle_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/smarttv_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/smc777.xml %%MAMEDATA%%%%DATADIR%%/hash/sms.xml @@ -1427,6 +1437,7 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/hash/tdv2324.xml %%MAMEDATA%%%%DATADIR%%/hash/tek4052_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/telestory_cart.xml +%%MAMEDATA%%%%DATADIR%%/hash/teradrive_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/tg16.xml %%MAMEDATA%%%%DATADIR%%/hash/thinkpad8xx.xml %%MAMEDATA%%%%DATADIR%%/hash/ti74_cart.xml @@ -1669,8 +1680,6 @@ share/man/man1/MAME.1.gz %%MAMEDATA%%%%DATADIR%%/plugins/xml/init.lua %%MAMEDATA%%%%DATADIR%%/plugins/xml/plugin.json %%MAMEDATA%%%%DATADIR%%/samples/LICENSE -%%MAMEDATA%%%%DATADIR%%/samples/MM1_keyboard/beep.wav -%%MAMEDATA%%%%DATADIR%%/samples/MM1_keyboard/power_switch.wav %%MAMEDATA%%%%DATADIR%%/samples/README.md %%MAMEDATA%%%%DATADIR%%/samples/dir.txt %%MAMEDATA%%%%DATADIR%%/samples/floppy/35_seek_12ms.wav |