From 288d0a230fb9cd40700965ec195742b0537fff00 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 22 Nov 2022 09:09:39 +0000 Subject: [PATCH 1/6] PRIMEHACK: temporary disabled (again) as it was overwriting dolphin --- net.retrodeck.retrodeck.yml | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 307d0703..7714923b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -815,45 +815,45 @@ modules: # RPCS3 - END - # PRIMEHACK - START - # https://github.com/flathub/io.github.shiiion.primehack - # Disabled because it's overwriting Dolphin + # # 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 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: rd-submodules/dolphin/detectflatpak.patch - # version strings must match exactly for online multiplayer - - type: patch - path: rd-submodules/dolphin/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: primehack-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: rd-submodules/dolphin/detectflatpak.patch + # # version strings must match exactly for online multiplayer + # - type: patch + # path: rd-submodules/dolphin/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: primehack-wrapper - # PRIMEHACK - END + # # PRIMEHACK - END # Duckstation - START # https://github.com/flathub/org.duckstation.DuckStation From c1c81c46c681a94cbe11fd3e2390ed828ccfd40a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 22 Nov 2022 10:16:17 +0000 Subject: [PATCH 2/6] RYUJINX: added libX11 --- net.retrodeck.retrodeck.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 7714923b..c7ba24b4 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -473,6 +473,20 @@ modules: # Ryujinx - START # https://ryujinx.org/download + - name: libX11 + #from: https://github.com/flathub/flatpak-external-data-checker/blob/6ed0a7b46cc4da2e4fc3a677cd1a078f335ff484/tests/org.x.xeyes.yml + sources: + - type: archive + url: http://some-incorrect.url/libX11.tar.gz + sha256: "0000000000000000000000000000000000000000000000000000000000000000" + x-checker-data: + type: html + url: https://www.x.org/releases/individual/lib/ + version-pattern: libX11-([\d\.]+).tar.gz + url-template: libX11-$version.tar.gz + versions: + ==: 1.7.5 + - name: Ryujinx buildsystem: simple build-commands: From d4b85f5964267f0cf7b7f198b8e6c7fa7323dcab Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 22 Nov 2022 10:41:29 +0000 Subject: [PATCH 3/6] Cemu: added libsepool --- net.retrodeck.retrodeck.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c7ba24b4..6f536e37 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -949,6 +949,19 @@ modules: # Cemu - START # https://github.com/cemu-project/Cemu/releases + - name: libsepol-dev + # from: https://github.com/flathub/com.ticktick.TickTick/blob/dc07865aca359148fbe15617db8f2d79312da898/com.ticktick.TickTick.yml + buildsystem: simple + build-commands: + - ar x libsepol*.deb data.tar.xz + - rm libsepol*.deb + - tar -xf data.tar.xz / + sources: + #from: https://launchpad.net/ubuntu/+source/libsepol + - type: file + url: https://launchpad.net/ubuntu/+archive/primary/+files/libsepol-dev_3.4-2_amd64.deb + sha256: 6cf60eb730f9a02a05a0f6e7c644347ad2948b2e1dc73750793ac58e1250d76c + - name: Cemu-binary buildsystem: simple build-commands: From d38ed365b3ef21f3233f817448b828224a050f6f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 22 Nov 2022 11:29:33 +0000 Subject: [PATCH 4/6] RYUJINX: trying to link the libt that maybe already exists + Updated Yuzu and Ryujinx --- net.retrodeck.retrodeck.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 6f536e37..a1b8c8d0 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -465,37 +465,31 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1233/yuzu-mainline-20221113-f8aba8b9d.AppImage - sha256: 77c4684d95dcaf2f116cf94f65b61c7e0d83b493245ea89aa6d3a2a5fb7eb330 + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1245/yuzu-mainline-20221121-5ad585b0f.AppImage + sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # Yuzu - END # Ryujinx - START # https://ryujinx.org/download - - name: libX11 - #from: https://github.com/flathub/flatpak-external-data-checker/blob/6ed0a7b46cc4da2e4fc3a677cd1a078f335ff484/tests/org.x.xeyes.yml - sources: - - type: archive - url: http://some-incorrect.url/libX11.tar.gz - sha256: "0000000000000000000000000000000000000000000000000000000000000000" - x-checker-data: - type: html - url: https://www.x.org/releases/individual/lib/ - version-pattern: libX11-([\d\.]+).tar.gz - url-template: libX11-$version.tar.gz - versions: - ==: 1.7.5 + # - name: libX11 + # #from: https://github.com/flathub/flatpak-external-data-checker/blob/6ed0a7b46cc4da2e4fc3a677cd1a078f335ff484/tests/org.x.xeyes.yml + # sources: + # - type: archive + # url: https://www.x.org/releases/individual/lib/libX11-1.8.tar.gz + # sha256: 68e0a30c4248b9f41492891a4b49672c3b0c59e84c4868144f03eef01ebc5eea - name: Ryujinx buildsystem: simple build-commands: - mv Ryujinx ${FLATPAK_DEST}/bin/Ryujinx - chmod 777 ${FLATPAK_DEST}/bin/Ryujinx + - ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so sources: - type: archive - url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.335/ryujinx-1.1.335-linux_x64.tar.gz - sha256: 9a175bcc5ea0e67e8b8b0ff944eb1fa316e6ff6336f91b09b719b2ccac7ecee5 + url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.369/ryujinx-1.1.369-linux_x64.tar.gz + sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # Ryujinx - END From 5d65aedd7a971e3c749e56e603cee2c86f2ac63e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 22 Nov 2022 13:19:26 +0000 Subject: [PATCH 5/6] RYUJINX & YUZU: fixed wrong SHAs --- 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 a1b8c8d0..08b4e716 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -466,7 +466,7 @@ modules: sources: - type: file url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1245/yuzu-mainline-20221121-5ad585b0f.AppImage - sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + sha256: e4d1b2fe4443326fb90f3398680c83e130ccab1f315029c1ccca8e7449235b07 # Yuzu - END @@ -489,7 +489,7 @@ modules: sources: - type: archive url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.369/ryujinx-1.1.369-linux_x64.tar.gz - sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + sha256: ef682e8ca14d46ba8ba9b4f8d3250ce4e661730d6ceee9abd9d12e4dd1d90e42 # Ryujinx - END From b408e79444f44a5f76f5a82e2c86374a0301377c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 22 Nov 2022 13:21:26 +0000 Subject: [PATCH 6/6] New version tag --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 08b4e716..9d158dba 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -81,7 +81,7 @@ modules: VERSION="0.6.0b-cooker" if [[ $VERSION == *"cooker"* ]]; then - VERSION="cooker-"$(git rev-parse --short HEAD) + VERSION="$VERSION-[$(git rev-parse --short HEAD)]" fi echo $VERSION >> ${FLATPAK_DEST}/retrodeck/version cat ${FLATPAK_DEST}/retrodeck/version