update pkgver, no v

1 files changed, 25 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6acd6c347ea3..bb03231531ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,12 @@
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com>
 # Maintainer: Ben Morgan <neembi@gmail.com>
+# Maintainer: Solomon Choina <shlomochoina@gmail.com>
 
 _pkgname="pulseaudio"
 pkgname="$_pkgname-git"
 pkgdesc="A featureful, general-purpose sound server (development version)"
-pkgver=v13.99.1.35.g1778f76c7
+pkgver=13.99.2.r4.g36a86d414
 pkgrel=1
 arch=("i686" "x86_64" "armv7h")
 url="http://pulseaudio.org/"
@@ -20,7 +21,7 @@ depends=(lib{ltdl,soxr,asyncns,xtst,sndfile} "rtkit" "speexdsp" "tdb" "orc"
          python-{pyqt5,dbus,sip} "fftw" dconf)
 makedepends=("git" lib{asyncns,xtst,tool,soxr,sndfile} "attr" "rtkit" "speexdsp"
              "tdb" jack2 bluez{,-libs} "intltool"  "sbc" "lirc" "fftw"
-             "orc" "gtk3" "webrtc-audio-processing" "check" "autoconf-archive")
+             "orc" "gtk3" "webrtc-audio-processing" "check" "meson")
 optdepends=("alsa-plugins: ALSA support"
             "pulseaudio-alsa: ALSA configuration (recommended)"
             "lirc-utils: infra-red support")
@@ -28,48 +29,33 @@ backup=(etc/pulse/{daemon.conf,default.pa,system.pa,client.conf})
 provides=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse" libpulse{,-{simple,mainloop-glib}}.so)
 conflicts=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse" libpulse{,-{simple,mainloop-glib}}.so)
 options=(!emptydirs)
-source=("git+git://anongit.freedesktop.org/pulseaudio/pulseaudio")
+source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git")
 sha256sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/$_pkgname"
-    git describe --always | sed "s/-/./g"
-}
-
-prepare() {
-    cd "$srcdir/$_pkgname"
-    NOCONFIGURE=1 ./bootstrap.sh
+    git describe --long | sed 's/v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "$srcdir/$_pkgname"
-
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --libexecdir=/usr/lib \
-        --localstatedir=/var \
-        --with-udev-rules-dir=/usr/lib/udev/rules.d \
-        --with-pulsedsp-location='/usr/\\$$LIB/pulseaudio' \
-        --with-database=tdb \
-        --disable-tcpwrap \
-        --disable-bluez4 \
-        --disable-rpath \
-        --disable-default-build-tests \
-        DATADIRNAME=share
-
-    # fight unused direct deps
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
+    arch-meson pulseaudio build \
+    -D gcov=false \
+    -D pulsedsp-location='/usr/\$LIB/pulseaudio' \
+    -D udevrulesdir=/usr/lib/udev/rules.d
+  ninja -C build
 }
 
+check() {
+  meson test -C build --print-errorlogs
+  ninja -C build test-daemon
+}
+ 
 package() {
-    cd "$srcdir/$_pkgname"
-    make DESTDIR="$pkgdir" install bashcompletiondir=/usr/share/bash-completion/completions
+    
+
+    DESTDIR="$pkgdir" meson install -C build
 
-    # Speed up pulseaudio shutdown so that it exits immediately with
-    # the last user session (module-systemd-login keeps it alive)
-    sed -e "/exit-idle-time/iexit-idle-time=0" -i "$pkgdir/etc/pulse/daemon.conf"
+    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
@@ -77,21 +63,21 @@ package() {
     # 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 "$pkgdir/etc/pulse/daemon.conf"
+        -i etc/pulse/daemon.conf
 
     # Superseded by socket activation
     sed -e '/autospawn/iautospawn = no' \
-        -i "$pkgdir/etc/pulse/client.conf"
+        -i etc/pulse/client.conf
 
     # Disable cork-request module, can result in e.g. media players unpausing
-    # when there"s a Skype call incoming
-    sed -e "s|/usr/bin/pactl load-module module-x11-cork-request|#&|" -i "$pkgdir/usr/bin/start-pulseaudio-x11"
+    # when there's a Skype call incoming
+    sed -e "s|/usr/bin/pactl load-module module-x11-cork-request|#&|" \
+    -i usr/bin/start-pulseaudio-x11
 
     # Required by qpaeq
     sed -e '/Load several protocols/aload-module module-dbus-protocol' \
         -i "$pkgdir/etc/pulse/default.pa"
 
-    rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
+    rm -r etc/dbus-1
 
-    install -Dm644 shell-completion/zsh/_pulseaudio "$pkgdir/usr/share/zsh/site-functions/_pulseaudio"
 }