Upgrade version and use MarijnS95/absolute-volume-on-hsphfpd

3 files changed, 88 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7eb818d1a18..148d3763aca4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pulseaudio-hsphfpd
 	pkgdesc = A fork of pulseaudio providing superior bluetooth headset functionality
-	pkgver = r9414.cbc09c9f1
-	pkgrel = 2
+	pkgver = 13.99.2+85+g95460f49e
+	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/PulseAudio/
 	arch = x86_64
 	license = GPL
@@ -32,15 +32,14 @@ pkgbase = pulseaudio-hsphfpd
 	makedepends = git
 	makedepends = meson
 	makedepends = xmltoman
-	makedepends = libopenaptx
-	source = git+https://gitlab.freedesktop.org/pali/pulseaudio.git#branch=hsphfpd
-	source = 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
+	makedepends = gst-plugins-base-libs
+	source = git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=6101798c7a4fa5b8ce7f5589706b03d87a3aee76
 	sha256sums = SKIP
-	sha256sums = 4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d
 
 pkgname = pulseaudio-hsphfpd
 	install = pulseaudio.install
-	depends = libpulse-hsphfpd=r9414.cbc09c9f1-2
+	depends = libpulse-hsphfpd=13.99.2+85+g95460f49e-1
+	depends = alsa-card-profiles
 	depends = rtkit
 	depends = libltdl
 	depends = speexdsp
@@ -49,7 +48,13 @@ pkgname = pulseaudio-hsphfpd
 	depends = libsoxr
 	depends = webrtc-audio-processing
 	optdepends = pulseaudio-alsa-hsphfpd: ALSA configuration (recommended)
-	provides = pulseaudio=r9414.cbc09c9f1-2
+	optdepends = pulseaudio-zeroconf-hsphfpd: Zeroconf support
+	optdepends = pulseaudio-lirc-hsphfpd: IR (lirc) support
+	optdepends = pulseaudio-jack-hsphfpd: Jack support
+	optdepends = pulseaudio-bluetooth-hsphfpd: Bluetooth support
+	optdepends = pulseaudio-equalizer-hsphfpd: Graphical equalizer
+	optdepends = pulseaudio-rtp-hsphfpd: RTP and RAOP support
+	provides = pulseaudio=13.99.2+85+g95460f49e-1
 	conflicts = pulseaudio
 	replaces = pulseaudio-xen<=9.0
 	replaces = pulseaudio-gconf<=11.1
@@ -70,48 +75,58 @@ pkgname = libpulse-hsphfpd
 	provides = libpulse.so
 	provides = libpulse-simple.so
 	provides = libpulse-mainloop-glib.so
-	provides = libpulse=r9414.cbc09c9f1-2
+	provides = libpulse=13.99.2+85+g95460f49e-1
 	conflicts = libpulse
 	backup = etc/pulse/client.conf
 
+pkgname = alsa-card-profiles-hsphfpd
+	pkgdesc = ALSA card profiles shared by PulseAudio
+	license = LGPL
+	provides = alsa-card-profiles=13.99.2+85+g95460f49e-1
+	conflicts = alsa-card-profiles
+
 pkgname = pulseaudio-zeroconf-hsphfpd
 	pkgdesc = Zeroconf support for PulseAudio
-	depends = pulseaudio-hsphfpd=r9414.cbc09c9f1-2
+	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-1
 	depends = avahi
 	depends = openssl
-	provides = pulseaudio-zeroconf=r9414.cbc09c9f1-2
+	provides = pulseaudio-zeroconf=13.99.2+85+g95460f49e-1
 	conflicts = pulseaudio-zeroconf
 
 pkgname = pulseaudio-lirc-hsphfpd
 	pkgdesc = IR (lirc) support for PulseAudio
-	depends = pulseaudio-hsphfpd=r9414.cbc09c9f1-2
+	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-1
 	depends = lirc
-	provides = pulseaudio-lirc=r9414.cbc09c9f1-2
+	provides = pulseaudio-lirc=13.99.2+85+g95460f49e-1
 	conflicts = pulseaudio-lirc
 
 pkgname = pulseaudio-jack-hsphfpd
 	pkgdesc = Jack support for PulseAudio
