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

diff --cc debian/changelog
index 6a402225b8447371a7f5283f5f37c7625d6034ae,591c03d0127f2258d63c3209abd7342ea1290724..419e10875683f3617efdeaa394f17895d89b2402
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- vlc (3.0.17.4-1+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.17.4-2+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>  Wed, 27 Apr 2022 04:08:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 May 2022 11:03:51 +0000
++
+ vlc (3.0.17.4-2) unstable; urgency=medium
+ 
+   * debian/patches: Apply upstream patches to fix build with dav1d 1.0.0
+     (Closes: #1008609)
+   * debian/control: Recommend vlc-plugin-pipewire
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 15 May 2022 13:47:10 +0200
  
  vlc (3.0.17.4-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 1bff042eb9c83c29531ed458eb339abf86499b53,1156afd5c14fbe1ba9368ab938e51603ec62f4e0..55a6ccdf16f90ce3e6f83eef18cdfdc7812ff636
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,4 +1,5 @@@
  0001-configure-fix-linking-on-RISC-V-ISA.patch
  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
 +add-extern-qualifiers.patch