summaryrefslogtreecommitdiff
path: root/nonsystemd
diff options
context:
space:
mode:
Diffstat (limited to 'nonsystemd')
-rw-r--r--nonsystemd/pulseaudio/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch28
-rw-r--r--nonsystemd/pulseaudio/PKGBUILD78
2 files changed, 39 insertions, 67 deletions
diff --git a/nonsystemd/pulseaudio/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch b/nonsystemd/pulseaudio/0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
deleted file mode 100644
index 6e6beeade..000000000
--- a/nonsystemd/pulseaudio/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/nonsystemd/pulseaudio/PKGBUILD b/nonsystemd/pulseaudio/PKGBUILD
index e286c716c..2a96d303d 100644
--- a/nonsystemd/pulseaudio/PKGBUILD
+++ b/nonsystemd/pulseaudio/PKGBUILD
@@ -1,14 +1,11 @@
# Maintainer: David P. <megver83@parabola.nu>
-# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor (Arch): Corrado Primier <bardo@aur.archlinux.org>
-# Contributor (Arch): William Rea <sillywilly@gmail.com>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=pulseaudio
-pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer})
+pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp})
pkgdesc="A featureful, general-purpose sound server"
-pkgver=13.0
-pkgrel=3
+pkgver=14.2
+pkgrel=2
pkgrel+=.nonsystemd1
arch=(x86_64)
arch+=(i686 armv7h)
@@ -18,13 +15,11 @@ makedepends=(libasyncns libcap attr libxtst libsm libsndfile rtkit libsoxr
speexdsp tdb elogind 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
+_commit=6a487c5244563f49a025088de3510c80824fc99e # tags/v14.2^0
source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit"
- 'meson-elogind-support.patch'
- 0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch)
+ "meson-elogind-support.patch")
sha256sums=('SKIP'
- 'fea0e09a9f026bc3c9160b53018b8e1dd1f3493c60f68405a758de7d3cb592cf'
- '4ff133e2847baad5bb6798b5816d67551cfba2efabb2f1f348628d7217abd07d')
+ 'fea0e09a9f026bc3c9160b53018b8e1dd1f3493c60f68405a758de7d3cb592cf')
pkgver() {
cd pulseaudio
@@ -35,22 +30,18 @@ prepare() {
cd pulseaudio
# Freeze version before patching
- ./git-version-gen doesnt-exist >.tarball-version
-
patch -Np 1 -i ../meson-elogind-support.patch
-
- # https://bugs.archlinux.org/task/63755
- git apply -3 ../0001-meson-Define-TUNNEL_SINK-for-module-tunnel-sink.patch
+ ./git-version-gen doesnt-exist >.tarball-version
}
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 \
-D systemd=disabled \
-D elogind=enabled
- ninja -C build
+ meson compile -C build
}
check() {
@@ -70,8 +61,14 @@ _pick() {
package_pulseaudio() {
depends=("libpulse=$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})
replaces=('pulseaudio-xen<=9.0' 'pulseaudio-gconf<=11.1')
@@ -85,14 +82,6 @@ package_pulseaudio() {
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 = yes' \
-i etc/pulse/client.conf
@@ -108,7 +97,7 @@ package_pulseaudio() {
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*
@@ -119,7 +108,6 @@ package_pulseaudio() {
_pick libpulse usr/share/man/man5/pulse-client.conf.5
_pick libpulse usr/share/vala
-### Split modules
local moddir=usr/lib/pulse-$pulsever/modules
_pick zeroconf $moddir/libavahi-wrap.so
@@ -137,11 +125,16 @@ package_pulseaudio() {
_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() {
pkgdesc="$pkgdesc (client library)"
- depends=(dbus libasyncns libcap libxtst libsm libsndfile elogind)
+ depends=(dbus libasyncns libcap libxcb libsm libsndfile elogind)
+ optdepends=('glib2: mainloop integration')
provides=(libpulse{,-simple,-mainloop-glib}.so)
license=(LGPL)
backup=(etc/pulse/client.conf)
@@ -149,39 +142,46 @@ package_libpulse() {
mv libpulse/* "$pkgdir"
}
-package_pulseaudio-zeroconf(){
+package_pulseaudio-zeroconf() {
pkgdesc="Zeroconf support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" avahi openssl)
mv zeroconf/* "$pkgdir"
}
-package_pulseaudio-lirc(){
+package_pulseaudio-lirc() {
pkgdesc="IR (lirc) support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" lirc)
mv lirc/* "$pkgdir"
}
-package_pulseaudio-jack(){
+package_pulseaudio-jack() {
pkgdesc="Jack support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" jack)
mv jack/* "$pkgdir"
}
-package_pulseaudio-bluetooth(){
+package_pulseaudio-bluetooth() {
pkgdesc="Bluetooth support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" bluez bluez-libs sbc)
mv bluetooth/* "$pkgdir"
}
-package_pulseaudio-equalizer(){
- pkgdesc="Equalizer for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus,sip} fftw)
+package_pulseaudio-equalizer() {
+ pkgdesc="Graphical equalizer for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw)
mv equalizer/* "$pkgdir"
}
+package_pulseaudio-rtp() {
+ pkgdesc="RTP and RAOP support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel")
+
+ mv rtp/* "$pkgdir"
+}
+
# vim:set sw=2 et: