!WiP new audio sessions

.gitmodules

@@ -42,7 +42,7 @@
 	url = git@github.com:ehmry/oberon-risc-libretro.git
 [submodule "libretro/cores/snes9x/core"]
 	path = libretro/cores/snes9x/upstream
-	url = git@github.com:ehmry/snes9x.git
+	url = https://github.com/libretro/snes9x.git
 [submodule "libretro/cores/tyrquake/core"]
 	path = libretro/cores/tyrquake/upstream
 	url = https://github.com/libretro/tyrquake
@@ -75,7 +75,7 @@
 	url = git@github.com:ehmry/blueMSX-libretro.git
 [submodule "nimble/fetch_and_copy"]
 	path = nim/fetch_and_copy
-	url = git@github.com:ehmry/fetch_and_copy.git
+	url = git://depot.h4ck.me/srv/git/fetch_and_copy.
 [submodule "nimble/nim"]
 	path = nim/nim
 	url = https://github.com/ehmry/nim.git

Tupfile

@@ -49,7 +49,7 @@ SHORT_SUM = b2sum -l24
 		awk -F '/' -f errata/raw.mk.awk $f >> %o; done; \
 	for f in %<bin-archives>; do \
 		awk -F '/' -f errata/bin.mk.awk $f >> %o; done; \
-	awk -F '/' -f errata/pkg.mk.awk $(PKG_SED_FILE) >> %o; done \
+	awk -F '/' -f errata/pkg.mk.awk $(PKG_SED_FILE) >> %o; \
 |> Makefile
 	# Generate the makefile for creating signed package tarballs
 

Tuprules.tup

@@ -20,13 +20,12 @@ CC_MARCH = -march=armv8-a
 endif
 
 GENODE_DIR = $(TUP_CWD)/upstream
+&STUB_DIR = stub
 STUB_DIR = $(TUP_CWD)/stub
 
 export NIX_PATH
 NIX_BUILD = nix-build --option substitute false
 
-&STUB_DIR = upstream/stub
-
 LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
 
 !prg = | $(GENODE_DIR)/<stub> $(GENODE_DIR)/<pkg-config> \
@@ -37,7 +36,7 @@ LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
 	%f \
 	$(LIBGCC) \
 	-o %o \
-|>
+|> %d
 
 !lib = | $(GENODE_DIR)/<stub> $(GENODE_DIR)/<pkg-config> |> ^o LD %o^ $(LD) $(LD_MARCH) %f $(LDFLAGS) `$(PKG_CONFIG) --libs genode-lib $(LIBS)` -L&(STUB_DIR) -o %o |>
 
@@ -155,6 +154,7 @@ AS_OPT += $(AS_MARCH)
 LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
 
 PKG_CONFIG_DIR = $(TUP_CWD)/pkg-config
+&PKG_CONFIG_DIR = pkg-config
 
 PKG_CONFIG_PATH = $(PKG_CONFIG_DIR)
 PKG_CONFIG = PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config
@@ -163,7 +163,7 @@ PKG_CONFIG = PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config
 
 !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 %f -o %o |> %B.o
 
-!cc_port = | $(GENODE_DIR)/<pkg-config> |> ^o CC %o^ @(CC_WRAPPER) $(CC) -c $(DEFINES) $(CFLAGS) $(CFLAGS_%o) $(INCLUDES) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` -o %o |> %B.o
+!cc_port = | $(GENODE_DIR)/<pkg-config> |> ^o CC %o^ @(CC_WRAPPER) $(CC) -c -fPIC $(DEFINES) $(CFLAGS) $(CFLAGS_%o) $(INCLUDES) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` -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 %f -o %o |> %B.o
 

configs/arm_v8.config

@@ -7,6 +7,6 @@ CONFIG_CXX_WRAPPER=ccache
 CONFIG_OFFLINE=
 CONFIG_NO_NETWORK=
 
-CONFIG_SCULPT_VERSION=19.05
+CONFIG_SCULPT_VERSION=19.07
 CONFIG_PUBLIC_USER=ehmry
 CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7

configs/i386.config

@@ -10,6 +10,6 @@ CONFIG_NO_NETWORK=
 
 CONFIG_BUILD_NOVA=y
 
-CONFIG_SCULPT_VERSION=19.05
+CONFIG_SCULPT_VERSION=19.07
 CONFIG_PUBLIC_USER=ehmry
 CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7

configs/x86_64.config

@@ -9,7 +9,7 @@ CONFIG_OFFLINE=
 
 CONFIG_BUILD_NOVA=y
 
-CONFIG_SCULPT_VERSION=19.05
+CONFIG_SCULPT_VERSION=19.07
 CONFIG_PUBLIC_USER=ehmry
 CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7
 
@@ -19,15 +19,15 @@ CONFIG_PUBLIC_PKG_BACKDROP=ehmry/pkg/backdrop/2019-05-24
 CONFIG_PUBLIC_PKG_NOUX_SYSTEM=ehmry/pkg/noux-system/2019-05-24
 CONFIG_PUBLIC_PKG_PDF_VIEW=ehmry/pkg/pdf_view/2019-05-17
 
-CONFIG_PUBLIC_SRC_BASE_NOVA=genodelabs/src/base-nova/2019-03-17
+CONFIG_PUBLIC_SRC_BASE_NOVA=genodelabs/src/base-nova/2019-05-26
 CONFIG_PUBLIC_SRC_BLOCK_SHRED=ehmry/src/block_shred/2019-03-31
-CONFIG_PUBLIC_SRC_CHROOT=ehmry/src/chroot/2019-05-24
+CONFIG_PUBLIC_SRC_CHROOT=_/src/chroot
 CONFIG_PUBLIC_SRC_EXPAT=nfeske/src/expat/2019-02-19
-CONFIG_PUBLIC_SRC_FS_LOG=ehmry/src/fs_log/2019-04-01
-CONFIG_PUBLIC_SRC_INIT=ehmry/src/init/2019-05-24
-CONFIG_PUBLIC_SRC_LIBC=ehmry/src/libc/2019-05-24
+CONFIG_PUBLIC_SRC_FS_LOG=_/src/fs_log
+CONFIG_PUBLIC_SRC_INIT=_/src/init
+CONFIG_PUBLIC_SRC_LIBC=nfeske/src/libc/2019-06-24
 CONFIG_PUBLIC_SRC_LIBCRYPTO=ehmry/src/libcrypto/2019-05-24
-CONFIG_PUBLIC_SRC_LIBICONV=genodelabs/src/libiconv/2019-02-25
+CONFIG_PUBLIC_SRC_LIBICONV=genodelabs/src/libiconv/2019-05-26
 CONFIG_PUBLIC_SRC_LIBMPG123=ehmry/src/libmpg123/2019-05-24
 CONFIG_PUBLIC_SRC_LIBPNG=ehmry/src/libpng/2019-05-24
 CONFIG_PUBLIC_SRC_LIBSSH=ehmry/src/libssh/2019-05-24
@@ -40,23 +40,23 @@ CONFIG_PUBLIC_SRC_NIC_BRIDGE=ehmry/src/nic_bridge/2019-05-24
 CONFIG_PUBLIC_SRC_NIT_FB=ehmry/src/nit_fb/2019-05-24
 CONFIG_PUBLIC_SRC_NOUX=ehmry/src/noux/2019-05-24
 CONFIG_PUBLIC_SRC_NCURSES=ehmry/src/ncurses/2019-05-24