-	depends = pulseaudio-hsphfpd=r9414.cbc09c9f1-2
+	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-1
 	depends = jack
-	provides = pulseaudio-jack=r9414.cbc09c9f1-2
+	provides = pulseaudio-jack=13.99.2+85+g95460f49e-1
 	conflicts = pulseaudio-jack
 
 pkgname = pulseaudio-bluetooth-hsphfpd
 	pkgdesc = Bluetooth support for PulseAudio
-	depends = pulseaudio-hsphfpd=r9414.cbc09c9f1-2
+	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-1
 	depends = bluez
 	depends = bluez-libs
 	depends = sbc
-	provides = pulseaudio-bluetooth=r9414.cbc09c9f1-2
+	provides = pulseaudio-bluetooth=13.99.2+85+g95460f49e-1
 	conflicts = pulseaudio-bluetooth
 
 pkgname = pulseaudio-equalizer-hsphfpd
-	pkgdesc = Equalizer for PulseAudio
-	depends = pulseaudio-hsphfpd=r9414.cbc09c9f1-2
+	pkgdesc = Graphical equalizer for PulseAudio
+	depends = pulseaudio-hsphfpd=13.99.2+85+g95460f49e-1
 	depends = python-pyqt5
 	depends = python-dbus
-	depends = python-sip
 	depends = fftw
-	provides = pulseaudio-equalizer=r9414.cbc09c9f1-2
+	provides = pulseaudio-equalizer=13.99.2+85+g95460f49e-1
 	conflicts = pulseaudio-equalizer
 
+pkgname = pulseaudio-rtp-hsphfpd
+	pkgdesc = RTP and RAOP support for PulseAudio
+	depends = pulseaudio=13.99.2+85+g95460f49e-1
+	depends = gst-plugins-base-libs
+
diff --git a/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch b/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
deleted file mode 100644
index 6e6beeade13d..000000000000
--- a/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c7e0c4373a304e167b11a68575b9da9506345dab Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
-
diff --git a/PKGBUILD b/PKGBUILD
index 06693e7c3a7a..ec71c0ec695e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,46 @@
 # Maintainer: SpineEyE <at gmail dot com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=pulseaudio-hsphfpd
-pkgname=(pulseaudio-hsphfpd libpulse-hsphfpd pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer}-hsphfpd)
+pkgname=(pulseaudio-hsphfpd libpulse-hsphfpd alsa-card-profiles-hsphfpd pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp}-hsphfpd)
 pkgdesc="A fork of pulseaudio providing superior bluetooth headset functionality"
-pkgver=r9414.cbc09c9f1
-pkgrel=2
+pkgver=13.99.2+85+g95460f49e
+pkgrel=1
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
 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 libopenaptx)
