extra/pulseaudio to 14.2-2

extra/pulseaudio/PKGBUILD

@@ -4,10 +4,10 @@
 #  - patch to remove meson NEON check
 
 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)
@@ -32,17 +32,6 @@ prepare() {
   # 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
-
   if [[ $CARCH != "aarch64" ]]; then
     patch -p1 -i ../0001-disable-neon.patch
   fi
@@ -50,7 +39,6 @@ prepare() {
 
 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
@@ -73,8 +61,8 @@ _pick() {
 }
 
 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'
@@ -122,8 +110,6 @@ package_pulseaudio() {
   _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
@@ -158,49 +144,42 @@ package_libpulse() {
   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)
 
   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(){
+package_pulseaudio-equalizer() {
   pkgdesc="Graphical equalizer for PulseAudio"
   depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw)
 
   mv equalizer/* "$pkgdir"
 }
 
-package_pulseaudio-rtp(){
+package_pulseaudio-rtp() {
   pkgdesc="RTP and RAOP support for PulseAudio"
   depends=("pulseaudio=$pkgver-$pkgrel")