-CONFIG_PUBLIC_SRC_POSIX=ehmry/src/posix/2019-05-24
+CONFIG_PUBLIC_SRC_POSIX=_/src/posix
 CONFIG_PUBLIC_SRC_RAM_BLOCK=alex-ab/src/ram_block/2019-02-25
-CONFIG_PUBLIC_SRC_REPORT_ROM=ehmry/src/report_rom/2019-05-24
+CONFIG_PUBLIC_SRC_REPORT_ROM=_/src/report_rom
 CONFIG_PUBLIC_SRC_ROM_BLOCK=ehmry/src/rom_block/2019-04-05-a
 CONFIG_PUBLIC_SRC_SDL=ehmry/src/sdl/2019-05-24
 CONFIG_PUBLIC_SRC_SEOUL_NOVA=ehmry/src/seoul-nova/2019-05-01-a
 CONFIG_PUBLIC_SRC_SHOW_INPUT=ehmry/src/show_input/2019-05-24
 CONFIG_PUBLIC_SRC_SSH_CLIENT=ehmry/src/ssh_client/2019-05-24
-CONFIG_PUBLIC_SRC_STDCXX=ehmry/src/stdcxx/2019-05-24
+CONFIG_PUBLIC_SRC_STDCXX=genodelabs/src/stdcxx/2019-05-27
 CONFIG_PUBLIC_SRC_TERMINAL=ehmry/src/terminal/2019-05-24-a
-CONFIG_PUBLIC_SRC_VBOX_NOVA=genodelabs/src/vbox5-nova/2019-03-17
+CONFIG_PUBLIC_SRC_VBOX_NOVA=genodelabs/src/vbox5-nova/2019-05-28
 CONFIG_PUBLIC_SRC_VFS_AUDIT=ehmry/src/vfs_audit/2019-04-20
-CONFIG_PUBLIC_SRC_VFS=ehmry/src/vfs/2019-05-24
+CONFIG_PUBLIC_SRC_VFS=_/src/vfs
 CONFIG_PUBLIC_SRC_VFS_JITTERENTROPY=ehmry/src/vfs_jitterentropy/2019-05-24
 CONFIG_PUBLIC_SRC_VFS_LWIP=ehmry/src/vfs_lwip/2019-05-24
 CONFIG_PUBLIC_SRC_VFS_LXIP=ehmry/src/vfs_lxip/2019-05-24
-CONFIG_PUBLIC_SRC_VFS_TTF=ehmry/src/vfs_ttf/2019-05-24
+CONFIG_PUBLIC_SRC_VFS_TTF=nfeske/src/vfs_ttf/2019-06-20
 CONFIG_PUBLIC_SRC_WINDOW_LAYOUTER=ehmry/src/window_layouter/2019-05-24
 CONFIG_PUBLIC_SRC_WM=ehmry/src/wm/2019-05-24
-CONFIG_PUBLIC_SRC_ZLIB=ehmry/src/zlib/2019-05-24
+CONFIG_PUBLIC_SRC_ZLIB=genodelabs/src/zlib/2019-05-26

default.nix

@@ -3,8 +3,6 @@
 let
   lddir = ./upstream/repos/base/src/ld;
   toolchain = import ./errata/toolchain.nix { inherit pkgs; };
-  sdk = import ./sdk { inherit pkgs toolchain; };
-  ports = import ./upstream/repos/libports/ports { };
 in
 pkgs.mkShell {
   name = "genode-dev-env";
@@ -45,13 +43,11 @@ pkgs.mkShell {
       ncurses
     ];
 
-  passthru = { inherit lddir sdk toolchain; };
+  passthru = { inherit lddir toolchain; };
 
   shellHook =
     ''
-      export SDK_DIR=${sdk}
       export LD_DIR=${lddir}
-      export PKG_CONFIG_PATH=${sdk}/pkg-config
       export TOOLCHAIN_DIR=${toolchain}
       export SYSLINUX=${syslinux}
       export PROMPT_DIRTRIM=2

errata/runtime.xsd

@@ -19,6 +19,7 @@
    <xs:element name="log" type="template_service"/>
    <xs:element name="nic" type="template_service"/>
    <xs:element name="nitpicker" type="template_service"/>
+   <xs:element name="platform" type="template_service"/>
    <xs:element name="report" type="template_service"/>
    <xs:element name="rm" type="template_service"/>
    <xs:element name="rom" type="template_service"/>

index.xml

@@ -1,5 +1,16 @@
 <index>
 
+	<index name="Audio">
+		<pkg path="_/pkg/mixer" info="Mixer component"/>
+		<pkg path="_/pkg/bsd_audio_drv" info="OpenBSD audio driver (mixer client)"/>
+		<pkg path="ehmry/pkg/audio_player/2019-05-24" info="Cnuke's audio player"/>
+		<index name="Radio streams">
+			<pkg path="_/pkg/ifm1" info="Intergalactic FM 1"/>
+			<pkg path="_/pkg/ifm2" info="Intergalactic FM 2"/>
+			<pkg path="_/pkg/ifm3" info="Intergalactic FM 3"/>
+		</index>
+	</index>
+
 	<index name="Emulators and game engines">
 		<pkg path="_/pkg/dosbox" info="Experimental Libretro port of DOSBox"/>
 		<pkg path="_/pkg/fceumm" info="NES"/>
@@ -60,10 +71,6 @@
 	</index>
 
 	<index name="Utility">
-		<index name="Audio">
-			<pkg path="ehmry/pkg/bsd_audio_drv/2019-05-24" info="Cnuke's audio driver"/>
-			<pkg path="ehmry/pkg/audio_player/2019-05-24" info="Cnuke's audio player"/>
-		</index>
 
 		<index name="Graphic">
 			<!-- <pkg path="ehmry/pkg/flif_capture/2019-03-22" info="Screen capture utility"/> -->
@@ -80,6 +87,7 @@
 			<pkg path="_/pkg/ninep" info="9P server"/>
 			<pkg path="_/pkg/ssh_client" info="SSH client"/>	
 			<pkg path="_/pkg/test-lwip_node" info="Standalone lwIP IPv6 node"/>
+			<pkg path="_/pkg/kiosk" info="Kiosk-style web browser"/>
 		</index>
 
 		<index name="UI">
@@ -95,6 +103,7 @@
 			<!-- <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/noux-system" info="Noux administration environment"/>
+			<pkg path="_/pkg/show_input" info="Nitpicker input event debugger"/>
 		</index>
 	</index>
 
@@ -104,16 +113,14 @@
 			<pkg path="_/pkg/musicbrainz_playlist_generator" info="XSPF playlist generator"/>
 			<pkg path="_/pkg/xspf_view" info="XSPF playlist viewer"/>
 		</index>
-		<pkg path="_/pkg/4do"/>
+		<pkg path="_/pkg/4do" "3DO emulator"/>
 		<pkg path="ehmry/pkg/avplay/2019-05-24"/>
 		<pkg path="_/pkg/bluemsx"/>
 		<pkg path="_/pkg/cruzes" info="An unfinished Picross Libretro core"/>
-		<pkg path="_/pkg/ifm1"/>
-		<pkg path="_/pkg/ifm2"/>
-		<pkg path="_/pkg/ifm3"/>
 		<pkg path="_/pkg/monero_vanity"/>
 		<pkg path="_/pkg/mu"/>
 		<pkg path="_/pkg/testgl"/>
+		<pkg path="_/pkg/yabause" info="Sega Saturn emulator/>
 	</index>
 
 	<pkg path="ehmry/pkg/fonts_fs/2019-05-24" info="Fonts provider"/>

libretro/cores/4do/runtime

@@ -8,7 +8,6 @@
 	</requires>
 
 	<content>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/cores/Tuprules.tup

@@ -1,6 +1,6 @@
 # Implicit dependencies
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_VFS) \
+	_/src/vfs \
 	@(PUBLIC_SRC_LIBC) \
 	_/src/$(BIN_NAME) \
 	_/src/retro_frontend \