-_branch=hsphfpd
-source=("git+https://gitlab.freedesktop.org/pali/pulseaudio.git#branch=$_branch"
-        0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch)
-sha256sums=('SKIP'
-            '4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d')
+             xmltoman gst-plugins-base-libs)
+_commit=6101798c7a4fa5b8ce7f5589706b03d87a3aee76  # master
+source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "${pkgname%-hsphfpd}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd pulseaudio
+  git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
 prepare() {
   cd pulseaudio
 
+  git fetch "https://gitlab.freedesktop.org/MarijnS95/pulseaudio.git" "absolute-volume-on-hsphfpd"
+  git checkout -B "MarijnS95/pulseaudio-absolute-volume-on-hsphfpd" FETCH_HEAD
+  git checkout master
+  git merge --ff -m "Merge branch 'MarijnS95/pulseaudio-absolute-volume-on-hsphfpd' into master" "MarijnS95/pulseaudio-absolute-volume-on-hsphfpd"
+
   # 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 alsadatadir=/usr/share/alsa-card-profile/mixer \
     -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,9 +59,15 @@ _pick() {
 }
 
 package_pulseaudio-hsphfpd() {
-  depends=("libpulse-hsphfpd=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc libsoxr
-           webrtc-audio-processing)
-  optdepends=('pulseaudio-alsa-hsphfpd: ALSA configuration (recommended)')
+  depends=("libpulse-hsphfpd=$pkgver-$pkgrel" alsa-card-profiles rtkit libltdl speexdsp
+           tdb orc libsoxr webrtc-audio-processing)
+  optdepends=('pulseaudio-alsa-hsphfpd: ALSA configuration (recommended)'
+              'pulseaudio-zeroconf-hsphfpd: Zeroconf support'
+              'pulseaudio-lirc-hsphfpd: IR (lirc) support'
+              'pulseaudio-jack-hsphfpd: Jack support'
+              'pulseaudio-bluetooth-hsphfpd: Bluetooth support'
+              'pulseaudio-equalizer-hsphfpd: Graphical equalizer'
+              'pulseaudio-rtp-hsphfpd: RTP and RAOP support')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
   replaces=('pulseaudio-xen<=9.0' 'pulseaudio-gconf<=11.1')
@@ -80,14 +84,6 @@ package_pulseaudio-hsphfpd() {
 
   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
@@ -103,7 +99,7 @@ package_pulseaudio-hsphfpd() {
 
   rm -r etc/dbus-1
 
-### Split libpulse
+  # Split packages
   _pick libpulse etc/pulse/client.conf
   _pick libpulse usr/bin/pa{cat,ctl,dsp,mon,play,rec,record}
   _pick libpulse usr/lib/libpulse{,-simple,-mainloop-glib}.so*
@@ -114,7 +110,8 @@ package_pulseaudio-hsphfpd() {
   _pick libpulse usr/share/man/man5/pulse-client.conf.5
   _pick libpulse usr/share/vala
 
-### Split modules
+  _pick alsa-card-profiles usr/share/alsa-card-profile
+
   local moddir=usr/lib/pulse-$pulsever/modules
 
   _pick zeroconf $moddir/libavahi-wrap.so
@@ -132,6 +129,10 @@ package_pulseaudio-hsphfpd() {
 
   _pick equalizer $moddir/module-equalizer-sink.so
   _pick equalizer usr/bin/qpaeq
+
+  _pick rtp $moddir/lib{rtp,raop}.so
+  _pick rtp $moddir/module-rtp-{send,recv}.so
+  _pick rtp $moddir/module-raop-sink.so
 }
 
 package_libpulse-hsphfpd() {
@@ -145,6 +146,15 @@ package_libpulse-hsphfpd() {
   mv libpulse/* "$pkgdir"
 }
 
+package_alsa-card-profiles-hsphfpd() {
+  pkgdesc="ALSA card profiles shared by PulseAudio"
+  provides=("alsa-card-profiles=$pkgver-$pkgrel")
+  conflicts=(alsa-card-profiles)
+  license=(LGPL)
+
+  mv alsa-card-profiles/* "$pkgdir"
+}
+
 package_pulseaudio-zeroconf-hsphfpd(){
   pkgdesc="Zeroconf support for PulseAudio"
   depends=("pulseaudio-hsphfpd=$pkgver-$pkgrel" avahi openssl)
@@ -182,12 +192,19 @@ package_pulseaudio-bluetooth-hsphfpd(){
 }
 
 package_pulseaudio-equalizer-hsphfpd(){
-  pkgdesc="Equalizer for PulseAudio"
-  depends=("pulseaudio-hsphfpd=$pkgver-$pkgrel" python-{pyqt5,dbus,sip} fftw)
+  pkgdesc="Graphical equalizer for PulseAudio"
+  depends=("pulseaudio-hsphfpd=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw)
   provides=("pulseaudio-equalizer=$pkgver-$pkgrel")
   conflicts=(pulseaudio-equalizer)
 
   mv equalizer/* "$pkgdir"
 }
 
+package_pulseaudio-rtp-hsphfpd(){
+  pkgdesc="RTP and RAOP support for PulseAudio"
+  depends=("pulseaudio=$pkgver-$pkgrel" gst-plugins-base-libs)
+
+  mv rtp/* "$pkgdir"
+}
+
 # vim:set sw=2 et: