diff -Nru vlc-3.0.18/debian/changelog vlc-3.0.18/debian/changelog
--- vlc-3.0.18/debian/changelog	2023-07-01 17:24:56.000000000 +0000
+++ vlc-3.0.18/debian/changelog	2023-07-31 21:47:01.000000000 +0000
@@ -1,3 +1,15 @@
+vlc (3.0.18-4) unstable; urgency=medium
+
+  [ Pino Toscano ]
+  * d/vlc-plugin-base.install: drop non-existing files
+  * d/rules: drop "libva" from "removeplugins" for all the archs
+  * d/vlc-plugin-video-output: mark vaapi plugins as "libva"
+
+  [ Sebastian Ramacher ]
+  * debian/: Disable libplacebo. libplacebo 6 is too new for vlc.
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Mon, 31 Jul 2023 23:47:01 +0200
+
 vlc (3.0.18-3) unstable; urgency=medium
 
   * debian/control: Bump Standards-Version
diff -Nru vlc-3.0.18/debian/control vlc-3.0.18/debian/control
--- vlc-3.0.18/debian/control	2023-07-01 17:23:00.000000000 +0000
+++ vlc-3.0.18/debian/control	2023-07-31 21:45:15.000000000 +0000
@@ -68,7 +68,6 @@
                libomxil-bellagio-dev [armhf arm64],
                libopenmpt-modplug-dev (>= 0.8.9) | libmodplug-dev (>= 1:0.8.9),
                libopus-dev (>= 1.0.3),
-               libplacebo-dev (>= 0.2.1) [linux-any],
                libpng-dev,
                libpostproc-dev (>= 7:3.0),
                libprotobuf-dev (>= 2.5.0),
diff -Nru vlc-3.0.18/debian/rules vlc-3.0.18/debian/rules
--- vlc-3.0.18/debian/rules	2023-07-01 17:24:08.000000000 +0000
+++ vlc-3.0.18/debian/rules	2023-07-31 21:45:47.000000000 +0000
@@ -105,6 +105,7 @@
 # freerdp: removed from Debian (#888323)
 # goom: not in Debian
 # gst-decode: not needed when having libavcodec
+# libplacebo: is too new
 # libtar: security issue (#737534)
 # live555: non-free code from RFC 3550 (#981439)
 # macosx*: MacOX only
@@ -133,6 +134,7 @@
 	--disable-freerdp \
 	--disable-goom \
 	--disable-gst-decode \
+	--disable-libplacebo \
 	--disable-libtar \
 	--disable-live555 \
 	--disable-macosx \
@@ -152,8 +154,6 @@
 	--disable-wasapi \
 	$(NULL)
 
-removeplugins += libva
-
 # Linux specific flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 # V4L2 is disabled on kFreeBSD due to a build failure.
@@ -161,7 +161,6 @@
 	--enable-alsa \
 	--enable-dc1394 \
 	--enable-dv1394 \
-	--enable-libplacebo \
 	--enable-linsys \
 	--enable-nfs \
 	--enable-udev \
@@ -173,7 +172,6 @@
 	--disable-alsa \
 	--disable-dc1394 \
 	--disable-dv1394 \
-	--disable-libplacebo \
 	--disable-linsys \
 	--disable-nfs \
 	--disable-udev \
diff -Nru vlc-3.0.18/debian/vlc-plugin-base.install vlc-3.0.18/debian/vlc-plugin-base.install
--- vlc-3.0.18/debian/vlc-plugin-base.install	2023-07-01 17:24:29.000000000 +0000
+++ vlc-3.0.18/debian/vlc-plugin-base.install	2023-07-31 21:45:03.000000000 +0000
@@ -105,8 +105,6 @@
 usr/lib/*/vlc/plugins/codec/libttml_plugin.so
 usr/lib/*/vlc/plugins/codec/libtwolame_plugin.so
 usr/lib/*/vlc/plugins/codec/libuleaddvaudio_plugin.so
-usr/lib/*/vlc/plugins/codec/libvaapi_drm_plugin.so [libva]
-usr/lib/*/vlc/plugins/codec/libvaapi_plugin.so [libva]
 usr/lib/*/vlc/plugins/codec/libvorbis_plugin.so
 usr/lib/*/vlc/plugins/codec/libwebvtt_plugin.so
 usr/lib/*/vlc/plugins/codec/libx264_plugin.so
diff -Nru vlc-3.0.18/debian/vlc-plugin-video-output.install vlc-3.0.18/debian/vlc-plugin-video-output.install
--- vlc-3.0.18/debian/vlc-plugin-video-output.install	2022-12-05 22:04:31.000000000 +0000
+++ vlc-3.0.18/debian/vlc-plugin-video-output.install	2023-07-31 21:45:03.000000000 +0000
@@ -2,7 +2,7 @@
 exec python3 $(dirname $0)/filter-plugin.py <<EOF
 usr/lib/*/vlc/libvlc_vdpau.so*
 usr/lib/*/vlc/libvlc_xcb_events.so*
-usr/lib/*/vlc/plugins/vaapi/libvaapi_filters_plugin.so
+usr/lib/*/vlc/plugins/vaapi/libvaapi_filters_plugin.so [libva]
 usr/lib/*/vlc/plugins/vdpau
 usr/lib/*/vlc/plugins/video_output/libaa_plugin.so
 usr/lib/*/vlc/plugins/video_output/libcaca_plugin.so
@@ -10,9 +10,9 @@
 usr/lib/*/vlc/plugins/video_output/libegl_x11_plugin.so
 usr/lib/*/vlc/plugins/video_output/libflaschen_plugin.so
 usr/lib/*/vlc/plugins/video_output/libgl_plugin.so
-usr/lib/*/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.so
-usr/lib/*/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so [wayland]
-usr/lib/*/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so
+usr/lib/*/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.so [libva]
+usr/lib/*/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so [libva,wayland]
+usr/lib/*/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so [libva]
 usr/lib/*/vlc/plugins/video_output/libglconv_vdpau_plugin.so
 usr/lib/*/vlc/plugins/video_output/libgles2_plugin.so
 usr/lib/*/vlc/plugins/video_output/libglx_plugin.so