From 96cc8b63bbd8c28f36c6946b98f8420ddd4c0dd6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 16 Nov 2022 16:48:08 +0100 Subject: [PATCH 1/7] git config --global protocol.file.allow always instead of: git config --global protocol.allow always --- .github/workflows/cooker-selfhosted.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index a17c0cd4..78137807 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -46,7 +46,7 @@ jobs: - name: Build flatpak run: | - git config --global protocol.allow always + git config --global protocol.file.allow always flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Create Artifact for flathub @@ -86,4 +86,4 @@ jobs: with: name: retrodeck-flatpak path: RetroDECK.flatpak - continue-on-error: true \ No newline at end of file + continue-on-error: true From 83c89243803a878227a5281a0dc4a567e079a789 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 17 Nov 2022 07:47:50 +0000 Subject: [PATCH 2/7] Dolphin: trying to clone via git instead of https --- 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 16dd1d82..7a31de42 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -608,7 +608,7 @@ modules: - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg sources: - type: git - url: https://github.com/dolphin-emu/dolphin.git + url: git@github.com:dolphin-emu/dolphin.git commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c x-checker-data: type: json From b674ab0f78c1bd62ac1d00ec7eb6e7bd3d0b6426 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 17 Nov 2022 08:12:51 +0000 Subject: [PATCH 3/7] Dolphin: trying ssh --- 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 7a31de42..544d0d1a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -608,7 +608,7 @@ modules: - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg sources: - type: git - url: git@github.com:dolphin-emu/dolphin.git + url: ssh://git@github.com:dolphin-emu/dolphin.git commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c x-checker-data: type: json From 0cb325448158eeb16ed53de353784a181fbfd876 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 17 Nov 2022 08:44:38 +0000 Subject: [PATCH 4/7] Dolphin: trying ssh -test2 --- 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 544d0d1a..df675acb 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -608,7 +608,7 @@ 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 commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c x-checker-data: type: json From a9503d6d2631e6939f67f12afea7e1838210e295 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 17 Nov 2022 10:29:54 +0000 Subject: [PATCH 5/7] Dolphin: trying ssh -test3 + debug code --- net.retrodeck.retrodeck.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index df675acb..8c3bbad2 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -538,6 +538,11 @@ modules: # PCSX2 - END + - name: debug + buildsystem: simple + build-commands: + - whoami + # Dolphin - START # https://github.com/flathub/org.DolphinEmu.dolphin-emu # WHEN UPADTING: remember to update rd-submodules/dolphin contents From 2ea93f1a401603512151a2482776c6bf8eb0add4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 18 Nov 2022 11:37:43 +0000 Subject: [PATCH 6/7] XEMU: added libpcap --- net.retrodeck.retrodeck.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8c3bbad2..7c58b7ea 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -672,6 +672,25 @@ modules: # stable-only: true # url-template: http://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz + - name: libpcap + buildsystem: cmake-ninja + cleanup: + - /bin + - /include + - /lib/debug + - /lib/pkgconfig + - /lib/*.a + - /share + sources: + - type: archive + url: https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz + sha256: ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 + x-checker-data: + type: anitya + project-id: 1702 + stable-only: true + url-template: https://www.tcpdump.org/release/libpcap-$version.tar.gz + - name: PyYAML buildsystem: simple build-commands: From 9d2de960e44800febe8dbc9aa68e287d0692c32e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 18 Nov 2022 14:55:59 +0000 Subject: [PATCH 7/7] DUCKSTATION: -.- --- net.retrodeck.retrodeck.yml | 66 ++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 7c58b7ea..8f2e3263 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -856,13 +856,43 @@ modules: # Duckstation - START # https://github.com/flathub/org.duckstation.DuckStation + # Disabled until we completely switch to QT6 - - name: duckstation + # - name: duckstation + # buildsystem: cmake-ninja + # no-make-install: true + # builddir: true + # config-opts: + # - -DCMAKE_BUILD_TYPE=RelWithDebInfo + # - -DUSE_EGL=ON + # - -DUSE_SDL2=ON + # - -DUSE_WAYLAND=ON + # - -DUSE_X11=ON + # - -DUSE_DRMKMS=ON + # - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + # post-install: + # - install -m755 bin/duckstation-qt /app/bin + # - cp -r ../data/* bin/translations /app/bin + # sources: + # - type: git + # url: https://github.com/stenzek/duckstation.git + # commit: 6f709468601183083b8581d4952aaba7baf77084 + # # Cloning dep/msvc/qt is only necessary for Windows + # disable-submodules: true + + # Duckstation - END + + # Duckstation-DontUpdate - START + # Old version moved to QT6 so it's either this or AppImage + # But AppImage is a single one that keep getting updated at the same link so the sha (that's mandatory) will break the build + # So yeah we're stuck with this for a while + + - name: duckstation-DontUpdate buildsystem: cmake-ninja no-make-install: true builddir: true config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DCMAKE_BUILD_TYPE=Release - -DUSE_EGL=ON - -DUSE_SDL2=ON - -DUSE_WAYLAND=ON @@ -870,16 +900,36 @@ modules: - -DUSE_DRMKMS=ON - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON post-install: - - install -m755 bin/duckstation-qt /app/bin + - install -m 755 -t /app/bin/ bin/duckstation-nogui bin/duckstation-qt + - |- + for px in 16 32 48 64 128 256; do + install -Dm644 ../extras/icons/icon-${px}px.png /app/share/icons/hicolor/${px}x${px}/apps/org.duckstation.DuckStation.png + done - cp -r ../data/* bin/translations /app/bin sources: - type: git url: https://github.com/stenzek/duckstation.git - commit: 6f709468601183083b8581d4952aaba7baf77084 - # Cloning dep/msvc/qt is only necessary for Windows - disable-submodules: true - - # Duckstation - END + commit: 3fb61865e505ba639609fbf16cb8bdf5c66e020c + + # Duckstation-DontUpdate - END + + # Duckstation-AppImage - START + # https://github.com/stenzek/duckstation/releases/tag/preview + + # - name: Duckstation-AppImage + # buildsystem: simple + # build-commands: + # - chmod +x DuckStation-*.AppImage + # - ./DuckStation-x64*.AppImage --appimage-extract + # - mkdir -p "${FLATPAK_DEST}/duckstation" + # - cp -r squashfs-root/* "${FLATPAK_DEST}/duckstation" + # - ln -s "${FLATPAK_DEST}/duckstation/usr/bin/duckstation" "${FLATPAK_DEST}/bin/duckstation" + # sources: + # - type: file + # url: https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage + # sha256: a107d1837df020cb4e7b8a542059665428883af69c1cf063edd29e2d75634867 + + # Duckstation-AppImage - END # Cemu - START # https://github.com/cemu-project/Cemu/releases