From 0cfbbf489e997f73c37405db4a00ad4119bcfac0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 6 Sep 2017 00:05:22 +0000
Subject: [PATCH] extra/pulseaudio to 11.0-1

---
 extra/pulseaudio/PKGBUILD          | 14 ++++++--------
 extra/pulseaudio/padsp-lib32.patch | 15 ---------------
 2 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 extra/pulseaudio/padsp-lib32.patch

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 8d23d2118..6e84fa1c2 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -10,8 +10,8 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse pulseaudio-{gconf,zeroconf,lirc,jack,bluetooth,equalizer})
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=10.0
-pkgrel=3
+pkgver=11.0
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(GPL)
@@ -20,11 +20,9 @@ makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit libso
              lirc openssl fftw orc gtk3 webrtc-audio-processing
              check autoconf-archive git)
 options=(!emptydirs)
-_commit=84952e6a092b6a0c5b153bd7a4f6e490810681c8  # tags/v10.0^0
-source=("git+https://anongit.freedesktop.org/git/pulseaudio/pulseaudio#commit=$_commit"
-        padsp-lib32.patch)
-sha256sums=('SKIP'
-            '7832fc59df76538ff10aedd297c03cb7ff117235da8bfad26082994bb5b84332')
+_commit=8db681606cd8cbb8cee67529937deaa9e4558db9  # tags/v11.0^0
+source=("git+https://anongit.freedesktop.org/git/pulseaudio/pulseaudio#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd pulseaudio
@@ -46,6 +44,7 @@ build() {
     --libexecdir=/usr/lib \
     --localstatedir=/var \
     --with-udev-rules-dir=/usr/lib/udev/rules.d \
+    --with-pulsedsp-location='/usr/\\$$LIB/pulseaudio' \
     --with-database=tdb \
     --disable-tcpwrap \
     --disable-bluez4 \
@@ -81,7 +80,6 @@ package_pulseaudio() {
     bashcompletiondir=/usr/share/bash-completion/completions
 
   cd "$pkgdir"
-  patch -Np1 -i "$srcdir/padsp-lib32.patch"
 
   # Assumes that any volume adjustment is intended by the user, who can control
   # each app's volume. Misbehaving clients can trigger earsplitting volume
diff --git a/extra/pulseaudio/padsp-lib32.patch b/extra/pulseaudio/padsp-lib32.patch
deleted file mode 100644
index 73c0ea66b..000000000
--- a/extra/pulseaudio/padsp-lib32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -u -r foo/usr/bin/padsp bar/usr/bin/padsp
---- foo/usr/bin/padsp	2015-09-09 14:26:20.000000000 +0200
-+++ bar/usr/bin/padsp	2015-09-09 14:47:54.828230174 +0200
-@@ -74,9 +74,9 @@
- shift $(( $OPTIND - 1 ))
- 
- if [ x"$LD_PRELOAD" = x ] ; then
--   LD_PRELOAD="/usr/lib/pulseaudio/libpulsedsp.so"
-+   LD_PRELOAD="/usr/\$LIB/pulseaudio/libpulsedsp.so"
- else
--   LD_PRELOAD="$LD_PRELOAD /usr/lib/pulseaudio/libpulsedsp.so"
-+   LD_PRELOAD="$LD_PRELOAD /usr/\$LIB/pulseaudio/libpulsedsp.so"
- fi
- 
- export LD_PRELOAD