From cd81f893f2779fea816c365061b4c096eb1450fc Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 1 Jul 2019 14:02:54 +0200
Subject: [PATCH] Update Libretro submodules

---
 .gitmodules                         |  6 ++--
 libretro/cores/4do/upstream         |  2 +-
 libretro/cores/fceumm/upstream      |  2 +-
 libretro/cores/mgba/upstream        |  2 +-
 libretro/cores/yabause/Tuprules.tup | 29 +++++++++++++++++++
 libretro/cores/yabause/runtime      | 45 +++++++++++++++++++++++++++++
 libretro/cores/yabause/upstream     |  2 +-
 7 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 libretro/cores/yabause/Tuprules.tup
 create mode 100644 libretro/cores/yabause/runtime

diff --git a/.gitmodules b/.gitmodules
index b2999abe1..e852c62ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,10 +30,10 @@
 	url = https://github.com/libretro/4do-libretro.git
 [submodule "libretro/cores/fceumm/core"]
 	path = libretro/cores/fceumm/upstream
-	url = git@github.com:ehmry/libretro-fceumm.git
+	url = https://github.com/libretro/libretro-fceumm.git
 [submodule "libretro/cores/mgba/core"]
 	path = libretro/cores/mgba/upstream
-	url = git@github.com:ehmry/mgba.git
+	url = https://github.com/libretro/mgba.git
 [submodule "libretro/cores/nxengine/core"]
 	path = libretro/cores/nxengine/upstream
 	url = git://depot.h4ck.me/srv/git/nxengine
@@ -105,4 +105,4 @@
 	url = git://depot.h4ck.me/srv/git/blobbot
 [submodule "libretro/cores/yabause/upstream"]
 	path = libretro/cores/yabause/upstream
-	url = git@github.com:ehmry/yabause.git
+	url = https://github.com/libretro/yabause.git
diff --git a/libretro/cores/4do/upstream b/libretro/cores/4do/upstream
index cfd239a6d..8c2b1cf0c 160000
--- a/libretro/cores/4do/upstream
+++ b/libretro/cores/4do/upstream
@@ -1 +1 @@
-Subproject commit cfd239a6dada9d51499df2e941e4ad96357b0def
+Subproject commit 8c2b1cf0ccd8ea8a36ae1ed7aa09ae7c2b3dc1cd
diff --git a/libretro/cores/fceumm/upstream b/libretro/cores/fceumm/upstream
index 74e43dbd0..4e1bdaaed 160000
--- a/libretro/cores/fceumm/upstream
+++ b/libretro/cores/fceumm/upstream
@@ -1 +1 @@
-Subproject commit 74e43dbd02a8f24a5b65931a88ef366b8d950361
+Subproject commit 4e1bdaaed021b0f6587c61f18de081bc3876f887
diff --git a/libretro/cores/mgba/upstream b/libretro/cores/mgba/upstream
index f0ec5a3c8..22c7ae749 160000
--- a/libretro/cores/mgba/upstream
+++ b/libretro/cores/mgba/upstream
@@ -1 +1 @@
-Subproject commit f0ec5a3c8ba20762d3190f643a30f305b24f9004
+Subproject commit 22c7ae749b9b46fb0343d8f25238db62ca6156ef
diff --git a/libretro/cores/yabause/Tuprules.tup b/libretro/cores/yabause/Tuprules.tup
new file mode 100644
index 000000000..3713b704a
--- /dev/null
+++ b/libretro/cores/yabause/Tuprules.tup
@@ -0,0 +1,29 @@
+CORE_PKGS += libc libm
+
+# TODO: enable dynamic recompiler
+
+include upstream/libretro/Makefile.common
+
+CFLAGS += $(INCFLAGS)
+CFLAGS += -DSIZEOF_DOUBLE=8
+CFLAGS += -DUSE_16BPP=1
+CFLAGS += -DUSE_RGB_565=1
+CFLAGS += -DUSE_SCSP2=1
+CFLAGS += -DNO_CLI
+CFLAGS += -DHAVE_SYS_TIME_H
+CFLAGS += -DHAVE_GETTIMEOFDAY
+CFLAGS += -DVERSION=\"0.9.12\"
+CFLAGS += -DHAVE_STRCASECMP
+CFLAGS += -DINLINE="inline"
+
+CFLAGS += -O3 -DNDEBUG
+
+: foreach $(C68KEXEC_SOURCE) |> !libretro_cc -O0 -DNDEBUG |> %B.o {obj}
+: foreach $(SOURCES_C) |> !libretro_cc |> {obj}
+
+: {obj} |> !libretro_core_link |> {core}
+: {core} |> !collect_bin |>
+: |> !bin |>
+
+: $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
+: |> !pkg |>
diff --git a/libretro/cores/yabause/runtime b/libretro/cores/yabause/runtime
new file mode 100644
index 000000000..ad1830b37
--- /dev/null
+++ b/libretro/cores/yabause/runtime
@@ -0,0 +1,45 @@
+<runtime ram="64M" caps="128" binary="retro_frontend">
+
+	<requires>
+		<audio_out/>
+		<file_system/>
+		<nitpicker/>
+		<rm/>
+	</requires>
+
+	<content>
+		<rom label="ld.lib.so"/>
+		<rom label="libc.lib.so"/>
+		<rom label="libm.lib.so"/>
+		<rom label="libretro.so"/>
+		<rom label="retro_frontend"/>
+		<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_Z" to="Y"/>
+			<map from="KEY_X" to="B"/>
+			<map from="KEY_C" to="A"/>
+			<map from="KEY_A" to="X"/>
+			<map from="KEY_S" to="L"/>
+			<map from="KEY_D" to="R"/>
+
+			<map from="KEY_ENTER" to="START"/>
+			<map from="KEY_RIGHTSHIFT" to="SELECT"/>
+		</default-controller>
+	</config>
+
+</runtime>
+ 
\ No newline at end of file
diff --git a/libretro/cores/yabause/upstream b/libretro/cores/yabause/upstream
index 4593cca43..7bb35b865 160000
--- a/libretro/cores/yabause/upstream
+++ b/libretro/cores/yabause/upstream
@@ -1 +1 @@
-Subproject commit 4593cca4339f4219015d443f176b7448c0c968b0
+Subproject commit 7bb35b865af74282d69f4ecc35ce3a1e0f2d0099