OK to update VLC to the latest upstream version and drop the vaapi
plugins for now? Otherwise this is an show stopper to update ffmpeg to
6. As Stuart has already said, it is currently unstable under AMD GPUs
anyway.

BTW. The port is wired, for example it disables dav1d but dav1d is a
libdepends and also in WANTLIB. However.

diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
index f1ccf7e1c6d..a95d91942b3 100644
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@@ -1,14 +1,13 @@
 COMMENT-main=	VideoLAN client; multimedia player
 COMMENT-jack=	JACK audio output module for VLC
 
-V=		3.0.20
+V=		3.0.21
 DISTNAME=	vlc-${V}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-jack=	vlc-jack-${V}
 CATEGORIES=	x11
 SITES=		https://download.videolan.org/pub/videolan/vlc/${V}/
 EXTRACT_SUFX=	.tar.xz
-REVISION-main=	5
 
 USE_NOBTCFI=	Yes
 
@@ -182,6 +181,7 @@ CONFIGURE_ARGS+=--disable-a52 \
 		--disable-kwallet \
 		--disable-libmpeg2 \
 		--disable-libplacebo \
+		--disable-libva \
 		--disable-linsys \
 		--disable-live555 \
 		--disable-mad \
diff --git a/x11/vlc/distinfo b/x11/vlc/distinfo
index 43f7f229414..ba5b9ae8f9c 100644
--- a/x11/vlc/distinfo
+++ b/x11/vlc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vlc-3.0.20.tar.xz) = rccoW00nIc3fQOtScMraKqoQozTLVG/VWgY1NEe6KbU=
-SIZE (vlc-3.0.20.tar.xz) = 25596392
+SHA256 (vlc-3.0.21.tar.xz) = JNu+HX367qCZTV3vC73iABdzRxNtv+Vz9bakzuJa+7A=
+SIZE (vlc-3.0.21.tar.xz) = 25649288
diff --git a/x11/vlc/pkg/PLIST-main b/x11/vlc/pkg/PLIST-main
index 0ef07080fc0..215a48d30fb 100644
--- a/x11/vlc/pkg/PLIST-main
+++ b/x11/vlc/pkg/PLIST-main
@@ -268,8 +268,6 @@ lib/vlc/plugins/codec/
 @so lib/vlc/plugins/codec/libtextst_plugin.so
 @so lib/vlc/plugins/codec/libttml_plugin.so
 @so lib/vlc/plugins/codec/libuleaddvaudio_plugin.so
-@so lib/vlc/plugins/codec/libvaapi_drm_plugin.so
-@so lib/vlc/plugins/codec/libvaapi_plugin.so
 @so lib/vlc/plugins/codec/libvorbis_plugin.so
 @so lib/vlc/plugins/codec/libwebvtt_plugin.so
 @so lib/vlc/plugins/codec/libx26410b_plugin.so