32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From: Christopher Degawa <ccom@randomderp.com>
|
|
Date: Wed, 11 May 2022 20:11:04 +0000 (-0500)
|
|
Subject: configure: extend SDL check to accept all 2.x versions
|
|
X-Git-Tag: n5.1~517
|
|
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/e5163b1d3438
|
|
|
|
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@randomderp.com>
|
|
Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
|
|
---
|
|
|
|
diff --git a/configure b/configure
|
|
index 4d2f4d9112..0faf2455b7 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6742,7 +6742,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)
|