From: Raspbian automatic forward porter Date: Sun, 3 Jul 2022 22:45:39 +0000 (+0100) Subject: Merge version 3.0.17.4-2+rpi1 and 3.0.17.4-4 to produce 3.0.17.4-4+rpi1 X-Git-Tag: archive/raspbian/3.0.17.4-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d952eaa360fdb13c9be3e2551d9f1483f219d8a;p=vlc.git Merge version 3.0.17.4-2+rpi1 and 3.0.17.4-4 to produce 3.0.17.4-4+rpi1 --- 6d952eaa360fdb13c9be3e2551d9f1483f219d8a diff --cc debian/changelog index 419e1087,cf05a417..89b5e898 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,19 +1,27 @@@ - vlc (3.0.17.4-2+rpi1) bookworm-staging; urgency=medium ++vlc (3.0.17.4-4+rpi1) bookworm-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 Thu, 19 May 2022 11:03:51 +0000 ++ -- Raspbian forward porter Sun, 03 Jul 2022 22:45:38 +0000 ++ + vlc (3.0.17.4-4) unstable; urgency=medium + + * debian/control: Bump Standards-Version + * debian/: Disable libva support + vlc's libva support and ffmpeg 5.0 are not compatible. + + -- Sebastian Ramacher Thu, 23 Jun 2022 10:39:09 +0200 + + 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 Fri, 17 Jun 2022 19:37:03 +0200 vlc (3.0.17.4-2) unstable; urgency=medium diff --cc debian/patches/series index 55a6ccdf,ca6e0e97..2e16bfe7 --- a/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