From 643a5096c899401eca9e884ace5f526c16fb8f6b Mon Sep 17 00:00:00 2001 From: cmitu <31816814+cmitu@users.noreply.github.com> Date: Sat, 5 Sep 2026 05:13:02 +0000 Subject: [PATCH] sdl2: update dependencies and version This is a re-do of https://github.com/RetroPie/RetroPie-Setup/pull/4220, slightly modified to prevent build errors because of Debian package requiring `fcitx-libs-dev`. From https://github.com/RetroPie/RetroPie-Setup/pull/4220: Remove `fcitx-libs-dev` on recent Debian/Ubuntu versions, since `fcitx-libs-dev` is for Fcitx 4 and on Debian 12+ or Ubuntu 24.04+ the default input method is fcitx5. Since `fcitx-libs-dev` conflicts with `fcitx5`, `apt` will remove `fcitx5` if SDL2 is build. Also, official Debian 12+ packages for SDL2 no longer use fcitx-libs-dev. --- scriptmodules/supplementary/sdl2.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scriptmodules/supplementary/sdl2.sh b/scriptmodules/supplementary/sdl2.sh index 91aea4cc74..694e5c128f 100644 --- a/scriptmodules/supplementary/sdl2.sh +++ b/scriptmodules/supplementary/sdl2.sh @@ -17,7 +17,7 @@ rp_module_flags="" function get_ver_sdl2() { if [[ "$__os_debian_ver" -ge 11 ]]; then - echo "2.32.10" + echo "2.32.11" else echo "2.0.10" fi @@ -42,13 +42,14 @@ function get_arch_sdl2() { function _list_depends_sdl2() { # Dependencies from the debian package control + additional dependencies for the pi (some are excluded like dpkg-dev as they are # already covered by the build-essential package retropie relies on. - local depends=(libasound2-dev libudev-dev libibus-1.0-dev libdbus-1-dev fcitx-libs-dev libsndio-dev libsamplerate0-dev) + local depends=(libasound2-dev libudev-dev libibus-1.0-dev libdbus-1-dev libsndio-dev libsamplerate0-dev) # these were removed by a PR for vero4k support (cannot test). Needed though at least for for RPI and X11 ! isPlatform "vero4k" && depends+=(libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev libgl1-mesa-dev) isPlatform "gles" || isPlatform "gl" && depends+=(libegl1-mesa-dev libgles2-mesa-dev) isPlatform "gl" || isPlatform "rpi" && depends+=(libgl1-mesa-dev libglu1-mesa-dev) isPlatform "kms" || isPlatform "rpi" && depends+=(libdrm-dev libgbm-dev) isPlatform "x11" && depends+=(libpulse-dev libwayland-dev) + [[ "$__os_debian_ver" -lt 11 ]] && depends+=(fcitx-libs-dev) echo "${depends[@]}" }