From 1301c2ef3f45b7ef600e50bb604c6b1a723eaeea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 25 Jun 2025 23:05:35 +0200
Subject: [PATCH] Merge pull request #20555 from ANR2MERefork/appimage-sdl2

Use SDL2 library instead of SDL2-compat with SDL3 library.
---
 .github/workflows/appimage.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index c2b69a841e..0c63f1d9de 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -89,6 +89,7 @@ jobs:
           sed -i 's/DownloadUser/#DownloadUser/g' /etc/pacman.conf
 
           ARCH=$(uname -m)
+          echo "ARCH=$ARCH" >> $GITHUB_ENV # Export ARCH to be reused on other steps
           if [[ "$ARCH" == "x86_64" ]]; then
           	PKG_TYPE='x86_64.pkg.tar.zst'
           else
@@ -107,6 +108,7 @@ jobs:
             desktop-file-utils \
             git \
             cmake \
+            ninja \
             clang \
             llvm-libs \
             llvm \
@@ -119,10 +121,10 @@ jobs:
             libc++ \
             libc++abi \
             glew \
-            sdl2 \
             sdl2_ttf \
             python \
             patchelf \
+            pipewire \
             pipewire-audio \
             pulseaudio \
             pulseaudio-alsa \
@@ -131,8 +133,12 @@ jobs:
             xorg-server-xvfb \
             zsync \
             vulkan-nouveau \
-            vulkan-radeon 
-
+            vulkan-radeon \
+            vulkan-headers \
+            alsa-lib sndio hidapi ibus jack libdecor libgl libpulse libusb \
+            libx11 libxcursor libxext libxinerama libxkbcommon libxrandr libxrender libxss libxtst \
+            wayland wayland-protocols
+          
           if [[ "$ARCH" == "x86_64" ]]; then
             pacman -Syu --noconfirm vulkan-intel
           fi
@@ -174,6 +180,17 @@ jobs:
           #clang --version
           #clang++ --version
 
+          # Install SDL2 from AUR
+          sed -i 's|EUID == 0|EUID == 69|g' /usr/bin/makepkg # because the docker image is ran as root this is needed lol
+          git clone https://aur.archlinux.org/sdl2.git
+          pushd sdl2
+          sed -i "s|x86_64|$ARCH|" ./PKGBUILD
+          makepkg -f
+          pacman --noconfirm -Rsndd sdl2-compat
+          pacman --noconfirm -U *.pkg.tar.*
+          popd
+          # End of Install SDL2 from AUR
+
           # Build ppsspp
           #./b.sh --release --no-sdl2 --no-png
           mkdir -p build