From e8a55e2d8c977750225468619e4020f434e79618 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 3 Mar 2019 12:25:05 +0100
Subject: [PATCH] Add Libretro sample cores

The Basic and Pascal cores are disabled.
---
 .gitmodules                                   |   4 +-
 index/Tupfile                                 |   9 +-
 libretro/cores/button_test/Tupfile            |  10 --
 libretro/cores/button_test/archives           |   4 -
 libretro/cores/fceumm/Tupfile                 |  15 --
 libretro/cores/fceumm/Tuprules.tup            |  28 ++++
 libretro/cores/fceumm/core                    |   1 -
 libretro/cores/fceumm/upstream                |   1 +
 libretro/cores/samples                        |   1 -
 libretro/cores/samples/Tuprules.tup           | 146 ++++++++++++++++++
 libretro/cores/samples/audio.runtime          |  43 ++++++
 .../{testgl/runtime => samples/midi.runtime}  |   8 +-
 .../runtime => samples/noaudio.runtime}       |   8 +-
 .../archives => samples/simple.archives}      |   2 +-
 libretro/cores/samples/simple.runtime         |  40 +++++
 libretro/cores/samples/testgl.archives        |   7 +
 libretro/cores/samples/testgl.runtime         |  28 ++++
 libretro/cores/samples/upstream               |   1 +
 libretro/cores/testgl/Tupfile                 |  18 ---
 19 files changed, 315 insertions(+), 59 deletions(-)
 delete mode 100644 libretro/cores/button_test/Tupfile
 delete mode 100644 libretro/cores/button_test/archives
 delete mode 100644 libretro/cores/fceumm/Tupfile
 create mode 100644 libretro/cores/fceumm/Tuprules.tup
 delete mode 160000 libretro/cores/fceumm/core
 create mode 160000 libretro/cores/fceumm/upstream
 delete mode 160000 libretro/cores/samples
 create mode 100644 libretro/cores/samples/Tuprules.tup
 create mode 100644 libretro/cores/samples/audio.runtime
 rename libretro/cores/{testgl/runtime => samples/midi.runtime} (71%)
 rename libretro/cores/{button_test/runtime => samples/noaudio.runtime} (86%)
 rename libretro/cores/{testgl/archives => samples/simple.archives} (70%)
 create mode 100644 libretro/cores/samples/simple.runtime
 create mode 100644 libretro/cores/samples/testgl.archives
 create mode 100644 libretro/cores/samples/testgl.runtime
 create mode 160000 libretro/cores/samples/upstream
 delete mode 100644 libretro/cores/testgl/Tupfile

diff --git a/.gitmodules b/.gitmodules
index ee55342ce..d21e43c76 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,7 +29,7 @@
 	path = libretro/cores/4do/core
 	url = https://github.com/libretro/4do-libretro
 [submodule "libretro/cores/fceumm/core"]
-	path = libretro/cores/fceumm/core
+	path = libretro/cores/fceumm/upstream
 	url = https://github.com/libretro/libretro-fceumm
 [submodule "libretro/cores/mgba/core"]
 	path = libretro/cores/mgba/core
@@ -47,7 +47,7 @@
 	path = libretro/cores/tyrquake/core
 	url = https://github.com/libretro/tyrquake
 [submodule "libretro/cores/samples"]
-	path = libretro/cores/samples
+	path = libretro/cores/samples/upstream
 	url = https://github.com/libretro/libretro-samples
 [submodule "libretro/cores/dosbox/core"]
 	path = libretro/cores/dosbox/core
diff --git a/index/Tupfile b/index/Tupfile
index e2aeaf774..318e33ede 100644
--- a/index/Tupfile
+++ b/index/Tupfile
@@ -9,8 +9,15 @@ DEPOT_INDEX_FILE = $(DEPOT_DIR)/index/@(SCULPT_VERSION)
 ifneq (@(DEPOT_USER),local)
 : index.xml |> tup varsed %f - | xmllint - > %o |> $(DEPOT_INDEX_FILE) {index}
 else
-: $(DEPOT_DIR)/<runtimes> |> ^ generate index^ \
+: $(DEPOT_DIR)/<runtimes> $(DEPOT_DIR)/<libretro-runtimes> |> ^ generate index^ \
 	echo '<index>' > %o; \
+	echo '	<index name="Libretro">' >> %o; \
+		echo %<libretro-runtimes> | tr ' ' '\n' | sort |\
+			sed \
+				-e 's|\.\./depot/|		<pkg path="|' \
+				-e 's|runtime|"/>|' \
+			- >> %o; \
+	echo '	</index>' >> %o; \
 	echo %<runtimes> | tr ' ' '\n' | sort |\
 		sed \
 			-e 's|\.\./depot/|	<pkg path="|' \
