summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMr. Tao2021-07-18 00:04:28 +0200
committerMr. Tao2021-07-18 00:06:04 +0200
commite8a4fce1a8cd84e570ef6caaf49ef59868162e65 (patch)
treeea3f1f804d9c5e15f8e95c247f7c94d984423f5d
parent488ca72100b462312161d667f815157958707222 (diff)
downloadaur-e8a4fce1a8cd84e570ef6caaf49ef59868162e65.tar.gz
Bump to the same version Testing has - 14.99.2
-rw-r--r--.SRCINFO32
-rw-r--r--0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch28
-rw-r--r--PKGBUILD74
3 files changed, 63 insertions, 71 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bfe8d9c64cf..ab4dc76adc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pulseaudio-airplay
pkgdesc = A featureful, general-purpose sound server
- pkgver = 13.99.1+104+gcc93eb360
+ pkgver = v14.99.2.r14.gd6dc500b7
pkgrel = 1
url = https://www.freedesktop.org/wiki/Software/PulseAudio/
arch = x86_64
@@ -32,14 +32,14 @@ pkgbase = pulseaudio-airplay
makedepends = git
makedepends = meson
makedepends = xmltoman
- source = git+https://gitlab.freedesktop.org/mr-tao/pulseaudio.git#commit=cc93eb360afeafb9bc8ac72c0511894aaa647769
- source = 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
+ makedepends = valgrind
+ makedepends = doxygen
+ source = git+https://gitlab.freedesktop.org/mr-tao/pulseaudio.git#commit=d6dc500b78e7d537bd65b2244ee54c3eeb42d3ea
sha256sums = SKIP
- sha256sums = 4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d
pkgname = pulseaudio-airplay
install = pulseaudio.install
- depends = libpulse-airplay=13.99.1+104+gcc93eb360-1
+ depends = libpulse-airplay=v14.99.2.r14.gd6dc500b7-1
depends = rtkit
depends = libltdl
depends = speexdsp
@@ -47,7 +47,14 @@ pkgname = pulseaudio-airplay
depends = orc
depends = libsoxr
depends = webrtc-audio-processing
+ depends = libxtst
optdepends = pulseaudio-alsa: ALSA configuration (recommended)
+ optdepends = pulseaudio-zeroconf: Zeroconf support
+ optdepends = pulseaudio-lirc: IR (lirc) support
+ optdepends = pulseaudio-jack: Jack support
+ optdepends = pulseaudio-bluetooth: Bluetooth support
+ optdepends = pulseaudio-equalizer: Graphical equalizer
+ optdepends = pulseaudio-rtp: RTP and RAOP support
provides = pulseaudio
conflicts = pulseaudio
replaces = pulseaudio-xen<=9.0
@@ -62,11 +69,11 @@ pkgname = libpulse-airplay
depends = dbus
depends = libasyncns
depends = libcap
- depends = libxtst
+ depends = libxcb
depends = libsm
depends = libsndfile
depends = systemd
- provides = libpulse
+ optdepends = glib2: mainloop integration
provides = libpulse.so
provides = libpulse-simple.so
provides = libpulse-mainloop-glib.so
@@ -75,7 +82,7 @@ pkgname = libpulse-airplay
pkgname = pulseaudio-airplay-zeroconf
pkgdesc = Zeroconf support for PulseAudio
- depends = pulseaudio-airplay=13.99.1+104+gcc93eb360-1
+ depends = pulseaudio-airplay=v14.99.2.r14.gd6dc500b7-1
depends = avahi
depends = openssl
provides = pulseaudio-zeroconf
@@ -83,21 +90,21 @@ pkgname = pulseaudio-airplay-zeroconf
pkgname = pulseaudio-airplay-lirc
pkgdesc = IR (lirc) support for PulseAudio
- depends = pulseaudio-airplay=13.99.1+104+gcc93eb360-1
+ depends = pulseaudio-airplay=v14.99.2.r14.gd6dc500b7-1
depends = lirc
provides = pulseaudio-lirc
conflicts = pulseaudio-lirc
pkgname = pulseaudio-airplay-jack
pkgdesc = Jack support for PulseAudio
- depends = pulseaudio-airplay=13.99.1+104+gcc93eb360-1
+ depends = pulseaudio-airplay=v14.99.2.r14.gd6dc500b7-1
depends = jack
provides = pulseaudio-jack
conflicts = pulseaudio-jack
pkgname = pulseaudio-airplay-bluetooth
pkgdesc = Bluetooth support for PulseAudio
- depends = pulseaudio-airplay=13.99.1+104+gcc93eb360-1
+ depends = pulseaudio-airplay=v14.99.2.r14.gd6dc500b7-1
depends = bluez
depends = bluez-libs
depends = sbc
@@ -106,11 +113,10 @@ pkgname = pulseaudio-airplay-bluetooth
pkgname = pulseaudio-airplay-equalizer
pkgdesc = Equalizer for PulseAudio
- depends = pulseaudio-airplay=13.99.1+104+gcc93eb360-1
+ depends = pulseaudio-airplay=v14.99.2.r14.gd6dc500b7-1
depends = python-pyqt5
depends = python-dbus
depends = python-sip
depends = fftw
provides = pulseaudio-equalizer
conflicts = pulseaudio-equalizer
-
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 6e6beeade13..00000000000
--- 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 eb59379e5e0..2b8d717c575 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=(pulseaudio-airplay libpulse-airplay pulseaudio-airplay-{zeroconf,lirc,jack,bluetooth,equalizer})
pkgdesc="A featureful, general-purpose sound server"
-pkgver=13.99.1+104+gcc93eb360
+pkgver=v14.99.2.r14.gd6dc500b7
pkgrel=1
arch=(x86_64)
url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -14,16 +14,14 @@ 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 gst-plugins-base-libs)
-_commit=cc93eb360afeafb9bc8ac72c0511894aaa647769 # tags/v13.99.1
-source=("git+https://gitlab.freedesktop.org/mr-tao/pulseaudio.git#commit=$_commit"
- 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch)
-sha256sums=('SKIP'
- '4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d')
+ xmltoman valgrind doxygen)
+_commit=d6dc500b78e7d537bd65b2244ee54c3eeb42d3ea # tags/v14.99.2
+source=("git+https://gitlab.freedesktop.org/mr-tao/pulseaudio.git#commit=$_commit")
+sha256sums=('SKIP')
pkgver() {
cd pulseaudio
- git describe --tags | sed 's/^v//;s/-/+/g'
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
@@ -31,17 +29,20 @@ prepare() {
# 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' \
+ local meson_options=(
+ -D stream-restore-clear-old-devices=true
+ -D pulsedsp-location='/usr/\$LIB/pulseaudio'
-D udevrulesdir=/usr/lib/udev/rules.d
- ninja -C build
+ -D bluez5-gstreamer=disabled
+ -D elogind=disabled
+ -D tcpwrap=disabled
+ )
+
+ arch-meson pulseaudio build "${meson_options[@]}"
+ meson compile -C build
}
check() {
@@ -63,8 +64,14 @@ package_pulseaudio-airplay() {
provides=(pulseaudio)
conflicts=(pulseaudio)
depends=("libpulse-airplay=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc libsoxr
- webrtc-audio-processing)
- optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
+ webrtc-audio-processing libxtst)
+ optdepends=('pulseaudio-alsa: ALSA configuration (recommended)'
+ 'pulseaudio-zeroconf: Zeroconf support'
+ 'pulseaudio-lirc: IR (lirc) support'
+ 'pulseaudio-jack: Jack support'
+ 'pulseaudio-bluetooth: Bluetooth support'
+ 'pulseaudio-equalizer: Graphical equalizer'
+ 'pulseaudio-rtp: 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')
@@ -75,18 +82,10 @@ package_pulseaudio-airplay() {
done
pulsever=${pulsever%%-*}
- DESTDIR="$pkgdir" meson install -C build
+ meson install -C build --destdir "$pkgdir"
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
@@ -102,7 +101,7 @@ package_pulseaudio-airplay() {
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*
@@ -111,9 +110,11 @@ package_pulseaudio-airplay() {
_pick libpulse usr/include
_pick libpulse usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.1
_pick libpulse usr/share/man/man5/pulse-client.conf.5
+ _pick libpulse usr/share/bash-completion/completions/pa{cat,ctl,dsp,play,rec,record}
+ _pick libpulse usr/share/bash-completion/completions/pulseaudio
_pick libpulse usr/share/vala
+ _pick libpulse usr/share/zsh
-### Split modules
local moddir=usr/lib/pulse-$pulsever/modules
_pick zeroconf $moddir/libavahi-wrap.so
@@ -131,13 +132,19 @@ package_pulseaudio-airplay() {
_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-airplay() {
+ provides=(libpulse)
conflicts=(libpulse)
pkgdesc="$pkgdesc (client library)"
- depends=(dbus libasyncns libcap libxtst libsm libsndfile systemd)
- provides=(libpulse libpulse{,-simple,-mainloop-glib}.so)
+ depends=(dbus libasyncns libcap libxcb libsm libsndfile systemd)
+ optdepends=('glib2: mainloop integration')
+ provides=(libpulse{,-simple,-mainloop-glib}.so)
license=(LGPL)
backup=(etc/pulse/client.conf)
@@ -189,4 +196,11 @@ package_pulseaudio-airplay-equalizer(){
mv equalizer/* "$pkgdir"
}
+package_pulseaudio-airplay-rtp() {
+ pkgdesc="RTP and RAOP support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel")
+
+ mv rtp/* "$pkgdir"
+}
+
# vim:set sw=2 et: