Merge version 3.0.17.4-2+rpi1 and 3.0.17.4-3 to produce 3.0.17.4-3+rpi1

diff --cc debian/changelog
index 419e10875683f3617efdeaa394f17895d89b2402,e2d48e83b53944a578276904e9cb0a2cfdce2824..a86d72a356592f01f646384ec0ef22702019e514
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- vlc (3.0.17.4-2+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.17.4-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2020 00:37:35 +0000]
 +  * Add extern to three functions for gcc-10 compatibility.
 +  * Partially fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 19 May 2022 11:03:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jun 2022 10:16:16 +0000
++
+ vlc (3.0.17.4-3) unstable; urgency=medium
+ 
+   * debian/control: Move vlc-plugin-pipewire to Suggests
+     The pipewire plugin fails to recognize some configurations where pipewire
+     is available but not used as sound server.
+   * debian/patches: Fix build with caca 0.99.beta20
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 17 Jun 2022 19:37:03 +0200
  
  vlc (3.0.17.4-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 55a6ccdf16f90ce3e6f83eef18cdfdc7812ff636,ca6e0e97ae8985b24a4a7cf7b4b01d1889c9f579..2e16bfe7f95fa820132488178251caecdd64863a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,4 +2,5 @@@
  0002-Do-not-generate-cache-during-build.patch
  0003-dav1d-fix-compilation-with-upcoming-dav1d-1.0.patch
  0004-dav1d-limit-the-number-of-extra-frames-needed-by-the.patch
+ 0005-caca-fix-to-newer-version.patch
 +add-extern-qualifiers.patch