@@ -29,7 +29,7 @@ PKG_DEPENDS += \
 		$(LDFLAGS) \
 		`$(PKG_CONFIG) --libs $(CORE_PKGS)` \
 		`$(PKG_CONFIG) --libs genode-lib` \
-		-L$(GENODE_DIR)/stub \
+		-L$(STUB_DIR) \
 |> libretro.so
 
 LINK_T = $(TUP_CWD)/link.T

libretro/cores/bluemsx/runtime

@@ -10,7 +10,6 @@
 
 	<content>
 		<rom label="blueMSX.tar"/>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/cores/fceumm/runtime

@@ -8,7 +8,6 @@
 	</requires>
 
 	<content>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/cores/gambatte/runtime

@@ -8,7 +8,6 @@
 	</requires>
 
 	<content>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/cores/mgba/runtime

@@ -8,7 +8,6 @@
 	</requires>
 
 	<content>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/cores/nxengine/runtime

@@ -8,7 +8,6 @@
 	</requires>
 
 	<content>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/cores/samples/audio.runtime

@@ -4,6 +4,7 @@
 		<audio_out/>
 		<file_system/>
 		<nitpicker/>
+		<rm/>
 	</requires>
 
 	<content>

libretro/cores/snes9x/runtime

@@ -8,7 +8,6 @@
 	</requires>
 
 	<content>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/cores/snes9x/upstream

@@ -1 +1 @@
-Subproject commit 5c2e090566e2ac31428570beed71149fce4f3e22
+Subproject commit 121576eb06ec7f1381881710d0ddd013355cd9de

libretro/cores/yabause/Tuprules.tup

@@ -4,6 +4,8 @@ CORE_PKGS += libc libm
 
 include upstream/libretro/Makefile.common
 
+: foreach $(C68KEXEC_SOURCE) |> !libretro_cc -O0 -DNDEBUG |> %B.o {obj}
+
 CFLAGS += $(INCFLAGS)
 CFLAGS += -DSIZEOF_DOUBLE=8
 CFLAGS += -DUSE_16BPP=1
@@ -18,7 +20,6 @@ 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}

libretro/cores/yabause/runtime

@@ -8,7 +8,6 @@
 	</requires>
 
 	<content>
-		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libretro.so"/>

libretro/games/quake_dopa/Tupfile

@@ -15,7 +15,7 @@ DOPA_FILES = \
 include &(RAW_RULES)
 
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_VFS) \
+	_/src/vfs \
 	@(PUBLIC_SRC_LIBC) \
 	_/src/tyrquake \
 	_/src/retro_frontend \

libretro/tests/240pSuite-SNES/Tupfile

@@ -9,7 +9,7 @@ include_rules
 	|> $(RAW_DIR)/240pSuite.sfc $(RAW_DIR)/README.TXT {unzipped}
 
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_VFS) \
+	_/src/vfs \
 	@(PUBLIC_SRC_LIBC) \
 	@(PUBLIC_SRC_STDCXX) \
 	_/src/snes9x \

libretro/tests/240pee-NES/Tupfile

@@ -9,7 +9,7 @@ include_rules
 	|> $(RAW_DIR)/240pee.nes $(RAW_DIR)/240pee-bnrom.nes $(RAW_DIR)/README.md {unzipped}
 
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_VFS) \
+	_/src/vfs \
 	@(PUBLIC_SRC_LIBC) \
 	_/src/fceumm \
 	_/src/retro_frontend \

nim/README.md

@@ -4,6 +4,6 @@ the repository contains an `*,nimble`, an `archives`, and a `runtime` file.
 
 ```tup
 include_rules
-include $(NIMBLE_BINARIES_INCLUDE)
-include $(NIMBLE_PACKAGE_INCLUDE)
+include &(NIMBLE_BINARIES_INCLUDE)
+include &(NIMBLE_PACKAGE_INCLUDE)
 ```

nim/Tuprules.tup

@@ -1,5 +1,15 @@
 # Nim default variables
 
+ifeq (@(TUP_ARCH),arm64)
+	NIM_CPU = arm64
+endif
+ifeq (@(TUP_ARCH),i386)
+	NIM_CPU = i386
+endif
+ifeq (@(TUP_ARCH),x86_64)
+	NIM_CPU = amd64
+endif
+
 NIM_RELEASE_FLAG = -d:release
 	# Drop the relase flag with the line "NIM_RELEASE_FLAG="
 
@@ -9,5 +19,15 @@ NIM_SRC_DIR = src
 BIN_VERSION = $(GIT_VERSION)
 	# Use the git version as the binary package version
 
-NIMBLE_BINARIES_INCLUDE = $(TUP_CWD)/binaries.tup
-NIMBLE_PACKAGE_INCLUDE = $(TUP_CWD)/package.tup
+&NIMBLE_BINARIES_INCLUDE = binaries.tup
+&NIMBLE_PACKAGE_INCLUDE = package.tup
+
+!nim_build = | $(GENODE_DIR)/<pkg-config> $(GENODE_DIR)/<stub> \
+|> ^o Nimble %B^ \
+	PKG_CONFIG_PATH=`pwd`/$(PKG_CONFIG_DIR) \
+	nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) \
+	--cpu:$(NIM_CPU) --os:genode -d:posix \
+	--parallelBuild:1 --passL:-L`pwd`/$(STUB_DIR) -o:%B %f \
+|> %B ./<binaries>
+	# Nim may invoke the C++ compiler at an arbitrary location,
+	# thus the relative $(PKG_CONFIG_DIR) is prepended with `pwd`

nim/binaries.tup

