Found changes

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "libretro/libretro-common"]
-	path = libretro/libretro-common
+	path = libretro-common
 	url = https://github.com/libretro/libretro-common.git
 [submodule "libretro/retro_frontend"]
-	path = libretro/retro_frontend
+	path = retro_frontend
 	url = git://depot.h4ck.me/srv/git/retro_frontend
 [submodule "libretro/cores/2048/core"]
-	path = libretro/cores/2048/upstream
+	path = cores/2048/upstream
 	url = https://github.com/libretro/libretro-2048
 [submodule "libretro/cores/4do/core"]
-	path = libretro/cores/4do/upstream
+	path = cores/4do/upstream
 	url = https://github.com/libretro/4do-libretro.git
 [submodule "libretro/cores/fceumm/core"]
-	path = libretro/cores/fceumm/upstream
+	path = cores/fceumm/upstream
 	url = https://github.com/libretro/libretro-fceumm.git
 [submodule "libretro/cores/mgba/core"]
-	path = libretro/cores/mgba/upstream
+	path = cores/mgba/upstream
 	url = https://github.com/libretro/mgba.git
 [submodule "libretro/cores/nxengine/core"]
-	path = libretro/cores/nxengine/upstream
+	path = cores/nxengine/upstream
 	url = git://depot.h4ck.me/srv/git/nxengine
 [submodule "libretro/cores/oberon/core"]
-	path = libretro/cores/oberon/upstream
+	path = cores/oberon/upstream
 	url = git@github.com:ehmry/oberon-risc-libretro.git
 [submodule "libretro/cores/snes9x/core"]
-	path = libretro/cores/snes9x/upstream
+	path = cores/snes9x/upstream
 	url = https://github.com/libretro/snes9x.git
 [submodule "libretro/cores/tyrquake/core"]
-	path = libretro/cores/tyrquake/upstream
+	path = cores/tyrquake/upstream
 	url = https://github.com/libretro/tyrquake
 [submodule "libretro/cores/samples"]
-	path = libretro/cores/samples/upstream
+	path = cores/samples/upstream
 	url = https://github.com/libretro/libretro-samples
 [submodule "libretro/cores/dosbox/core"]
-	path = libretro/cores/dosbox-libretro/upstream
+	path = cores/dosbox-libretro/upstream
 	url = https://github.com/libretro/dosbox-libretro
 [submodule "libretro/cores/mrboom/core"]
-	path = libretro/cores/mrboom/upstream
+	path = cores/mrboom/upstream
 	url = git@github.com:ehmry/mrboom-libretro.git
 [submodule "libretro/cores/gambatte/core"]
-	path = libretro/cores/gambatte/upstream
+	path = cores/gambatte/upstream
 	url = git@github.com:github.com/ehmry/gambatte-libretro.git
 [submodule "libretro/cores/dinothawr/core"]
-	path = libretro/cores/dinothawr/core
+	path = cores/dinothawr/core
 	url = https://github.com/libretro/Dinothawr
 [submodule "libretro/cores/scummvm/upstream"]
 	path = libretro/cores/scummvm/upstream
 	url = https://github.com/libretro/scummvm.git
 [submodule "libretro/cores/lutro/upstream"]
-	path = libretro/cores/lutro/upstream
+	path = cores/lutro/upstream
 	url = git@github.com:ehmry/libretro-lutro.git
 [submodule "libretro/cores/bluemsx/upstream"]
-	path = libretro/cores/bluemsx/upstream
+	path = cores/bluemsx/upstream
 	url = git@github.com:ehmry/blueMSX-libretro.git
 [submodule "libretro/bios/cbios-cbios"]
-	path = libretro/bios/cbios-cbios
+	path = bios/cbios-cbios
 	url = https://git.code.sf.net/p/cbios/cbios
 [submodule "libretro/cores/mu/upstream"]
