Update mame to 0.215.

2019-10-30 14:31:07 +00:00 · 2019-10-30 14:31:07 +00:00 · 55781d0616
commit 55781d0616
parent bec86d9602
8 changed files with 35 additions and 31 deletions
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2019/09/30 07:45:47 fcambus Exp $
+# $OpenBSD: Makefile,v 1.32 2019/10/30 14:31:07 fcambus Exp $

 BROKEN-i386 =	broken on 32-bit; enum in src/frontend/mame/ui/videoopt.h starting at 0x80000000
 ONLY_FOR_ARCHS = amd64 i386
@ -7,7 +7,7 @@ USE_WXNEEDED =	Yes

 COMMENT =	Multiple Arcade Machine Emulator

-V =		214
+V =		215
 DISTNAME =	mame0${V}s
 PKGNAME =	mame-0.${V}

--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@ -1,2 +1,2 @@
-SHA256 (mame0214s.zip) = 4aUAgRiiWQDHJ6NSNBt3vQFOonqvWGoaDzqX/wA1WW4=
-SIZE (mame0214s.zip) = 139427495
+SHA256 (mame0215s.zip) = Gv07xiqnkqA4bX8OggbWAK7N/840K++gn0XChhAKAOU=
+SIZE (mame0215s.zip) = 172155446
--- a/emulators/mame/patches/patch-3rdparty_bgfx_examples_common_nanovg_fontstash_h
+++ b/emulators/mame/patches/patch-3rdparty_bgfx_examples_common_nanovg_fontstash_h
@ -1,11 +1,11 @@
-$OpenBSD: patch-3rdparty_bgfx_examples_common_nanovg_fontstash_h,v 1.2 2018/12/26 11:29:18 fcambus Exp $
+$OpenBSD: patch-3rdparty_bgfx_examples_common_nanovg_fontstash_h,v 1.3 2019/10/30 14:31:07 fcambus Exp $

 Don't include malloc.h header on OpenBSD.

 Index: 3rdparty/bgfx/examples/common/nanovg/fontstash.h
 --- 3rdparty/bgfx/examples/common/nanovg/fontstash.h.orig
 +++ 3rdparty/bgfx/examples/common/nanovg/fontstash.h
-@@ -253,7 +253,6 @@ int fons__tt_getGlyphKernAdvance(FONSttFontImpl *font,
+@@ -261,7 +261,6 @@ int fons__tt_getGlyphKernAdvance(FONSttFontImpl *font,
 static void* fons__tmpalloc(size_t size, void* up);
 static void fons__tmpfree(void* ptr, void* up);
 #else
--- a/emulators/mame/patches/patch-3rdparty_bx_src_mutex_cpp
+++ b/emulators/mame/patches/patch-3rdparty_bx_src_mutex_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-3rdparty_bx_src_mutex_cpp,v 1.2 2018/12/26 11:29:18 fcambus Exp $
+$OpenBSD: patch-3rdparty_bx_src_mutex_cpp,v 1.3 2019/10/30 14:31:07 fcambus Exp $

 Index: 3rdparty/bx/src/mutex.cpp
 --- 3rdparty/bx/src/mutex.cpp.orig
 +++ 3rdparty/bx/src/mutex.cpp
-@@ -16,7 +16,8 @@
+@@ -17,7 +17,8 @@
 	|| BX_PLATFORM_IOS     \
 	|| BX_PLATFORM_OSX     \
 	|| BX_PLATFORM_PS4     \
--- a/emulators/mame/patches/patch-3rdparty_bx_src_thread_cpp
+++ b/emulators/mame/patches/patch-3rdparty_bx_src_thread_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-3rdparty_bx_src_thread_cpp,v 1.2 2018/12/26 11:29:18 fcambus Exp $
+$OpenBSD: patch-3rdparty_bx_src_thread_cpp,v 1.3 2019/10/30 14:31:07 fcambus Exp $

 Index: 3rdparty/bx/src/thread.cpp
 --- 3rdparty/bx/src/thread.cpp.orig
 +++ 3rdparty/bx/src/thread.cpp
-@@ -15,9 +15,10 @@
+@@ -20,9 +20,10 @@
 	|| BX_PLATFORM_IOS     \
 	|| BX_PLATFORM_OSX     \
 	|| BX_PLATFORM_PS4     \
--- a/emulators/mame/patches/patch-3rdparty_genie_build_gmake_bsd_genie_make
+++ b/emulators/mame/patches/patch-3rdparty_genie_build_gmake_bsd_genie_make
@ -1,4 +1,4 @@
-$OpenBSD: patch-3rdparty_genie_build_gmake_bsd_genie_make,v 1.1.1.1 2018/01/24 20:56:12 fcambus Exp $
+$OpenBSD: patch-3rdparty_genie_build_gmake_bsd_genie_make,v 1.2 2019/10/30 14:31:07 fcambus Exp $

 Index: 3rdparty/genie/build/gmake.bsd/genie.make
 --- 3rdparty/genie/build/gmake.bsd/genie.make.orig
@ -14,16 +14,20 @@ Index: 3rdparty/genie/build/gmake.bsd/genie.make
 AR  = ar
 
 ifndef RESCOMP
-@@ -48,9 +48,9 @@ ifeq ($(config),release)
-   INCLUDES      += -I../../src/host/lua-5.3.0/src
-   INCLUDES      +=
-   ALL_CPPFLAGS  += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
-  ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
-  ALL_CXXFLAGS  += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
-  ALL_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
-+  ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra
-+  ALL_CXXFLAGS  += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra
-+  ALL_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra
-   ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-   ALL_LDFLAGS   += $(LDFLAGS) -L. -s -rdynamic
-   LDDEPS        +=
+@@ -49,11 +49,11 @@ ifeq ($(config),release)
+   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)
+-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
+-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
+-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
+-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM)
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM)
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM)
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM)
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra $(MPARAM)
+   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+   ALL_LDFLAGS        += $(LDFLAGS) -L. -s -rdynamic
+   LDDEPS             +=
--- a/emulators/mame/patches/patch-makefile
+++ b/emulators/mame/patches/patch-makefile
@ -1,4 +1,4 @@
-$OpenBSD: patch-makefile,v 1.10 2019/09/07 07:02:29 fcambus Exp $
+$OpenBSD: patch-makefile,v 1.11 2019/10/30 14:31:07 fcambus Exp $

 - Disable hardcoded -O3 optimizations
 - Fix GCC_VERSION and CLANG_VERSION detection