@@ -1,17 +1,3 @@
-ifeq (@(TUP_ARCH),arm64)
-	CPU = arm64
-endif
-ifeq (@(TUP_ARCH),i386)
-	CPU = i386
-endif
-ifeq (@(TUP_ARCH),x86_64)
-	CPU = amd64
-endif
-
-!nim_build = |> ^o Nimble %B^ \
-	PKG_CONFIG_PATH=@(PKG_CONFIG_PATH) PATH=$PATH:@(TOOLCHAIN_PATH) nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) --cpu:$(CPU) --os:genode -d:posix --parallelBuild:1 -o:%B %f \
-|> %B ./<binaries>
-
 : foreach $(NIM_SRC_DIR)/*.nim |> !nim_build |> {binary}
 : foreach {binary} |> !collect_bin |>
 : |> !bin |>

nim/blobsets

@@ -1 +1 @@
-Subproject commit 2cc154f6b6d718ed4473fb4544547a7e4a5d5dee
+Subproject commit aaa61aebd895e60de28936711b6231d9e555888a

nim/carn_layouter

@@ -1 +1 @@
-Subproject commit 75cf89f0abe715074b959b737e14bdb20c4ea412
+Subproject commit 48b29f8d699571eb79ac73e248754e464f6b9bc7

nim/fetch_and_copy

@@ -1 +1 @@
-Subproject commit b435efd9befcb1cf12bc7aa5ad5a71e759c6b8f1
+Subproject commit 80a63d06a41230f98a44b09c8167d14275efee7c

nim/icy_client

@@ -1 +1 @@
-Subproject commit 9d59f400f2a2c98be84c0598847dec9244b78cf3
+Subproject commit c16dd1b093dface9bb8be00da5edbc4b790363cc

nim/imap_report

@@ -1 +1 @@
-Subproject commit bb47512970e1f7bdc453d5687a1239d203efb788
+Subproject commit e8abc833f3522794ea691e36f561fe8bf2481af4

nim/musicbrainz_playlist_generator

@@ -1 +1 @@
-Subproject commit 3961d2ee7000236f9a35ac878d81643e0eb29d48
+Subproject commit 84c694a34b489157ce222de1b77d67f0775f9993

nim/nim-genode

@@ -1 +1 @@
-Subproject commit e100bf80fbef15aa0b741bb1f58a976054142a02
+Subproject commit 1d58fcff44e4ad94a5fd5983e64989ba312f7d70

nim/nim-monero

@@ -1 +1 @@
-Subproject commit 5109915ac162cd356a4fc06e367e790eb8024d62
+Subproject commit a50208a35aec3031c81f5b4d6141498465ebcf90

nim/ninep

@@ -1 +1 @@
-Subproject commit 7889d655acdff0fcab8c939e93f7700ff6ea0d36
+Subproject commit 739918bcd740f1c3447d3fe54ff275919762c5fe

nim/xspf_view

@@ -1 +1 @@
-Subproject commit 40ae6930ebc57cae6b1161344d10c899c6bfa6bd
+Subproject commit 066b2c3fb9c005e1f29ee9a7c1b0431882790116

ports/default.nix

@@ -5,7 +5,6 @@ let
     let f = (import path);
     in f (builtins.intersectAttrs (builtins.functionArgs f) (tool.nixpkgs // tool) );
 
-  hasSuffixNix = tool.hasSuffix ".nix";
   dir = builtins.readDir ../ports;
 in
 builtins.listToAttrs (

ports/mpg123/Tupfile

@@ -0,0 +1,35 @@
+TARGET_NAME = mpg123
+LIBS += libc
+include_rules
+
+SOURCE_LINK = port-source
+API_LINK = port-api
+
+: |> $(NIX_BUILD) .. --out-link port \
+	--attr %d.source --attr %d.api |> $(SOURCE_LINK) $(API_LINK) {port}
+
+: $(API_LINK) |> cp %f/pkg-config/%d.pc %o \
+	|> $(PKG_CONFIG_DIR)/%d.pc $(GENODE_DIR)/<pkg-config>
+
+: mpg123.symbols |> !abi_stub |>
+
+INCLUDES += -I.
+INCLUDES += -I$(SOURCE_LINK)/src/libmpg123
+INCLUDES += -I$(SOURCE_LINK)/src/compat
+INCLUDES += -I$(SOURCE_LINK)/src
+INCLUDES += -I$(API_LINK)/include
+
+ifeq (@(TUP_ARCH),x86_64)
+	DEFINES += -DOPT_X86_64
+	run ./port_rules.sh $(SOURCE_LINK) common.files x86_64.files
+endif
+
+ifeq (@(TUP_ARCH),arm)
+	DEFINES += -DOPT_ARM
+	run ./port_rules.sh $(SOURCE_LINK) common.files arm.files
+endif
+
+: {obj} |> !lib |> %d.lib.so {bin}
+: {bin} |> !collect_bin |>
+
+include &(BIN_RULES)

ports/mpg123/arm.files

@@ -0,0 +1 @@
+src/libmpg123/synth_arm.S

ports/mpg123/common.files

@@ -0,0 +1,38 @@
+src/compat/compat.c
+src/compat/compat_str.c
+src/libmpg123/parse.c
+src/libmpg123/layer1.c
+src/libmpg123/synth_stereo_avx.S
+src/libmpg123/feature.c
+src/libmpg123/lfs_alias.c
+src/libmpg123/synth_s32.c
+src/libmpg123/dct64_avx.S
+src/libmpg123/tabinit.c
+src/libmpg123/dct64_i386.c
+src/libmpg123/format.c
+src/libmpg123/dct64_avx_float.S
+src/libmpg123/dither.c
+src/libmpg123/synth.c
+src/libmpg123/synth_8bit.c
+src/libmpg123/layer3.c
+src/libmpg123/dct64.c
+src/libmpg123/synth_stereo_avx_accurate.S
+src/libmpg123/mpg123.h.in
+src/libmpg123/icy.c
+src/libmpg123/index.c
+src/libmpg123/equalizer.c
+src/libmpg123/readers.c
+src/libmpg123/icy2utf8.c
+src/libmpg123/stringbuf.c
+src/libmpg123/synth_real.c
+src/libmpg123/dct36_avx.S
+src/libmpg123/testcpu.c
+src/libmpg123/frame.c
+src/libmpg123/id3.c
+src/libmpg123/Makemodule.am
+src/libmpg123/ntom.c
+src/libmpg123/synth_stereo_avx_float.S
+src/libmpg123/libmpg123.c
+src/libmpg123/synth_stereo_avx_s32.S
+src/libmpg123/layer2.c
+src/libmpg123/optimize.c

ports/mpg123/config.h

@@ -0,0 +1,48 @@
+#define ASMALIGN_BALIGN 1
+#define CCALIGN 1
+#define DYNAMIC_BUILD 1
+#define FRAME_INDEX 1
+#define GAPLESS 1
+#define HAVE_ATOLL 1
+#define HAVE_DIRENT_H 1
+#define HAVE_DLCLOSE 1
+#define HAVE_DLFCN_H 1
+#define HAVE_DLOPEN 1
+#define HAVE_DLSYM 1
+#define HAVE_GETPAGESIZE 1
+#define HAVE_GETUID 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_LIBM 1
+#define HAVE_LIMITS_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_RANDOM 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRERROR 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_SIGNAL_H 1
+#define HAVE_SYS_SOUNDCARD_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_TERMIOS 1
+#define HAVE_UNISTD_H 1
+#define IEEE_FLOAT 1
+#define INDEX_SIZE 1000
+#define LFS_ALIAS_BITS 64
+#define SIZEOF_INT32_T 4
+#define SIZEOF_LONG 8
+#define SIZEOF_OFF_T 8
+#define SIZEOF_SIZE_T 8
+#define SIZEOF_SSIZE_T 8
+#define STDC_HEADERS 1
+#define USE_MODULES 1
+#define USE_NEW_HUFFTABLE 1
+#define lfs_alias_t off_t

ports/mpg123/default.nix

@@ -0,0 +1,27 @@
+{ preparePort, mpg123 }:
+
+let
+  apiVersion = 44; # found in configure.ac
+in
+preparePort rec {
+  inherit (mpg123) name src;
+  outputs = [ "source" "api" ];
+  buildPhase =
+    ''
+      mkdir -p $api/include $api/pkg-config
+
+      sed \
+        -e 's/@API_VERSION@/$(API_VERSION)/' \
+        -e '/@.*@/d' \
+        src/libmpg123/mpg123.h.in > $api/include/mpg123.h
+
+      cp src/libmpg123/fmt123.h $api/include
+
+      sed \
+        -e "s|@includedir@|$api/include|" \
+        -e 's/@PACKAGE_VERSION@/${(builtins.parseDrvName name).version}/' \
+        -e 's/^Libs:.*/Libs: -l:mpg123.lib.so/' \
+        -e '/@/d' \
+        < libmpg123.pc.in > $api/pkg-config/mpg123.pc
+    '';
+}

