Merge version 3.0.17.4-2+rpi1 and 3.0.17.4-4 to produce 3.0.17.4-4+rpi1 archive/raspbian/3.0.17.4-4+rpi1 raspbian/3.0.17.4-4+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sun, 3 Jul 2022 22:45:39 +0000 (23:45 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Sun, 3 Jul 2022 22:45:39 +0000 (23:45 +0100)
1  2 
debian/changelog
debian/patches/series
debian/rules

index 419e10875683f3617efdeaa394f17895d89b2402,cf05a4173927d655e11e12507f3c13cac7482770..89b5e89898ac93083325651b0ac2e88e14adccfe
@@@ -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 <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>  Thu, 19 May 2022 11:03:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 <sramacher@debian.org>  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 <sramacher@debian.org>  Fri, 17 Jun 2022 19:37:03 +0200
  
  vlc (3.0.17.4-2) unstable; urgency=medium
  
index 55a6ccdf16f90ce3e6f83eef18cdfdc7812ff636,ca6e0e97ae8985b24a4a7cf7b4b01d1889c9f579..2e16bfe7f95fa820132488178251caecdd64863a
@@@ -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
diff --cc debian/rules
Simple merge