New and exciting stuff

2019-04-12 14:13:31 +02:00 · 2019-04-12 14:13:31 +02:00 · 83c2fde730
parent 9723778b14
commit 83c2fde730
16 changed files with 155 additions and 18 deletions
--- a/build-x86_64/tup.config
+++ b/build-x86_64/tup.config
@ -25,7 +25,7 @@ CONFIG_PUBLIC_SRC_LIBSSH=genodelabs/src/libssh/2019-03-17
 CONFIG_PUBLIC_SRC_LIBSSL=genodelabs/src/libssl/2019-03-17
 CONFIG_PUBLIC_SRC_MENU_VIEW=genodelabs/src/menu_view/2019-03-17
 CONFIG_PUBLIC_SRC_MESA=nfeske/src/mesa/2019-02-19
-CONFIG_PUBLIC_SRC_NIC_BRIDGE=ehmry/src/nic_bridge/2019-03-17
+CONFIG_PUBLIC_SRC_NIC_BRIDGE=ehmry/src/nic_bridge/2019-04-12
 CONFIG_PUBLIC_SRC_NIT_FB=genodelabs/src/nit_fb/2019-03-17
 CONFIG_PUBLIC_SRC_POSIX=genodelabs/src/posix/2019-03-17
 CONFIG_PUBLIC_SRC_RAM_BLOCK=alex-ab/src/ram_block/2019-02-25
--- a/index.xml
+++ b/index.xml
@ -2,13 +2,14 @@

 	<index name="Emulators and game engines">
 		<pkg path="_/pkg/fceumm" info="NES"/>
-		<pkg path="_/pkg/gambatte"/>
+		<pkg path="_/pkg/gambatte" info="GB"/>
 		<pkg path="_/pkg/mgba" info="GBA"/>
 		<pkg path="_/pkg/nxengine" info="Cave Story engine without game data"/>
 		<pkg path="_/pkg/snes9x" info="SNES"/>
 		<pkg path="_/pkg/advanced_tests" info="Libretro tests"/>
 		<pkg path="_/pkg/dosbox" info="Experimental Libretro port of DOSBox"/>
 		<index name="Tests">
+			<pkg path="_/pkg/240pee-NES" info="NES tests"/>
 			<pkg path="_/pkg/240pSuite-SNES" info="SNES tests"/>
 			<pkg path="_/pkg/simple_tests" info="A test core written in C"/>
 			<pkg path="_/pkg/advanced_tests" info="An advanced test core written in C"/>
@ -24,15 +25,18 @@
 		<pkg path="ehmry/pkg/abuse/2019-03-20" info="Side-scrolling shooter"/>
 		<pkg path="_/pkg/cave_story-en" info="Cave Story ~ Doukutsu Monogatari is a jumping-and-shooting action game."/>
 		<pkg path="_/pkg/mrboom" info="Bomberman clone"/>
+		<pkg path="_/pkg/streemerz" info="Streemerz remake"/>
 		<pkg path="_/pkg/tyrquake" info="Tyrquake"/>
 	</index>

 	<index name="VMs">
+	<!--
 		<index name="NixOS">
 			<pkg path="_/pkg/fetch-nixos" info="Download a NixOS ISO"/>
 		</index>
+	 -->
 		<!-- <pkg path="_/pkg/fetch_alpine_x86_virt" info="Download an Alpine ISO"/> -->
-		<!-- <pkg path="_/pkg/dual_nic_vbox" info="32bit VirtualBox as a Nic service"/> -->
+		<pkg path="_/pkg/dual_nic_vbox" info="Dual nic VirtualBox"/>
 		<index name="Alpine">
 			<pkg path="_/pkg/installer-alpine_seoul_nova" info="Alpine Linux as a Seoul VMM guest installer with 8GiB disk"/>
 			<pkg path="_/pkg/alpine_seoul_nova" info="Alpine Linux as a Seoul VMM guest"/>
@ -43,43 +47,42 @@
 		<pkg path="_/pkg/oberon" info="Oberon RISC emulator (requires three-button mouse)"/>
 		<pkg path="_/pkg/soyuz" info="Training program for the Soyuz-TMA spacecraft"/>
 		<pkg path="_/pkg/templeos" info="The Temple Operating System hosted in VirtualBox for NOVA"/>
-		<pkg path="_/pkg/ban.ai" info="BAN.AI Public Access Multics"/>
+		<pkg path="_/pkg/ban.ai_multics" info="BAN.AI Public Access Multics"/>
 	</index>

 	<index name="Utilities">
 		<!-- <pkg path="ehmry/pkg/flif_capture/2019-03-22" info="Screen capture utility"/> -->