@ -6,7 +6,7 @@ $OpenBSD: patch-makefile,v 1.10 2019/09/07 07:02:29 fcambus Exp $
 Index: makefile
 --- makefile.orig
 +++ makefile
-@@ -207,7 +207,7 @@ GENIEOS := freebsd
+@@ -208,7 +208,7 @@ GENIEOS := freebsd
 endif
 ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
 OS := openbsd
@ -15,7 +15,7 @@ Index: makefile
 endif
 ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
 OS := macosx
-@@ -573,11 +573,6 @@ PROFILER =
+@@ -589,11 +589,6 @@ PROFILER =
 SYMBOLS = 1
 endif
 
@ -27,7 +27,7 @@ Index: makefile
 # set the symbols level
 ifdef SYMBOLS
 PARAMS += --SYMBOLS='$(SYMBOLS)'
-@@ -938,8 +933,8 @@ endif
+@@ -958,8 +953,8 @@ endif
 
 ifeq ($(OS),windows)
 ifeq (posix,$(SHELLTYPE))
@ -38,7 +38,7 @@ Index: makefile
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
 GIT_AVAILABLE    := $(shell git --version > /dev/null 2>&1 && echo git)
 else
-@@ -994,9 +989,9 @@ else
+@@ -1014,9 +1009,9 @@ else
 $(info Clang $(CLANG_VERSION) detected)
 ifneq ($(TARGETOS),asmjs)
 ifeq ($(ARCHITECTURE),_x64)
--- a/emulators/mame/patches/patch-scripts_genie_lua
+++ b/emulators/mame/patches/patch-scripts_genie_lua
@ -1,4 +1,4 @@
-$OpenBSD: patch-scripts_genie_lua,v 1.10 2019/09/07 07:02:29 fcambus Exp $
+$OpenBSD: patch-scripts_genie_lua,v 1.11 2019/10/30 14:31:07 fcambus Exp $

 - Set OPT_FLAGS even when OPTIMIZE is unset, to allow passing CXXFLAGS
 - Remove broken GCC version detection
@ -6,7 +6,7 @@ $OpenBSD: patch-scripts_genie_lua,v 1.10 2019/09/07 07:02:29 fcambus Exp $
 Index: scripts/genie.lua
 --- scripts/genie.lua.orig
 +++ scripts/genie.lua
-@@ -853,17 +853,19 @@ if _OPTIONS["NOWERROR"]==nil then
+@@ -852,17 +852,19 @@ if _OPTIONS["NOWERROR"]==nil then
 	}
 end