From 5306a4f385aba1ad36a8d0bf6d4dc9b186b783bc Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 28 Jun 2019 23:17:41 +0200 Subject: [PATCH] Update Libretro submodules --- .gitmodules | 20 ++++++++++---------- libretro/cores/4do/upstream | 2 +- libretro/cores/Tuprules.tup | 7 ++++--- libretro/cores/fceumm/upstream | 2 +- libretro/cores/gambatte/upstream | 2 +- libretro/cores/lutro/upstream | 2 +- libretro/cores/mgba/upstream | 2 +- libretro/cores/mrboom/upstream | 2 +- libretro/cores/oberon/upstream | 2 +- libretro/cores/samples/upstream | 2 +- libretro/cores/snes9x/upstream | 2 +- libretro/cores/tyrquake/upstream | 2 +- libretro/libretro-common | 2 +- libretro/retro_frontend | 2 +- 14 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.gitmodules b/.gitmodules index 905b29b64..8c9ae42f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,22 +27,22 @@ url = https://github.com/libretro/libretro-2048 [submodule "libretro/cores/4do/core"] path = libretro/cores/4do/upstream - url = https://github.com/libretro/4do-libretro + url = https://github.com/libretro/4do-libretro.git [submodule "libretro/cores/fceumm/core"] path = libretro/cores/fceumm/upstream - url = https://github.com/libretro/libretro-fceumm + url = git@github.com:ehmry/libretro-fceumm.git [submodule "libretro/cores/mgba/core"] path = libretro/cores/mgba/upstream - url = https://github.com/libretro/mgba + url = git@github.com:ehmry/mgba.git [submodule "libretro/cores/nxengine/core"] path = libretro/cores/nxengine/upstream url = git://depot.h4ck.me/srv/git/nxengine [submodule "libretro/cores/oberon/core"] path = libretro/cores/oberon/upstream - url = https://github.com/pdewacht/oberon-risc-emu.git + url = git@github.com:ehmry/oberon-risc-libretro.git [submodule "libretro/cores/snes9x/core"] path = libretro/cores/snes9x/upstream - url = https://github.com/libretro/snes9x + url = git@github.com:ehmry/snes9x.git [submodule "libretro/cores/tyrquake/core"] path = libretro/cores/tyrquake/upstream url = https://github.com/libretro/tyrquake @@ -54,10 +54,10 @@ url = https://github.com/libretro/dosbox-libretro [submodule "libretro/cores/mrboom/core"] path = libretro/cores/mrboom/upstream - url = https://github.com/libretro/mrboom-libretro.git + url = git@github.com:ehmry/mrboom-libretro.git [submodule "libretro/cores/gambatte/core"] path = libretro/cores/gambatte/upstream - url = https://github.com/libretro/gambatte-libretro + url = git@github.com:github.com/ehmry/gambatte-libretro.git [submodule "libretro/cores/dinothawr/core"] path = libretro/cores/dinothawr/core url = https://github.com/libretro/Dinothawr @@ -69,10 +69,10 @@ url = https://github.com/libretro/scummvm.git [submodule "libretro/cores/lutro/upstream"] path = libretro/cores/lutro/upstream - url = https://github.com/libretro/libretro-lutro.git + url = git@github.com:ehmry/libretro-lutro.git [submodule "libretro/cores/bluemsx/upstream"] path = libretro/cores/bluemsx/upstream - url = https://github.com/libretro/blueMSX-libretro.git + 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 @@ -93,7 +93,7 @@ url = https://github.com/meepingsnesroms/Mu.git [submodule "libretro/cores/dosbox-svn/upstream"] path = libretro/cores/dosbox-svn/upstream - url = https://github.com/fr500/dosbox-svn + url = https://github.com/libretro/dosbox-svn.git [submodule "nim/xspf_view"] path = nim/xspf_view url = git://depot.h4ck.me/srv/git/xspf_view diff --git a/libretro/cores/4do/upstream b/libretro/cores/4do/upstream index 714a81b5c..cfd239a6d 160000 --- a/libretro/cores/4do/upstream +++ b/libretro/cores/4do/upstream @@ -1 +1 @@ -Subproject commit 714a81b5c7c05dc2e2c5956efe04698e1c723056 +Subproject commit cfd239a6dada9d51499df2e941e4ad96357b0def diff --git a/libretro/cores/Tuprules.tup b/libretro/cores/Tuprules.tup index ae995afcb..dbc70a58b 100644 --- a/libretro/cores/Tuprules.tup +++ b/libretro/cores/Tuprules.tup @@ -5,7 +5,7 @@ PKG_DEPENDS += \ _/src/$(BIN_NAME) \ _/src/retro_frontend \ -!libretro_cc = |> ^ CC %f^ \ +!libretro_cc = | $(GENODE_DIR)/ |> ^ CC %f^ \ $(CC) \ $(DEFINES) \ `$(PKG_CONFIG) --cflags $(CORE_PKGS)` \ @@ -14,7 +14,7 @@ PKG_DEPENDS += \ -c %f -o %o \ |> %f.$(TARGET_NAME).o -!libretro_cxx = |> ^ CXX %f^ \ +!libretro_cxx = | $(GENODE_DIR)/ |> ^ CXX %f^ \ $(CXX) \ $(DEFINES) \ `$(PKG_CONFIG) --cflags $(CORE_PKGS)` \ @@ -23,12 +23,13 @@ PKG_DEPENDS += \ -c %f -o %o \ |> %f.$(TARGET_NAME).o -!libretro_core_link = |> ^o LD %d^ \ +!libretro_core_link = | $(GENODE_DIR)/ $(GENODE_DIR)/ |> ^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` \ + -L$(GENODE_DIR)/stub \ |> libretro.so LINK_T = $(TUP_CWD)/link.T diff --git a/libretro/cores/fceumm/upstream b/libretro/cores/fceumm/upstream index 386d7d911..74e43dbd0 160000 --- a/libretro/cores/fceumm/upstream +++ b/libretro/cores/fceumm/upstream @@ -1 +1 @@ -Subproject commit 386d7d9114234475221e72d2cdfdb8ee74d987eb +Subproject commit 74e43dbd02a8f24a5b65931a88ef366b8d950361 diff --git a/libretro/cores/gambatte/upstream b/libretro/cores/gambatte/upstream index 9f88b26c7..5fd9a1fb1 160000 --- a/libretro/cores/gambatte/upstream +++ b/libretro/cores/gambatte/upstream @@ -1 +1 @@ -Subproject commit 9f88b26c77c93e4f2f0254ec6d20b29b4c49610e +Subproject commit 5fd9a1fb1dc2ae259f9f0edd7fce1549465f4fe9 diff --git a/libretro/cores/lutro/upstream b/libretro/cores/lutro/upstream index a9ed4a40c..ceab569d8 160000 --- a/libretro/cores/lutro/upstream +++ b/libretro/cores/lutro/upstream @@ -1 +1 @@ -Subproject commit a9ed4a40cfe0b607f753d444fa633240b716c886 +Subproject commit ceab569d88da6846bc632a79961fb30b1aa8c186 diff --git a/libretro/cores/mgba/upstream b/libretro/cores/mgba/upstream index 03c7fac5b..f0ec5a3c8 160000 --- a/libretro/cores/mgba/upstream +++ b/libretro/cores/mgba/upstream @@ -1 +1 @@ -Subproject commit 03c7fac5b733d5eb7f2de59929b840333a4c553c +Subproject commit f0ec5a3c8ba20762d3190f643a30f305b24f9004 diff --git a/libretro/cores/mrboom/upstream b/libretro/cores/mrboom/upstream index 5dfb5f2a2..148b9f730 160000 --- a/libretro/cores/mrboom/upstream +++ b/libretro/cores/mrboom/upstream @@ -1 +1 @@ -Subproject commit 5dfb5f2a2d1a56c6240dfdc60212be479b9ce5c3 +Subproject commit 148b9f7301db2aebfc3b9190526ebde43eba170b diff --git a/libretro/cores/oberon/upstream b/libretro/cores/oberon/upstream index 94909c687..41aa3d5ec 160000 --- a/libretro/cores/oberon/upstream +++ b/libretro/cores/oberon/upstream @@ -1 +1 @@ -Subproject commit 94909c68720719f87fdd68fa02df3c72c2a8b179 +Subproject commit 41aa3d5ecaab3c4dc68be3857af89c36053b02c6 diff --git a/libretro/cores/samples/upstream b/libretro/cores/samples/upstream index fd6547e86..32aa98eea 160000 --- a/libretro/cores/samples/upstream +++ b/libretro/cores/samples/upstream @@ -1 +1 @@ -Subproject commit fd6547e86fae1bd35606f19ddc8caa00596d509d +Subproject commit 32aa98eeaad66cc3318d6e821a7a83de75603831 diff --git a/libretro/cores/snes9x/upstream b/libretro/cores/snes9x/upstream index a07fbf660..5c2e09056 160000 --- a/libretro/cores/snes9x/upstream +++ b/libretro/cores/snes9x/upstream @@ -1 +1 @@ -Subproject commit a07fbf660e29be2db9f6f9b051514dfd546cef26 +Subproject commit 5c2e090566e2ac31428570beed71149fce4f3e22 diff --git a/libretro/cores/tyrquake/upstream b/libretro/cores/tyrquake/upstream index 627c96be5..d058fb7e5 160000 --- a/libretro/cores/tyrquake/upstream +++ b/libretro/cores/tyrquake/upstream @@ -1 +1 @@ -Subproject commit 627c96be59e4abc9f26bfd0e65a18a973205f886 +Subproject commit d058fb7e58137d92f148f1b81a8b2eb147090aab diff --git a/libretro/libretro-common b/libretro/libretro-common index 855c69a89..7437ccc0f 160000 --- a/libretro/libretro-common +++ b/libretro/libretro-common @@ -1 +1 @@ -Subproject commit 855c69a8917e9ea0013819dbaee8ac0d12b5a469 +Subproject commit 7437ccc0fb92c8177a980b8b45e2a3e995f98f8c diff --git a/libretro/retro_frontend b/libretro/retro_frontend index 8cff8361a..90e1d41b8 160000 --- a/libretro/retro_frontend +++ b/libretro/retro_frontend @@ -1 +1 @@ -Subproject commit 8cff8361ac42b15a93be2c6d97d01c05be8d6f74 +Subproject commit 90e1d41b851cb812ab841344a21c4e61f5ff4232