Date: Tue, 02 Jun 2026 12:58:49 +0000 From: Laurent Chardon <laurent@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b2ecbc524f22 - main - emulators/mame: Update to 0.288 Message-ID: <6a1ed389.25a5a.1f285b73@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by laurent: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2ecbc524f22c274b2bf9e44fcff5012568982fe commit b2ecbc524f22c274b2bf9e44fcff5012568982fe Author: Laurent Chardon <laurent@FreeBSD.org> AuthorDate: 2026-05-17 19:45:31 +0000 Commit: Laurent Chardon <laurent@FreeBSD.org> CommitDate: 2026-06-02 12:58:09 +0000 emulators/mame: Update to 0.288 - Drop obsolete Qt debugger patch - Refresh patches - Fix DEBUG option does not respect existing MAKE_ENV flags - Fix LOCALBASE substitution in pkg-message Changes: https://www.mamedev.org/releases/whatsnew_0288.txt PR: 295760 Reviewed by: thierry (mentor) Approved by: thierry (mentor) --- emulators/mame/Makefile | 11 +++--- emulators/mame/distinfo | 6 +-- emulators/mame/files/patch-makefile | 10 ++--- .../mame/files/patch-scripts_src_osd_modules.lua | 43 ---------------------- emulators/mame/files/pkg-message.in | 2 +- emulators/mame/pkg-plist | 11 ++++++ 6 files changed, 25 insertions(+), 58 deletions(-) diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index a94ff3e22f88..1950cd4d4c53 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -1,5 +1,5 @@ PORTNAME= mame -DISTVERSION= 0.287 +DISTVERSION= 0.288 CATEGORIES= emulators games MAINTAINER= laurent@FreeBSD.org @@ -106,7 +106,7 @@ SSE2_DESC= Build with Streaming SIMD Extensions 2 TOOLS_DESC= Tools for archiving, development, and multimedia DEBUG_MAKE_ENV= DEBUG=1 \ - OPTIMIZE=g \ + SYMBOLS=1 \ STRIP_SYMBOLS=0 DEBUG_MAKE_ENV_OFF= STRIP_SYMBOLS=1 # Attempt to avoid address space exhaustion during linking, specifically @@ -139,8 +139,7 @@ OPENMP_MAKE_ENV= OPENMP=1 OPENMP_MAKE_ENV_OFF= OPENMP=0 QTDEBUGGER_USES= qt:6 QTDEBUGGER_USE= QT=base,tools:build -QTDEBUGGER_MAKE_ENV= QT_HOME="${PREFIX}" \ - USE_QTDEBUG=1 +QTDEBUGGER_MAKE_ENV= USE_QTDEBUG=1 QTDEBUGGER_MAKE_ENV_OFF= USE_QTDEBUG=0 SIZE_OPTIMIZED_CFLAGS_MAKE_ENV= OPTIMIZE=s SIZE_OPTIMIZED_CFLAGS_CXXFLAGS= -Os @@ -197,9 +196,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3rdparty_lzma_C_AesOpt.c # 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) && \ diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index fd595192ca30..193991d617df 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1775233150 -SHA256 (mamedev-mame-0.287-mame0287_GH0.tar.gz) = 85f5e91b0f31f0c398834b888cd5a83dc2466569250069cb6e3712158d015f44 -SIZE (mamedev-mame-0.287-mame0287_GH0.tar.gz) = 212157098 +TIMESTAMP = 1780050057 +SHA256 (mamedev-mame-0.288-mame0288_GH0.tar.gz) = 244d916eb3fb8bcd71f2ac51ae71ab6af8cf99869ea7b85d7efc7339ea56c563 +SIZE (mamedev-mame-0.288-mame0288_GH0.tar.gz) = 212563943 diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile index 53f4858b0d29..1f4744f2e893 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 2025-09-24 14:56:11 UTC +--- makefile.orig 2026-05-27 19:03:56 UTC +++ makefile -@@ -430,9 +430,9 @@ ifneq ($(TARGETOS),asmjs) +@@ -440,9 +440,9 @@ ifneq ($(TARGETOS),asmjs) endif ifneq ($(TARGETOS),asmjs) @@ -16,7 +16,7 @@ endif #------------------------------------------------- -@@ -578,11 +578,6 @@ endif +@@ -577,11 +577,6 @@ endif SYMBOLS = 1 endif @@ -28,7 +28,7 @@ # set the symbols level ifdef SYMBOLS PARAMS += --SYMBOLS='$(SYMBOLS)' -@@ -1042,7 +1037,7 @@ endif +@@ -1045,7 +1040,7 @@ endif NEW_GIT_VERSION := unknown endif @@ -37,7 +37,7 @@ ifeq ($(TARGET),$(SUBTARGET_FULL)) FULLTARGET := $(TARGET) -@@ -1376,6 +1371,11 @@ $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: make +@@ -1353,6 +1348,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_src_osd_modules.lua b/emulators/mame/files/patch-scripts_src_osd_modules.lua deleted file mode 100644 index c752c9d1668b..000000000000 --- a/emulators/mame/files/patch-scripts_src_osd_modules.lua +++ /dev/null @@ -1,43 +0,0 @@ - Enable the build to find Qt-6. - ---- scripts/src/osd/modules.lua.orig 2025-09-24 14:56:11 UTC -+++ scripts/src/osd/modules.lua -@@ -405,7 +405,7 @@ function qtdebuggerbuild() - MOC = "moc" - else - if _OPTIONS["QT_HOME"]~=nil then -- 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 - local MOCTST = backtick("which moc-qt5 2>/dev/null") -@@ -461,7 +461,7 @@ function qtdebuggerbuild() - else - if _OPTIONS["QT_HOME"]~=nil then - buildoptions { -- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"), -+ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake6 -query QT_INSTALL_HEADERS"), - } - else - buildoptions { -@@ -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")) -+ local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake6 -query QT_VERSION")) - linkoptions { -- "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), -+ "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake6 -query QT_INSTALL_LIBS"), - } - if qt_version < 60000 then - links { diff --git a/emulators/mame/files/pkg-message.in b/emulators/mame/files/pkg-message.in index d35996fa01ad..cc6d0f183c3b 100644 --- a/emulators/mame/files/pkg-message.in +++ b/emulators/mame/files/pkg-message.in @@ -18,7 +18,7 @@ To create clean copies of MAME's configuration files, execute: the output from this can be stored in ~/.mame or a custom path. To run MAME with custom configuration path(s), execute: -"mame -inipath /var/db/mame /usr/local/etc/mame" +"mame -inipath /var/db/mame %%LOCALBASE%%/etc/mame" See mame(6) for more information. EOM diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist index 2f1152ad2c8f..bf9d0fc3f436 100644 --- a/emulators/mame/pkg-plist +++ b/emulators/mame/pkg-plist @@ -850,6 +850,7 @@ %%MAMEDATA%%%%DATADIR%%/hash/apple2_flop_clcracked.xml %%MAMEDATA%%%%DATADIR%%/hash/apple2_flop_misc.xml %%MAMEDATA%%%%DATADIR%%/hash/apple2_flop_orig.xml +%%MAMEDATA%%%%DATADIR%%/hash/apple2_rom.xml %%MAMEDATA%%%%DATADIR%%/hash/apple2gs_flop_clcracked.xml %%MAMEDATA%%%%DATADIR%%/hash/apple2gs_flop_misc.xml %%MAMEDATA%%%%DATADIR%%/hash/apple2gs_flop_orig.xml @@ -1092,6 +1093,7 @@ %%MAMEDATA%%%%DATADIR%%/hash/jakks_gamekey_nk.xml %%MAMEDATA%%%%DATADIR%%/hash/jakks_gamekey_nm.xml %%MAMEDATA%%%%DATADIR%%/hash/jakks_gamekey_sw.xml +%%MAMEDATA%%%%DATADIR%%/hash/jakks_gamekey_wp.xml %%MAMEDATA%%%%DATADIR%%/hash/jaminator.xml %%MAMEDATA%%%%DATADIR%%/hash/jazz.xml %%MAMEDATA%%%%DATADIR%%/hash/jb3000_flop.xml @@ -1180,6 +1182,7 @@ %%MAMEDATA%%%%DATADIR%%/hash/mobigo_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/monon_color.xml %%MAMEDATA%%%%DATADIR%%/hash/mpc3000_flop.xml +%%MAMEDATA%%%%DATADIR%%/hash/mpc60_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/mpf1_rom.xml %%MAMEDATA%%%%DATADIR%%/hash/mpu1000.xml %%MAMEDATA%%%%DATADIR%%/hash/mpz80.xml @@ -1254,6 +1257,8 @@ %%MAMEDATA%%%%DATADIR%%/hash/orionpro_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/osborne1.xml %%MAMEDATA%%%%DATADIR%%/hash/osborne2.xml +%%MAMEDATA%%%%DATADIR%%/hash/p2000_cart.xml +%%MAMEDATA%%%%DATADIR%%/hash/p2000_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/p500_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/partner_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/partner_flop.xml @@ -1279,6 +1284,7 @@ %%MAMEDATA%%%%DATADIR%%/hash/pc8801_cdrom.xml %%MAMEDATA%%%%DATADIR%%/hash/pc8801_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/pc88va.xml +%%MAMEDATA%%%%DATADIR%%/hash/pc88va_flop_orig.xml %%MAMEDATA%%%%DATADIR%%/hash/pc98.xml %%MAMEDATA%%%%DATADIR%%/hash/pc98_cd.xml %%MAMEDATA%%%%DATADIR%%/hash/pc98_flop_orig.xml @@ -1317,6 +1323,7 @@ %%MAMEDATA%%%%DATADIR%%/hash/plus4_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/plus4_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/plus4_flop.xml +%%MAMEDATA%%%%DATADIR%%/hash/plus4_quik.xml %%MAMEDATA%%%%DATADIR%%/hash/pmd85_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/pockchalv2.xml %%MAMEDATA%%%%DATADIR%%/hash/pockchalw.xml @@ -1325,6 +1332,7 @@ %%MAMEDATA%%%%DATADIR%%/hash/pokemini.xml %%MAMEDATA%%%%DATADIR%%/hash/poly_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/polysix.xml +%%MAMEDATA%%%%DATADIR%%/hash/popstar_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/precur2w_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/princ.xml %%MAMEDATA%%%%DATADIR%%/hash/pro128_cart.xml @@ -1337,6 +1345,7 @@ %%MAMEDATA%%%%DATADIR%%/hash/psion1.xml %%MAMEDATA%%%%DATADIR%%/hash/psion2.xml %%MAMEDATA%%%%DATADIR%%/hash/psion_flop.xml +%%MAMEDATA%%%%DATADIR%%/hash/psion_quik.xml %%MAMEDATA%%%%DATADIR%%/hash/psion_ssd.xml %%MAMEDATA%%%%DATADIR%%/hash/psx.xml %%MAMEDATA%%%%DATADIR%%/hash/pt68k2.xml @@ -1542,10 +1551,12 @@ %%MAMEDATA%%%%DATADIR%%/hash/x1_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/x1_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/x37_flop.xml +%%MAMEDATA%%%%DATADIR%%/hash/x37_hdd.xml %%MAMEDATA%%%%DATADIR%%/hash/x68k_flop.xml %%MAMEDATA%%%%DATADIR%%/hash/xegs.xml %%MAMEDATA%%%%DATADIR%%/hash/xerox820.xml %%MAMEDATA%%%%DATADIR%%/hash/xerox820ii.xml +%%MAMEDATA%%%%DATADIR%%/hash/yeno_laptop_cart.xml %%MAMEDATA%%%%DATADIR%%/hash/z80clock.xml %%MAMEDATA%%%%DATADIR%%/hash/z80ne_cass.xml %%MAMEDATA%%%%DATADIR%%/hash/z80ne_flop.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1ed389.25a5a.1f285b73>