extra/pulseaudio to 12.99.3-1

extra/pulseaudio/0001-disable-neon.patch

@@ -0,0 +1,24 @@
+From 253893b4a7eec97e96114bfad6a974d03c0a0bbb Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Thu, 12 Sep 2019 05:44:39 -0600
+Subject: [PATCH] disable neon
+
+---
+ src/pulsecore/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
+index 19f6b9e99..09193eb19 100644
+--- a/src/pulsecore/meson.build
++++ b/src/pulsecore/meson.build
+@@ -174,7 +174,6 @@ simd = import('unstable-simd')
+ libpulsecore_simd = simd.check('libpulsecore_simd',
+   mmx : ['remap_mmx.c', 'svolume_mmx.c'],
+   sse : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'],
+-  neon : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'],
+   c_args : [pa_c_args],
+   include_directories : [configinc, topinc],
+   implicit_include_directories : false,
+-- 
+2.23.0
+

extra/pulseaudio/PKGBUILD

@@ -1,28 +1,28 @@
-# $Id$
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - added --disable-neon-opt to configure
+#  - patch to remove meson NEON check
 
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer})
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=12.2
+pkgver=12.99.3
-pkgrel=2
+pkgrel=1
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
-makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit libsoxr
+makedepends=(libasyncns libcap attr libxtst libsm libsndfile rtkit libsoxr
-             speexdsp tdb systemd dbus avahi bluez bluez-libs intltool jack2-dbus sbc
+             speexdsp tdb systemd dbus avahi bluez bluez-libs jack2 sbc
-             lirc openssl fftw orc gtk3 webrtc-audio-processing
+             lirc openssl fftw orc gtk3 webrtc-audio-processing check git meson
-             check autoconf-archive git)
+             xmltoman)
-options=(!emptydirs)
+_commit=fb530e0f3b2e36cfd28fb975237144d083419044  # tags/v12.99.3^0
-_commit=ee910cf6daa5120ab534eb2e6c573d94b9b182e7  # tags/v12.2^0
+source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit"
-source=("git+https://anongit.freedesktop.org/git/pulseaudio/pulseaudio#commit=$_commit")
+        '0001-disable-neon.patch')
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            'b1c20e992511e62f28434f0c4217c13aa9a557ae93dda5df4127aa42b0800614')
 
 pkgver() {
   cd pulseaudio
@@ -31,33 +31,32 @@ pkgver() {
 
 prepare() {
   cd pulseaudio
-  NOCONFIGURE=1 ./bootstrap.sh
+  if [[ $CARCH != "aarch64" ]]; then
+    patch -p1 -i ../0001-disable-neon.patch
+  fi
 }
 
 build() {
-  cd pulseaudio
+  arch-meson pulseaudio build \
+    -D gcov=false \
+    -D pulsedsp-location='/usr/\$LIB/pulseaudio' \
+    -D udevrulesdir=/usr/lib/udev/rules.d
+  ninja -C build
+}
 
-  [[ $CARCH != "aarch64" ]] && CONFIG="--disable-neon-opt"
+check() {
+  meson test -C build --print-errorlogs
+  ninja -C build test-daemon
+}
 
-  ./configure --prefix=/usr \
+_pick() {
-    --sysconfdir=/etc \
+  local p="$1" f d; shift
-    --libexecdir=/usr/lib \
+  for f; do
-    --localstatedir=/var \
+    d="$srcdir/$p/${f#$pkgdir/}"
-    --with-udev-rules-dir=/usr/lib/udev/rules.d \
+    mkdir -p "$(dirname "$d")"
-    --with-pulsedsp-location='/usr/\\$$LIB/pulseaudio' \
+    mv "$f" "$d"
-    --with-database=tdb \
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
-    --disable-tcpwrap \
+  done
-    --disable-bluez4 \
-    --disable-samplerate \
-    --disable-rpath \
-    --disable-default-build-tests \
-    $CONFIG \
-   DATADIRNAME=share
-
-  # fight unused direct deps
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
 }
 
 package_pulseaudio() {
@@ -68,16 +67,13 @@ package_pulseaudio() {
   install=pulseaudio.install
   replaces=('pulseaudio-xen<=9.0' 'pulseaudio-gconf<=11.1')
 
-  cd pulseaudio
+  local pulsever=$(cd pulseaudio; ./git-version-gen .tarball-version)
-
+  while [[ $pulsever = *.*.* ]]; do
-  _pulsever=$(./git-version-gen .tarball-version)
+    pulsever=${pulsever%.*}
-  while [[ $_pulsever = *.*.* ]]; do
-    _pulsever=${_pulsever%.*}
   done
-  _pulsever=${_pulsever%%-*}
+  pulsever=${pulsever%%-*}
 
-  make -j1 DESTDIR="$pkgdir" install \
+  DESTDIR="$pkgdir" meson install -C build
-    bashcompletiondir=/usr/share/bash-completion/completions
 
   cd "$pkgdir"
 
@@ -102,58 +98,37 @@ package_pulseaudio() {
   sed -e '/Load several protocols/aload-module module-dbus-protocol' \
       -i etc/pulse/default.pa
 
-  rm etc/dbus-1/system.d/pulseaudio-system.conf
+  rm -r etc/dbus-1
 
 ### Split libpulse
-
+  _pick libpulse etc/pulse/client.conf
-  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}}
+  _pick libpulse usr/bin/pa{cat,ctl,dsp,mon,play,rec,record}
-
+  _pick libpulse usr/lib/libpulse{,-simple,-mainloop-glib}.so*
-  mv etc/pulse/client.conf \
+  _pick libpulse usr/lib/{cmake,pkgconfig}
-     "$srcdir/libpulse/etc/pulse"
+  _pick libpulse usr/lib/pulseaudio/libpulse{dsp,common-*}.so
-
+  _pick libpulse usr/include
-  mv usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \
+  _pick libpulse usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.1
-     "$srcdir/libpulse/usr/bin"
+  _pick libpulse usr/share/man/man5/pulse-client.conf.5
-
+  _pick libpulse usr/share/vala
-  mv usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
-     usr/lib/{cmake,pkgconfig} \
-     "$srcdir/libpulse/usr/lib"
-
-  mv usr/lib/pulseaudio/libpulse{dsp,common-*}.so \
-     "$srcdir/libpulse/usr/lib/pulseaudio"
-
-  mv usr/include \
-     "$srcdir/libpulse/usr"
-
-  mv usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.1 \
-     "$srcdir/libpulse/usr/share/man/man1"
-
-  mv usr/share/man/man5/pulse-client.conf.5 \
-     "$srcdir/libpulse/usr/share/man/man5"
-
-  mv usr/share/vala \
-     "$srcdir/libpulse/usr/share"
 
 ### Split modules
+  local moddir=usr/lib/pulse-$pulsever/modules
 
-  mkdir -p "$srcdir"/{zeroconf,lirc,jack,bluetooth,equalizer}/usr/lib/pulse-$_pulsever/modules \
+  _pick zeroconf $moddir/libavahi-wrap.so
-           "$srcdir"/equalizer/usr/bin
+  _pick zeroconf $moddir/module-zeroconf-{publish,discover}.so
+  _pick zeroconf $moddir/module-raop-discover.so
 
-  mv usr/lib/pulse-$_pulsever/modules/{libavahi-wrap,module-{zeroconf-{publish,discover},raop-discover}}.so \
+  _pick lirc $moddir/module-lirc.so
-     "$srcdir/zeroconf/usr/lib/pulse-$_pulsever/modules"
 
-  mv usr/lib/pulse-$_pulsever/modules/module-lirc.so \
+  _pick jack $moddir/module-jack-{sink,source}.so
-     "$srcdir/lirc/usr/lib/pulse-$_pulsever/modules"
+  _pick jack $moddir/module-jackdbus-detect.so
 
-  mv usr/lib/pulse-$_pulsever/modules/module-jack{-sink,-source,dbus-detect}.so \
+  _pick bluetooth $moddir/libbluez5-util.so
-     "$srcdir/jack/usr/lib/pulse-$_pulsever/modules"
+  _pick bluetooth $moddir/module-bluetooth-{discover,policy}.so
+  _pick bluetooth $moddir/module-bluez5-{discover,device}.so
 
-  mv usr/lib/pulse-$_pulsever/modules/{libbluez5-util,module-{bluetooth-{discover,policy},bluez5-{discover,device}}}.so \
+  _pick equalizer $moddir/module-equalizer-sink.so
-     "$srcdir/bluetooth/usr/lib/pulse-$_pulsever/modules"
+  _pick equalizer usr/bin/qpaeq
-
-  mv usr/lib/pulse-$_pulsever/modules/module-equalizer-sink.so \
-     "$srcdir/equalizer/usr/lib/pulse-$_pulsever/modules"
-  mv usr/bin/qpaeq \
-     "$srcdir/equalizer/usr/bin"
 }
 
 package_libpulse() {
@@ -162,40 +137,42 @@ package_libpulse() {
   license=(LGPL)
   backup=(etc/pulse/client.conf)
 
-  mv "$srcdir"/libpulse/* "$pkgdir"
+  mv libpulse/* "$pkgdir"
 }
 
 package_pulseaudio-zeroconf(){
   pkgdesc="Zeroconf support for PulseAudio"
   depends=("pulseaudio=$pkgver-$pkgrel" avahi openssl)
 
-  mv "$srcdir"/zeroconf/* "$pkgdir"
+  mv zeroconf/* "$pkgdir"
 }
 
 package_pulseaudio-lirc(){
   pkgdesc="IR (lirc) support for PulseAudio"
   depends=("pulseaudio=$pkgver-$pkgrel" lirc)
 
-  mv "$srcdir"/lirc/* "$pkgdir"
+  mv lirc/* "$pkgdir"
 }
 
 package_pulseaudio-jack(){
   pkgdesc="Jack support for PulseAudio"
   depends=("pulseaudio=$pkgver-$pkgrel" jack)
 
-  mv "$srcdir"/jack/* "$pkgdir"
+  mv jack/* "$pkgdir"
 }
 
 package_pulseaudio-bluetooth(){
   pkgdesc="Bluetooth support for PulseAudio"
   depends=("pulseaudio=$pkgver-$pkgrel" bluez bluez-libs sbc)
 
-  mv "$srcdir"/bluetooth/* "$pkgdir"
+  mv bluetooth/* "$pkgdir"
 }
 
 package_pulseaudio-equalizer(){
   pkgdesc="Equalizer for PulseAudio"
   depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus,sip} fftw)
 
-  mv "$srcdir"/equalizer/* "$pkgdir"
+  mv equalizer/* "$pkgdir"
 }
+
+# vim:set sw=2 et: