Merge version 3.0.11.1-3+rpi1 and 3.0.12-1 to produce 3.0.12-1+rpi1

diff --cc debian/changelog
index 712786853cfae781492b1d2dd88eb9ac38462ce2,9a9c74d7ba5459d961f96a28b15427bf4fe7f914..63f9c16e38633cad6e7c278e902b366cc0c11dbd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,22 @@@
- vlc (3.0.11.1-3+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.12-1+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>  Mon, 26 Oct 2020 13:07:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 25 Jan 2021 00:51:06 +0000
++
+ vlc (3.0.12-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - mkv: Fix heap-based buffer overflow (CVE-2020-26664) (Closes: #979676)
+   * debian/control:
+     - Switch to libshout-dev
+     - Bump Standards-Version
+   * debian/patches: Refresh patches
+   * debian/vlc-plugins-base.install: Install RIST access plugins
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Mon, 18 Jan 2021 17:13:21 +0100
  
  vlc (3.0.11.1-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index c3a49a4066431b423d35729128942300376fdf4c,4ac56b9c173988f5992eefc6bd9d3702a365dda5..00ff3ab4b1e3a2db8a34f258ae2d2f7223c5bb09
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,3 +1,4 @@@
  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-fix-missing-header-when-compiling-with-Qt-5.15.patch
- 0005-qt-add-missing-include-for-QPainterPath.patch
 +add-extern-qualifiers.patch