mame: upgrade 0221 -> 0222

* License checksum changed by adding another author
* Give up our inline pokey patch

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

recipes-emulators/mame/mame.bb

@@ -2,16 +2,16 @@ SUMMARY = "Multiple Arcade Machine Emulator"
 HOMEPAGE = "http://www.mamedev.org/index.php" 
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b9fb1aafa6200e0f5fe91623fe536dc3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c9c1babc1ba9605e7b9d320d2d4f6be7"
 
 SRC_URI = " \
     git://github.com/mamedev/mame.git \
-    file://no-upstream/0001-pokey-Make-step_one_clock-inline.patch \
+    file://0001-Only-build-asmjit-on-x86-and-x86_64.patch \
     file://mame.desktop \
     file://mame32k.desktop \
 "
-PV = "0221"
-SRCREV = "e8a0e0469b0e7956be5e3b0c4d243c65d7b8406c"
+PV = "0222"
+SRCREV = "6d50d60a43b335d71d9a2d0496deeb6973658423"
 S = "${WORKDIR}/git"
 
 inherit siteinfo gtk-icon-cache

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

@@ -0,0 +1,47 @@
+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
+

recipes-emulators/mame/mame/no-upstream/0001-pokey-Make-step_one_clock-inline.patch

@@ -1,48 +0,0 @@
-From 0ba9c56e7a27bd926270678e7add074fb00204f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 3 Mar 2019 15:00:41 +0100
-Subject: [PATCH] pokey: Make step_one_clock inline
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This gives another small performance win on machines using multiple pokeys. Since
-it ruins our valgind output and upstream will not be keen on:
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/devices/sound/pokey.cpp | 2 +-
- src/devices/sound/pokey.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp
-index 231dc01e8b..d20c20cc8a 100644
---- a/src/devices/sound/pokey.cpp
-+++ b/src/devices/sound/pokey.cpp
-@@ -562,7 +562,7 @@ void pokey_device::step_pot()
-  *
-  */
- 
--void pokey_device::step_one_clock(void)
-+inline void pokey_device::step_one_clock(void)
- {
- 	/* Clocks only count if we are not in a reset */
- 	if (m_SKCTL & SK_RESET)
-diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h
-index 7e63e89e54..48858bc743 100644
---- a/src/devices/sound/pokey.h
-+++ b/src/devices/sound/pokey.h
-@@ -264,7 +264,7 @@ private:
- 
- 	static constexpr int POKEY_CHANNELS = 4;
- 
--	void step_one_clock();
-+	inline void step_one_clock();
- 	void step_keyboard();
- 	void step_pot();
- 
--- 
-2.20.1
-