From 47633c77ba6dee728de32ddc37ab19ee70c684a93df741167f93e651704ba878 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2024 12:23:18 +0200 Subject: [PATCH] no longer build against libmfx; build also 15.5 against libvpl --- ffmpeg-7.changes | 6 ++++++ ffmpeg-7.spec | 12 ++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ffmpeg-7.changes b/ffmpeg-7.changes index 035132f..d704f35 100644 --- a/ffmpeg-7.changes +++ b/ffmpeg-7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 26 10:02:20 UTC 2024 - Stefan Dirsch + +- no longer build against libmfx; build also 15.5 against libvpl + (boo#1230983) + ------------------------------------------------------------------- Wed Aug 21 09:58:42 UTC 2024 - Jan Engelhardt diff --git a/ffmpeg-7.spec b/ffmpeg-7.spec index 72111c5..e37aa62 100644 --- a/ffmpeg-7.spec +++ b/ffmpeg-7.spec @@ -230,11 +230,7 @@ BuildRequires: pkgconfig(shaderc) >= 2019.1 BuildRequires: pkgconfig(vulkan) >= 1.3.255 %endif -%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150200 && 0%{?sle_version} < 150600 -%ifarch x86_64 %x86_64 -BuildRequires: pkgconfig(libmfx) -%endif -%else +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500 %ifarch x86_64 %x86_64 BuildRequires: pkgconfig(vpl) >= 2.6 %endif @@ -631,11 +627,7 @@ LDFLAGS="%_lto_cflags" \ %endif %endif --enable-lv2 \ -%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150200 && 0%{?sle_version} < 150600 -%ifarch x86_64 %x86_64 - --enable-libmfx \ -%endif -%else +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500 %ifarch x86_64 %x86_64 --enable-libvpl \ %endif