diff --git a/libretro/cores/button_test/Tupfile b/libretro/cores/button_test/Tupfile
deleted file mode 100644
index 6e1148faa..000000000
--- a/libretro/cores/button_test/Tupfile
+++ /dev/null
@@ -1,10 +0,0 @@
-include_rules
-
-CORE_DIR = ../samples/input/button_test
-
-CFLAGS += -O3 -std=gnu99 -Wall -pedantic
-CFLAGS += -I$(CORE_DIR)/libretro-common/include
-
-SOURCES_C = $(CORE_DIR)/libretro.c
-
-include $(LIBRETRO_CORE_INCLUDE)
diff --git a/libretro/cores/button_test/archives b/libretro/cores/button_test/archives
deleted file mode 100644
index 0963984b8..000000000
--- a/libretro/cores/button_test/archives
+++ /dev/null
@@ -1,4 +0,0 @@
-@SDK_USER@/src/vfs/@SDK_VERSION@
-@SDK_USER@/src/libc/@SDK_VERSION@
-@DEPOT_USER@/src/retro_frontend/@DEPOT_VERSION@
-@DEPOT_USER@/src/libretro-button_test/@DEPOT_VERSION@
diff --git a/libretro/cores/fceumm/Tupfile b/libretro/cores/fceumm/Tupfile
deleted file mode 100644
index d8529346c..000000000
--- a/libretro/cores/fceumm/Tupfile
+++ /dev/null
@@ -1,15 +0,0 @@
-include_rules
-
-GIT_VERSION = `git describe --always`
-CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
-
-CFLAGS += -O2 -DNDEBUG
-CFLAGS += -DWANT_GRIFFIN
-
-CORE_DIR = core/src
-include $(CORE_DIR)/../Makefile.common
-CFLAGS += -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DINLINE=inline -DPSS_STYLE=1
-CFLAGS += -Wno-write-strings
-CFLAGS += $(INCFLAGS)
-
-include $(LIBRETRO_CORE_INCLUDE)
diff --git a/libretro/cores/fceumm/Tuprules.tup b/libretro/cores/fceumm/Tuprules.tup
new file mode 100644
index 000000000..3e7b7bea9
--- /dev/null
+++ b/libretro/cores/fceumm/Tuprules.tup
@@ -0,0 +1,28 @@
+CORE_PKGS += libc libm
+
+GIT_VERSION = `git describe --always`
+CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+
+CFLAGS += -O2 -DNDEBUG
+CFLAGS += -DWANT_GRIFFIN
+
+include upstream/Makefile.common
+
+CFLAGS += -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DINLINE=inline -DPSS_STYLE=1
+CFLAGS += -Wno-write-strings
+CFLAGS += $(INCFLAGS)
+
+: 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/fceumm/core b/libretro/cores/fceumm/core
deleted file mode 160000
index b5190048b..000000000
--- a/libretro/cores/fceumm/core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5190048b7250d4d73f712ed26182eee8cc979c3
diff --git a/libretro/cores/fceumm/upstream b/libretro/cores/fceumm/upstream
new file mode 160000
index 000000000..f8dd9953e
--- /dev/null
+++ b/libretro/cores/fceumm/upstream
@@ -0,0 +1 @@
+Subproject commit f8dd9953e44063691050dc71e75b0916083b87de
diff --git a/libretro/cores/samples b/libretro/cores/samples
deleted file mode 160000
index 8452cd948..000000000
--- a/libretro/cores/samples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8452cd94833eea3c3dea870f6d8c881452f4a10b
diff --git a/libretro/cores/samples/Tuprules.tup b/libretro/cores/samples/Tuprules.tup
new file mode 100644
index 000000000..be469b106
--- /dev/null
+++ b/libretro/cores/samples/Tuprules.tup
@@ -0,0 +1,146 @@
+CORE_PKGS += libc libm
+LDFLAGS += --no-undefined
+CFLAGS += -O3 -Wall -pedantic -std=gnu99
+
+ifeq ($(TARGET_NAME),testaudio_callback)
+	CFLAGS += -I../../libretro-common/include
+	SOURCES_C += libretro-test.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/audio.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testaudio_no_callback)
+	CFLAGS += -I../../libretro-common/include
+	SOURCES_C += libretro-test.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/audio.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testaudio_playback_wav)
+	CFLAGS += -I../../libretro-common/include
+	SOURCES_C += libretro-test.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/audio.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),button_test)
+	CFLAGS += -Ilibretro-common/include
+	SOURCES_C += libretro.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+endif
+
+#ifeq ($(TARGET_NAME),freebasic)
+#	: fbastest.bas |> fbc -dll %f -x %o |> libretro.so {core}
+#	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+#	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+#endif
+
+#ifeq ($(TARGET_NAME),pascal_pong)
+#	: pong.pas |> fpc -o%o %f |> libretro.so {core}
+#	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+#	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+#endif
+
+ifeq ($(TARGET_NAME),midi_test)
+	SOURCES_C += libretro.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/midi.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),test)
+	CFLAGS += -I../../libretro-common/include
+	SOURCES_C += libretro-test.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),cruzes)
+	SOURCES_C += cruzes.c ttf2c.c
+	# : obj/Carlito-Regular.ttf |> ttf2c 24 font24 %f %o |> font24.h
+	# : obj/Carlito-Regular.ttf |> ttf2c 16 font16 %f %o |> font16.h
+	# : obj/Carlito-Regular.ttf |> ttf2c 10 font10 %f %o |> font10.h
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),advanced_tests)
+	CFLAGS += -I../../libretro-common/include
+	SOURCES_C += libretro-test.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/audio.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testgl_compute_shaders)
+	CORE_PKGS += mesa
+	CFLAGS += -Igl -DNDEBUG -fPIC -DHAVE_ZIP_DEFLATE
+	CXXFLAGS += -std=gnu++11
+	SOURCES_CXX += libretro/libretro.cpp
+	SOURCES_CXX += gl/*.cpp
+	SOURCES_CXX += app/boxes.cpp
+	SOURCES_C += glsym/rglgen.c
+	SOURCES_C += glsym/glsym_gl.c
+
+	: $(TUP_CWD)/testgl.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/testgl.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testgl_ff)
+	CORE_PKGS += mesa
+	CFLAGS +=
+	SOURCES_C += libretro_gl_ff_test.c glsym/rglgen.c glsym/glsym_gl.c
+	: $(TUP_CWD)/testgl.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/testgl.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testgl)
+	CORE_PKGS += mesa
+	CFLAGS +=
+	SOURCES_C += libretro_gl_test.c
+	SOURCES_C += glsym/rglgen.c
+	SOURCES_C += glsym/glsym_gl.c
+
+	: $(TUP_CWD)/testgl.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/testgl.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testsw)
+	CFLAGS += -I../../libretro-common/include
+	SOURCES_C += libretro-test.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testsw_vram)
+	CFLAGS += -I../../libretro-common/include
+	SOURCES_C += libretro-test.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testvulkan_async_compute)
+	CFLAGS += -I../../libretro-common/include -Iinclude
+	SOURCES_C += libretro-test.c vulkan_symbol_wrapper.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+endif
+
+ifeq ($(TARGET_NAME),testvulkan)
+	CFLAGS += -I../../libretro-common/include -Iinclude
+	SOURCES_C += libretro-test.c vulkan_symbol_wrapper.c
+	: $(TUP_CWD)/simple.archives |> !publish_core_archives |> {package}
+	: $(TUP_CWD)/simple.runtime |> !publish_core_runtime |> {package}
+endif
+
+: foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs}
+
+: {libretro_objs} |> !libretro_core_link |> {core}
+: {core} |> !publish_core |>
+
+: README.md |> !publish_core_metadata |> {package}
+
+ifdef DEPOT_KEY
+: {binary}  |> !depot_bin_tarball |> {tarballs}
+: {package} |> !depot_pkg_tarball |> {tarballs}
+: foreach {tarballs} |> !public_signature |>
+endif
diff --git a/libretro/cores/samples/audio.runtime b/libretro/cores/samples/audio.runtime
new file mode 100644
index 000000000..aaaa13548
--- /dev/null
+++ b/libretro/cores/samples/audio.runtime
@@ -0,0 +1,43 @@
+<runtime ram="16M" caps="192" binary="retro_frontend">
+
+	<requires>
+		<audio_out/>
+		<file_system/>
+		<nitpicker/>
+	</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/testgl/runtime b/libretro/cores/samples/midi.runtime
similarity index 71%
rename from libretro/cores/testgl/runtime
rename to libretro/cores/samples/midi.runtime
index 69f2e30ac..0fd923dd7 100644
--- a/libretro/cores/testgl/runtime
+++ b/libretro/cores/samples/midi.runtime
@@ -1,8 +1,7 @@
-<runtime ram="16M" caps="128" binary="retro_frontend">
+<runtime ram="16M" caps="192" binary="retro_frontend">
 
 	<requires>
 		<audio_out/>
-		<file_system/>
 		<nitpicker/>
 	</requires>
 
@@ -11,15 +10,18 @@
 		<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>
+			<ram/>
 			<dir name="dev"> <log label="core"/> </dir>
 		</vfs>
-		<default-controller port="0" device="1"/>
+		<default-controller port="0" device="3"/>
 	</config>
 
 </runtime>
diff --git a/libretro/cores/button_test/runtime b/libretro/cores/samples/noaudio.runtime
similarity index 86%
rename from libretro/cores/button_test/runtime
rename to libretro/cores/samples/noaudio.runtime
index 2adc275fd..eb30f33b5 100644
--- a/libretro/cores/button_test/runtime
+++ b/libretro/cores/samples/noaudio.runtime
@@ -1,13 +1,15 @@
-<runtime ram="16M" caps="128" binary="retro_frontend">
+<runtime ram="16M" caps="192" binary="retro_frontend">
 
-	<requires> <nitpicker/> </requires>
+	<requires>
+		<nitpicker/>
+	</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="stdcxx.lib.so"/>
 		<rom label="vfs.lib.so"/>
 	</content>
 
diff --git a/libretro/cores/testgl/archives b/libretro/cores/samples/simple.archives
similarity index 70%
rename from libretro/cores/testgl/archives
rename to libretro/cores/samples/simple.archives
index 610b22e7f..7401911c7 100644
--- a/libretro/cores/testgl/archives
+++ b/libretro/cores/samples/simple.archives
@@ -1,4 +1,4 @@
 @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-testgl/@DEPOT_VERSION@
diff --git a/libretro/cores/samples/simple.runtime b/libretro/cores/samples/simple.runtime
new file mode 100644
index 000000000..eb30f33b5
--- /dev/null
+++ b/libretro/cores/samples/simple.runtime
@@ -0,0 +1,40 @@
+<runtime ram="16M" caps="192" binary="retro_frontend">
+
+	<requires>
+		<nitpicker/>
+	</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>
+			<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/samples/testgl.archives b/libretro/cores/samples/testgl.archives
new file mode 100644
index 000000000..d13e52f49
--- /dev/null
+++ b/libretro/cores/samples/testgl.archives
@@ -0,0 +1,7 @@
+@SDK_USER@/src/vfs/@SDK_VERSION@
+@SDK_USER@/src/libc/@SDK_VERSION@
+@SDK_USER@/src/stdcxx/@SDK_VERSION@
+@PUBLIC_SRC_EXPAT@
+@PUBLIC_SRC_MESA@
+@DEPOT_USER@/src/retro_frontend/@DEPOT_VERSION@
+@DEPOT_USER@/src/libretro-testgl/@DEPOT_VERSION@
diff --git a/libretro/cores/samples/testgl.runtime b/libretro/cores/samples/testgl.runtime
new file mode 100644
index 000000000..6b177b752
--- /dev/null
+++ b/libretro/cores/samples/testgl.runtime
@@ -0,0 +1,28 @@
+<runtime ram="16M" caps="192" binary="retro_frontend">
+
+	<requires>
+		<nitpicker/>
+	</requires>
+
+	<content>
+		<rom label="expat.lib.so"/>
+		<rom label="libc.lib.so"/>
+		<rom label="libm.lib.so"/>
+		<rom label="libretro.so"/>
+		<rom label="mesa.lib.so"/>
+		<rom label="retro_frontend"/>
+		<rom label="egl.lib.so"/>
+		<rom label="glapi.lib.so"/>
+		<rom label="stdcxx.lib.so"/>
+		<rom label="vfs.lib.so"/>
+	</content>
+
+	<config>
+		<libc stdout="/dev/log" stderr="/dev/log"/>
+		<game/>
+		<vfs>
+			<dir name="dev"> <log label="core"/> </dir>
+		</vfs>
+	</config>
+
+</runtime>
diff --git a/libretro/cores/samples/upstream b/libretro/cores/samples/upstream
new file mode 160000
index 000000000..fd6547e86
--- /dev/null
+++ b/libretro/cores/samples/upstream
@@ -0,0 +1 @@
+Subproject commit fd6547e86fae1bd35606f19ddc8caa00596d509d
diff --git a/libretro/cores/testgl/Tupfile b/libretro/cores/testgl/Tupfile
deleted file mode 100644
index 243984366..000000000
--- a/libretro/cores/testgl/Tupfile
+++ /dev/null
@@ -1,18 +0,0 @@
-ifdef BUILD_BROKEN
-
-include_rules
-
-CFLAGS += -O3 -std=gnu99 -Wall -pedantic
-
-CORE_DIR = ../samples/video/opengl/libretro_test_gl_shaders
-
-CFLAGS += -I/home/repo/genode/contrib/mesa-6835d67506c800140e54b384baa5b070c8e48aeb/include
-
-SOURCES_C = \
-	$(CORE_DIR)/libretro_gl_test.c \
-	$(CORE_DIR)/glsym/rglgen.c \
-	$(CORE_DIR)/glsym/glsym_gl.c \
-
-include $(LIBRETRO_CORE_INCLUDE)
-
-endif