ports/mpg123/mpg123.symbols

@@ -0,0 +1,115 @@
+mpg123_add_string T
+mpg123_add_substring T
+mpg123_chomp_string T
+mpg123_clip T
+mpg123_close T
+mpg123_copy_string T
+mpg123_current_decoder T
+mpg123_decode T
+mpg123_decode_frame T
+mpg123_decode_frame_64 T
+mpg123_decoder T
+mpg123_decoders T
+mpg123_delete T
+mpg123_delete_pars T
+mpg123_enc_from_id3 T
+mpg123_encodings T
+mpg123_encsize T
+mpg123_eq T
+mpg123_errcode T
+mpg123_exit T
+mpg123_feature T
+mpg123_feed T
+mpg123_feedseek T
+mpg123_feedseek_64 T
+mpg123_fmt T
+mpg123_fmt_all T
+mpg123_fmt_none T
+mpg123_fmt_support T
+mpg123_format T
+mpg123_format_all T
+mpg123_format_none T
+mpg123_format_support T
+mpg123_framebyframe_decode T
+mpg123_framebyframe_decode_64 T
+mpg123_framebyframe_next T
+mpg123_framedata T
+mpg123_framelength T
+mpg123_framelength_64 T
+mpg123_framepos T
+mpg123_framepos_64 T
+mpg123_free_string T
+mpg123_geteq T
+mpg123_getformat T
+mpg123_getformat2 T
+mpg123_getpar T
+mpg123_getparam T
+mpg123_getstate T
+mpg123_getvolume T
+mpg123_grow_string T
+mpg123_icy T
+mpg123_icy2utf8 T
+mpg123_id3 T
+mpg123_index T
+mpg123_index_64 T
+mpg123_info T
+mpg123_init T
+mpg123_init_string T
+mpg123_length T
+mpg123_length_64 T
+mpg123_meta_check T
+mpg123_meta_free T
+mpg123_new T
+mpg123_new_pars T
+mpg123_noise T
+mpg123_open T
+mpg123_open_64 T
+mpg123_open_fd T
+mpg123_open_fd_64 T
+mpg123_open_feed T
+mpg123_open_handle T
+mpg123_open_handle_64 T
+mpg123_outblock T
+mpg123_par T
+mpg123_param T
+mpg123_parnew T
+mpg123_plain_strerror T
+mpg123_position T
+mpg123_position_64 T
+mpg123_rates T
+mpg123_read T
+mpg123_replace_buffer T
+mpg123_replace_reader T
+mpg123_replace_reader_64 T
+mpg123_replace_reader_handle T
+mpg123_replace_reader_handle_64 T
+mpg123_reset_eq T
+mpg123_resize_string T
+mpg123_safe_buffer T
+mpg123_scan T
+mpg123_seek T
+mpg123_seek_64 T
+mpg123_seek_frame T
+mpg123_seek_frame_64 T
+mpg123_set_filesize T
+mpg123_set_filesize_64 T
+mpg123_set_index T
+mpg123_set_index_64 T
+mpg123_set_string T
+mpg123_set_substring T
+mpg123_spf T
+mpg123_store_utf8 T
+mpg123_strerror T
+mpg123_strlen T
+mpg123_supported_decoders T
+mpg123_tell T
+mpg123_tell_64 T
+mpg123_tell_stream T
+mpg123_tell_stream_64 T
+mpg123_tellframe T
+mpg123_tellframe_64 T
+mpg123_timeframe T
+mpg123_timeframe_64 T
+mpg123_tpf T
+mpg123_volume T
+mpg123_volume_change T

ports/mpg123/port_rules.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+LINK=$1
+shift
+
+for LIST in $@
+do
+	grep '\.c$' ${LIST} | while read f
+	do
+		echo ": {port} |> !cc_port ${LINK}/${f} |> ${f}.o {obj}"
+	done
+	grep '\.S$' ${LIST} | while read f
+	do
+		echo ": {port} |> !cc_port ${LINK}/${f} |> ${f}.o {obj}"
+	done
+done

ports/mpg123/x86_64.files

@@ -0,0 +1,5 @@
+src/libmpg123/getcpuflags_x86_64.S
+src/libmpg123/dct64_x86_64.S
+src/libmpg123/synth_stereo_x86_64.S
+src/libmpg123/synth_x86_64.S
+src/libmpg123/dct36_x86_64.S

runtimes/depot_9P/Tupfile

@@ -1,9 +1,9 @@
 TARGET_NAME = depot_9P
 
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_VFS) \
 	@(PUBLIC_SRC_LIBC) \
 	@(PUBLIC_SRC_VFS_LWIP) \
+	_/src/vfs \
 	_/src/ninep \
 
 include_rules

runtimes/icy-streams/Tuprules.tup

@@ -1,11 +1,11 @@
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_INIT) \
 	@(PUBLIC_SRC_LIBC) \
-	@(PUBLIC_SRC_VFS) \
 	@(PUBLIC_SRC_LIBMPG123) \
 	@(PUBLIC_SRC_MP3_AUDIO_SINK) \
 	@(PUBLIC_SRC_VFS_LWIP) \
 	@(PUBLIC_SRC_ZLIB) \
+	_/src/init \
+	_/src/vfs \
 	_/src/icy_client \
 
 : ../runtime.in |> sed 's|@STREAM_URL@|$(STREAM_URL)|' %f > %o |> runtime

sdk/Tuprules.tup

@@ -1,66 +0,0 @@
-.gitignore
-GENODE_DIR = $(TUP_CWD)
-BASE_DIR = $(GENODE_DIR)/repos/base
-
-SDK_VERSION = 19.05
-	# TODO: these are configuration settings
-
-LOCAL_LIB_PREFIX = lib
-LOCAL_PKGCONFIG_PREFIX = pkgconfig
-
-SDK_PREFIX = /opt/genode/sdk-$(SDK_VERSION)
-SDK_INCLUDE_PREFIX = $(SDK_PREFIX)/include
-SDK_LIB_PREFIX = $(SDK_PREFIX)/$(LOCAL_LIB_PREFIX)
-SDK_PKGCONFIG_PREFIX = $(SDK_PREFIX)/$(LOCAL_PKGCONFIG_PREFIX)
-
-SDK_DIR = $(GENODE_DIR)/sdk
-
-!ln = |> ^ LN %o -> %f^ ln -s %f %o |>
-!cp = |> ^ CP %o^ cp %f %o |>
-
-!tar = |> tar cf %o %f $(TAR_FLAGS) |>
-
-SED_PKGCONFIG_FLAGS += -e 's|@exec_prefix@|$(SDK_PREFIX)|'
-SED_PKGCONFIG_FLAGS += -e 's|@includedir@|$(SDK_INCLUDE_PREFIX)|'
-SED_PKGCONFIG_FLAGS += -e 's|@prefix@|$(SDK_PREFIX)|'
-SED_PKGCONFIG_FLAGS += -e 's|@sharedlibdir@|@libdir@|'
-SED_PKGCONFIG_FLAGS += -e 's|@SDK_VERSION@|$(SDK_VERSION)|'
-
-SED_FLAGS_arm64 += -e 's|@libdir@|$(SDK_LIB_PREFIX)/arm64|'
-SED_FLAGS_i386 += -e 's|@libdir@|$(SDK_LIB_PREFIX)/x86_32|'
-SED_FLAGS_x86_64 += -e 's|@libdir@|$(SDK_LIB_PREFIX)/x86_64|'
-
-!sed_pkgconfig_file = |> ^ SED %B^ \
-	sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_arm64) %f \
-		> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%B; \
-	sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_i386) %f \
-		> $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%B; \
-	sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_x86_64) %f \
-		> $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%B; \
-|> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%B \
-   $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%B \
-   $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%B \
-   <artifacts>
-
-!sed_pkgconfig_flags = |> ^ SED %d.pc^ \
-	sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_arm64) \
-		> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%d.pc; \
-	sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_i386) \
-		> $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%d.pc; \
-	sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_x86_64) \
-		> $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%d.pc; \
-|> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%d.pc \
-   $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%d.pc \
-   $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%d.pc \
-   <artifacts>
-
-PORTS_CURRENT = $(GENODE_DIR)/tool/ports/current
-
-SDK_ABI_INCLUDE = $(TUP_CWD)/abi.tup
-SDK_TAR_INCLUDE = $(TUP_CWD)/tar.tup
-SDK_PKGCONFIG_TEMPLATE_INCLUDE = $(TUP_CWD)/template.pc.tup
-
-CC  = genode-x86-gcc
-CXX = genode-x86-g++
-AR  = genode-x86-ar
-LD  = genode-x86-ld

