Skip to content

Use SDL2 library instead of SDL2-compat with SDL3 library. #20555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hrydgard merged 1 commit into from
Jun 25, 2025
Merged

Use SDL2 library instead of SDL2-compat with SDL3 library. #20555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .github/workflows/appimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,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
Expand All @@ -112,6 +113,7 @@ jobs:
desktop-file-utils \
git \
cmake \
ninja \
clang \
ccache \
llvm-libs \
Expand All @@ -125,10 +127,10 @@ jobs:
libc++ \
libc++abi \
glew \
sdl2 \
sdl2_ttf \
python \
patchelf \
pipewire \
pipewire-audio \
pulseaudio \
pulseaudio-alsa \
Expand All @@ -137,8 +139,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
Expand Down Expand Up @@ -180,6 +186,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
Expand Down
Loading