diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d14c4c1e4..70c005f332 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,7 +150,7 @@ jobs: uses: actions/cache@v4 with: path: app/src/main/assets/linuxfs - key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/fakeinput_steam.cpp', 'tools/linuxfs/preload/*.c', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env') }} + key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/fakeinput_steam.cpp', 'tools/linuxfs/preload/*.c', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env', 'tools/mangoapp/*') }} - name: Build libfakeinput.so and libblsession.so (glibc aarch64) if: steps.preloads.outputs.cache-hit != 'true' @@ -191,6 +191,25 @@ jobs: test -f "$D/usr/local/bin/gamescope" rm gamescope.tzst fi + # Valve's aarch64 mangoapp for Deck mode's performance overlay, plus the five libraries the + # runtime lacks, pinned by sha256 in tools/mangoapp/packages.txt. Stored under the SONAME + # each is loaded by, as real files: assets cannot carry symlinks. + M="$D/usr/local/lib/mangoapp" + mkdir -p "$M" mango-pkgs + grep -v '^#' tools/mangoapp/packages.txt | while read -r sum url; do + [ -n "$url" ] || continue + curl -fsSL --retry 3 -o mango-pkgs/pkg.tar.zst "$url" + echo "$sum mango-pkgs/pkg.tar.zst" | sha256sum -c - + tar --use-compress-program=unzstd -xf mango-pkgs/pkg.tar.zst -C mango-pkgs + rm mango-pkgs/pkg.tar.zst + done + install -m644 mango-pkgs/usr/bin/mangoapp "$M/mangoapp" + for so in libfmt.so.10 libspdlog.so.1.13 libglfw.so.3 libtraceevent.so.1 libtracefs.so.1; do + cp -L "mango-pkgs/usr/lib/$so" "$M/$so" + done + install -Dm644 tools/mangoapp/mangoapp "$D/usr/local/bin/mangoapp" + rm -rf mango-pkgs + ls -l "$M" # And the desktop's launcher and labwc defaults, staged over the desktop package's copies. install -Dm644 tools/linuxfs/desktop/steamdeck-desktop "$D/usr/local/bin/steamdeck-desktop" install -Dm644 tools/linuxfs/desktop/autostart "$D/etc/xdg/labwc/autostart" diff --git a/app/src/main/java/com/steamdeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/steamdeck/launcher/session/SessionFiles.kt index 20c7c35e6a..15167a3299 100644 --- a/app/src/main/java/com/steamdeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/steamdeck/launcher/session/SessionFiles.kt @@ -64,9 +64,20 @@ object SessionFiles { // The patched gamescope (tools/gamescope): the runtime's own version rebuilt with the ARM64 // client fixes, over /usr/local/bin so it comes first in the session's PATH. Only when the // apk carries it - a build without the asset leaves the runtime's copy alone. - val optional = arrayOf( + // Valve's mangoapp (tools/mangoapp) - Deck mode's performance overlay - with the five + // libraries the runtime lacks beside it, and the wrapper on PATH that points it at them. + val mangoapp = listOf( + "usr/local/bin/mangoapp", + "usr/local/lib/mangoapp/mangoapp", + "usr/local/lib/mangoapp/libfmt.so.10", + "usr/local/lib/mangoapp/libspdlog.so.1.13", + "usr/local/lib/mangoapp/libglfw.so.3", + "usr/local/lib/mangoapp/libtraceevent.so.1", + "usr/local/lib/mangoapp/libtracefs.so.1", + ).map { it to it } + val optional = (arrayOf( "usr/local/bin/gamescope" to "usr/local/bin/gamescope", - ).filter { (asset, _) -> + ) + mangoapp).filter { (asset, _) -> val dir = asset.substringBeforeLast('/') runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false) } diff --git a/tools/mangoapp/mangoapp b/tools/mangoapp/mangoapp new file mode 100644 index 0000000000..6557ed559d --- /dev/null +++ b/tools/mangoapp/mangoapp @@ -0,0 +1,4 @@ +#!/bin/sh +# gamescope --mangoapp runs `mangoapp` from PATH; this puts Valve's build beside the libraries the +# runtime lacks (fmt 10, spdlog 1.13, glfw, libtracefs, libtraceevent), staged by the app. +LD_LIBRARY_PATH=/usr/local/lib/mangoapp${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} exec /usr/local/lib/mangoapp/mangoapp "$@" diff --git a/tools/mangoapp/packages.txt b/tools/mangoapp/packages.txt new file mode 100644 index 0000000000..5df866be0c --- /dev/null +++ b/tools/mangoapp/packages.txt @@ -0,0 +1,11 @@ +# Valve's aarch64 mangoapp (the Deck performance overlay) and the five libraries it needs that the +# runtime does not have, at the versions it was built against (its .BUILDINFO: fmt 10.2.0, +# spdlog 1.13.0). CI fetches each, checks the sha256 and stages the files named below into the apk +# under usr/local/lib/mangoapp; SessionFiles copies them into the runtime at every launch. +# sha256 url +5b203a711e4e48f01fdffaa4f5a330f8fef22f1eab865f067a3e60bd99a28a5c https://holo-packages.steamos.cloud/archlinux-deckard-hotfixes/release/0.4.x/mangohud-20260902.1-1-aarch64.pkg.tar.zst +ef7411229ea4e9b3ab4e36ac356a85b5072f362ee1de68b28d09c43f0b0ecc44 https://steamdeck-packages.steamos.cloud/archlinux-deckard/archlinux/mash-20240705.2/extra/os/aarch64/fmt-10.2.0-1-aarch64.pkg.tar.zst +c9bfd2c3f15071329d381b9c2061d07503c4787ceb7001b9dfbf72a23c85cb04 https://steamdeck-packages.steamos.cloud/archlinux-deckard/archlinux/mash-20240705.2/extra/os/aarch64/spdlog-1.13.0-1-aarch64.pkg.tar.zst +f9fae6c84a0382188f1cb20761424051593fd09b1456191cc250bd16e0a1d7a5 https://steamdeck-packages.steamos.cloud/archlinux-deckard/archlinux/mash-20240705.2/extra/os/aarch64/glfw-3.4-2-aarch64.pkg.tar.zst +0cccdc9c92cb3cae1e37ebeb0ed20b93bb3b5000c8f955b63d0e07bd878c7018 https://steamdeck-packages.steamos.cloud/archlinux-deckard/archlinux/mash-20240705.2/extra/os/aarch64/libtraceevent-1%3A1.8.2-2-aarch64.pkg.tar.zst +47ffd6a953959d6a0df44539bef30a67d0b8c95cce0053273908d9d70ef7abc4 https://steamdeck-packages.steamos.cloud/archlinux-deckard/archlinux/mash-20240705.2/extra/os/aarch64/libtracefs-1.8.0-1-aarch64.pkg.tar.zst