sdk/abi.tup

@@ -1,31 +0,0 @@
-ifeq ($(SYMBOLS_DIR),)
-	SYMBOLS_DIR = $(REP_DIR)/lib/symbols
-endif
-
-LD_SCRIPT_SO = $(BASE_DIR)/src/ld/genode_rel.ld
-
-: |> ^ CONVERT %o^ sed \
-	-e "s/^\(\w\+\) D \(\w\+\)\$/.data; .global \1; .type \1,%%object; .size \1,\2; \1:/p" \
-	-e "s/^\(\w\+\) V/.data; .weak \1; .type \1,%%object; \1:/p" \
-	-e "s/^\(\w\+\) T/.text; .global \1; .type \1,%%function; \1:/p" \
-	-e "s/^\(\w\+\) R \(\w\+\)\$/.section .rodata; .global \1; .type \1,%%object; .size \1,\2; \1:/p" \
-	-e "s/^\(\w\+\) W/.text; .weak \1; .type \1,%%function; \1:/p" \
-	-e "s/^\(\w\+\) B \(\w\+\)\$/.bss; .global \1; .type \1,%%object; .size \1,\2; \1:/p" \
-	-e "s/^\(\w\+\) U/.text; .global \1; $(ASM_SYM_DEPENDENCY)/p" \
-	$(SYMBOLS_DIR)/%d > %o |> $(LOCAL_LIB_PREFIX)/%d.symbols.s {asm}
-
-: {asm} |> ^ ASSEMBLE %o^ $(CC) -c %f -o %o \
-	|> $(LOCAL_LIB_PREFIX)/%b.o {obj}
-
-!merge = |> ^ MERGE %o^ $(LD) \
-	-o %o \
-	-shared --eh-frame-hdr $(LD_OPT) \
-	-T $(LD_SCRIPT_SO) \
-	--whole-archive --start-group \
-	$(LIB_SO_DEPS) %f \
-	--end-group --no-whole-archive \
-|>
-
-: {obj} |> !merge |> $(LOCAL_LIB_PREFIX)/arm64/%d.lib.so  <artifacts>
-: {obj} |> !merge |> $(LOCAL_LIB_PREFIX)/x86_32/%d.lib.so <artifacts>
-: {obj} |> !merge |> $(LOCAL_LIB_PREFIX)/x86_64/%d.lib.so <artifacts>

sdk/cmake/Toolchain.cmake.in

@@ -1,17 +0,0 @@
-INCLUDE(CMakeForceCompiler)
-
-SET(CMAKE_SYSTEM_NAME Genode)
-SET(CMAKE_SYSTEM_VERSION @SDK_VERSION@)
-
-SET(CMAKE_FORCE_C_COMPILER   @COMPILER_PREFIX@gcc GNU)
-SET(CMAKE_FORCE_CXX_COMPILER @COMPILER_PREFIX@g++ GNU)
-
-# where is the target environment
-SET(CMAKE_FIND_ROOT_PATH @SDK_PREFIX@)
-SET(CMAKE_PREFIX_PATH @SDK_PREFIX@/cmake)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

sdk/default.nix

@@ -1,40 +0,0 @@
-{ toolchain, pkgs ? import <nixpkgs> {} }: with pkgs;
-
-let
-  version = "19.05";
-  tarball = fetchurl {
-    url = "https://github.com/genodelabs/genode/archive/19.05.tar.gz";
-    sha256 = "1mr81885ysjff7plfvav6cr3lx5yhlcyq63q8c8bfvgi1fcarbww";
-  };
-in
-stdenv.mkDerivation {
-  name = "genode-sdk-${version}";
-  inherit tarball version;
-
-  phases = "mainPhase";
-
-  toolchain_dir = toolchain.out;
-  tool_prefix = "genode-x86-";
-
-  spec_includes="-I\${includedir}/spec/x86_64 -I\${includedir}/spec/x86 -I\${includedir}/spec/64bit";
-
-  mainPhase = ''
-    export includedir=$out/include
-    export libdir=$out/lib
-    pkg_config_dir=$out/pkg-config
-    mkdir -p $includedir $pkg_config_dir
-
-    for i in ${./pkg-config}/*.pc; do
-       substituteAll "$i" "$out/pkg-config/`basename $i`"
-     done
-
-    tar xfv ${tarball} \
-      --transform='s|genode-${version}/repos/base/include|genode-base/|' \
-      --transform='s|genode-${version}/repos/os/include|genode-os/|' \
-      --transform='s|genode-${version}/repos/gems/include|genode-gems/|' \
-      -C $includedir \
-      genode-${version}/repos/base/include \
-      genode-${version}/repos/os/include \
-      genode-${version}/repos/gems/include \
-  '';
-}

sdk/repos/base/Tuprules.tup

@@ -1 +0,0 @@
-REP_DIR = $(TUP_CWD)

sdk/repos/gems/Tuprules.tup

@@ -1 +0,0 @@
-REP_DIR = $(TUP_CWD)

sdk/repos/os/Tuprules.tup

@@ -1 +0,0 @@
-REP_DIR = $(TUP_CWD)

sdk/sdk.nix

@@ -1,42 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }: with pkgs;
-
-let
-  genodeVersion = "19.05";
-  toolchain = import /opt/genode/errata/toolchain.nix { inherit pkgs; };
-  upstream = fetchFromGitHub {
-    owner = "genodelabs";
-    repo = "genode";
-    rev = "19.05";
-    sha256 = "01sgixyvsq5g7fd0nj9j67d9jma0bhlprwyjf21dql9hqn5k0ngf";
-  };  
-in
-stdenv.mkDerivation {
-  name = "genode-sdk-${genodeVersion}";
-  version = genodeVersion;
-
-  toolchain_dir = toolchain.out;
-
-  inherit upstream;
-
-  src = fetchurl {
-    url = "https://github.com/ehmry/genode/releases/download/19.05-sdk/sdk.tar.xz";
-    sha256 = "ab6f9c1856c535ed17960f66bf4fca0d82f49b7457ac21c2f22adb612d489aa9";
-  };
-
-  phases = [ "mainPhase" ];
-
-  mainPhase = ''
-    dest=$out/opt/genode
-    mkdir -p $dest
-
-    tar xf $src --strip-components=3 -C $dest
-
-    for i in $dest/pkgconfig/*/*.pc; do
-       substituteInPlace "$i" \
-         --replace /opt/genode/sdk-${genodeVersion} $dest \
-         --replace @TOOLCHAIN_DIR@ $toolchain_dir \
-    ; done
-  '';
-}
-
-

