[arch-commits] Commit in pulseaudio/trunk (2 files)

[Jan Steffens]

    Date: Sunday, September 15, 2019 @ 12:03:54
  Author: heftig
Revision: 362841

13.0-2

Added:
  pulseaudio/trunk/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
Modified:
  pulseaudio/trunk/PKGBUILD

------------------------------------------------------------+
 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch |   28 +++++++++++
 PKGBUILD                                                   |   11 +++-
 2 files changed, 36 insertions(+), 3 deletions(-)

Added: 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
===================================================================
--- 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch	                        (rev 0)
+++ 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch	2019-09-15 12:03:54 UTC (rev 362841)
@@ -0,0 +1,28 @@
+From c7e0c4373a304e167b11a68575b9da9506345dab Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 15 Sep 2019 13:47:19 +0200
+Subject: [PATCH] meson: Define TUNNEL_SINK for module-tunnel-sink
+
+This was missing, so it was building another tunnel-source instead.
+
+Fixes https://bugs.archlinux.org/task/63755
+---
+ src/modules/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index 92d5871f9..dd2241f42 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -55,7 +55,7 @@ all_modules = [
+   [ 'module-suspend-on-idle', 'module-suspend-on-idle.c' ],
+   [ 'module-switch-on-connect', 'module-switch-on-connect.c' ],
+   [ 'module-switch-on-port-available', 'module-switch-on-port-available.c' ],
+-  [ 'module-tunnel-sink', 'module-tunnel.c', [], [], [x11_dep] ],
++  [ 'module-tunnel-sink', 'module-tunnel.c', [], ['-DTUNNEL_SINK=1'], [x11_dep] ],
+   [ 'module-tunnel-sink-new', 'module-tunnel-sink-new.c' ],
+   [ 'module-tunnel-source', 'module-tunnel.c', [], [], [x11_dep] ],
+   [ 'module-tunnel-source-new', 'module-tunnel-source-new.c' ],
+-- 
+2.23.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-15 11:50:08 UTC (rev 362840)
+++ PKGBUILD	2019-09-15 12:03:54 UTC (rev 362841)
@@ -7,7 +7,7 @@
 pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer})
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=13.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
@@ -16,8 +16,10 @@
              lirc openssl fftw orc gtk3 webrtc-audio-processing check git meson
              xmltoman)
 _commit=200618b32f0964a479d69c9b6e5073e6931c370a  # tags/v13.0^0
-source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit"
+        0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch)
+sha256sums=('SKIP'
+            '4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d')
 
 pkgver() {
   cd pulseaudio
@@ -26,6 +28,9 @@
 
 prepare() {
   cd pulseaudio
+
+  # https://bugs.archlinux.org/task/63755
+  git apply -3 ../0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
 }
 
 build() {