From 26c3d1af4511c1c523cd626cb9833a772f5e9902 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 3 Mar 2019 14:11:01 +0100
Subject: [PATCH] Update MrBoom core

---
 .gitmodules                        |  2 +-
 libretro/cores/mrboom/Tuprules.tup | 28 +++++++++++++++++++
 libretro/cores/mrboom/archives     |  5 ++++
 libretro/cores/mrboom/core         |  1 -
 libretro/cores/mrboom/runtime      | 43 ++++++++++++++++++++++++++++++
 libretro/cores/mrboom/upstream     |  1 +
 6 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 libretro/cores/mrboom/Tuprules.tup
 create mode 100644 libretro/cores/mrboom/archives
 delete mode 160000 libretro/cores/mrboom/core
 create mode 100644 libretro/cores/mrboom/runtime
 create mode 160000 libretro/cores/mrboom/upstream

diff --git a/.gitmodules b/.gitmodules
index c40f251..e4cd631 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -53,7 +53,7 @@
 	path = libretro/cores/dosbox/upstream
 	url = https://github.com/libretro/dosbox-libretro
 [submodule "libretro/cores/mrboom/core"]
-	path = libretro/cores/mrboom/core
+	path = libretro/cores/mrboom/upstream
 	url = https://github.com/libretro/mrboom-libretro.git
 [submodule "libretro/cores/gambatte/core"]
 	path = libretro/cores/gambatte/upstream
diff --git a/libretro/cores/mrboom/Tuprules.tup b/libretro/cores/mrboom/Tuprules.tup
new file mode 100644
index 0000000..c374050
--- /dev/null
+++ b/libretro/cores/mrboom/Tuprules.tup
@@ -0,0 +1,28 @@
+CORE_PKGS += stdcxx libc libm
+NO_UNDEFINED =
+	# Uses Genode API to create secondary stack
+
+GIT_VERSION = `git describe --always`
+
+CFLAGS += -O3
+CFLAGS += -DMRBOOM -DHAVE_IBXM -D_FORTIFY_SOURCE=0
+CFLAGS += -DPLATFORM=\"genode\" -DGIT_VERSION=\"$(GIT_VERSION)\"
+CFLAGS += -std=gnu99
+CXXFLAGS += -std=c++98
+
+include upstream/Makefile.common
+
+: foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs}
+: foreach $(SOURCES_CXX) |> !libretro_cxx |> {libretro_objs}
+
+: {libretro_objs} |> !libretro_core_link |> {core}
+: {core} |> !publish_core |>
+
+: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
+: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
+
+ifdef DEPOT_KEY
+: {binary}  |> !depot_bin_tarball |> {tarballs}
+: {package} |> !depot_pkg_tarball |> {tarballs}
+: foreach {tarballs} |> !public_signature |>
+endif
diff --git a/libretro/cores/mrboom/archives b/libretro/cores/mrboom/archives
new file mode 100644
index 0000000..065a964
--- /dev/null
+++ b/libretro/cores/mrboom/archives
@@ -0,0 +1,5 @@
+@SDK_USER@/src/vfs/@SDK_VERSION@
+@SDK_USER@/src/libc/@SDK_VERSION@
+@SDK_USER@/src/stdcxx/@SDK_VERSION@
+@DEPOT_USER@/src/retro_frontend/@DEPOT_VERSION@
+@DEPOT_USER@/src/libretro-mrboom/@DEPOT_VERSION@
diff --git a/libretro/cores/mrboom/core b/libretro/cores/mrboom/core
deleted file mode 160000
index 48ac391..0000000
--- a/libretro/cores/mrboom/core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 48ac3918a20492f651cbd42f97d69c62b3ca67e4
diff --git a/libretro/cores/mrboom/runtime b/libretro/cores/mrboom/runtime
new file mode 100644
index 0000000..4e552ec
--- /dev/null
+++ b/libretro/cores/mrboom/runtime
@@ -0,0 +1,43 @@
+<runtime ram="16M" caps="192" binary="retro_frontend">
+
+	<requires>
+		<audio_out/>
+		<nitpicker/>
+		<file_system/>
+	</requires>
+
+	<content>
+		<rom label="libc.lib.so"/>
+		<rom label="libm.lib.so"/>
+		<rom label="libretro.so"/>
+		<rom label="retro_frontend"/>
+		<rom label="stdcxx.lib.so"/>
+		<rom label="vfs.lib.so"/>
+	</content>
+
+	<config>
+		<libc stdout="/dev/log" stderr="/dev/log"/>
+		<game/>
+		<vfs>
+			<fs/>
+			<dir name="dev"> <log label="core"/> </dir>
+		</vfs>
+		<default-controller port="0" device="1">
+			<map from="KEY_LEFT" to="LEFT"/>
+			<map from="KEY_RIGHT" to="RIGHT"/>
+			<map from="KEY_UP" to="UP"/>
+			<map from="KEY_DOWN" to="DOWN"/>
+
+			<map from="KEY_X" to="A"/>
+			<map from="KEY_Z" to="B"/>
+			<map from="KEY_S" to="X"/>
+			<map from="KEY_A" to="Y"/>
+			<map from="KEY_Q" to="L"/>
+			<map from="KEY_W" to="R"/>
+
+			<map from="KEY_ENTER" to="START"/>
+			<map from="KEY_RIGHTSHIFT" to="SELECT"/>
+		</default-controller>
+	</config>
+
+</runtime>
diff --git a/libretro/cores/mrboom/upstream b/libretro/cores/mrboom/upstream
new file mode 160000
index 0000000..5dfb5f2
--- /dev/null
+++ b/libretro/cores/mrboom/upstream
@@ -0,0 +1 @@
+Subproject commit 5dfb5f2a2d1a56c6240dfdc60212be479b9ce5c3