mame: upgrade 0222 -> 0223

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

recipes-emulators/mame/mame.bb

@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9c1babc1ba9605e7b9d320d2d4f6be7"
 
 SRC_URI = " \
     git://github.com/mamedev/mame.git \
-    file://0001-Only-build-asmjit-on-x86-and-x86_64.patch \
+    file://0001-Fix-non-x86-build-and-try-to-make-sure-it-does-not-b.patch \
     file://mame.desktop \
     file://mame32k.desktop \
 "
-PV = "0222"
-SRCREV = "6d50d60a43b335d71d9a2d0496deeb6973658423"
+PV = "0223"
+SRCREV = "c55a261d26d225c5c847c046f729290139b6546e"
 S = "${WORKDIR}/git"
 
 inherit siteinfo gtk-icon-cache

recipes-emulators/mame/mame/0001-Fix-non-x86-build-and-try-to-make-sure-it-does-not-b.patch

@@ -0,0 +1,59 @@
+From 65b0df8761dd7772149ac1608fe7109f8cc8e056 Mon Sep 17 00:00:00 2001
+From: Julian Sikorski <belegdol+github@gmail.com>
+Date: Wed, 12 Aug 2020 18:54:22 +0200
+Subject: [PATCH] Fix non-x86 build and try to make sure it does not break
+ silently again (#7041)
+
+* Do not build x64 DRC backend when C backend is forced
+
+Upstream-Status: Backport[https://github.com/mamedev/mame/commit/83df00516badcdd4df0d73bf15f79dd54537f03a]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ scripts/src/cpu.lua        |  12 ++-
+ src/devices/cpu/drcuml.cpp |   2 +
+ 2 files changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
+index 64814fd67d7..f8c16807c87 100644
+--- a/scripts/src/cpu.lua
++++ b/scripts/src/cpu.lua
+@@ -39,12 +39,16 @@ if (CPU_INCLUDE_DRC) then
+ 		MAME_DIR .. "src/devices/cpu/uml.h",
+ 		MAME_DIR .. "src/devices/cpu/x86log.cpp",
+ 		MAME_DIR .. "src/devices/cpu/x86log.h",
+-		MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
+-		MAME_DIR .. "src/devices/cpu/drcbex86.h",
+-		MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
+-		MAME_DIR .. "src/devices/cpu/drcbex64.h",
+ 		MAME_DIR .. "src/devices/cpu/drcumlsh.h",
+ 	}
++	if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
++		files {
++			MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
++			MAME_DIR .. "src/devices/cpu/drcbex64.h",
++			MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
++			MAME_DIR .. "src/devices/cpu/drcbex86.h",
++		}
++	end
+ end
+ 
+ --------------------------------------------------
+diff --git a/src/devices/cpu/drcuml.cpp b/src/devices/cpu/drcuml.cpp
+index 0a1dcae9d02..e935913aceb 100644
+--- a/src/devices/cpu/drcuml.cpp
++++ b/src/devices/cpu/drcuml.cpp
+@@ -36,8 +36,10 @@
+ 
+ #include "emuopts.h"
+ #include "drcbec.h"
++#ifdef NATIVE_DRC
+ #include "drcbex86.h"
+ #include "drcbex64.h"
++#endif
+ 
+ #include <fstream>
+ 
+-- 
+2.26.2
+

recipes-emulators/mame/mame/0001-Only-build-asmjit-on-x86-and-x86_64.patch

@@ -1,47 +0,0 @@
-From a8bd59055eda6b6656e56e689a8a74f7e835434d Mon Sep 17 00:00:00 2001
-From: Julian Sikorski <belegdol+github@gmail.com>
-Date: Sat, 27 Jun 2020 14:50:48 +0200
-Subject: [PATCH] Only build asmjit on x86 and x86_64
-
----
- scripts/src/3rdparty.lua | 2 ++
- scripts/src/main.lua     | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
-index 52e5d862168..7002fdbe0ff 100644
---- a/scripts/src/3rdparty.lua
-+++ b/scripts/src/3rdparty.lua
-@@ -2224,6 +2224,7 @@ project "wdlfft"
- -- asmjit library
- --------------------------------------------------
- 
-+if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
- project "asmjit"
- 	uuid "4539757c-6e99-4bae-b3d0-b342a7c49539"
- 	kind "StaticLib"
-@@ -2353,3 +2354,4 @@ project "asmjit"
- 		MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp",
- 		MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass_p.h",
- 	}
-+end
-diff --git a/scripts/src/main.lua b/scripts/src/main.lua
-index 26e7ab94394..4d787bfbdaf 100644
---- a/scripts/src/main.lua
-+++ b/scripts/src/main.lua
-@@ -261,8 +261,12 @@ end
- 		"wdlfft",
- 		ext_lib("jpeg"),
- 		"7z",
-+	}
-+if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
-+	links {
- 		"asmjit",
- 	}
-+end
- if (STANDALONE~=true) then
- 	links {
- 		ext_lib("lua"),
--- 
-2.21.3
-