[FFmpeg-cvslog] configure: fix SDL2 version check for pkg_config fallback

dvhh git at videolan.org
Sat Jul 9 22:38:53 EEST 2022


ffmpeg | branch: master | dvhh <dvhh-at-yahoo.com at ffmpeg.org> | Sat Jun 18 01:46:12 2022 +0900| [c6fdbe26ef30fff817581e5ed6e078d96111248a] | committer: Marton Balint

configure: fix SDL2 version check for pkg_config fallback

pkg_config fallback for SDL2 use 2.1.0 as max (excluded) version
where the pkg_config specify 3.0.0
Correcting fallback version to be in line with the pkg_config version

Signed-off-by: dvhh <dvhh at yahoo.com>
Signed-off-by: Marton Balint <cus at passwd.hu>

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

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

diff --git a/configure b/configure
index 7d5c4900bf..0558e937ca 100755
--- a/configure
+++ b/configure
@@ -6756,7 +6756,7 @@ if enabled sdl2; then
         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
         test_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags &&
-        test_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags &&
+        test_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x030000" $sdl2_cflags &&
         check_func_headers SDL_events.h SDL_PollEvent $sdl2_extralibs $sdl2_cflags &&
             enable sdl2
     fi



More information about the ffmpeg-cvslog mailing list