diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 10e2b8e1abc..c6a9286f950 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -5,7 +5,7 @@ USE_WXNEEDED = Yes COMMENT = Multiple Arcade Machine Emulator -V = 287 +V = 288 GH_ACCOUNT = mamedev GH_PROJECT = mame GH_TAGNAME = mame0${V} diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index e8ca009ad87..f75907aaa8e 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,2 +1,2 @@ -SHA256 (mame-0.287.tar.gz) = hfXpGw8x8MOYg0uIjNWoPcJGZWklAGnLbjcSFY0BX0Q= -SIZE (mame-0.287.tar.gz) = 212157098 +SHA256 (mame-0.288.tar.gz) = JE2RbrP7i81x8qxRrnGravjPmYaep7hdfvxzOepWxWM= +SIZE (mame-0.288.tar.gz) = 212563943 diff --git a/emulators/mame/patches/patch-3rdparty_genie_build_gmake_bsd_genie_make b/emulators/mame/patches/patch-3rdparty_genie_build_gmake_bsd_genie_make index f966dc9df1a..54fe9d84bb5 100644 --- a/emulators/mame/patches/patch-3rdparty_genie_build_gmake_bsd_genie_make +++ b/emulators/mame/patches/patch-3rdparty_genie_build_gmake_bsd_genie_make @@ -16,16 +16,16 @@ Index: 3rdparty/genie/build/gmake.bsd/genie.make DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN INCLUDES += -I"../../src/host/lua-5.3.0/src" ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES) -- ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough -- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough -- ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough -- ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough -- ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough -+ ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM) -Wno-implicit-fallthrough -+ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM) -Wno-implicit-fallthrough -+ ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM) -Wno-implicit-fallthrough -+ ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM) -Wno-implicit-fallthrough -+ ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM) -Wno-implicit-fallthrough +- ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -Wno-implicit-fallthrough +- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -Wno-implicit-fallthrough +- ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -Wno-implicit-fallthrough +- ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -Wno-implicit-fallthrough +- ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -Wno-implicit-fallthrough ++ ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -m64 -Wno-implicit-fallthrough ++ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -m64 -Wno-implicit-fallthrough ++ ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -m64 -Wno-implicit-fallthrough ++ ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -m64 -Wno-implicit-fallthrough ++ ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -m64 -Wno-implicit-fallthrough ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) ALL_LDFLAGS += $(LDFLAGS) -L"." -s -rdynamic LIBDEPS += diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile index e3fffc422f7..59c6a14e94a 100644 --- a/emulators/mame/patches/patch-makefile +++ b/emulators/mame/patches/patch-makefile @@ -1,7 +1,7 @@ Index: makefile --- makefile.orig +++ makefile -@@ -226,7 +226,7 @@ OS := netbsd +@@ -223,7 +223,7 @@ OS := netbsd GENIEOS := freebsd else ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD) OS := openbsd diff --git a/emulators/mame/patches/patch-scripts_genie_lua b/emulators/mame/patches/patch-scripts_genie_lua index 4247e4e58d3..4913d9a1021 100644 --- a/emulators/mame/patches/patch-scripts_genie_lua +++ b/emulators/mame/patches/patch-scripts_genie_lua @@ -3,7 +3,7 @@ Index: scripts/genie.lua --- scripts/genie.lua.orig +++ scripts/genie.lua -@@ -788,7 +788,6 @@ end +@@ -780,7 +780,6 @@ end -- if we are optimizing, include optimization options if _OPTIONS["OPTIMIZE"] then buildoptions { diff --git a/emulators/mame/patches/patch-scripts_toolchain_lua b/emulators/mame/patches/patch-scripts_toolchain_lua index edd486452ce..9d7058e466d 100644 --- a/emulators/mame/patches/patch-scripts_toolchain_lua +++ b/emulators/mame/patches/patch-scripts_toolchain_lua @@ -3,7 +3,7 @@ https://github.com/mamedev/mame/issues/11049 Index: scripts/toolchain.lua --- scripts/toolchain.lua.orig +++ scripts/toolchain.lua -@@ -60,7 +60,8 @@ function androidToolchainRoot() +@@ -58,7 +58,8 @@ function androidToolchainRoot() local hostTags = { windows = "windows-x86_64", linux = "linux-x86_64", diff --git a/emulators/mame/patches/patch-src_osd_modules_file_posixptty_cpp b/emulators/mame/patches/patch-src_osd_modules_file_posixptty_cpp index 23503532758..c881501b6c6 100644 --- a/emulators/mame/patches/patch-src_osd_modules_file_posixptty_cpp +++ b/emulators/mame/patches/patch-src_osd_modules_file_posixptty_cpp @@ -1,7 +1,7 @@ Index: src/osd/modules/file/posixptty.cpp --- src/osd/modules/file/posixptty.cpp.orig +++ src/osd/modules/file/posixptty.cpp -@@ -161,7 +161,7 @@ std::error_condition posix_open_ptty(std::uint32_t ope +@@ -117,7 +117,7 @@ std::error_condition posix_open_ptty(std::uint32_t ope tios.c_lflag = 0; int masterfd = -1, slavefd = -1;