From df3e9c32e58b60a4b2ec272d84b16863639854cb Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 4 Jul 2019 14:45:54 +0200 Subject: [PATCH] 19.07 compatibility --- .gitmodules | 2 +- Tupfile | 2 +- Tuprules.tup | 3 ++- configs/arm_v8.config | 2 +- configs/i386.config | 2 +- configs/x86_64.config | 28 ++++++++++---------- index.xml | 14 +++++++--- libretro/cores/4do/runtime | 1 - libretro/cores/Tuprules.tup | 4 +-- libretro/cores/bluemsx/runtime | 1 - libretro/cores/fceumm/runtime | 1 - libretro/cores/gambatte/runtime | 1 - libretro/cores/mgba/runtime | 1 - libretro/cores/nxengine/runtime | 1 - libretro/cores/samples/audio.runtime | 1 + libretro/cores/snes9x/runtime | 1 - libretro/cores/snes9x/upstream | 2 +- libretro/cores/yabause/Tuprules.tup | 3 ++- libretro/cores/yabause/runtime | 1 - libretro/games/quake_dopa/Tupfile | 2 +- libretro/tests/240pSuite-SNES/Tupfile | 2 +- libretro/tests/240pee-NES/Tupfile | 2 +- runtimes/depot_9P/Tupfile | 2 +- runtimes/icy-streams/Tuprules.tup | 4 +-- src/Tuprules.tup | 1 - src/{server => }/fs_block/README | 0 src/{server => }/fs_block/Tupfile | 0 src/{server => }/fs_block/component.cc | 0 src/{server => }/nic_bus/README | 0 src/{server => }/nic_bus/Tupfile | 5 ++-- src/{server => }/nic_bus/bus.h | 0 src/{server => }/nic_bus/main.cc | 0 src/{server => }/nic_bus/runtime | 0 src/{server => }/nic_bus/session_component.h | 0 src/{app => }/show_input/Tupfile | 6 ++--- src/{app => }/show_input/main.cc | 0 src/{app => }/show_input/runtime | 0 37 files changed, 47 insertions(+), 48 deletions(-) delete mode 100644 src/Tuprules.tup rename src/{server => }/fs_block/README (100%) rename src/{server => }/fs_block/Tupfile (100%) rename src/{server => }/fs_block/component.cc (100%) rename src/{server => }/nic_bus/README (100%) rename src/{server => }/nic_bus/Tupfile (78%) rename src/{server => }/nic_bus/bus.h (100%) rename src/{server => }/nic_bus/main.cc (100%) rename src/{server => }/nic_bus/runtime (100%) rename src/{server => }/nic_bus/session_component.h (100%) rename src/{app => }/show_input/Tupfile (74%) rename src/{app => }/show_input/main.cc (100%) rename src/{app => }/show_input/runtime (100%) diff --git a/.gitmodules b/.gitmodules index 9a4799c..df264e3 100644 --- a/.gitmodules +++ b/.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 diff --git a/Tupfile b/Tupfile index a9528a8..450bb80 100644 --- a/Tupfile +++ b/Tupfile @@ -49,7 +49,7 @@ SHORT_SUM = b2sum -l24 awk -F '/' -f errata/raw.mk.awk $f >> %o; done; \ for f in %; 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 diff --git a/Tuprules.tup b/Tuprules.tup index 931714b..5f4680f 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -20,6 +20,7 @@ CC_MARCH = -march=armv8-a endif GENODE_DIR = $(TUP_CWD)/upstream +&STUB_DIR = stub STUB_DIR = $(TUP_CWD)/stub export NIX_PATH @@ -35,7 +36,7 @@ LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name` %f \ $(LIBGCC) \ -o %o \ -|> +|> %d !lib = | $(GENODE_DIR)/ $(GENODE_DIR)/ |> ^o LD %o^ $(LD) $(LD_MARCH) %f $(LDFLAGS) `$(PKG_CONFIG) --libs genode-lib $(LIBS)` -L&(STUB_DIR) -o %o |> diff --git a/configs/arm_v8.config b/configs/arm_v8.config index 745ccad..fbebf7d 100644 --- a/configs/arm_v8.config +++ b/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 diff --git a/configs/i386.config b/configs/i386.config index 4c6e7b0..fa6fec1 100644 --- a/configs/i386.config +++ b/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 diff --git a/configs/x86_64.config b/configs/x86_64.config index 533b057..b759c8d 100644 --- a/configs/x86_64.config +++ b/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 diff --git a/index.xml b/index.xml index 76cef5b..4a989b9 100644 --- a/index.xml +++ b/index.xml @@ -80,6 +80,7 @@ + @@ -95,25 +96,30 @@ + + + + + + + - + - - - + diff --git a/libretro/cores/4do/runtime b/libretro/cores/4do/runtime index 85115f2..e7c4010 100644 --- a/libretro/cores/4do/runtime +++ b/libretro/cores/4do/runtime @@ -8,7 +8,6 @@ - diff --git a/libretro/cores/Tuprules.tup b/libretro/cores/Tuprules.tup index e225f1c..774f3ab 100644 --- a/libretro/cores/Tuprules.tup +++ b/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 diff --git a/libretro/cores/bluemsx/runtime b/libretro/cores/bluemsx/runtime index 288556a..56f0892 100644 --- a/libretro/cores/bluemsx/runtime +++ b/libretro/cores/bluemsx/runtime @@ -10,7 +10,6 @@ - diff --git a/libretro/cores/fceumm/runtime b/libretro/cores/fceumm/runtime index 5522411..173bdf9 100644 --- a/libretro/cores/fceumm/runtime +++ b/libretro/cores/fceumm/runtime @@ -8,7 +8,6 @@ - diff --git a/libretro/cores/gambatte/runtime b/libretro/cores/gambatte/runtime index aa50cf2..5d48e3e 100644 --- a/libretro/cores/gambatte/runtime +++ b/libretro/cores/gambatte/runtime @@ -8,7 +8,6 @@ - diff --git a/libretro/cores/mgba/runtime b/libretro/cores/mgba/runtime index dacce5f..cd14f94 100644 --- a/libretro/cores/mgba/runtime +++ b/libretro/cores/mgba/runtime @@ -8,7 +8,6 @@ - diff --git a/libretro/cores/nxengine/runtime b/libretro/cores/nxengine/runtime index c5b3200..9fb5189 100644 --- a/libretro/cores/nxengine/runtime +++ b/libretro/cores/nxengine/runtime @@ -8,7 +8,6 @@ - diff --git a/libretro/cores/samples/audio.runtime b/libretro/cores/samples/audio.runtime index aaaa135..9c25a9a 100644 --- a/libretro/cores/samples/audio.runtime +++ b/libretro/cores/samples/audio.runtime @@ -4,6 +4,7 @@ + diff --git a/libretro/cores/snes9x/runtime b/libretro/cores/snes9x/runtime index b2cd8d6..a5d9247 100644 --- a/libretro/cores/snes9x/runtime +++ b/libretro/cores/snes9x/runtime @@ -8,7 +8,6 @@ - diff --git a/libretro/cores/snes9x/upstream b/libretro/cores/snes9x/upstream index 5c2e090..121576e 160000 --- a/libretro/cores/snes9x/upstream +++ b/libretro/cores/snes9x/upstream @@ -1 +1 @@ -Subproject commit 5c2e090566e2ac31428570beed71149fce4f3e22 +Subproject commit 121576eb06ec7f1381881710d0ddd013355cd9de diff --git a/libretro/cores/yabause/Tuprules.tup b/libretro/cores/yabause/Tuprules.tup index 3713b70..880d0df 100644 --- a/libretro/cores/yabause/Tuprules.tup +++ b/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} diff --git a/libretro/cores/yabause/runtime b/libretro/cores/yabause/runtime index ad1830b..4ce9a9f 100644 --- a/libretro/cores/yabause/runtime +++ b/libretro/cores/yabause/runtime @@ -8,7 +8,6 @@ - diff --git a/libretro/games/quake_dopa/Tupfile b/libretro/games/quake_dopa/Tupfile index 4321bce..b5a63bf 100644 --- a/libretro/games/quake_dopa/Tupfile +++ b/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 \ diff --git a/libretro/tests/240pSuite-SNES/Tupfile b/libretro/tests/240pSuite-SNES/Tupfile index 57f1a18..4146a7f 100644 --- a/libretro/tests/240pSuite-SNES/Tupfile +++ b/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 \ diff --git a/libretro/tests/240pee-NES/Tupfile b/libretro/tests/240pee-NES/Tupfile index eed3a0d..79827c9 100644 --- a/libretro/tests/240pee-NES/Tupfile +++ b/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 \ diff --git a/runtimes/depot_9P/Tupfile b/runtimes/depot_9P/Tupfile index 558527d..af1b230 100644 --- a/runtimes/depot_9P/Tupfile +++ b/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 diff --git a/runtimes/icy-streams/Tuprules.tup b/runtimes/icy-streams/Tuprules.tup index 11a6bf0..2c24029 100644 --- a/runtimes/icy-streams/Tuprules.tup +++ b/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 diff --git a/src/Tuprules.tup b/src/Tuprules.tup deleted file mode 100644 index 43217e0..0000000 --- a/src/Tuprules.tup +++ /dev/null @@ -1 +0,0 @@ -LDFLAGS += -L$(GENODE_DIR)/stub diff --git a/src/server/fs_block/README b/src/fs_block/README similarity index 100% rename from src/server/fs_block/README rename to src/fs_block/README diff --git a/src/server/fs_block/Tupfile b/src/fs_block/Tupfile similarity index 100% rename from src/server/fs_block/Tupfile rename to src/fs_block/Tupfile diff --git a/src/server/fs_block/component.cc b/src/fs_block/component.cc similarity index 100% rename from src/server/fs_block/component.cc rename to src/fs_block/component.cc diff --git a/src/server/nic_bus/README b/src/nic_bus/README similarity index 100% rename from src/server/nic_bus/README rename to src/nic_bus/README diff --git a/src/server/nic_bus/Tupfile b/src/nic_bus/Tupfile similarity index 78% rename from src/server/nic_bus/Tupfile rename to src/nic_bus/Tupfile index 4beb9c8..b284945 100644 --- a/src/server/nic_bus/Tupfile +++ b/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 |> diff --git a/src/server/nic_bus/bus.h b/src/nic_bus/bus.h similarity index 100% rename from src/server/nic_bus/bus.h rename to src/nic_bus/bus.h diff --git a/src/server/nic_bus/main.cc b/src/nic_bus/main.cc similarity index 100% rename from src/server/nic_bus/main.cc rename to src/nic_bus/main.cc diff --git a/src/server/nic_bus/runtime b/src/nic_bus/runtime similarity index 100% rename from src/server/nic_bus/runtime rename to src/nic_bus/runtime diff --git a/src/server/nic_bus/session_component.h b/src/nic_bus/session_component.h similarity index 100% rename from src/server/nic_bus/session_component.h rename to src/nic_bus/session_component.h diff --git a/src/app/show_input/Tupfile b/src/show_input/Tupfile similarity index 74% rename from src/app/show_input/Tupfile rename to src/show_input/Tupfile index 1568708..e2f7ce5 100644 --- a/src/app/show_input/Tupfile +++ b/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 |> diff --git a/src/app/show_input/main.cc b/src/show_input/main.cc similarity index 100% rename from src/app/show_input/main.cc rename to src/show_input/main.cc diff --git a/src/app/show_input/runtime b/src/show_input/runtime similarity index 100% rename from src/app/show_input/runtime rename to src/show_input/runtime