From 9bd0059ddbf840b2c46a550b7ee5928a6870b7ad Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 5 Oct 2022 18:51:15 -0400 Subject: [PATCH] fix build with new SDL2 versioning fixes #39648 --- srcpkgs/ffmpeg/patches/sdl2-version.patch | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 srcpkgs/ffmpeg/patches/sdl2-version.patch diff --git a/srcpkgs/ffmpeg/patches/sdl2-version.patch b/srcpkgs/ffmpeg/patches/sdl2-version.patch new file mode 100644 index 00000000000..e23c8ece415 --- /dev/null +++ b/srcpkgs/ffmpeg/patches/sdl2-version.patch @@ -0,0 +1,31 @@ +From: Christopher Degawa +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 +Signed-off-by: Gyan Doshi +--- + +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)