[FFmpeg-cvslog] configure: extend SDL check to accept all 2.x versions

Christopher Degawa git at videolan.org
Fri Jun 10 14:58:57 EEST 2022


ffmpeg | branch: release/4.2 | Christopher Degawa <ccom at randomderp.com> | Wed May 11 15:11:04 2022 -0500| [839f98ff6719cf2db0cbd88cd787a1b19b9cbf47] | committer: Timo Rothenpieler

configure: extend SDL check to accept all 2.x versions

sdl2 recently changed their versioning, moving the patch level to minor level
https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
and have said that they will instead ship sdl3.pc for 3.0.0

Fixes ticket 9768

Signed-off-by: Christopher Degawa <ccom at randomderp.com>
Signed-off-by: Gyan Doshi <ffmpeg at gyani.pro>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=839f98ff6719cf2db0cbd88cd787a1b19b9cbf47
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 927857fd10..16d9c78a0f 100755
--- a/configure
+++ b/configure
@@ -6383,7 +6383,7 @@ 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
+    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)



More information about the ffmpeg-cvslog mailing list