From 2a9bf98721f7242d5a1433a0d9568cf73702fa2120d64c1eb9d9ac0ef990c4a6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 9 Mar 2023 09:32:14 +0000
Subject: [PATCH] Accepting request 1070364 from home:iDesmI:Wayland

- enable libplacebo filter
- clean old BuildRequires conditions
- add libjxl to enable_encoders

OBS-URL: https://build.opensuse.org/request/show/1070364
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=2
---
 enable_encoders  |  1 +
 ffmpeg-6.changes |  7 +++++++
 ffmpeg-6.spec    | 40 +++++++++++++++++++---------------------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/enable_encoders b/enable_encoders
index d74562d..a9c689c 100644
--- a/enable_encoders
+++ b/enable_encoders
@@ -14,6 +14,7 @@ libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2
 libgsm # libgsm
+libjxl # jpegxl
 libmp3lame # lame
 libopenh264 # libopenh264_dlopen
 libopenjpeg # openjpeg
diff --git a/ffmpeg-6.changes b/ffmpeg-6.changes
index dbf1ece..98f1ef8 100644
--- a/ffmpeg-6.changes
+++ b/ffmpeg-6.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar  9 09:02:01 UTC 2023 - Enrico Belleri <idesmi@protonmail.com>
+
+- enable libplacebo filter
+- clean old BuildRequires conditions
+- add libjxl to enable_encoders
+
 -------------------------------------------------------------------
 Tue Feb 28 13:23:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec
index eb66513..3054f45 100644
--- a/ffmpeg-6.spec
+++ b/ffmpeg-6.spec
@@ -120,25 +120,22 @@ BuildRequires:  nasm
 BuildRequires:  pkg-config
 %ifarch x86_64 %x86_64
 %if 0%{?suse_version} >= 1550
-BuildRequires:  pkgconfig(SvtAv1Enc) >= 0.8.4
+BuildRequires:  pkgconfig(SvtAv1Enc) >= 0.9.0
 %endif
 %endif
 BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(aom)
-BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(aom) >= 1.0.0
 %if %{with codec2}
 BuildRequires:  pkgconfig(codec2)
 %endif
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
-BuildRequires:  pkgconfig(dav1d)
-%endif
-BuildRequires:  pkgconfig(ffnvcodec)
+BuildRequires:  pkgconfig(dav1d) >= 0.5.0
+BuildRequires:  pkgconfig(ffnvcodec) >= 8.1.24.14
 BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libass) >= 0.11.0
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libbs2b)
 BuildRequires:  pkgconfig(libcdio)
@@ -155,22 +152,24 @@ BuildRequires:  pkgconfig(libssh)
 BuildRequires:  pkgconfig(libva) >= 0.35.0
 BuildRequires:  pkgconfig(libva-drm)
 BuildRequires:  pkgconfig(libva-x11)
-BuildRequires:  pkgconfig(libvmaf) >= 1.3.9
+BuildRequires:  pkgconfig(libvmaf) >= 2.0.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4
+BuildRequires:  pkgconfig(libwebpmux) >= 0.4.0
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libzmq)
+BuildRequires:  pkgconfig(libzmq) >= 4.2.1
 BuildRequires:  pkgconfig(lilv-0)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(opus)
 %if 0%{?suse_version} >= 1550
-BuildRequires:  pkgconfig(libjxl)
+BuildRequires:  pkgconfig(libjxl) >= 0.7.0
+BuildRequires:  pkgconfig(libjxl_threads) >= 0.7.0
 BuildRequires:  pkgconfig(librist)
 %endif
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
-BuildRequires:  pkgconfig(rav1e)
+BuildRequires:  pkgconfig(rav1e) >= 0.5.0
 %endif
 %if %{with rubberband}
-BuildRequires:  pkgconfig(rubberband)
+BuildRequires:  pkgconfig(rubberband) >= 1.8.1
 %endif
 BuildRequires:  pkgconfig(sdl2)
 %if %{with smbclient}
@@ -178,27 +177,26 @@ BuildRequires:  pkgconfig(smbclient)
 %endif
 BuildRequires:  pkgconfig(soxr)
 BuildRequires:  pkgconfig(speex)
-BuildRequires:  pkgconfig(srt)
+BuildRequires:  pkgconfig(srt) >= 1.3.0
 BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(twolame)
+BuildRequires:  pkgconfig(twolame) >= 0.3.10
 BuildRequires:  pkgconfig(vdpau)
 %if %{with vidstab}
 BuildRequires:  pkgconfig(vidstab) >= 0.98
 %endif
 %if %{with vulkan}
 BuildRequires:  pkgconfig(shaderc)
-BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  pkgconfig(vulkan) >= 1.2.189
+BuildRequires:  pkgconfig(libplacebo) >= 4.192.0
 %endif
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vpx) >= 1.4.0
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-render)
 BuildRequires:  pkgconfig(xcb-shape)
 BuildRequires:  pkgconfig(xcb-shm)
 BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 %ifarch x86_64 %x86_64
 BuildRequires:  pkgconfig(libmfx)
@@ -563,7 +561,9 @@ LDFLAGS="%_lto_cflags" \
 	--enable-gnutls \
 	--enable-ladspa \
 %if %{with vulkan}
-	--enable-libshaderc --enable-vulkan \
+	--enable-libshaderc \
+	--enable-vulkan \
+	--enable-libplacebo \
 %endif
 %if %{with amf}
         --enable-amf \
@@ -579,9 +579,7 @@ LDFLAGS="%_lto_cflags" \
 %if %{with codec2}
 	--enable-libcodec2 \
 %endif
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 	--enable-libdav1d \
-%endif
 	--enable-libdc1394 \
 	--enable-libdrm \
 	--enable-libfontconfig \