use quick-sharun (#225)

* use debloated packages installer, add mesa that does not link to llvm

* oops

* oops2

* use wrapper scripts

* check qml deployment

* oops

* disable webview on macos

* use both arm64 and amd64 targets for macOS

* use aqt

* fixup ccache

Signed-off-by: crueter <crueter@eden-emu.dev>

---------

Signed-off-by: crueter <crueter@eden-emu.dev>
Co-authored-by: crueter <crueter@eden-emu.dev>

Author: Samueru-sama

.ci/linux/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# SPDX-FileCopyrightText: 2025 QDash
+# SPDX-FileCopyrightText: 2025 crueter
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 export ARCH="$(uname -m)"
@@ -10,25 +10,21 @@ case "$1" in
         echo "Making amd64-v3 optimized build of QDash"
         ARCH="amd64_v3"
         ARCH_FLAGS="-march=x86-64-v3"
-        export USE_CCACHE=true
         ;;
     steamdeck)
         echo "Making Steam Deck (Zen 2) optimized build of QDash"
         ARCH="steamdeck"
         ARCH_FLAGS="-march=znver2 -mtune=znver2"
-        export USE_CCACHE=true
         ;;
     rog-ally|allyx)
         echo "Making ROG Ally X (Zen 4) optimized build of QDash"
         ARCH="rog-ally-x"
-        ARCH_FLAGS="-march=znver3 -mtune=znver4" # GH actions runner is a Zen 3 CPU, so a small workaround
-        export USE_CCACHE=true
+        ARCH_FLAGS="-march=znver4 -mtune=znver4"
         ;;
     legacy)
         echo "Making amd64 generic build of QDash"
         ARCH=amd64
         ARCH_FLAGS="-march=x86-64 -mtune=generic"
-        export USE_CCACHE=true
         ;;
     aarch64)
         echo "Making armv8-a build of QDash"

.ci/linux/get-dependencies.sh

@@ -1,18 +1,12 @@
 #!/bin/sh
 
-set -eux
-
-sed -i 's/DownloadUser/#DownloadUser/g' /etc/pacman.conf
+# SPDX-FileCopyrightText: 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-if [ "$(uname -m)" = 'x86_64' ]; then
-		PKG_TYPE='x86_64.pkg.tar.zst'
-else
-		PKG_TYPE='aarch64.pkg.tar.xz'
-fi
+set -eux
 
-QT6_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/qt6-base-iculess-$PKG_TYPE"
-LIBXML_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/libxml2-iculess-$PKG_TYPE"
-OPUS_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/opus-nano-$PKG_TYPE"
+ARCH="$(uname -m)"
+EXTRA_PACKAGES="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"
 
 echo "Installing build dependencies..."
 echo "---------------------------------------------------------------"
@@ -40,14 +34,8 @@ pacman -Syu --noconfirm \
 		zip \
 		zsync
 
-echo "Installing debloated pckages..."
-echo "---------------------------------------------------------------"
-wget --retry-connrefused --tries=30 "$QT6_URL"    -O  ./qt6-base-iculess.pkg.tar.zst
-wget --retry-connrefused --tries=30 "$LIBXML_URL" -O  ./libxml2-iculess.pkg.tar.zst
-wget --retry-connrefused --tries=30 "$OPUS_URL"   -O  ./opus-nano.pkg.tar.zst
-
-pacman -U --noconfirm ./*.pkg.tar.zst
-rm -f ./*.pkg.tar.zst
-
-echo "All done!"
+echo "Installing debloated packages..."
 echo "---------------------------------------------------------------"
+wget --retry-connrefused --tries=30 "$EXTRA_PACKAGES" -O ./get-debloated-pkgs.sh
+chmod +x ./get-debloated-pkgs.sh 
+./get-debloated-pkgs.sh --add-mesa --prefer-nano qt6-base-mini libxml2-mini opus-mini

.ci/linux/package.sh

@@ -1,15 +1,16 @@
 #!/bin/sh -e
 
-# SPDX-FileCopyrightText: 2025 QDash
+# SPDX-FileCopyrightText: 2025 crueter
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # This script assumes you're in the source directory
 
-export APPIMAGE_EXTRACT_AND_RUN=1
-export BASE_ARCH="$(uname -m)"
+URUNTIME="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/uruntime2appimage.sh"
+SHARUN="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/qml/useful-tools/quick-sharun.sh"
 
-SHARUN="https://github.com/VHSgunzo/sharun/releases/latest/download/sharun-${BASE_ARCH}-aio"
-URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-${BASE_ARCH}"
+export ICON="$PWD"/dist/org.Q-FRC.QDash.svg
+export DESKTOP="$PWD"/dist/org.Q-FRC.QDash.desktop
+export OPTIMIZE_LAUNCH=1
 
 case "$1" in
     amd64|"")
@@ -47,93 +48,21 @@ QDash_TAG=$(git describe --tags --abbrev=0)
 echo "Making \"$QDash_TAG\" build"
 VERSION="$QDash_TAG"
 
-# NOW MAKE APPIMAGE
-mkdir -p ./AppDir
-cd ./AppDir
+export UPINFO="gh-releases-zsync|Q-FRC|QDash|latest|*$ARCH.AppImage.zsync"
+export OUTNAME=QDash-"$VERSION"-"$ARCH".AppImage
 
-cp ../dist/org.Q-FRC.QDash.desktop .
-cp ../dist/org.Q-FRC.QDash.svg .
+# Deploy dependencies
+wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun
+chmod +x ./quick-sharun
+./quick-sharun "$BUILDDIR"/QDash/Native/QDash
 
-ln -sf ./org.Q-FRC.QDash.svg ./.DirIcon
+# MAKE APPIMAGE WITH URUNTIME
+wget --retry-connrefused --tries=30 "$URUNTIME" -O ./uruntime2appimage
+chmod +x ./uruntime2appimage
+./uruntime2appimage
 
-UPINFO='gh-releases-zsync|Q-FRC|QDash|latest|*.AppImage.zsync'
-
-LIBDIR="/usr/lib"
-
-# Workaround for Gentoo
-if [ ! -d "$LIBDIR/qt6" ]
-then
-	LIBDIR="/usr/lib64"
-fi
-
-# Workaround for Debian
-if [ ! -d "$LIBDIR/qt6" ]
-then
-    LIBDIR="/usr/lib/${BASE_ARCH}-linux-gnu"
+if [ "$DEVEL" = 'true' ]; then
+    rm -f ./*.AppImage.zsync
 fi
 
-# Bundle all libs
-
-wget --retry-connrefused --tries=30 "$SHARUN" -O ./sharun-aio
-chmod +x ./sharun-aio
-xvfb-run -a ./sharun-aio l -p -v -e -s -k \
-	../$BUILDDIR/QDash/Native/QDash \
-	$LIBDIR/libXss.so* \
-	$LIBDIR/libdecor-0.so* \
-	$LIBDIR/qt6/plugins/audio/* \
-	$LIBDIR/qt6/plugins/bearer/* \
-	$LIBDIR/qt6/plugins/imageformats/* \
-	$LIBDIR/qt6/plugins/iconengines/* \
-	$LIBDIR/qt6/plugins/platforms/* \
-	$LIBDIR/qt6/plugins/platformthemes/* \
-	$LIBDIR/qt6/plugins/platforminputcontexts/* \
-	$LIBDIR/qt6/plugins/styles/* \
-	$LIBDIR/qt6/plugins/xcbglintegrations/* \
-	$LIBDIR/qt6/plugins/wayland-*/*
-
-rm -f ./sharun-aio
-
-# Copy QML Files
-mkdir -p shared/lib/qt6/qml
-set +e
-cp -r $LIBDIR/qt6/qml/Qt{,Core,Multimedia,Network,Quick} shared/lib/qt6/qml/
-set -e
-
-# Prepare sharun
-if [ "$ARCH" = 'aarch64' ]; then
-	# allow the host vulkan to be used for aarch64 given the sad situation
-	echo 'SHARUN_ALLOW_SYS_VKICD=1' > ./.env
-fi
-
-# Workaround for Gentoo
-if [ -d "shared/libproxy" ]; then
-	cp shared/libproxy/* lib/
-fi
-
-ln -f ./sharun ./AppRun
-./sharun -g
-
-# turn appdir into appimage
-cd ..
-wget -q "$URUNTIME" -O ./uruntime
-chmod +x ./uruntime
-
-#Add udpate info to runtime
-echo "Adding update information \"$UPINFO\" to runtime..."
-./uruntime --appimage-addupdinfo "$UPINFO"
-
-echo "Generating AppImage..."
-./uruntime --appimage-mkdwarfs -f \
-	--set-owner 0 --set-group 0 \
-	--no-history --no-create-timestamp \
-	--compression zstd:level=22 -S26 -B32 \
-	--header uruntime \
-    -N 4 \
-	-i ./AppDir -o QDash-"$VERSION"-"$ARCH".AppImage
-
-	# --categorize=hotness --hotness-list=.ci/linux/QDash.dwfsprof \
-if [ "$DEVEL" != 'true' ]; then
-    echo "Generating zsync file..."
-    zsyncmake *.AppImage -u *.AppImage
-fi
 echo "All Done!"

.ci/macos/build.sh

@@ -1,10 +1,10 @@
 #!/bin/bash -e
 
-# SPDX-FileCopyrightText: 2025 eden Emulator Project
+# SPDX-FileCopyrightText: 2025 crueter
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ "$USE_CCACHE" = "true" ]; then
-    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DUSE_CCACHE=ON)
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache)
 fi
 
 if [ "$BUILD_TYPE" = "" ]; then
@@ -16,7 +16,8 @@ export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
 mkdir -p build && cd build
 cmake .. -G Ninja \
     -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-    -DCMAKE_OSX_ARCHITECTURES="arm64" \
+    -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+	-DQDASH_WEBVIEW=OFF \
     -DBUILD_SHARED_LIBS=OFF \
 	"${EXTRA_CMAKE_FLAGS[@]}"
 

.ci/macos/package.sh

@@ -1,4 +1,7 @@
-set -ex
+#!/bin/sh -ex
+
+# SPDX-FileCopyrightText: 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 cd build
 rm -rf QDash.app

.ci/windows/build.sh

@@ -1,10 +1,10 @@
 #!/bin/bash -e
 
-# SPDX-FileCopyrightText: 2025 eden Emulator Project
+# SPDX-FileCopyrightText: 2025 crueter
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ "$USE_CCACHE" = "true" ]; then
-    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DUSE_CCACHE=ON)
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache)
 fi
 
 if [ "$WINDEPLOYQT" == "" ]; then

.ci/windows/package.sh

@@ -1,3 +1,8 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 QDash_TAG=$(git describe --tags --abbrev=0)
 echo "Making \"$QDash_TAG\" build"
 VERSION="$QDash_TAG"

.github/workflows/build.yml

@@ -13,6 +13,9 @@ on:
         description: Whether or not this is a development build
         type: string
         default: true
+env:
+  qt_version: 6.9.1
+  qt_modules: qtmultimedia
 
 jobs:
   linux:
@@ -49,10 +52,9 @@ jobs:
           ./.ci/linux/get-dependencies.sh
 
       - name: Setup CCache
-        if: matrix.arch != 'aarch64'
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ${{ runner.os }}-${{ inputs.build_type }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-${{ inputs.build_type }}
 
       - name: Cache Build Deps
         uses: actions/cache@v4
@@ -64,6 +66,7 @@ jobs:
         run: |
           export TARGET=appimage
           export BUILD_TYPE=${{ inputs.build_type }}
+          export USE_CCACHE=true
 
           chmod a+x .ci/linux/build.sh
           .ci/linux/build.sh ${{ matrix.pkg_arch }}
@@ -106,17 +109,9 @@ jobs:
         include:
           - runs-on: windows-latest
             arch: amd64
-            qt_arch: win64_msvc2022_64
-            qt_version: 6.9.1
-            qt_modules: qtmultimedia
-            ccache: true
 
           - runs-on: windows-11-arm
             arch: arm64
-            qt_arch: win64_msvc2022_arm64
-            qt_version: 6.9.1
-            qt_modules: qtmultimedia
-            ccache: false
 
     steps:
       - name: Checkout
@@ -127,8 +122,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: ${{ matrix.qt_version }}
-          modules: ${{ matrix.qt_modules }}
+          version: ${{ env.qt_version }}
+          modules: ${{ env.qt_modules }}
           cache: 'true'
 
       - name: Set up MSVC
@@ -145,10 +140,9 @@ jobs:
           pip install jinja2
 
       - name: Setup CCache
-        if: matrix.arch != 'arm64'
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ${{ runner.os }}-${{ inputs.build_type }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-${{ inputs.build_type }}
 
       - name: Cache Build Deps
         uses: actions/cache@v4
@@ -159,10 +153,9 @@ jobs:
       - name: Build
         shell: bash
         run: |
-          export PATH="${PATH}:${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch }}/bin"
           export DEVEL=true
           export WINDEPLOYQT=windeployqt
-          export USE_CCACHE=${{ matrix.ccache }}
+          export USE_CCACHE=true
 
           ./.ci/windows/build.sh
 
@@ -207,6 +200,13 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ env.qt_version }}
+          modules: ${{ env.qt_modules }}
+          cache: 'true'
+
       - name: Install CMake
         uses: lukka/get-cmake@v4.0.1
 
@@ -230,7 +230,7 @@ jobs:
       - name: Install Dependencies
         run: |
           brew update
-          brew install llvm ninja qt@6
+          brew install llvm ninja
           pip install jinja2
 
       - name: Configure & Build
@@ -243,8 +243,7 @@ jobs:
 
       - name: Package
         run: |
-          export PATH="$PATH;$(brew --prefix qt@6)/bin"
-          export QML_SOURCES_PATHS="$(brew --prefix qt@6)/share/qt/qml"
+          export QML_SOURCES_PATHS="$QML2_IMPORT_PATH"
 
           chmod a+x .ci/macos/package.sh
           .ci/macos/package.sh