34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From fc7fb12f22180d03428310da7eca55403a123322 Mon Sep 17 00:00:00 2001
|
|
From: dvhh <dvhh-at-yahoo.com@ffmpeg.org>
|
|
Date: Sat, 18 Jun 2022 01:46:12 +0900
|
|
Subject: [PATCH 2/2] 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@yahoo.com>
|
|
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
|
|
(cherry picked from commit c6fdbe26ef30fff817581e5ed6e078d96111248a)
|
|
---
|
|
configure | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index e731a9d3ff..596be632c4 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6747,7 +6747,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
|
|
--
|
|
2.36.1
|
|
|