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

[Jan Steffens]

    Date: Friday, July 24, 2020 @ 18:40:26
  Author: heftig
Revision: 392504

13.99.1+67+g414644dff-1: Release candidate only for [testing]

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

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

Deleted: 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
===================================================================
--- 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch	2020-07-24 18:07:10 UTC (rev 392503)
+++ 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch	2020-07-24 18:40:26 UTC (rev 392504)
@@ -1,28 +0,0 @@
-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	2020-07-24 18:07:10 UTC (rev 392503)
+++ PKGBUILD	2020-07-24 18:40:26 UTC (rev 392504)
@@ -1,13 +1,10 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer})
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=13.0
-pkgrel=3
+pkgver=13.99.1+67+g414644dff
+pkgrel=1
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
@@ -14,12 +11,10 @@
 makedepends=(libasyncns libcap attr libxtst libsm libsndfile rtkit libsoxr
              speexdsp tdb systemd dbus avahi bluez bluez-libs jack2 sbc
              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"
-        0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch)
-sha256sums=('SKIP'
-            '4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d')
+             xmltoman gst-plugins-base-libs)
+_commit=414644dff1abd32294db3be1fde001f56ec9e65a  # master
+source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd pulseaudio
@@ -31,17 +26,14 @@
 
   # Freeze version before patching
   ./git-version-gen doesnt-exist >.tarball-version
-
-  # https://bugs.archlinux.org/task/63755
-  git apply -3 ../0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
 }
 
 build() {
   arch-meson pulseaudio build \
-    -D gcov=false \
     -D pulsedsp-location='/usr/\$LIB/pulseaudio' \
+    -D stream-restore-clear-old-devices=true \
     -D udevrulesdir=/usr/lib/udev/rules.d
-  ninja -C build
+  meson compile -C build
 }
 
 check() {
@@ -61,7 +53,7 @@
 
 package_pulseaudio() {
   depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc libsoxr
-           webrtc-audio-processing)
+           webrtc-audio-processing gst-plugins-base-libs)
   optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
@@ -77,14 +69,6 @@
 
   cd "$pkgdir"
 
-  # Assumes that any volume adjustment is intended by the user, who can control
-  # each app's volume. Misbehaving clients can trigger earsplitting volume
-  # jumps. App volumes can diverge wildly and cause apps without their own
-  # volume control to fall below sink volume; a sink-only volume control will
-  # suddenly be unable to make such an app loud enough.
-  sed -e '/flat-volumes/iflat-volumes = no' \
-      -i etc/pulse/daemon.conf
-
   # Superseded by socket activation
   sed -e '/autospawn/iautospawn = no' \
       -i etc/pulse/client.conf
@@ -171,7 +155,7 @@
 
 package_pulseaudio-equalizer(){
   pkgdesc="Equalizer for PulseAudio"
-  depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus,sip} fftw)
+  depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw)
 
   mv equalizer/* "$pkgdir"
 }