Update runner & scripts to support aarch64 builds for linux

Author: SSimco

.github/workflows/build.yml

@@ -16,7 +16,16 @@ env:
 
 jobs:
   build-ubuntu:
-    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-22.04
+            arch: x86_64
+
+          - runner: ubuntu-22.04-arm
+            arch: aarch64
+
+    runs-on: ${{ matrix.runner }}
     steps:
     - name: "Checkout repo"
       uses: actions/checkout@v4
@@ -39,12 +48,17 @@ jobs:
     - name: "Install system dependencies"
       run: |
         sudo apt update -qq
-        sudo apt install -y clang-15 cmake freeglut3-dev libgcrypt20-dev libglm-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev libudev-dev nasm ninja-build libbluetooth-dev
+        sudo apt install -y clang-15 cmake freeglut3-dev libgcrypt20-dev libglm-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev libudev-dev nasm ninja-build libbluetooth-dev appstream
 
     - name: "Setup cmake"
-      uses: jwlawson/actions-setup-cmake@v2
-      with:
-        cmake-version: '3.29.0'
+      uses: lukka/get-cmake@v3.29.0
+
+    - name: Overwrite /usr/bin/mono
+        # nuget downloaded by vcpkg fetch on aarch64 is a shell script. This
+        # prevents vcpkg from trying and failing, to run it in mono.
+        # https://github.com/microsoft/vcpkg/issues/46040
+      if: matrix.arch == 'aarch64'
+      run: sudo sh -c "mv /usr/bin/mono /usr/bin/mono-real && echo '#! /usr/bin/env bash\nif [ \"\$1\" = \"/usr/bin/nuget\" ]; then \$*; else /usr/bin/mono-real \$*; fi' > /usr/bin/mono && chmod 755 /usr/bin/mono"
 
     - name: "Bootstrap vcpkg"
       run: |
@@ -63,7 +77,7 @@ jobs:
         mono `./dependencies/vcpkg/vcpkg fetch nuget | tail -n 1` \
         setapikey "${{ secrets.GITHUB_TOKEN }}" \
         -source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
-        
+
     - name: "cmake"
       run: |
         cmake -S . -B build ${{ env.BUILD_FLAGS }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} -DCMAKE_C_COMPILER=/usr/bin/clang-15 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-15 -G Ninja -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja
@@ -78,36 +92,20 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: cemu-bin-linux-x64
+        name: cemu-bin-linux-${{ matrix.arch }}
         path: ./bin/Cemu
 
-  build-appimage:
-    runs-on: ubuntu-22.04
-    needs: build-ubuntu
-    steps:
-    - name: Checkout Upstream Repo
-      uses: actions/checkout@v4
-
-    - uses: actions/download-artifact@v4
-      with:
-        name: cemu-bin-linux-x64
-        path: bin
-
-    - name: "Install system dependencies"
-      run: |
-        sudo apt update -qq
-        sudo apt install -y clang-15 cmake freeglut3-dev libgcrypt20-dev libglm-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev nasm ninja-build appstream libbluetooth-dev
-
     - name: "Build AppImage"
       run: |
         export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
         export DEPLOY_GTK_VERSION=3
+        export CEMU_ARCH=${{ matrix.arch }}
         dist/linux/appimage.sh
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: cemu-appimage-x64
+        name: cemu-appimage-${{ matrix.arch }}
         path: artifacts
 
   build-windows:

.github/workflows/build_check.yml

@@ -11,7 +11,7 @@ on:
     paths-ignore:
       - "*.md"
     branches:
-      - main
+      - linux-aarch64-appimage
 
 jobs:
   build:

dependencies/ih264d/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.8)
 
 project ("ih264d")
 
@@ -183,6 +183,11 @@ target_sources(ih264d PRIVATE
 "decoder/arm/ih264d_function_selector.c"
 )
 target_compile_options(ih264d PRIVATE -DARMV8)
