[arch-commits] Commit in pulseaudio/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, May 28, 2022 @ 17:02:14
  Author: heftig
Revision: 446606

16.0-1

Modified:
  pulseaudio/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-28 16:28:14 UTC (rev 446605)
+++ PKGBUILD	2022-05-28 17:02:14 UTC (rev 446606)
@@ -3,16 +3,17 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp})
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=15.0
-pkgrel=4
+pkgver=16.0
+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
+             speexdsp tdb systemd dbus avahi bluez bluez-libs jack2 sbc alsa-lib
              lirc openssl fftw orc gtk3 webrtc-audio-processing check git meson
              xmltoman valgrind doxygen gst-plugins-base-libs)
-_commit=6329a2498eb038f8a9537888280a62b00a93f68e  # tags/v15.0^0
+options=(debug)
+_commit=237c5a5c36d49a51b1b7831b091ea250367c9102  # tags/v16.0^0
 source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -26,18 +27,15 @@
 
   # Freeze version before patching
   ./git-version-gen doesnt-exist >.tarball-version
-
-  # https://bugs.archlinux.org/task/73888
-  git cherry-pick -n 9f0a18b290de3e93812fbb7666f6377acf1e96e7
 }
 
 build() {
   local meson_options=(
+    -D elogind=disabled
+    -D pulsedsp-location='/usr/\$LIB/pulseaudio'
     -D stream-restore-clear-old-devices=true
-    -D pulsedsp-location='/usr/\$LIB/pulseaudio'
+    -D tcpwrap=disabled
     -D udevrulesdir=/usr/lib/udev/rules.d
-    -D elogind=disabled
-    -D tcpwrap=disabled
   )
 
   arch-meson pulseaudio build "${meson_options[@]}"
@@ -61,7 +59,7 @@
 
 package_pulseaudio() {
   depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc libsoxr
-           webrtc-audio-processing libxtst)
+           webrtc-audio-processing libxtst fftw alsa-lib)
   optdepends=('pulseaudio-alsa: ALSA configuration (recommended)'
               'pulseaudio-zeroconf: Zeroconf support'
               'pulseaudio-lirc: IR (lirc) support'
@@ -73,12 +71,6 @@
   install=pulseaudio.install
   replaces=('pulseaudio-xen<=9.0' 'pulseaudio-gconf<=11.1')
 
-  local pulsever=$(cd pulseaudio; ./git-version-gen .tarball-version)
-  while [[ $pulsever = *.*.* ]]; do
-    pulsever=${pulsever%.*}
-  done
-  pulsever=${pulsever%%-*}
-
   meson install -C build --destdir "$pkgdir"
 
   cd "$pkgdir"
@@ -112,7 +104,7 @@
   _pick libpulse usr/share/vala
   _pick libpulse usr/share/zsh
 
-  local moddir=usr/lib/pulse-$pulsever/modules
+  local moddir=usr/lib/pulseaudio/modules
 
   _pick zeroconf $moddir/libavahi-wrap.so
   _pick zeroconf $moddir/module-zeroconf-{publish,discover}.so
@@ -178,7 +170,7 @@
 
 package_pulseaudio-equalizer() {
   pkgdesc="Graphical equalizer for PulseAudio"
-  depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw)
+  depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus})
 
   mv equalizer/* "$pkgdir"
 }
@@ -185,7 +177,8 @@
 
 package_pulseaudio-rtp() {
   pkgdesc="RTP and RAOP support for PulseAudio"
-  depends=("pulseaudio=$pkgver-$pkgrel")
+  depends=("pulseaudio=$pkgver-$pkgrel" gst-plugins-base-libs gst-plugins-base
+           gst-plugins-good)
 
   mv rtp/* "$pkgdir"
 }