From 4ad384b8ae8e4d995aeaad6dc4f39e17307f0d81 Mon Sep 17 00:00:00 2001
From: fcambus <fcambus@openbsd.org>
Date: Wed, 26 Dec 2018 11:29:18 +0000
Subject: [PATCH] Update mame to 0.205.

---
 emulators/mame/Makefile                                |  4 ++--
 emulators/mame/distinfo                                |  4 ++--
 ...ch-3rdparty_bgfx_examples_common_nanovg_fontstash_h |  4 ++--
 emulators/mame/patches/patch-3rdparty_bx_src_mutex_cpp |  4 ++--
 .../mame/patches/patch-3rdparty_bx_src_thread_cpp      |  4 ++--
 emulators/mame/patches/patch-makefile                  | 10 +++++-----
 emulators/mame/patches/patch-scripts_genie_lua         |  6 +++---
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index a16992d0533..5903bb6970c 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2018/11/29 09:10:58 fcambus Exp $
+# $OpenBSD: Makefile,v 1.19 2018/12/26 11:29:18 fcambus Exp $
 
 ONLY_FOR_ARCHS = amd64 i386
 
@@ -6,7 +6,7 @@ USE_WXNEEDED =	Yes
 
 COMMENT =	Multiple Arcade Machine Emulator
 
-V =		204
+V =		205
 DISTNAME =	mame0${V}s
 PKGNAME =	mame-0.${V}
 
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index b8e7acfe1ee..b5511319718 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mame0204s.zip) = u7P/n95szT6x7/6BGQTwZ19ZRwCoJWfD49gu+VjBBM0=
-SIZE (mame0204s.zip) = 122133819
+SHA256 (mame0205s.zip) = TLnPJ2hdje4qCazs8IzXgWIWQrZFoBaL6T04Tx31PJo=
+SIZE (mame0205s.zip) = 136255294
diff --git a/emulators/mame/patches/patch-3rdparty_bgfx_examples_common_nanovg_fontstash_h b/emulators/mame/patches/patch-3rdparty_bgfx_examples_common_nanovg_fontstash_h
index e92a790c118..c9d63bb2cd3 100644
--- 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.1.1.1 2018/01/24 20:56:12 fcambus Exp $
+$OpenBSD: patch-3rdparty_bgfx_examples_common_nanovg_fontstash_h,v 1.2 2018/12/26 11:29:18 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
-@@ -247,7 +247,6 @@ int fons__tt_getGlyphKernAdvance(FONSttFontImpl *font,
+@@ -253,7 +253,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
diff --git a/emulators/mame/patches/patch-3rdparty_bx_src_mutex_cpp b/emulators/mame/patches/patch-3rdparty_bx_src_mutex_cpp
index f2e1d9824a0..db0beb36361 100644
--- 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.1.1.1 2018/01/24 20:56:12 fcambus Exp $
+$OpenBSD: patch-3rdparty_bx_src_mutex_cpp,v 1.2 2018/12/26 11:29:18 fcambus Exp $
 
 Index: 3rdparty/bx/src/mutex.cpp
 --- 3rdparty/bx/src/mutex.cpp.orig
 +++ 3rdparty/bx/src/mutex.cpp
-@@ -13,7 +13,8 @@
+@@ -16,7 +16,8 @@
  	|| BX_PLATFORM_IOS     \
  	|| BX_PLATFORM_OSX     \
  	|| BX_PLATFORM_PS4     \
diff --git a/emulators/mame/patches/patch-3rdparty_bx_src_thread_cpp b/emulators/mame/patches/patch-3rdparty_bx_src_thread_cpp
index 30d2134eb6b..968089e317c 100644
--- 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.1.1.1 2018/01/24 20:56:12 fcambus Exp $
+$OpenBSD: patch-3rdparty_bx_src_thread_cpp,v 1.2 2018/12/26 11:29:18 fcambus Exp $
 
 Index: 3rdparty/bx/src/thread.cpp
 --- 3rdparty/bx/src/thread.cpp.orig
 +++ 3rdparty/bx/src/thread.cpp
-@@ -11,9 +11,10 @@
+@@ -15,9 +15,10 @@
  	|| BX_PLATFORM_IOS     \
  	|| BX_PLATFORM_OSX     \
  	|| BX_PLATFORM_PS4     \
diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile
index 98fb4538df7..917a106154d 100644
--- a/emulators/mame/patches/patch-makefile
+++ b/emulators/mame/patches/patch-makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-makefile,v 1.6 2018/08/31 16:19:01 fcambus Exp $
+$OpenBSD: patch-makefile,v 1.7 2018/12/26 11:29:18 fcambus Exp $
 
 - Disable hardcoded -O3 optimizations
 - Fix GCC_VERSION and CLANG_VERSION detection
@@ -6,7 +6,7 @@ $OpenBSD: patch-makefile,v 1.6 2018/08/31 16:19:01 fcambus Exp $
 Index: makefile
 --- makefile.orig
 +++ makefile
-@@ -202,7 +202,7 @@ GENIEOS := freebsd
+@@ -206,7 +206,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
-@@ -566,11 +566,6 @@ PROFILER =
+@@ -570,11 +570,6 @@ PROFILER =
  SYMBOLS = 1
  endif
  
@@ -27,7 +27,7 @@ Index: makefile
  # set the symbols level
  ifdef SYMBOLS
  PARAMS += --SYMBOLS='$(SYMBOLS)'
-@@ -911,8 +906,8 @@ endif
+@@ -931,8 +926,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
-@@ -965,9 +960,9 @@ else
+@@ -985,9 +980,9 @@ else
  $(info Clang $(CLANG_VERSION) detected)
  ifneq ($(TARGETOS),asmjs)
  ifeq ($(ARCHITECTURE),_x64)
diff --git a/emulators/mame/patches/patch-scripts_genie_lua b/emulators/mame/patches/patch-scripts_genie_lua
index 97a962a9f5a..ade7a64644e 100644
--- 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.7 2018/09/27 10:43:14 fcambus Exp $
+$OpenBSD: patch-scripts_genie_lua,v 1.8 2018/12/26 11:29:18 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.7 2018/09/27 10:43:14 fcambus Exp $
 Index: scripts/genie.lua
 --- scripts/genie.lua.orig
 +++ scripts/genie.lua
-@@ -796,17 +796,19 @@ if _OPTIONS["NOWERROR"]==nil then
+@@ -816,17 +816,19 @@ if _OPTIONS["NOWERROR"]==nil then
  	}
  end
  
@@ -31,7 +31,7 @@ Index: scripts/genie.lua
  	if _OPTIONS["LTO"]=="1" then
  		buildoptions {
  -- windows native mingw GCC 5.2 fails with -flto=x with x > 1. bug unfixed as of this commit
-@@ -996,54 +998,6 @@ end
+@@ -1040,54 +1042,6 @@ end