Date: Wednesday, January 20, 2021 @ 23:25:12 Author: heftig Revision: 406496
14.2-2: Unsplit and move alsa-card-profiles to pipewire Modified: pulseaudio/trunk/PKGBUILD ----------+ PKGBUILD | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-01-20 23:17:33 UTC (rev 406495) +++ PKGBUILD 2021-01-20 23:25:12 UTC (rev 406496) @@ -1,10 +1,10 @@ # Maintainer: Jan Alexander Steffens (heftig) <[email protected]> pkgbase=pulseaudio -pkgname=(pulseaudio libpulse alsa-card-profiles pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp}) +pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp}) pkgdesc="A featureful, general-purpose sound server" pkgver=14.2 -pkgrel=1 +pkgrel=2 arch=(x86_64) url="https://www.freedesktop.org/wiki/Software/PulseAudio/"; license=(GPL) @@ -26,22 +26,10 @@ # Freeze version before patching ./git-version-gen doesnt-exist >.tarball-version - - # Pick some ACP updates required by pipewire - git cherry-pick -n \ - a28f2e7293a055588f7bba568b5049ff91b3aad0 \ - 69ba5a2b58ad6e98c8899aa297afd8276dbbe052 \ - 05c373d939506f31f96e58d8390b92e737e12afc \ - a73ec2a3f4f03829575761dc17546cf3226861c7 \ - 71aa4720a4194e9602271634d9042b8e56a8217f \ - 7ec6ee4725a72b42ddcb38550efc968a06e6be2f \ - 836ba89c4a3cd15efa33f9e70ed8e4764bcb3793 \ - 19e34d8d5bb9380ed70607b3f661c26df6d4836c } build() { arch-meson pulseaudio build \ - -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 @@ -64,8 +52,8 @@ } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" alsa-card-profiles rtkit libltdl speexdsp - tdb orc libsoxr webrtc-audio-processing libxtst) + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc libsoxr + webrtc-audio-processing libxtst) optdepends=('pulseaudio-alsa: ALSA configuration (recommended)' 'pulseaudio-zeroconf: Zeroconf support' 'pulseaudio-lirc: IR (lirc) support' @@ -113,8 +101,6 @@ _pick libpulse usr/share/man/man5/pulse-client.conf.5 _pick libpulse usr/share/vala - _pick alsa-card-profiles usr/share/alsa-card-profile - local moddir=usr/lib/pulse-$pulsever/modules _pick zeroconf $moddir/libavahi-wrap.so @@ -149,14 +135,7 @@ mv libpulse/* "$pkgdir" } -package_alsa-card-profiles() { - pkgdesc="ALSA card profiles shared by PulseAudio" - license=(LGPL) - - mv alsa-card-profiles/* "$pkgdir" -} - -package_pulseaudio-zeroconf(){ +package_pulseaudio-zeroconf() { pkgdesc="Zeroconf support for PulseAudio" depends=("pulseaudio=$pkgver-$pkgrel" avahi openssl) @@ -163,7 +142,7 @@ mv zeroconf/* "$pkgdir" } -package_pulseaudio-lirc(){ +package_pulseaudio-lirc() { pkgdesc="IR (lirc) support for PulseAudio" depends=("pulseaudio=$pkgver-$pkgrel" lirc) @@ -170,7 +149,7 @@ mv lirc/* "$pkgdir" } -package_pulseaudio-jack(){ +package_pulseaudio-jack() { pkgdesc="Jack support for PulseAudio" depends=("pulseaudio=$pkgver-$pkgrel" jack) @@ -177,7 +156,7 @@ mv jack/* "$pkgdir" } -package_pulseaudio-bluetooth(){ +package_pulseaudio-bluetooth() { pkgdesc="Bluetooth support for PulseAudio" depends=("pulseaudio=$pkgver-$pkgrel" bluez bluez-libs sbc) @@ -184,7 +163,7 @@ mv bluetooth/* "$pkgdir" } -package_pulseaudio-equalizer(){ +package_pulseaudio-equalizer() { pkgdesc="Graphical equalizer for PulseAudio" depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw) @@ -191,7 +170,7 @@ mv equalizer/* "$pkgdir" } -package_pulseaudio-rtp(){ +package_pulseaudio-rtp() { pkgdesc="RTP and RAOP support for PulseAudio" depends=("pulseaudio=$pkgver-$pkgrel")