+
+if(NOT MSVC)
+    set(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
+endif()
+
 if(APPLE)
     target_sources(ih264d PRIVATE "common/armv8/macos_arm_symbol_aliases.s")
 endif()

dist/linux/appimage.sh

@@ -4,19 +4,19 @@ if [[ -z "${GITHUB_WORKSPACE}" ]]; then
 	export GITHUB_WORKSPACE="."
 fi
 
-curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
-chmod a+x linuxdeploy*.AppImage
-curl -sSfL https://github.com"$(curl https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous | grep "mkappimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)" -o mkappimage.AppImage
+if [[ -z "${CEMU_ARCH}" ]]; then
+	export CEMU_ARCH="x86_64"
+fi
+
+curl -sSfL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$CEMU_ARCH.AppImage" -o linuxdeploy.AppImage
+chmod a+x linuxdeploy.AppImage
+curl -sSfL https://github.com"$(curl https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous | grep "mkappimage-.*-$CEMU_ARCH.AppImage" | head -n 1 | cut -d '"' -f 2)" -o mkappimage.AppImage
 chmod a+x mkappimage.AppImage
 curl -sSfLO "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
 chmod a+x linuxdeploy-plugin-gtk.sh
 curl -sSfLO "https://github.com/darealshinji/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt.sh"
 chmod a+x linuxdeploy-plugin-checkrt.sh
 
-if [[ ! -e /usr/lib/x86_64-linux-gnu ]]; then
-	sed -i 's#lib\/x86_64-linux-gnu#lib64#g' linuxdeploy-plugin-gtk.sh
-fi
-
 mkdir -p AppDir/usr/bin
 mkdir -p AppDir/usr/share/Cemu
 mkdir -p AppDir/usr/share/applications
@@ -32,11 +32,33 @@ cp -r bin/* AppDir/usr/share/Cemu
 mv AppDir/usr/share/Cemu/Cemu AppDir/usr/bin/
 chmod +x AppDir/usr/bin/Cemu
 
-cp /usr/lib/x86_64-linux-gnu/{libsepol.so.1,libffi.so.7,libpcre.so.3,libGLU.so.1,libthai.so.0} AppDir/usr/lib
+libs=(
+	libsepol.so
+	libffi.so
+	libpcre.so
+	libGLU.so
+	libthai.so
+)
+
+for lib in "${libs[@]}"; do
+	libpath="/usr/lib/$CEMU_ARCH-linux-gnu/$lib"
+
+	if [ ! -e "$libpath" ]; then
+		libpath="/usr/lib/$lib"
+		if [ ! -e "$libpath" ]; then
+			echo "Library $lib not found at /usr/lib/$CEMU_ARCH-linux-gnu/$lib or /usr/lib/$lib, skipping."
+			continue
+		fi
+	fi
+
+	libpath=$(realpath "$libpath")
+
+	cp "$libpath" AppDir/usr/lib
+done
 
 export UPD_INFO="gh-releases-zsync|cemu-project|Cemu|ci|Cemu.AppImage.zsync"
 export NO_STRIP=1
-./linuxdeploy-x86_64.AppImage --appimage-extract-and-run \
+./linuxdeploy.AppImage --appimage-extract-and-run \
   --appdir="${GITHUB_WORKSPACE}"/AppDir/ \
   -d "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.desktop \
   -i "${GITHUB_WORKSPACE}"/AppDir/info.cemu.Cemu.png \
@@ -49,9 +71,9 @@ if ! GITVERSION="$(git rev-parse --short HEAD 2>/dev/null)"; then
 fi
 echo "Cemu Version Cemu-${GITVERSION}"
 
-rm AppDir/usr/lib/libwayland-client.so.0
+rm AppDir/usr/lib/libwayland-client.so.* || true
 echo -e "export LC_ALL=C\nexport FONTCONFIG_PATH=/etc/fonts" >> AppDir/apprun-hooks/linuxdeploy-plugin-gtk.sh
 VERSION="${GITVERSION}" ./mkappimage.AppImage --appimage-extract-and-run "${GITHUB_WORKSPACE}"/AppDir
 
 mkdir -p "${GITHUB_WORKSPACE}"/artifacts/
-mv Cemu-"${GITVERSION}"-x86_64.AppImage "${GITHUB_WORKSPACE}"/artifacts/
+mv Cemu-"${GITVERSION}"-$CEMU_ARCH.AppImage "${GITHUB_WORKSPACE}"/artifacts/