From 34836b2d977fdb835a4ee7c94dd026062e4f0a688e114cc4a35553d84fd30da8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Jan 2024 22:07:18 +0000 Subject: [PATCH] - Disable libjxl integration as ffmpeg-5 cannot handle libjxl>=0.9. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=78 --- ffmpeg-5.changes | 5 +++++ ffmpeg-5.spec | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index 6d0e5ac..53ecf39 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 19 21:31:35 UTC 2024 - Jan Engelhardt + +- Disable libjxl integration as ffmpeg-5 cannot handle libjxl>=0.9. + ------------------------------------------------------------------- Wed Dec 6 08:50:00 UTC 2023 - Jan Engelhardt diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 7ad2194..d6dee53 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -1,7 +1,7 @@ # # spec file for package ffmpeg-5 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -171,7 +171,6 @@ BuildRequires: pkgconfig(lilv-0) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(opus) %if 0%{?suse_version} >= 1550 -BuildRequires: pkgconfig(libjxl) BuildRequires: pkgconfig(librist) %endif %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 @@ -599,7 +598,6 @@ LDFLAGS="%_lto_cflags" \ --enable-libgsm \ --enable-libjack \ %if 0%{?suse_version} >= 1550 - --enable-libjxl \ --enable-librist \ %endif --enable-libmp3lame \