sdk/tar.tup

@@ -1 +0,0 @@
-: <artifacts> |> ^ TAR %o^ tar cf %o --transform='s|^|$(SDK_PREFIX)/|' %<artifacts> $(TAR_FLAGS) |> %d.sdk.tar $(SDK_DIR)/<api_tarballs>

sdk/template.pc.in

@@ -1 +0,0 @@
-Libs: -l:%d.lib.so

sdk/template.pc.tup

@@ -1,13 +0,0 @@
-TEMPLATE_FILE = $(TUP_CWD)/template.pc.in
-
-: $(TEMPLATE_FILE) | $(LOCAL_LIB_PREFIX)/*.lib.so \
-	|> ^ Generate %d^ sed 's|%%d|%d|' %f > %o \
-		|> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%d.pc
-
-: $(TEMPLATE_FILE) | $(LOCAL_LIB_PREFIX)/*.lib.so \
-	|> ^ Generate %d^ sed 's|%%d|%d|' %f > %o \
-		|> $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%d.pc
-
-: $(TEMPLATE_FILE) | $(LOCAL_LIB_PREFIX)/*.lib.so \
-	|> ^ Generate %d^ sed 's|%%d|%d|' %f > %o \
-		|> $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%d.pc

src/Tuprules.tup

@@ -1 +0,0 @@
-LDFLAGS += -L$(GENODE_DIR)/stub

src/mp3_audio_sink/Tupfile

@@ -0,0 +1,12 @@
+TARGET_NAME = mp3_audio_sink
+LIBS += mpg123 libc libm genode-gems
+
+include_rules
+
+INCLUDES += -I../cached_fs_rom
+
+: foreach *.cc |> !cxx |> %B.o {obj}
+: {obj} |  |> !prg |> {bin}
+: {bin} |> !collect_bin |>
+
+include &(BIN_RULES)

src/mp3_audio_sink/component.cc

@@ -0,0 +1,317 @@
+/*
+ * \brief  MP3 audio decoder
+ * \author Emery Hemingway
+ * \date   2018-03-24
+ */
+
+/*
+ * Copyright (C) 2018 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU Affero General Public License version 3.
+ */
+
+/*
+ * TODO:
+ * - Metadata report
+ * - Optimize buffer sizes
+ */
+
+/* Genode includes */
+#include <gems/magic_ring_buffer.h>
+#include <os/static_root.h>
+#include <libc/component.h>
+#include <audio/source.h>
+#include <terminal_session/connection.h>
+#include <base/attached_rom_dataspace.h>
+#include <base/attached_ram_dataspace.h>
+#include <base/sleep.h>
+
+/* Mpg123 includes */
+#include <stdlib.h>
+#include <sys/types.h>
+#include <mpg123.h>
+
+namespace Mp3_audio_sink {
+
+	enum { LEFT, RIGHT, NUM_CHANNELS };
+
+	enum {
+		FEED_POOL_SIZE = 2,
+		CLIENT_BUFFER_SIZE = 1 << 14, /* 16 KiB */
+	};
+
+	enum {
+		AUDIO_OUT_BUFFER_SIZE = NUM_CHANNELS
+			* Audio_out::QUEUE_SIZE
+			* Audio_out::PERIOD
+			* Audio_out::SAMPLE_SIZE
+	};
+
+	using namespace Genode;
+
+	struct Decoder;
+
+	class Terminal_component;
+	struct Main;
+}
+
+
+struct Mp3_audio_sink::Decoder : Audio::Source
+{
+	template <typename FUNC>
+	static void for_each_channel(FUNC const &func) {
+		for (int i = 0; i < NUM_CHANNELS; ++i) func(i); }
+
+	Genode::Env &_env;
+
+	Attached_rom_dataspace _config_rom { _env, "config" };
+
+	Audio::Stereo_out _stereo_out { _env, *this };
+
+	void die_mpg123(mpg123_handle *mh, char const *msg)
+	{
+		int code = mpg123_errcode(mh);
+		Genode::error(msg, ", ", mpg123_strerror(mh));
+
+		mpg123_close(mh);
+		mpg123_delete(mh);
+		mpg123_exit();
+
+		_env.parent().exit(code);
+		Genode::sleep_forever();
+	}
+
+	mpg123_handle *create_mpg123_handle()
+	{
+		mpg123_handle *mh = NULL;
+
+		int err = mpg123_init();
+		if(err != MPG123_OK || (mh = mpg123_new(NULL, &err)) == NULL)
+			Genode::error("Mpg123 setup failed, ", mpg123_plain_strerror(err));
+
+		mpg123_param(mh, MPG123_FEEDPOOL, FEED_POOL_SIZE, 0);
+		mpg123_param(mh, MPG123_FEEDBUFFER, CLIENT_BUFFER_SIZE, 0);
+
+		/* Set mpg123 output format to match Audio_out exactly */
+		mpg123_param(mh, MPG123_FORCE_RATE,
+		             Audio_out::SAMPLE_RATE, Audio_out::SAMPLE_RATE);
+		mpg123_format_none(mh);
+		if (mpg123_format(mh, Audio_out::SAMPLE_RATE,
+		                  MPG123_STEREO, MPG123_ENC_FLOAT_32) != MPG123_OK)
+			die_mpg123(mh, "Audio_out format is unsupported");
+
+		if (mpg123_open_feed(mh) != MPG123_OK)
+			die_mpg123(mh, "mpg123 feeder mode failed");
+		return mh;
+	}
+
+	mpg123_handle *_mh = create_mpg123_handle();
+
+	/* last error code logged */
+	int _mh_err = MPG123_OK;
+
+	/**
+	 * Use half of the available RAM as buffer
+	 */
+	size_t _pcm_buffer_size()
+	{
+		size_t n = _env.pd().avail_ram().value / 2;
+		if (n > (1<<20))
+			log("internal buffer size is ", n>>20, "MiB");
+		else if (n > (1<<10))
+			log("internal buffer size is ", n>>10, "KiB");
+		else
+			log("internal buffer size is ", n, " bytes");
+		return n;
+	}
+
+	Magic_ring_buffer<float> _pcm { _env, _pcm_buffer_size() };
+
+	void _log_error()
+	{
+		int code = mpg123_errcode(_mh);
+		if (code != MPG123_OK && _mh_err != code) {
+			_mh_err = code;
+			error(mpg123_plain_strerror(code));
+		}
+	}
+
+	Genode::size_t feedbuffer_size()
+	{
+		long value = 0;
+		double fvalue = 0;
+		if (mpg123_getparam(_mh, MPG123_FEEDBUFFER, &value, &fvalue))
+			die_mpg123(_mh, "failed to get feed buffer size");
+		return value;
+	}
+
+	bool fill(float *left, float *right, Genode::size_t samples) override;
+
+	/**
+	 * Process client data, blocks until all data is consumed.
+	 */
+	void process(unsigned char const *src, size_t num_bytes)
+	{
+		/* TODO: patch mpgg123 not to use stdio for printing errors */
+
+		Libc::with_libc([&] () {
+
+			/* feed client data into mpg123 buffer */
+			if (mpg123_feed(_mh, src, num_bytes))
+				die_mpg123(_mh, "failed to feed");
+
+			::off_t num = 0;
+			unsigned char *audio = nullptr;
+			size_t bytes = 0;
+
+			while (mpg123_decode_frame(_mh, &num, &audio, &bytes) == MPG123_OK) {
+				Genode::size_t const samples = bytes / Audio_out::SAMPLE_SIZE;
+
+				while (_pcm.write_avail() < samples) {
+					/* submit audio blocks for packet allocation */
+					_env.ep().wait_and_dispatch_one_io_signal();
+				}
+
+				Genode::memcpy(_pcm.write_addr(), audio, bytes);
+				_pcm.fill(samples);
+
+			}
+
+			if (mpg123_errcode(_mh) != MPG123_ERR_READER
+			 || mpg123_errcode(_mh) != MPG123_OK)
+				_log_error();
+		});
+	}
+
+	Signal_handler<Decoder> _config_handler {
+		_env.ep(), *this, &Decoder::_handle_config };
+
+	void _handle_config()
+	{
+		_config_rom.update();
+		Xml_node const config = _config_rom.xml();
+
+		enum { EQ_COUNT = 32 };
+
+		mpg123_reset_eq(_mh);
+		config.for_each_sub_node("eq", [&] (Xml_node const &node) {
+			unsigned band = node.attribute_value("band", 32U);
+			double value = node.attribute_value("value", 0.0);
+			if (band < EQ_COUNT && value != 0.0) {
+				mpg123_eq(_mh, MPG123_LR , band, value);
+				log("EQ ", band, ": ", mpg123_geteq(_mh, MPG123_LR , band));
+			}
+		});
+
+		double volume = 0.5;
+		config.for_each_sub_node("volume", [&] (Xml_node const &node) {
+			volume = node.attribute_value("linear", volume); });
+		mpg123_volume(_mh, 0.5);
+	}
+
+	Decoder(Genode::Env &env) : _env(env)
+	{
+		_config_rom.sigh(_config_handler);
+		_handle_config();
+	}
+};
+
+
+bool Mp3_audio_sink::Decoder::fill(float *left,
+                                   float *right,
+                                   Genode::size_t samples)
+{
+	using namespace Audio_out;
+
+	if (_pcm.read_avail() < samples*2) return false;
+
+	float const *buf = _pcm.read_addr();
+	for (unsigned i = 0; i < samples; ++i) {
+	 	 left[i] = buf[(i<<1)|0];
+		right[i] = buf[(i<<1)|1];
+	}
+
+	_pcm.drain(samples*2);
+	return true;
+}
+
+
+class Mp3_audio_sink::Terminal_component :
+	public Rpc_object<Terminal::Session, Terminal_component>
+{
+	private:
+
+		Decoder &_decoder;
+
+		Genode::Attached_ram_dataspace _io_buffer;
+
+	public:
+
+		Terminal_component(Genode::Env &env, Decoder &decoder)
+		:
+			_decoder(decoder),
+			_io_buffer(env.pd(), env.rm(), _decoder.feedbuffer_size())
+		{ }
+
+
+		/********************************
+		 ** Terminal session interface **
+		 ********************************/
+
+		Genode::Dataspace_capability _dataspace() {
+			return _io_buffer.cap(); }
+
+		Size size() { return Size(0, 0); }
+
+		bool avail() { return false; }
+
+		Genode::size_t read(void *, Genode::size_t) { return 0; }
+		Genode::size_t _read(Genode::size_t dst_len) { return 0; }
+
+		Genode::size_t write(void const *, Genode::size_t) { return 0; }
+		Genode::size_t _write(Genode::size_t num_bytes)
+		{
+			/* sanitize argument */
+			num_bytes = Genode::min(num_bytes, _io_buffer.size());
+
+			/* copy to decoder */
+			_decoder.process(
+				_io_buffer.local_addr<unsigned char>(), num_bytes);
+
+			return num_bytes;
+		}
+
+		void connected_sigh(Genode::Signal_context_capability cap) {
+			Genode::Signal_transmitter(cap).submit(); }
+
+		void read_avail_sigh(Genode::Signal_context_capability) { }
+
+		void size_changed_sigh(Genode::Signal_context_capability) { }
+};
+
+
+struct Mp3_audio_sink::Main
+{
+	Genode::Env &_env;
+
+	Decoder _decoder { _env };
+
+	Terminal_component _terminal { _env, _decoder };
+
+	Static_root<Terminal::Session> _terminal_root {
+		_env.ep().manage(_terminal) };
+
+	Main(Libc::Env &env) : _env(env)
+	{
+		env.parent().announce(env.ep().manage(_terminal_root));
+	}
+};
+
+
+/***************
+ ** Component **
+ ***************/
+
+void Libc::Component::construct(Libc::Env &env) {
+	static Mp3_audio_sink::Main _main(env); }

