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

diff --cc debian/changelog
index 63f83cb855bd78eb04cf0c62ebfd02be9bf55d91,1b3237d2722459922827e89d7b976728e4196bd5..ceb0a3306b0c5e7ea8b1fae78aa94b326307755e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.12-2+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.12-3+rpi1) bullseye-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>  Fri, 05 Feb 2021 06:02:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 16 Mar 2021 16:39:48 +0000
++
+ vlc (3.0.12-3) unstable; urgency=medium
+ 
+   * debian/patches: Apply upstream patches to prevent process freeze on exit
+     (Closes: #916595) (LP: #1819543)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 09 Mar 2021 17:42:00 +0100
  
  vlc (3.0.12-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 00ff3ab4b1e3a2db8a34f258ae2d2f7223c5bb09,c923bedff9e0d052f79fcfc23fb8b949f7e8da47..3de03fe821431245e582467501f378869b31de5d
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,6 +1,7 @@@
  0001-configure-fix-linking-on-RISC-V-ISA.patch
  0002-Revert-configure-Require-libmodplug-0.8.9.patch
  0003-Do-not-generate-cache-during-build.patch
+ 0004-qt-add-a-private-structure-for-window-provider.patch
+ 0005-qt-create-another-indirection-X11-window.patch
+ 0006-qt-reparent-video-window-to-root-whence-UI-closes.patch
 +add-extern-qualifiers.patch