vlc: 3.0.21

multimedia/vlc/vaapi-without-ffmepg4.patch

@@ -0,0 +1,18 @@
+avcodec_vaapi requires ffmpeg-4, but other vaapi modules can be built
+
+diff --git a/configure.ac b/configure.ac
+index 69beb77..c7f7142 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2454,9 +2454,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
+     have_avcodec_vaapi="yes"
+   ],[
+     AS_IF([test -n "${enable_libva}"], [
+-      AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
++      AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing])
+     ], [
+-      AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
++      AC_MSG_NOTICE([libva is present but libavcodec/vaapi.h is missing ])
+     ])
+   ])
+   VLC_RESTORE_FLAGS

multimedia/vlc/vlc.spec

@@ -51,8 +51,8 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Epoch:		1
 Name:		vlc
-Version:	3.0.20
+Version:	3.0.21
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		https://www.videolan.org
 %if 0%{?commit0:1}
@@ -79,6 +79,8 @@ Patch8:         fix-build-with-fdk-2.0.patch
 # Backport for 3.0 notifyd without gtk3
 Patch9: notify-don-t-depend-on-any-GTK-version.patch
 
+Patch10: vaapi-without-ffmepg4.patch
+
 BuildRequires:	desktop-file-utils
 BuildRequires:	libappstream-glib
 BuildRequires:	fontpackages-devel
@@ -104,7 +106,8 @@ BuildRequires:	pkgconfig(dbus-1)
 %{?_with_fdk_aac:
 BuildRequires:  pkgconfig(fdk-aac)
 }
-%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
+# Doesn't support ffmpeg >= 7.0 yet
+%{?_with_ffmpeg:BuildRequires: ffmpeg-devel < 7.0}
 BuildRequires:	flac-devel
 %{?_with_fluidsynth:BuildRequires: fluidsynth-devel}
 BuildRequires:	fribidi-devel
@@ -159,7 +162,7 @@ BuildRequires:	libtiger-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	pkgconfig(libidn)
 BuildRequires:	pkgconfig(libjpeg)
-BuildRequires:	pkgconfig(libplacebo)
+BuildRequires:	pkgconfig(libplacebo) < 6.0
 BuildRequires:	pkgconfig(libudev)
 BuildRequires:	pkgconfig(libvncclient)
 BuildRequires:	pkgconfig(libnotify)
@@ -369,6 +372,8 @@ sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac
 
 %patch9 -p1
 
+%patch10 -p1
+
 %{?_with_bootstrap:
 rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
 ./bootstrap
@@ -644,6 +649,9 @@ fi || :
 
 
 %changelog
+* Thu Jun  6 2024 Raven <raven@sysadmins.ws> - 1:3.21-1
+- Update to 3.0.21 release
+
 * Sun Dec 24 2023 Raven <raven@sysadmins.ws> - 1:3.0.20-2
 - rebuild for new protobuf