-	path = libretro/cores/mu/upstream
+	path = cores/mu/upstream
 	url = https://github.com/meepingsnesroms/Mu.git
 [submodule "libretro/cores/dosbox-svn/upstream"]
-	path = libretro/cores/dosbox-svn/upstream
+	path = cores/dosbox-svn/upstream
 	url = https://github.com/libretro/dosbox-svn.git
 [submodule "libretro/cores/yabause/upstream"]
-	path = libretro/cores/yabause/upstream
+	path = cores/yabause/upstream
 	url = https://github.com/libretro/yabause.git

Tuprules.tup

@@ -29,12 +29,9 @@ ifeq (@(TUP_ARCH),arm_v8)
 CC_MARCH = -march=armv8-a
 endif
 
-GENODE_DIR = $(TUP_CWD)
-
 LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
 
-!prg = | $(GENODE_DIR)/<lib> $(GENODE_DIR)/<pkg-config> \
-|> ^o LD %o^ \
+!prg = |> ^o LD %o^ \
 	$(LD) $(LD_MARCH) $(LDFLAGS) \
 	%f \
 	`$(PKG_CONFIG) --libs $(LIBS) genode-prg` \
@@ -42,7 +39,8 @@ LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
 	-o %o \
 |> %d
 
-!lib = | $(GENODE_DIR)/<lib> $(GENODE_DIR)/<pkg-config> |> ^o LD %o^ $(LD) $(LD_MARCH) %f $(LDFLAGS) `$(PKG_CONFIG) --libs genode-lib $(LIBS)` -o %o |>
+!lib = |> ^o LD %o^ \
+	$(LD) $(LD_MARCH) %f $(LDFLAGS) `$(PKG_CONFIG) --libs genode-lib $(LIBS)` -o %o |>
 
 ifeq ($(RAW_NAME),)
 RAW_NAME = $(TARGET_NAME)
@@ -99,15 +97,11 @@ PKG_CONFIG = pkg-config
 
 !asm = |> ^ CC %b^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) -D__ASSEMBLY__ $(INCLUDES) -c %f -o %o |> %B.o
 
-!cc = | $(GENODE_DIR)/<pkg-config> |> ^o CC %f^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o
+!cc = |> ^o CC %f^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o
 