+		<pkg path="_/pkg/backdrop" info="Nitpicker backdrop"/>
 		<pkg path="_/pkg/block_shred" info="Fill a block device with psuedo-random noise"/>
 		<pkg path="_/pkg/depot_9P" info="Serve /depot/local over 9P"/>
 		<pkg path="ehmry/pkg/flif_view/2019-03-22" info="FLIF file viewer"/>
 		<pkg path="ehmry/pkg/grafx2/2019-03-19" info="Bitmap paint program (ported by cnuke)"/>
 		<pkg path="ehmry/pkg/jitter_sponge/2019-03-31" info="Entropy source"/>
 		<pkg path="ehmry/pkg/noux-build-x86/2019-03-20" info="Noux build environment"/>
-		<pkg path="_/pkg/ssh_client" info="SSH client"/>
 		<pkg path="_/pkg/ninep" info="9P server"/>
+		<pkg path="_/pkg/test-lwip_node" info="Standalone lwIP IPv6 node"/>
+		<pkg path="_/pkg/ssh_client" info="SSH client"/>	
 	</index>

-<!--
 	<index name="Network">
 		<pkg path="_/pkg/nic_bridge" info="Ethernet bridge service"/>
 		<pkg path="_/pkg/nic_bridge_logged" info="Logged ethernet bridge service"/>
-		<pkg path="_/pkg/ssh_client" info="SSH client"/>	
+		<pkg path="_/pkg/test-lwip_node" info="Standalone lwIP IPv6 node"/>
 	</index>
- -->

 	<index name="Experimental">
 		<pkg path="_/pkg/4do"/>
-		<pkg path="_/pkg/advanced_tests"/>
-		<pkg path="_/pkg/blobsets_fs"/>
-		<pkg path="_/pkg/blobsets_http"/>
+		<pkg path="_/pkg/blobs_service"/>
 		<pkg path="_/pkg/bluemsx"/>
-		<pkg path="_/pkg/dosbox"/>
 		<pkg path="_/pkg/ifm1"/>
 		<pkg path="_/pkg/ifm2"/>
 		<pkg path="_/pkg/ifm3"/>
 		<pkg path="_/pkg/monero_vanity"/>
+		<pkg path="_/pkg/mu"/>
 		<pkg path="_/pkg/musicbrainz_playlist_generator"/>
+		<pkg path="_/pkg/testgl"/>
 	</index>

 	<pkg path="_/pkg/chroot" info="Automatic file-system session partitioner"/>
-
+	<pkg path="cnuke/pkg/bsd_audio_drv/2019-03-21" info="Cnuke's audio driver"/>
 </index>
--- a/libretro/games/streemerz/Tupfile
+++ b/libretro/games/streemerz/Tupfile
@ -0,0 +1,18 @@
+TARGET_NAME = streemerz
+RAW_VERSION = 02
+include_rules
+
+: |> wget --quiet https://www.fauxgame.com/downloads/%o \
+	|> streemerz-v02.zip {zip}
+
+: {zip} |> unzip %f \
+		README.txt streemerz-v02.nes -d $(RAW_DIR) \
+	|> $(RAW_DIR)/README.txt $(RAW_DIR)/streemerz-v02.nes {unzipped}
+
+: |> !raw |>
+
+PKG_DEPENDS += \
+	_/pkg/fceumm \
+	_/raw/$(TARGET_NAME) \
+
+: runtime |> !collect_pkg_runtime |>
--- a/libretro/games/streemerz/runtime
+++ b/libretro/games/streemerz/runtime
@ -0,0 +1,39 @@
+<runtime ram="16M" caps="128" binary="retro_frontend">
+
+	<requires>
+		<audio_out/>
+		<nitpicker/>
+		<rm/>
+	</requires>
+
+	<content>
+		<rom label="streemerz-v02.nes"/>
+		<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>
+			<rom name="streemerz-v02.nes"/>
+			<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_ENTER" to="START"/>
+			<map from="KEY_RIGHTSHIFT" to="SELECT"/>
+		</default-controller>
+	</config>
+
+</runtime>
--- a/libretro/tests/240pSuite-SNES/Tupfile
+++ b/libretro/tests/240pSuite-SNES/Tupfile
@ -1,10 +1,13 @@
 TARGET_NAME = 240pSuite-SNES
+RAW_VERSION = 1.03
 include_rules

