From 156d72b8fe6354f26338ab2bf400a2c535e479d0 Mon Sep 17 00:00:00 2001
From: dcvz <david@dcvz.io>
Date: Mon, 10 Jun 2024 00:53:47 +0200
Subject: [PATCH] Try fixes

---
 .github/linux/appimage.sh      |  2 ++
 .github/workflows/validate.yml | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/linux/appimage.sh b/.github/linux/appimage.sh
index 03c3cc5..0ffc42f 100755
--- a/.github/linux/appimage.sh
+++ b/.github/linux/appimage.sh
@@ -14,6 +14,8 @@ fi
 
 curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$LINUX_DEPLOY_ARCH.AppImage"
 curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/raw/master/linuxdeploy-plugin-gtk.sh"
+curl -sSfLO "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$LINUX_DEPLOY_ARCH.AppImage"
+
 chmod a+x linuxdeploy*
  
 mkdir -p AppDir/usr/bin
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index ee898c3..d8cab0f 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Install Linux Dependencies
         run: |
           apt-get update
-          apt-get install -y libcanberra-gtk-module libcanberra-gtk3-module
+          apt-get install -y libcanberra-gtk-module libcanberra-gtk3-module libgbm-dev
       - name: Prepare Build
         run: |-
           git clone ${{ secrets.ZRE_REPO_WITH_PAT }}
@@ -75,8 +75,15 @@ jobs:
         with:
           name: Zelda64Recompiled-${{ runner.os }}-X64-${{ matrix.type }}
           path: Zelda64Recompiled.tar.gz
-      - name: Prepare AppImage
-        run: ./.github/linux/appimage.sh 
+      - name: Build AppImage
+        run: |-
+          ./.github/linux/appimage.sh 
+      - name: Adjust AppImage
+        run: |
+          ./Zelda64Recompiled-x86_64.AppImage --appimage-extract
+          rm -rf squashfs-root/usr/lib/libgmodule*
+          appimagetool-x86_64.AppImage -v squashfs-root
+          rm -rf squashfs-root/
       - name: Zelda64Recomp AppImage
         uses: actions/upload-artifact@v3
         with:
@@ -117,7 +124,7 @@ jobs:
           ./configure
           make -j 10
           sudo make install
-          sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
+          sudo cp -av /usr/local/lib/libSDL* /lib/aarch64-linux-gnu/
           echo ::endgroup::
       - name: Prepare Build
         run: |-