-!cc_port = | $(GENODE_DIR)/<pkg-config> |> ^o CC %o^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%o) $(INCLUDES) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` -c -fPIC -g -o %o |> %B.o
+!cxx = |> ^o CXX %b^ @(CC_WRAPPER) $(CXX) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o
 
-!cxx = | $(GENODE_DIR)/<pkg-config> |> ^o CXX %b^ @(CC_WRAPPER) $(CXX) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o
-
-!cxx_port = | $(GENODE_DIR)/<pkg-config> |> ^o CXX %o^ @(CC_WRAPPER) $(CXX) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(INCLUDES) -c -fPIC -g -o %o |> %B.o
-
-!ld = | $(GENODE_DIR)/<lib> $(GENODE_DIR)/<pkg-config> |> ^o LD %o^ $(LD) $(LDFLAGS) `$(PKG_CONFIG) --libs $(LIBS)` --whole-archive --start-group %f --no-whole-archive --end-group -o %o |>
+!ld = |> ^o LD %o^ $(LD) $(LDFLAGS) `$(PKG_CONFIG) --libs $(LIBS)` --whole-archive --start-group %f --no-whole-archive --end-group -o %o |>
 
 !strip = |> strip -o %o %f |>
 
@@ -128,10 +122,14 @@ DHALL = dhall
 !index_pkg = |> |>
 
 !render_runtime = | $(VERSIONS_SED_FILE) |> ^o render %d runtime^ \
-	$(DHALL) --explain text <<< '$(ERRATA_DIR)/renderRuntime.dhall (%f).runtime' \
-		> $(OUT_PKG_DIR)/$(PKG_NAME)/current/runtime; \
-	xmllint --noout -schema $(ERRATA_DIR)/runtime.xsd - \
-		< $(OUT_PKG_DIR)/$(PKG_NAME)/current/runtime; \
+	echo  '$(ERRATA_DIR)/renderRuntime.dhall (%f).runtime' \
+		| $(DHALL) text \
+		| xmllint --format -schema $(ERRATA_DIR)/runtime.xsd - \
+		> %o; \
 |> \
 	$(OUT_PKG_DIR)/$(PKG_NAME)/current/runtime \
 	$(OUT_PKG_DIR)/<pkg> \
+
+LIBRETRO_COMM_DIR = $(TUP_CWD)/libretro-common
+GIT_VERSION = `git describe --always`
+BIN_VERSION = $(GIT_VERSION)

cores/4do/pkg.dhall

@@ -0,0 +1,12 @@
+let Genode = env:DHALL_GENODE
+
+let defaults = ./../../pkgJoypadDefaults.dhall
+
+in  { indexInfo =
+        "3DO Emulator"
+    , runtime =
+          defaults.runtime
+        ⫽ { resources =
+              { caps = 128, ram = Genode.units.MiB 16 }
+          }
+    }

cores/REminiscense/Tuprules.tup

@@ -0,0 +1,24 @@
+CORE_PKGS += stdcxx libc libm
+NO_UNDEFINED =
+
+DEBUG = 0
+FRONTEND_SUPPORTS_RGB565 = 1
+WANT_MODPLUG = 1
+LIBRETRO_COMM_DIR=
+
+include upstream/Makefile.common
+
+: foreach $(SOURCES_C) |> !libretro_cc |> {objs}
+: foreach $(SOURCES_CXX) |> !libretro_cxx |> {objs}
+
+: {objs} |> !libretro_core_link |> {core}
+: {core} |> !collect_bin |>
+: |> !bin |>
+
+PKG_DEPENDS += \
+	@(PUBLIC_SRC_STDCXX) \
+
+: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
+: |> !pkg |>
+
+: $(TUP_CWD)/pkg.dhall |> !index_pkg |>

cores/REminiscense/pkg.dhall

@@ -0,0 +1,15 @@
+let Genode = env:DHALL_GENODE
+
+let XML = Genode.Prelude.XML
+
+let defaults = ./../../pkgJoypadDefaults.dhall
+
+in    defaults
+    ⫽ { indexInfo =
+          "Port of Gregory Montoir's Flashback emulator, running as a libretro core"
+      , runtime =
+            defaults.runtime
+          ⫽ { roms =
+                defaults.runtime.roms # [ "stdcxx.lib.so" ]
+            }
+      }

cores/Tuprules.tup

@@ -5,7 +5,7 @@ PKG_DEPENDS += \
 	_/src/$(BIN_NAME) \
 	_/src/retro_frontend \
 
-!libretro_cc  = | $(GENODE_DIR)/<pkg-config> |> ^ CC %f^ \
+!libretro_cc  = |> ^ CC %f^ \
 	$(CC) \
 		$(DEFINES) \
 		`$(PKG_CONFIG) --cflags $(CORE_PKGS)` \
@@ -13,7 +13,7 @@ PKG_DEPENDS += \
 		-c %f -o %o \
 |> %f.$(TARGET_NAME).o
 
-!libretro_cxx = | $(GENODE_DIR)/<pkg-config> |> ^ CXX %f^ \
+!libretro_cxx = |> ^ CXX %f^ \
 	$(CXX) \
 		$(DEFINES) \
 		`$(PKG_CONFIG) --cflags $(CORE_PKGS)` \
@@ -21,12 +21,11 @@ PKG_DEPENDS += \
 		-c %f -o %o \
 |> %f.$(TARGET_NAME).o
 
-!libretro_core_link = | $(GENODE_DIR)/<pkg-config> $(GENODE_DIR)/<stub> |> ^o LD %d^ \
+!libretro_core_link = |> ^o LD %d^ \
 	$(LD)  %f -o %o \
 		-shared --version-script=$(LINK_T) $(NO_UNDEFINED) \
 		$(LDFLAGS) \
-		`$(PKG_CONFIG) --libs $(CORE_PKGS)` \
-		`$(PKG_CONFIG) --libs genode-lib` \
+		`$(PKG_CONFIG) --libs $(CORE_PKGS) genode-lib` \
 |> libretro.so
 
 LINK_T = $(TUP_CWD)/link.T

cores/beetle-psx/Tuprules.tup

@@ -0,0 +1,52 @@
+CORE_PKGS += stdcxx libc libm
+NO_UNDEFINED =
+
+FRONTEND_SUPPORTS_RGB565 = 1
+HAVE_CHD = 1
+NEED_BPP = 16
+NEED_CD = 1
+NEED_DEINTERLACER = 1
+NEED_TREMOR = 1
+WANT_NEW_API = 1
+
+ifeq (@(TUP_ARCH),x86_64)
+	IS_X86 = 1
+endif
+
+CORE_DEFINE = -DWANT_PSX_EMU
+
+include upstream/Makefile.common
+
+DEFINES += $(FLAGS)
+
+DEFINES += \
+	$(ENDIANNESS_DEFINES) \
+	-DSIZEOF_DOUBLE=8 \
+	$(WARNINGS) \
+	-DMEDNAFEN_VERSION=\"0.9.38.6\" \
+	-DPACKAGE=\"mednafen\" \
+	-DMEDNAFEN_VERSION_NUMERIC=9386 \
+	-DPSS_STYLE=1 \
+	-DMPC_FIXED_POINT \
+	$(CORE_DEFINE) \
+	-DSTDC_HEADERS \
+	-D__STDC_LIMIT_MACROS \
+	-D__LIBRETRO__ \
+	-D_LOW_ACCURACY_ \
+	$(EXTRA_INCLUDES) \
+	$(SOUND_DEFINE) \
+	-D_FILE_OFFSET_BITS=64 \
+
+: foreach $(SOURCES_C) |> !libretro_cc |> {obj}
+: foreach $(SOURCES_CXX) |> !libretro_cxx |> {obj}
+: {obj} |> !libretro_core_link |> {core}
+: {core} |> !collect_bin |>
+: |> !bin |>
+
+PKG_DEPENDS += \
+	@(PUBLIC_SRC_STDCXX) \
+
+: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
+: |> !pkg |>
+
+: $(TUP_CWD)/pkg.dhall |> !index_pkg |>

cores/beetle-psx/pkg.dhall

@@ -0,0 +1,17 @@
+let Genode = env:DHALL_GENODE
+
+let XML = Genode.Prelude.XML
+
+let defaults = ./../../pkgJoypadDefaults.dhall
+
+in    defaults
+    ⫽ { indexInfo =
+          "PSX emulator"
+      , runtime =
+            defaults.runtime
+          ⫽ { resources =
+                { caps = 512, ram = Genode.units.MiB 128 }
+            , roms =
+                defaults.runtime.roms # [ "stdcxx.lib.so" ]
+            }
+      }

cores/beetle-psx/upstream

@@ -0,0 +1 @@
+Subproject commit 7b584a4ce05968482a1e5e3719ba341807f42277

cores/gambatte/Tuprules.tup

@@ -1,4 +1,4 @@
-CORE_PKGS += stdcxx
+CORE_PKGS += stdcxx libc libm
 NO_UNDEFINED =
 
 LIBRETRO_COMM_DIR =

cores/oberon/.history

@@ -0,0 +1 @@
+let pkg = ./pkg.dhall

cores/oberon/pkg.dhall

@@ -0,0 +1,38 @@
+let Genode = env:DHALL_GENODE
+
+let Prelude = Genode.Prelude
+
+let XML = Prelude.XML
+
+let Frontend = ./../../retro_frontend/package.dhall
+
+let defaults = ./../../pkgKeyboardDefaults.dhall
+
+let frontend =
+        defaults.frontend
+      ⫽ { vfs =
+            XML.text
+            ''
+            <vfs>
+            	<rom name="Oberon-2019-01-21.dsk"/>
+            	<dir name="dev"> <log label="core"/> </dir>
+            </vfs>
+            ''
+        , game =
+            XML.text "<game path=\"/Oberon-2019-01-21.dsk\"/>"
+        }
+
+in  { indexInfo =
+        "Oberon RISC emulator (requires three-button mouse)"
+    , runtime =
+          defaults.runtime
+        ⫽ { config =
+              Frontend.Config.toXML frontend
+          , resources =
+              { caps = 256, ram = Genode.units.MiB 32 }
+          , roms =
+              defaults.runtime.roms # [ "Oberon-2019-01-21.dsk" ]
+          }
+    , frontend =
+        frontend
+    }

cores/yabause/pkg.dhall

@@ -0,0 +1,10 @@
+let Genode = env:DHALL_GENODE
+
+let defaults = ./../../pkgJoypadDefaults.dhall
+
+in  { indexInfo =
+        "Sega Saturn emulator"
+    , runtime =
+          defaults.runtime
+        ⫽ { resources = { caps = 128, ram = Genode.units.MiB 32 } }
+    }

games/quake_dopa/pkg.dhall

@@ -0,0 +1,40 @@
+let Genode = env:DHALL_GENODE
+
+let Prelude = Genode.Prelude
+
+let XML = Prelude.XML
+
+let Frontend = ./../../retro_frontend/package.dhall
+
+let defaults = ./../../pkgDefaults.dhall
+
+let tyquake = ./../../cores/tyrquake/pkg.dhall
+
+let frontend =
+        tyquake.frontend
+      ⫽ { vfs =
+            XML.text
+            ''
+            <vfs>
+            	<tar name="quake_shareware.tar"/>
+            	<dir name="dopa"> <tar name="quake_dopa.tar"/> </dir>
+            	<fs/>
+            	<dir name="dev"> <log label="core"/> </dir>
+            </vfs>
+            ''
+        , game =
+            XML.text "<game path="dopa/pak0.pak"/>"
+        }
+
+in  { indexInfo =
+        "Quake Episode 5: Dimension of the Past (id1/pak1.pak required)"
+    , runtime =
+          tyquake.runtime
+        ⫽ { config =
+              Frontend.Config.toXML frontend
+          , roms =
+              tyquake.runtime.roms # [ "quake_dopa.tar" ]
+          }
+    , frontend =
+        frontend
+    }

libretro/Tuprules.tup

@@ -1,3 +0,0 @@
-LIBRETRO_COMM_DIR = $(TUP_CWD)/libretro-common
-GIT_VERSION = `git describe --always`
-BIN_VERSION = $(GIT_VERSION)

libretro/cores/yabause/upstream

@@ -1 +0,0 @@
-Subproject commit 7bb35b865af74282d69f4ecc35ce3a1e0f2d0099

pkgDefaults.dhall

@@ -20,8 +20,7 @@ in  { runtime =
               [ "audio_out", "file_system", "nitpicker", "rm" ]
           , resources = { caps = 128, ram = Genode.units.MiB 32 }
           , roms =
-              [ "retro_frontend"
-              , "libc.lib.so"
+              [ "libc.lib.so"
               , "libm.lib.so"
               , "libretro.so"
               , "vfs.lib.so"

shell.nix

@@ -1,10 +0,0 @@
-{ pkgs ? import <genodepkgs> { } }:
-
-pkgs.shell.mkShell
-  { buildInputs = with pkgs;
-      [ ports.libc.dev
-        ports.stdcxx.dev
-        ports.egl_api.dev
-        ports.mesa.dev
-      ];
-  }