From f1f8e75c79240d38aaf126869297a963ecc31341dcc2c1985582877d9d1756c3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 29 Aug 2022 07:05:30 +0000 Subject: [PATCH] Accepting request 999763 from home:cgiboudeaux:branches:multimedia:libs - Add patch to detect SDL2 >= 2.1.0 (boo#1202848): * ffmpeg-sdl2-detection.patch OBS-URL: https://build.opensuse.org/request/show/999763 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=184 --- ffmpeg-4.changes | 6 ++++++ ffmpeg-4.spec | 19 ++++++++++++++++++- ffmpeg-sdl2-detection.patch | 30 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 ffmpeg-sdl2-detection.patch diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 6b9630f..5f84e54 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 29 05:39:31 UTC 2022 - Christophe Giboudeaux + +- Add patch to detect SDL2 >= 2.1.0 (boo#1202848): + * ffmpeg-sdl2-detection.patch + ------------------------------------------------------------------- Fri Jun 17 17:02:35 UTC 2022 - Bjørn Lie diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 5fb27da..54d9fda 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -120,6 +120,7 @@ Patch8: vmaf-trim-usr-local.patch Patch9: ffmpeg-4.4-CVE-2020-22046.patch Patch10: ffmpeg-chromium.patch Patch11: ffmpeg-libglslang-detection.patch +Patch12: ffmpeg-sdl2-detection.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel @@ -807,7 +808,23 @@ done %files %doc Changelog CREDITS README.md -%_bindir/* +%_bindir/aviocat +%_bindir/cws2fws +%_bindir/ffescape +%_bindir/ffeval +%_bindir/ffhash +%_bindir/ffmpeg +%_bindir/ffplay +%_bindir/ffprobe +%_bindir/fourcc2pixfmt +%_bindir/graph2dot +%_bindir/ismindex +%_bindir/pktdumper +%_bindir/probetest +%_bindir/qt-faststart +%_bindir/seek_print +%_bindir/sidxindex +%_bindir/trasher %_mandir/man1/ff*.1* %_datadir/ffmpeg/ %_libdir/libavcodec.so.58 diff --git a/ffmpeg-sdl2-detection.patch b/ffmpeg-sdl2-detection.patch new file mode 100644 index 0000000..01f0e92 --- /dev/null +++ b/ffmpeg-sdl2-detection.patch @@ -0,0 +1,30 @@ +From 839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 Mon Sep 17 00:00:00 2001 +From: Christopher Degawa +Date: Wed, 11 May 2022 15:11:04 -0500 +Subject: [PATCH] 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 +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 927857fd1024..16d9c78a0fdc 100755 +--- a/configure ++++ b/configure +@@ -6383,7 +6383,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)