-: 240pSuite-SNES-1.03.zip |> unzip %f %o \
-	|> $(RAW_DIR)/240pSuite.sfc $(RAW_DIR)/README.TXT {raw}
+# Mirrored here, fuck sourceforge
+: 240pSuite-SNES-$(RAW_VERSION).zip |> unzip %f \
+		240pSuite.sfc README.TXT \
+		-d $(RAW_DIR) \
+	|> $(RAW_DIR)/240pSuite.sfc $(RAW_DIR)/README.TXT {unzipped}

-: foreach {raw} |> !collect_raw |>
 : |> !raw |>

 PKG_DEPENDS += \
--- a/libretro/tests/240pee-NES/240pee-0.08.2.zip
+++ b/libretro/tests/240pee-NES/240pee-0.08.2.zip
--- a/libretro/tests/240pee-NES/Tupfile
+++ b/libretro/tests/240pee-NES/Tupfile
@ -0,0 +1,17 @@
+TARGET_NAME = 240pee-NES
+RAW_VERSION = 0.08.2
+include_rules
+
+# Mirrored here, fuck sourceforge
+: 240pee-$(RAW_VERSION).zip |> unzip %f \
+		240pee.nes 240pee-bnrom.nes README.md \
+		-d $(RAW_DIR) \
+	|> $(RAW_DIR)/240pee.nes $(RAW_DIR)/240pee-bnrom.nes $(RAW_DIR)/README.md {unzipped}
+
+: |> !raw |>
+
+PKG_DEPENDS += \
+	_/pkg/fceumm \
+	_/raw/$(TARGET_NAME) \
+
+: runtime |> !collect_pkg_runtime |>
--- a/libretro/tests/240pee-NES/runtime
+++ b/libretro/tests/240pee-NES/runtime
@ -0,0 +1,39 @@
+<runtime ram="16M" caps="128" binary="retro_frontend">
+
+	<requires>
+		<audio_out/>
+		<nitpicker/>
+		<rm/>
+	</requires>
+
+	<content>
+		<rom label="240pee.nes"/>
+		<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>
+			<rom name="240pee.nes"/>
+			<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_ENTER" to="START"/>
+			<map from="KEY_RIGHTSHIFT" to="SELECT"/>
+		</default-controller>
+	</config>
+
+</runtime>
--- a/libretro/topbench/Tuprules.tup
+++ b/libretro/topbench/Tuprules.tup
@ -0,0 +1,3 @@
+PKG_DEPENDS += ehmry/raw/topbench/0.38.h
+: $(TUP_CWD)/runtime |> !collect_pkg_runtime |>
+: |> !pkg |>
--- a/libretro/topbench/dosbox-libretro/Tupfile
+++ b/libretro/topbench/dosbox-libretro/Tupfile
@ -0,0 +1,3 @@
+TARGET_NAME = topbench_dosbox-libretro
+PKG_DEPENDS += _/pkg/dosbox
+include_rules
--- a/libretro/topbench/dosbox-svn/Tupfile
+++ b/libretro/topbench/dosbox-svn/Tupfile
@ -0,0 +1,3 @@
+TARGET_NAME = topbench_dosbox-svn
+PKG_DEPENDS += _/pkg/dosbox_svn
+include_rules
--- a/nim/blobsets
+++ b/nim/blobsets
@ -1 +1 @@
-Subproject commit d7066b4db4851baec6b7b9ae4ac777d2e30dcfc2
+Subproject commit f0946f4367fd493e5f9d3919fa777b1aa8fec635
--- a/runtimes/ban.ai_multics/Tupfile
+++ b/runtimes/ban.ai_multics/Tupfile
@ -1,4 +1,4 @@
-TARGET_NAME = ban.ai
+TARGET_NAME = ban.ai_multics

 PKG_DEPENDS += \
 	@(SDK_USER)/src/libc/@(SDK_VERSION) \
--- a/runtimes/ban.ai_multics/runtime
+++ b/runtimes/ban.ai_multics/runtime
--- a/runtimes/test-lwip_node/Tupfile
+++ b/runtimes/test-lwip_node/Tupfile
@ -0,0 +1,4 @@
+TARGET_NAME = test-lwip_node
+include_rules
+PKG_DEPENDS += local/src/test-lwip_node/current
+: runtime |> !collect_pkg_runtime |>
--- a/runtimes/test-lwip_node/runtime
+++ b/runtimes/test-lwip_node/runtime
@ -0,0 +1,5 @@
+<runtime ram="4M" caps="128" binary="test-lwip_node">
+	<requires> <nic/> </requires>
+	<content> <rom label="test-lwip_node"/> </content>
+	<config ipv6="yes"/>
+</runtime>