From 081894c6c8901440b08432d8631f7125a603a655 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 21 Nov 2022 10:59:12 +0000 Subject: [PATCH 1/4] Dolphin: check if it's still breaking without ssh --- net.retrodeck.retrodeck.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8f2e3263..cff5a0e9 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -613,7 +613,8 @@ modules: - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg sources: - type: git - url: ssh://git@github.com/dolphin-emu/dolphin.git + #url: ssh://git@github.com/dolphin-emu/dolphin.git + url: https://github.com/dolphin-emu/dolphin.git commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c x-checker-data: type: json From 41cacdb7c90394c83a114a929d5198c06e07b7bb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 21 Nov 2022 10:59:42 +0000 Subject: [PATCH 2/4] ...If not this should build --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index cff5a0e9..17952e94 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -613,8 +613,8 @@ modules: - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg sources: - type: git - #url: ssh://git@github.com/dolphin-emu/dolphin.git - url: https://github.com/dolphin-emu/dolphin.git + url: ssh://git@github.com/dolphin-emu/dolphin.git + #url: https://github.com/dolphin-emu/dolphin.git commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c x-checker-data: type: json From dec00a1e255298899cc1788f0417ac49089d33e3 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 21 Nov 2022 11:10:21 +0000 Subject: [PATCH 3/4] Primehack: check if the latest commits are not overwriting Dolphin --- es-configs/es_systems.xml | 4 +- net.retrodeck.retrodeck.appdata.xml | 4 +- net.retrodeck.retrodeck.yml | 70 +++++++++++++++-------------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 0973c2c0..a1871dc1 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -565,7 +565,7 @@ .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_DOLPHIN% -b -e %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% - + %EMULATOR_PRIMEHACK% -b -e %ROM% gc gc @@ -1073,7 +1073,7 @@ %EMULATOR_PCSX2% -batch %ROM% .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - + ps2 ps2 diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 91a61941..a6762b65 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -69,12 +69,13 @@ - + https://github.com/XargonWan/RetroDECK/releases/tag/0.6.0b
  • Added Cemu
  • Added Ryujinx
    • +
  • Added Primehack
  • Fix: PCSX2-QT is now looking for saves in the correct directory ~/retrodeck/saves/ps2/memcards and not in ~/retrodeck/saves/ps2/pcsx2/memcards
  • Updated RetroArch to v1.12.0
  • Updated PPSSPP (SA) to v1.13.2
    • @@ -86,7 +87,6 @@
  • Updated Duckstation to latest on 31/10/2022
  • Migrated Yuzu from appimage mainline-1233
  • Removed old PCSX2 (non-qt)
    • -
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 17952e94..e2f37ebd 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -818,40 +818,42 @@ modules: # PRIMEHACK - START # https://github.com/flathub/io.github.shiiion.primehack # Disabled because it's overwriting Dolphin - # - name: primehack - # buildsystem: cmake-ninja - # config-opts: - # - -DCMAKE_BUILD_TYPE=Release - # - -DENABLE_ALSA=OFF - # - -DENABLE_SDL=ON - # - -DENABLE_EVDEV=ON - # - -DDISTRIBUTOR=Flathub - # cleanup: - # - /share/man - # post-install: - # - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper - # - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg - # sources: - # - type: git - # url: https://github.com/shiiion/dolphin.git - # commit: 9ca0eb888bd6f8ed13a4efb92d808fbf0705ffa4 - # # detects whether dolphin is running in a flatpak sandbox - # # and makes it use xdg directories if it is. - # # prevents dolphin from attempting to write conf files - # # in non-writable paths, typically happens when a user - # # has leftover files from a previous non-flatpak install - # - type: patch - # path: rd-submodules/primehack/detectflatpak.patch - # # version strings must match exactly for online multiplayer - # - type: patch - # path: rd-submodules/primehack/nodirtyversion.patch - # - type: script - # commands: - # - for i in {0..9}; do - # - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i; - # - done - # - dolphin-emu "$@" - # dest-filename: dolphin-emu-wrapper + + - name: primehack + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DENABLE_ALSA=OFF + - -DENABLE_SDL=ON + - -DENABLE_EVDEV=ON + - -DDISTRIBUTOR=Flathub + cleanup: + - /share/man + post-install: + - install -D primehack-wrapper /app/bin/primehack-wrapper + sources: + - type: git + url: https://github.com/shiiion/dolphin.git + commit: efb99ebfd20b1bc16ea3e51fec409c91e354d8c2 + # detects whether dolphin is running in a flatpak sandbox + # and makes it use xdg directories if it is. + # prevents dolphin from attempting to write conf files + # in non-writable paths, typically happens when a user + # has leftover files from a previous non-flatpak install + - type: patch + path: detectflatpak.patch + # version strings must match exactly for online multiplayer + - type: patch + path: nodirtyversion.patch + - type: file + path: appdata.xml + - type: script + commands: + - for i in {0..9}; do + - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i; + - done + - dolphin-emu "$@" + dest-filename: primehack-wrapper # PRIMEHACK - END From b2fbc2b810cbc67b12ae5767dd36d2d68fc88d01 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 21 Nov 2022 13:00:30 +0000 Subject: [PATCH 4/4] Primehack: submodule path fix --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e2f37ebd..7f5f0d60 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -841,10 +841,10 @@ modules: # in non-writable paths, typically happens when a user # has leftover files from a previous non-flatpak install - type: patch - path: detectflatpak.patch + path: rd-submodules/dolphin/detectflatpak.patch # version strings must match exactly for online multiplayer - type: patch - path: nodirtyversion.patch + path: rd-submodules/dolphin/nodirtyversion.patch - type: file path: appdata.xml - type: script