35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 32f9a3e0c23c403cd6c6dc812939253227001f88 Mon Sep 17 00:00:00 2001
|
|
From: Christopher Degawa <ccom@randomderp.com>
|
|
Date: Wed, 11 May 2022 15:11:04 -0500
|
|
Subject: [PATCH 1/2] 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>
|
|
|
|
(cherry picked from commit e5163b1d34381a3319214a902ef1df923dd2eeba)
|
|
---
|
|
configure | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 2369ea0240..e731a9d3ff 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)
|
|
--
|
|
2.36.1
|
|
|