From 7ca84e29e3c32b2ec844beb260c348bd7f1d8009 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 8 Jun 2022 15:00:33 +0200 Subject: [PATCH 01/14] Updated RA --- net.retrodeck.retrodeck.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 65f03b92..04234720 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -202,7 +202,7 @@ modules: sources: - type: git url: https://github.com/libretro/RetroArch.git - branch: de4e56ecf28a09057734f8624af6d62f3088734f + branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 - type: file path: rd-submodules/retroarch/retroarch.cfg post-install: @@ -210,20 +210,23 @@ modules: - >- mv ${FLATPAK_DEST}/share/pixmaps/retroarch.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - - rmdir --ignore-fail-on-non-empty ${FLATPAK_DEST}/share/pixmaps/ + - rmdir ${FLATPAK_DEST}/share/pixmaps/ - mkdir -p ${FLATPAK_DEST}/etc - >- sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg > ${FLATPAK_DEST}/etc/retroarch.cfg modules: - - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json + - libpng/libpng-1.6.35.json + #- rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json - shared-modules/SDL/SDL-1.2.15.json - shared-modules/SDL/SDL_image-1.2.12.json - shared-modules/SDL/SDL_mixer-1.2.12.json - shared-modules/SDL/SDL_net-1.2.8.json + - shared-modules/SDL/SDL_ttf-2.0.11.json - shared-modules/libusb/libusb.json - shared-modules/gudev/gudev.json - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json + - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json - rd-submodules/retroarch/libaio/libaio-0.3.112.json # glu issue, check libglu module for more info #- shared-modules/glu/glu-9.json @@ -235,7 +238,7 @@ modules: sources: - type: git url: https://github.com/libretro/RetroArch.git - branch: de4e56ecf28a09057734f8624af6d62f3088734f + branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 - name: retroarch-filers-audio subdir: libretro-common/audio/dsp_filters make-install-args: @@ -243,7 +246,7 @@ modules: sources: - type: git url: https://github.com/libretro/RetroArch.git - branch: de4e56ecf28a09057734f8624af6d62f3088734f + branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 - name: retroarch-assets make-install-args: - PREFIX=${FLATPAK_DEST} @@ -257,21 +260,21 @@ modules: sources: - type: git url: https://github.com/libretro/libretro-database.git - commit: 1754130f72d8c00a512797bf85442576258279e8 + commit: f3b10ec262fcbd78da3473f46d244270d12a327e - name: libretro-core-info make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/libretro-core-info.git - commit: 1b2472eca14a5a187ff298ace1b614fd3d47bc7c + commit: 06dac6318c067a6a40e2ea1e1260e74681ada844 - name: retroarch-joypad-autoconfig make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/retroarch-joypad-autoconfig.git - commit: 0eb3ad2666e6bdc2de2cde4c5d4af29b8c7f2c67 + commit: 760b057f1865a827762a54a8a32afda2cdd9e170 - name: common-shaders make-install-args: - PREFIX=${FLATPAK_DEST} @@ -285,14 +288,14 @@ modules: sources: - type: git url: https://github.com/libretro/slang-shaders.git - commit: 77558d5f2ac807b27201fb888cbf2caee8e289fa + commit: 148c57d9747f5db124135501ac280b5ca129a83f - name: glsl-shaders make-install-args: - PREFIX=${FLATPAK_DEST} sources: - type: git url: https://github.com/libretro/glsl-shaders.git - commit: 20801b38aa2c89a2beb9f57ffbbbcea7256e2523 + commit: 8f6b2649489760caea8f36ec6099998854059569 - name: common-overlays make-install-args: - PREFIX=${FLATPAK_DEST} From 738e1f4c7c48e6dddae1fed552e9562ed31e76c8 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 8 Jun 2022 15:06:11 +0200 Subject: [PATCH 02/14] Updated yuzu from 969 to 1039 --- net.retrodeck.retrodeck.yml | 38 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 04234720..649a2e50 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -322,6 +322,7 @@ modules: - name: libzip buildsystem: cmake-ninja config-opts: + - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON' - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' sources: - type: archive @@ -349,6 +350,7 @@ modules: - name: fmt buildsystem: cmake-ninja config-opts: + - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON' - '-DFMT_TEST=OFF' sources: - type: archive @@ -365,8 +367,8 @@ modules: - '-DCMAKE_BUILD_TYPE=Release' sources: - type: archive - url: https://github.com/KhronosGroup/glslang/archive/11.8.0.tar.gz - sha256: 9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0 + url: https://github.com/KhronosGroup/glslang/archive/11.9.0.tar.gz + sha256: d5744adba19eef9ad3d73f524226b39fec559d94cb582cd442e3c5de930004b2 x-checker-data: type: anitya stable-only: true @@ -376,12 +378,13 @@ modules: buildsystem: cmake-ninja config-opts: - '-DCMAKE_BUILD_TYPE=Release' + - '-DCATCH_INSTALL_EXTRAS=ON' - '-DCATCH_BUILD_TESTING=OFF' builddir: true sources: - type: archive - url: https://github.com/catchorg/Catch2/archive/v2.13.8.tar.gz - sha256: b9b592bd743c09f13ee4bf35fc30eeee2748963184f6bea836b146e6cc2a585a + url: https://github.com/catchorg/Catch2/archive/v2.13.9.tar.gz + sha256: 06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52 x-checker-data: type: anitya stable-only: true @@ -391,6 +394,7 @@ modules: buildsystem: cmake-ninja config-opts: - '-DCMAKE_BUILD_TYPE=Release' + - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON' - '-DJSON_BuildTests=OFF' sources: - type: archive @@ -398,7 +402,7 @@ modules: sha256: 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 x-checker-data: type: anitya - project-id: 141453 + project-id: 11152 url-template: https://github.com/nlohmann/json/archive/v$version.tar.gz - name: boost buildsystem: simple @@ -408,13 +412,13 @@ modules: sources: - type: archive url: >- - https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2 - sha256: 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc + https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 + sha256: 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 x-checker-data: type: anitya project-id: 6845 url-template: >- - https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_78_0.tar.bz2 + https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_79_0.tar.bz2 - name: nv-codec-headers make-install-args: - PREFIX=/app @@ -440,8 +444,8 @@ modules: - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' - '-DYUZU_USE_QT_WEB_ENGINE=ON' - '-DYUZU_USE_BUNDLED_FFMPEG=ON' - - '-DDISPLAY_VERSION=969' - - '-DBUILD_TAG=mainline-969' + - '-DDISPLAY_VERSION=1039' + - '-DBUILD_TAG=mainline-1039' - '-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline' build-options: env: @@ -453,24 +457,14 @@ modules: - /share/pixmaps post-install: - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop - - >- - desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key - Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop - >- install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg - - >- - mv /app/share/mime/packages/yuzu.xml - /app/share/mime/packages/org.yuzu_emu.yuzu.xml - - >- - sed 's/yuzu/org.yuzu_emu.yuzu/g' -i - /app/share/mime/packages/org.yuzu_emu.yuzu.xml sources: - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git - tag: mainline-0-969 - commit: d179e12137cd8ff88b0eade7d13de801661f869b + tag: mainline-0-1039 + commit: 983afc5328725109a1cf13c61103b8a553c005d0 disable-shallow-clone: true x-checker-data: type: git From e400855cf899aa60a00cfb9c95a803a865821d99 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 8 Jun 2022 15:08:46 +0200 Subject: [PATCH 03/14] Updated PCSX2 (not to the new GUI) --- net.retrodeck.retrodeck.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 649a2e50..f309c022 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -489,8 +489,8 @@ modules: sources: - type: git url: https://github.com/wxWidgets/wxWidgets.git - tag: v3.1.5 - commit: 9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1 + tag: v3.1.6 + commit: 19907924842a9152b8ee5f03f117aed65193b964 x-checker-data: type: git tag-pattern: ^v([\d.]+)$ @@ -502,8 +502,8 @@ modules: sources: - type: git url: https://pagure.io/libaio.git - tag: libaio-0.3.112 - commit: d025927efa75a0d1b46ca3a5ef331caa2f46ee0e + tag: libaio-0.3.113 + commit: 1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448 x-checker-data: type: git tag-pattern: ^libaio-([\d.]+)$ @@ -597,8 +597,8 @@ modules: sources: - type: git url: https://github.com/PCSX2/pcsx2.git - tag: v1.7.2554 - commit: 0d1675fbaa0d40874df98eed6270efc55620271b + tag: v1.7.2889 + commit: a6649b2d6b558806fbe7cbaf6296014e3c5c192e - type: file path: rd-submodules/pcsx2/AppIcon128.png From 3f00eaeea969c0973d0b8be0a2ae745cca2cd634 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 8 Jun 2022 15:11:52 +0200 Subject: [PATCH 04/14] Updated Dolphin --- net.retrodeck.retrodeck.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index f309c022..945999da 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -677,7 +677,7 @@ modules: sources: - type: git url: https://github.com/dolphin-emu/dolphin.git - commit: 8ecfa537a242de74d2e372e30d9d79b14584b2fb + commit: 8335ec70e5fe253eb21509408ca6b5736ed57dfc # 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 @@ -688,14 +688,19 @@ modules: # version strings must match exactly for online multiplayer - type: patch path: rd-submodules/dolphin/nodirtyversion.patch - - type: file - path: rd-submodules/dolphin/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 "$@" + # use gtk3 filechooser on steamdeck + - bv=`cat /sys/devices/virtual/dmi/id/board_vendor` + - bv=$bv`cat /sys/devices/virtual/dmi/id/board_name` + - if [[ $bv == "ValveJupiter" ]]; then + - QT_QPA_PLATFORMTHEME=gtk3 dolphin-emu "$@" + - else + - dolphin-emu "$@" + - fi dest-filename: dolphin-emu-wrapper # Dolphin - END From 700b51af254ead520e729da9a65ba91adcaf1709 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 8 Jun 2022 15:15:24 +0200 Subject: [PATCH 05/14] Updated XEMU --- net.retrodeck.retrodeck.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 945999da..5daf7edf 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -706,6 +706,7 @@ modules: # Dolphin - END # XEMU - START + # https://github.com/flathub/app.xemu.xemu # glu issue, check libglu module for more info # - name: libglu @@ -725,6 +726,15 @@ modules: # stable-only: true # url-template: http://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz + - name: PyYAML + buildsystem: simple + build-commands: + - python3 setup.py install --prefix=/app --root=/ + sources: + - type: archive + url: https://github.com/yaml/pyyaml/archive/refs/tags/6.0.tar.gz + sha256: f33eaba25d8e0c1a959bbf00655198c287dfc5868f5b7b01e401eaa1796cc778 + - name: xemu buildsystem: autotools builddir: true @@ -743,21 +753,18 @@ modules: install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png done - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg - - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications - - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop - mv qemu-system-i386 /app/bin/xemu - mkdir -p /app/share/licenses/xemu - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt sources: - type: git url: https://github.com/mborgerson/xemu.git - tag: gh-release/0.6.2-90-g6f507c80af - commit: 6f507c80af546e0f5d316622d20f78820423ce6e + tag: v0.7.29 + commit: 69dcbe9b3081ee51d1468b1b7777b8b930bfba6c x-checker-data: type: json url: https://api.github.com/repos/mborgerson/xemu/releases/latest tag-query: .tag_name - version-query: $tag | sub("^gh-release/"; "") timestamp-query: .published_at is-main-source: true From 30ebc085dcd831aac97fa1d93dc1b9f5fb4c63d9 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 8 Jun 2022 15:17:57 +0200 Subject: [PATCH 06/14] Updated CITRA from nightly-1762 to nightly-1767 --- 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 5daf7edf..ce9c05e3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -822,8 +822,8 @@ modules: sources: - type: git url: https://github.com/citra-emu/citra-nightly.git - tag: nightly-1762 - commit: 1382035d4de5ada310c7f4fd00f1836b16ab74fb + tag: nightly-1767 + commit: 6f6a9357c26eccf09bf0c993f159d69bbe472f49 disable-shallow-clone: true x-checker-data: type: git From 3df1a44bacff0d2ac255fdc270051dd1381643bf Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 8 Jun 2022 15:20:53 +0200 Subject: [PATCH 07/14] Updated RPCS3 +llvm14 --- net.retrodeck.retrodeck.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ce9c05e3..ffeee17d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -857,8 +857,8 @@ modules: CXX: clang++ RANLIB: llvm-ranlib ldflags: -fuse-ld=lld - prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - prepend-path: /usr/lib/sdk/llvm13/bin + prepend-ld-library-path: /usr/lib/sdk/llvm14/lib + prepend-path: /usr/lib/sdk/llvm14/bin config-opts: - -DCMAKE_BUILD_TYPE=Release - -DBUILD_SHARED_LIBS=OFF @@ -882,7 +882,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/llvm-mirror.git - commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + commit: c725f494c91611018f5d830eca22c0a1662c0f31 - type: git url: https://github.com/intel/ittapi.git dest: ittapi/ittapi @@ -892,8 +892,8 @@ modules: buildsystem: cmake-ninja builddir: true build-options: - append-ld-library-path: /usr/lib/sdk/llvm13/lib - append-path: /usr/lib/sdk/llvm13/bin + append-ld-library-path: /usr/lib/sdk/llvm14/lib + append-path: /usr/lib/sdk/llvm14/bin cflags: *optflags cflags-override: true cxxflags: *optflags @@ -925,7 +925,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: e9570d1a0045926f63ec8ea9af68f81743d4f365 + commit: 8d46840e091fa8e330d505f91be45a527f529efd # RPCS3 - END From eacdb0bba276b548574171eb07c67fe8fba395aa Mon Sep 17 00:00:00 2001 From: xargon Date: Thu, 9 Jun 2022 09:20:57 +0200 Subject: [PATCH 08/14] EMULATORS: updated libretro cores from 1.10.2 to 1.10.3 --- 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 ffeee17d..44c9b9af 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -314,8 +314,8 @@ modules: - mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/ sources: - type: archive - url: https://buildbot.libretro.com/stable/1.10.2/linux/x86_64/RetroArch_cores.7z - sha256: 0c59f99534a1ae3a2d34b1747c40398325e53db69acfab35b99c8fa8d76430e5 + url: https://buildbot.libretro.com/stable/1.10.3/linux/x86_64/RetroArch_cores.7z + sha256: 33abf39839687f8faba202ed5dcf3a54c06266a49fad35f0521fa445523d009f # Yuzu - https://github.com/flathub/org.yuzu_emu.yuzu From 03f0b8c460aeab1781064708abf410efd66a677a Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 09:29:41 +0200 Subject: [PATCH 09/14] WORKFLOW: restored the cooker-selfhosted.yml from the branch cooker --- .github/workflows/cooker-selfhosted.yml | 110 +----------------------- 1 file changed, 3 insertions(+), 107 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index b0be824c..b1b2c982 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -32,21 +32,6 @@ jobs: - uses: actions/checkout@v3 - # - name: Download global cache - # uses: dawidd6/action-download-artifact@v2 - # with: - # workflow: cooker.yml - # name: global-cache - # search_artifacts: true - # skip_unpack: true - # continue-on-error: true - - # - name: Extract global cache - # run: | - # tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - # rm -f retrodeck-cooker.tar.gz - # continue-on-error: true - - name: Initialize enviornment run: | git pull @@ -56,93 +41,19 @@ jobs: flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 + # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} - name: Build flatpak run: | - flatpak-builder --build-only --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - # - name: Compress cache - # run: | - # touch retrodeck-cooker.tar.gz - # rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - # find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build - - # - name: Upload build specific cache - # uses: actions/upload-artifact@v3 - # with: - # name: "${{ steps.generating_buildid.outputs.build-id }}" - # path: retrodeck-cooker.tar.gz - - # this is done to speed up the things now, it may be removed later - # - name: Compress global cache - # run: | - # touch retrodeck-cooker.tar.gz - # rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - # find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build - # continue-on-error: true - - # - name: Upload global cache - # uses: actions/upload-artifact@v3 - # with: - # name: global-cache - # path: retrodeck-cooker.tar.gz RetroDECK.flatpak - # continue-on-error: true - - # outputs: - # buildID: "${{ steps.generating_buildid.outputs.build-id }}" - - # - uses: actions/checkout@v3 - - # - name: Download build specific cache - # uses: actions/download-artifact@v2 - # with: - # name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} - - # - name: Extract cache - # run: | - # tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - # rm -f retrodeck-cooker.tar.gz - - # - name: DEBUG - # run: | - # echo "Listing folder $PWD contents" - # ls -lna - # echo "Checking for version file" - # find ~ -iname version - # cat $(find ~ -iname version) - - # - name: Initialize enviornment - # run: | - # git pull - # git submodule init - # git submodule update - # sudo add-apt-repository ppa:alexlarsson/flatpak - # sudo apt-get update - # sudo apt install flatpak flatpak-builder p7zip-full - # sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - # sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 + flatpak-builder --user --force-clean --keep-build-dirs --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - name: Create Bundle run: | - flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - - # - name: Extract branch name - # shell: bash - # run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - # id: extract_branch + flatpak build-bundle ${HOME}/local RetroDECK.flatpak net.retrodeck.retrodeck - name: Read version from version file id: version run: echo "##[set-output name=version;]$(cat $(find . -name version))" - # - name: DEBUG - Print version name - # shell: bash - # run: | - # echo "DEBUG: printing version from version file" - # echo "${{ steps.version.outputs.version }}" - - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: @@ -163,21 +74,6 @@ jobs: repo: RetroDECK-cooker continue-on-error: true - # - name: Compress global cache - # run: | - # touch retrodeck-cooker.tar.gz - # rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - # find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - # tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build - # continue-on-error: true - - # - name: Upload global cache - # uses: actions/upload-artifact@v3 - # with: - # name: global-cache - # path: retrodeck-cooker.tar.gz RetroDECK.flatpak - # continue-on-error: true - # In case it cannot publish the release at least it's probiding the flatpak file for creating a manual release - name: Upload RetroDECK.flatpak uses: actions/upload-artifact@v3 From bbb7c2e304c56050fff26e861be8972140136f67 Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 10:32:15 +0200 Subject: [PATCH 10/14] MANIFEST: fixed an issue where RetroArch couldn't remove a folder --- 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 44c9b9af..edfcef10 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -210,7 +210,7 @@ modules: - >- mv ${FLATPAK_DEST}/share/pixmaps/retroarch.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - - rmdir ${FLATPAK_DEST}/share/pixmaps/ + - rm -rf ${FLATPAK_DEST}/share/pixmaps/ - mkdir -p ${FLATPAK_DEST}/etc - >- sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg > From cea282bc9c118f8b20710a784cabb7e7cd5c423b Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 10:41:51 +0200 Subject: [PATCH 11/14] RETROARCH: folder deletion was maybe wrong --- 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 edfcef10..2a4391c2 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -210,7 +210,7 @@ modules: - >- mv ${FLATPAK_DEST}/share/pixmaps/retroarch.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - - rm -rf ${FLATPAK_DEST}/share/pixmaps/ + - rmdir --ignore-fail-on-non-empty ${FLATPAK_DEST}/share/pixmaps/ - mkdir -p ${FLATPAK_DEST}/etc - >- sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg > From da6364ed69881911c653f1208b209e5b57f17cdc Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 20:21:36 +0200 Subject: [PATCH 12/14] Woarkaround for the gnutil certificate issues --- net.retrodeck.retrodeck.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2a4391c2..54e20f18 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -119,6 +119,33 @@ modules: url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.2.tar.xz sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 + - name: gudev + buildsystem: meson + config-opts: + - '-Dtests=disabled' + - '-Dvapi=disabled' + - '-Dintrospection=disabled' + - '-Dgtk_doc=false' + cleanup: + - /include + - /etc + - /libexec + - /sbin + - /lib/pkgconfig + - /lib/systemd + - /man + - /share/aclocal + - /share/doc + - /share/gtk-doc + - /share/man + - /share/pkgconfig + - '*.la' + - '*.a' + sources: + - type: archive + url: https://ftp.osuosl.org/pub/blfs/conglomeration/libgudev/libgudev-237.tar.xz + sha256: 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa + # ES-DE - name: ffmpeg @@ -224,7 +251,8 @@ modules: - shared-modules/SDL/SDL_net-1.2.8.json - shared-modules/SDL/SDL_ttf-2.0.11.json - shared-modules/libusb/libusb.json - - shared-modules/gudev/gudev.json + # same glu issue + # - shared-modules/gudev/gudev.json - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json - rd-submodules/retroarch/libaio/libaio-0.3.112.json From e5f858c95f06cc46c85cfa5e477273596a051485 Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 20:49:33 +0200 Subject: [PATCH 13/14] DOLPHIN: removed appdata.xml and .desktop file --- net.retrodeck.retrodeck.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 54e20f18..27540fdc 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -698,10 +698,7 @@ modules: - /share/man post-install: - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper - - install -Dm644 appdata.xml /app/share/appdata/dolphin-emu.appdata.xml - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg - - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper' - /app/share/applications/dolphin-emu.desktop sources: - type: git url: https://github.com/dolphin-emu/dolphin.git From 264d29475b0c3650b213f5656f5f463c1951650e Mon Sep 17 00:00:00 2001 From: xargon Date: Sat, 11 Jun 2022 21:21:38 +0200 Subject: [PATCH 14/14] DOLPHIN: removed appdata.xml and .desktop file --- 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 27540fdc..f26a34d0 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1107,4 +1107,5 @@ modules: - type: file path: net.retrodeck.retrodeck.desktop - type: file - path: net.retrodeck.retrodeck.appdata.xml \ No newline at end of file + path: net.retrodeck.retrodeck.appdata.xml + \ No newline at end of file