diff --git a/.github/scripts/Linux/arm/build.sh b/.github/scripts/Linux/arm/build.sh index 6371095d2..45042f19f 100755 --- a/.github/scripts/Linux/arm/build.sh +++ b/.github/scripts/Linux/arm/build.sh @@ -22,6 +22,7 @@ export CFLAGS CXXFLAGS # shellcheck disable=SC2086 # intentional set -- $FEATURES +set -- --enable-sdl=2 # use SDL2 (environment.sh sets sdl=3) set -- "$@" --enable-drm_disp ./autogen.sh "$@" diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index bc3264f6f..af8c5fa27 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -58,7 +58,7 @@ $PACMAN_INSTALL $m-asciidoc \ $m-vulkan-headers $m-vulkan-loader \ $PACMAN_INSTALL $m-libsoxr $m-speexdsp -$PACMAN_INSTALL $m-SDL2 $m-SDL2_ttf +$PACMAN_INSTALL $m-sdl3 $m-sdl3-ttf $PACMAN_INSTALL $m-glm $PACMAN_INSTALL $m-portaudio # in case of problems build PA with --with-winapi=wmme,directx,wasapi $PACMAN_INSTALL $m-curl # RTSP capture diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index 4a0e466fc..75e6aa5fe 100644 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -64,7 +64,7 @@ export FEATURES="\ --enable-rtsp-server\ --enable-scale\ --enable-screen\ - --enable-sdl=2\ + --enable-sdl=3\ --enable-sdp-http\ --enable-soxr\ --enable-speexdsp\ diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 62bdf1d16..4f8ea3273 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -50,8 +50,8 @@ set -- \ pkg-config \ portaudio \ qt \ - sdl2 \ - sdl2_ttf \ + sdl3 \ + sdl3_ttf \ speexdsp \ vulkan-headers \ wolfssl \