[FFmpeg-devel] [PATCH v2] configure: add check for sdl2 >= 2.23.0

Christopher Degawa ccom at randomderp.com
Wed May 11 08:22:57 EEST 2022


sdl2 recently changed their versioning, moving the patch level to minor level
https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff

trac: https://trac.ffmpeg.org/ticket/9768

Signed-off-by: Christopher Degawa <ccom at randomderp.com>
---
 configure | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configure b/configure
index 4d2f4d9112..0fdab7391e 100755
--- a/configure
+++ b/configure
@@ -6743,6 +6743,13 @@ fi
 if enabled sdl2; then
     SDL2_CONFIG="${cross_prefix}sdl2-config"
     test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
+    # sdl2 changed their versioning scheme to match GLib and flatpack moving the patch to
+    # minor instead in
+    # https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
+    # which obviously breaks the previous check, so go ahead and check for the new version
+    if disabled sdl2; then
+        test_pkg_config sdl2 "sdl2 >= 2.23.0 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
+    fi
     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
-- 
2.35.1



More information about the ffmpeg-devel mailing list