diff options
Diffstat (limited to 'emulators/mame/files')
| -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 |
6 files changed, 25 insertions, 59 deletions
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")) |