commit 00b5a7ba47cc07980a0026b568d561b287cafc22 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Mon Oct 17 14:09:21 2022 +0100 Fix sdl2 test c6fdbe26ef30fff817581e5ed6e078d96111248a.patch | 31 ++++++++++++++++++++++++++ ffmpeg.spec | 3 +++ 2 files changed, 34 insertions(+) --- diff --git a/c6fdbe26ef30fff817581e5ed6e078d96111248a.patch b/c6fdbe26ef30fff817581e5ed6e078d96111248a.patch new file mode 100644 index 0000000..d23c1e4 --- /dev/null +++ b/c6fdbe26ef30fff817581e5ed6e078d96111248a.patch @@ -0,0 +1,31 @@ +From c6fdbe26ef30fff817581e5ed6e078d96111248a Mon Sep 17 00:00:00 2001 +From: dvhh <dvhh-at-yahoo.com(a)ffmpeg.org&gt; +Date: Sat, 18 Jun 2022 01:46:12 +0900 +Subject: [PATCH] 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(a)yahoo.com&gt; +Signed-off-by: Marton Balint <cus(a)passwd.hu&gt; +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 7d5c4900bf..0558e937ca 100755 +--- a/configure ++++ b/configure +@@ -6756,7 +6756,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.25.1 + diff --git a/ffmpeg.spec b/ffmpeg.spec index 51ab24c..055b7aa 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -142,6 +142,9 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2 Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif Patch0: fix-vmaf-model-path.patch +# Fix sdl test +# https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c6fdbe26ef30fff817581e5ed... +Patch1: c6fdbe26ef30fff817581e5ed6e078d96111248a.patch Conflicts: %{name}-free Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}