src/nic_bus/Tupfile

@@ -1,12 +1,11 @@
 TARGET_NAME = nic_bus
+LIBS += genode-os genode-prg
 PKG_DEPENDS += _/src/$(TARGET_NAME)
 
 include_rules
 
-LIBS = genode-os genode-prg
-
 : foreach *.cc |> !cxx |> %B.o {objs}
-: {objs} |> !ld |> %d {binary}
+: {objs} |> !prg |> %d {binary}
 : {binary} |> !collect_bin |>
 : runtime |> !collect_pkg_runtime |>
 

src/show_input/Tupfile

@@ -1,19 +1,19 @@
 TARGET_NAME = show_input
 include_rules
 
-PKG_CONFIGS = vfs genode-gems genode-os genode-base genode-prg
+LIBS = vfs genode-gems genode-os genode-base genode-prg
 CXXFLAGS += `$(PKG_CONFIG) --cflags $(PKG_CONFIGS)`
 LDFLAGS += `$(PKG_CONFIG) --libs $(PKG_CONFIGS)`
 
 : foreach *.cc |> !cxx |> %B.o {objs}
 
-: {objs} |> !ld |> %d {binary}
+: {objs} |> !prg |> %d {binary}
 
 : {binary} |> !collect_bin |>
 include &(BIN_RULES)
 
 PKG_DEPENDS += \
-	@(PUBLIC_SRC_VFS) \
+	_/src/vfs \
 	_/src/$(BIN_NAME) \
 
 : runtime |> !collect_pkg_runtime |>

tool/prepare-port/setup.sh

@@ -1000,11 +1000,11 @@ checkPhase() {
 installPhase() {
     runHook preInstall
 
-    if [ -n "$prefix" ]; then
-        mkdir -p "$prefix"
+    if [ -n "$source" ]; then
+        mkdir -p "$source"
     fi
 
-    cp -r ./* "$prefix"
+    cp -r ./* "$source"
 
     runHook postInstall
 }

upstream

@@ -1 +1 @@
-Subproject commit c1cf7c9ad6d43a35b1f28f5f7ebe1472bf293585
+Subproject commit 1661482caa4ca5e2ddfdc0d14f1f8f6b84bb961c