From: Raspbian automatic forward porter Date: Tue, 16 Mar 2021 16:39:48 +0000 (+0000) Subject: Merge version 3.0.12-2+rpi1 and 3.0.12-3 to produce 3.0.12-3+rpi1 X-Git-Tag: archive/raspbian/3.0.12-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f57c83a1232507824cee4ac37fa4ea2b503cac97;p=vlc.git Merge version 3.0.12-2+rpi1 and 3.0.12-3 to produce 3.0.12-3+rpi1 --- f57c83a1232507824cee4ac37fa4ea2b503cac97 diff --cc debian/changelog index 63f83cb8,1b3237d2..ceb0a330 --- a/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 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 Fri, 05 Feb 2021 06:02:20 +0000 ++ -- Raspbian forward porter 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 Tue, 09 Mar 2021 17:42:00 +0100 vlc (3.0.12-2) unstable; urgency=medium diff --cc debian/patches/series index 00ff3ab4,c923bedf..3de03fe8 --- a/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