19.07 compatibility

This commit is contained in:
Emery Hemingway 2019-07-04 14:45:54 +02:00
parent 487207e150
commit df3e9c32e5
37 changed files with 47 additions and 48 deletions

2
.gitmodules vendored
View File

@ -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

View File

@ -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

View File

@ -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)/<stub> $(GENODE_DIR)/<pkg-config> |> ^o LD %o^ $(LD) $(LD_MARCH) %f $(LDFLAGS) `$(PKG_CONFIG) --libs genode-lib $(LIBS)` -L&(STUB_DIR) -o %o |>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -80,6 +80,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,25 +96,30 @@
<!-- <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>
<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 name="Experimental">
<index name="Semantic audio player demo">
<pkg path="_/pkg/blob_service" info="Blobsets package with file-system and HTTP frontends"/>
<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"/>

View File

@ -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"/>

View File

@ -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

View File

@ -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"/>

View File

@ -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"/>

View File

@ -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"/>

View File

@ -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"/>

View File

@ -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"/>

View File

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

View File

@ -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"/>

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

View File

@ -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}

View File

@ -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"/>

View File

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

View File

@ -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 \

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

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

View File

@ -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 |>

View File

@ -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 |>