fix

2 files changed, 215 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfa9dc62a042..f746a7d5ca80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,10 @@
 pkgbase = pulseaudio-nosystemd-git
-	pkgdesc = A featureful, general-purpose sound server (development version)
-	pkgver = 13.99.2.r4.g36a86d414
+	pkgdesc = A featureful, general-purpose sound server
+	pkgver = 13.99.1+98+g460d0c0b7
 	pkgrel = 1
-	url = http://pulseaudio.org/
-	arch = i686
+	url = https://www.freedesktop.org/wiki/Software/PulseAudio/
 	arch = x86_64
-	arch = armv7h
 	license = GPL
-	license = LGPL
 	makedepends = git
 	makedepends = libasyncns
 	makedepends = libxtst
@@ -53,26 +50,6 @@ pkgbase = pulseaudio-nosystemd-git
 	optdepends = alsa-plugins: ALSA support
 	optdepends = pulseaudio-alsa: ALSA configuration (recommended)
 	optdepends = lirc-utils: infra-red support
-	provides = pulseaudio
-	provides = pulseaudio-zeroconf
-	provides = pulseaudio-lirc
-	provides = pulseaudio-jack
-	provides = pulseaudio-bluetooth
-	provides = pulseaudio-equalizer
-	provides = libpulse
-	provides = libpulse.so
-	provides = libpulse-simple.so
-	provides = libpulse-mainloop-glib.so
-	conflicts = pulseaudio
-	conflicts = pulseaudio-zeroconf
-	conflicts = pulseaudio-lirc
-	conflicts = pulseaudio-jack
-	conflicts = pulseaudio-bluetooth
-	conflicts = pulseaudio-equalizer
-	conflicts = libpulse
-	conflicts = libpulse.so
-	conflicts = libpulse-simple.so
-	conflicts = libpulse-mainloop-glib.so
 	options = !emptydirs
 	backup = etc/pulse/daemon.conf
 	backup = etc/pulse/default.pa
@@ -82,4 +59,76 @@ pkgbase = pulseaudio-nosystemd-git
 	sha256sums = SKIP
 
 pkgname = pulseaudio-nosystemd-git
+	depends = rtkit
+	depends = libltdl
+	depends = speexdsp
+	depends = tdb
+	depends = orc
+	depends = libsoxr
+	depends = webrtc-audio-processing
+	depends = gst-plugins-base-libs
+	optdepends = pulseaudio-alsa: ALSA configuration (recommended)
+	provides = pulseaudio
+	conflicts = pulseaudio
+	replaces = pulseaudio-xen<=9.0
+	replaces = pulseaudio-gconf<=11.1
+	backup = etc/pulse/daemon.conf
+	backup = etc/pulse/default.pa
+	backup = etc/pulse/system.pa
+
+pkgname = libpulse-nosystemd-git
+	pkgdesc = A featureful, general-purpose sound server (client library)
+	license = LGPL
+	depends = dbus
+	depends = libasyncns
+	depends = libcap
+	depends = libxtst
+	depends = libsm
+	depends = libsndfile
+	provides = libpulse.so
+	provides = libpulse-simple.so
+	provides = libpulse-mainloop-glib.so
+	provides = libpulse
+	conflicts = libpulse
+	backup = etc/pulse/client.conf
+
+pkgname = pulseaudio-zeroconf-nosystemd-git
+	pkgdesc = Zeroconf support for PulseAudio
+	depends = pulseaudio
+	depends = avahi
+	depends = openssl
+	provides = pulseaudio-zeroconf
+	conflicts = pulseaudio-zeroconf
+
+pkgname = pulseaudio-lirc-nosystemd-git
+	pkgdesc = IR (lirc) support for PulseAudio
+	depends = pulseaudio
+	depends = lirc
+	provides = pulseaudio-lirc
+	conflicts = pulseaudio-lirc
+
+pkgname = pulseaudio-jack-nosystemd-git
+	pkgdesc = Jack support for PulseAudio
+	depends = pulseaudio
+	depends = jack
+	provides = pulseaudio-jack
+	conflicts = pulseaudio-jack
+
+pkgname = pulseaudio-bluetooth-nosystemd-git
+	pkgdesc = Bluetooth support for PulseAudio
+	depends = pulseaudio
+	depends = bluez
+	depends = bluez-libs
+	depends = sbc
+	provides = pulseaudio-bluetooth
+	conflicts = pulseaudio-bluetooth
+
+pkgname = pulseaudio-equalizer-nosystemd-git
+	pkgdesc = Equalizer for PulseAudio
+	depends = pulseaudio
+	depends = python-pyqt5
+	depends = python-dbus
+	depends = fftw
+	provides = pulseaudio-equalizer
+	conflicts = pulseaudio-equalizer
 
diff --git a/PKGBUILD b/PKGBUILD
index 05ccc4b79acb..3a6495cd0960 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,13 @@
 # Contriubtor: Ben Morgan <neembi@gmail.com>
 # Contributor: Solomon Choina <shlomochoina@gmail.com>
 
-_pkgname="pulseaudio"
-pkgname="$_pkgname-nosystemd-git"
-pkgdesc="A featureful, general-purpose sound server (development version)"
-pkgver=13.99.2.r4.g36a86d414
+pkgname=(pulseaudio-nosystemd-git libpulse-nosystemd-git pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer}-nosystemd-git)
+pkgdesc="A featureful, general-purpose sound server"
+pkgver=13.99.1+98+g460d0c0b7
 pkgrel=1
-arch=("i686" "x86_64" "armv7h")
-url="http://pulseaudio.org/"
-license=("GPL" "LGPL")
+arch=(x86_64)
+url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+license=(GPL)
 depends=(lib{ltdl,soxr,asyncns,xtst,sndfile} "rtkit" "speexdsp" "tdb" "orc"
          "webrtc-audio-processing" jack2 "lirc" bluez{,-libs} "sbc"
          python-{pyqt5,dbus,sip} "fftw" dconf)
@@ -27,61 +26,165 @@ optdepends=("alsa-plugins: ALSA support"
             "pulseaudio-alsa: ALSA configuration (recommended)"
             "lirc-utils: infra-red support")
 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+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/$_pkgname"
-    git describe --long | sed 's/v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd pulseaudio
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd pulseaudio
+
 }
 
 build() {
-    arch-meson pulseaudio build \
-    -D gcov=false \
+  arch-meson pulseaudio build \
     -D pulsedsp-location='/usr/\$LIB/pulseaudio' \
+    -D stream-restore-clear-old-devices=true \
     -D udevrulesdir=/usr/lib/udev/rules.d \
     -D gcov=false \
     -D tests=false \
     -D systemd=disabled
-  ninja -C build
+  meson compile -C build
 }
 
 #check() {
 #  meson test -C build --print-errorlogs
 #  ninja -C build test-daemon
 #}
- 
-package() {
-    
 
-    DESTDIR="$pkgdir" meson install -C build
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_pulseaudio-nosystemd-git() {
+  depends=(rtkit libltdl speexdsp tdb orc libsoxr
+           webrtc-audio-processing gst-plugins-base-libs)
+  optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
+  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
+  provides=(pulseaudio)
+  conflicts=(pulseaudio)
+  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%%-*}
+
+  DESTDIR="$pkgdir" meson install -C build
+
+  cd "$pkgdir"
+
+  # Superseded by socket activation
+  sed -e '/autospawn/iautospawn = no' \
+      -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 usr/bin/start-pulseaudio-x11
+
+  # Required by qpaeq
+  sed -e '/Load several protocols/aload-module module-dbus-protocol' \
+      -i etc/pulse/default.pa
+
+  rm -r etc/dbus-1
+
+### Split libpulse
+  _pick libpulse etc/pulse/client.conf
+  _pick libpulse usr/bin/pa{cat,ctl,dsp,mon,play,rec,record}
+  _pick libpulse usr/lib/libpulse{,-simple,-mainloop-glib}.so*
+  _pick libpulse usr/lib/{cmake,pkgconfig}
+  _pick libpulse usr/lib/pulseaudio/libpulse{dsp,common-*}.so
+  _pick libpulse usr/include
+  _pick libpulse usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.1
+  _pick libpulse usr/share/man/man5/pulse-client.conf.5
+  _pick libpulse usr/share/vala
+
+### Split modules
+  local moddir=usr/lib/pulse-$pulsever/modules
+
+  _pick zeroconf $moddir/libavahi-wrap.so
+  _pick zeroconf $moddir/module-zeroconf-{publish,discover}.so
+  _pick zeroconf $moddir/module-raop-discover.so
 
-    cd "$pkgdir"
+  _pick lirc $moddir/module-lirc.so
 
-    # Assumes that any volume adjustment is intended by the user, who can control
-    # each app's volume. Misbehaving clients can trigger earsplitting volume
-    # jumps. App volumes can diverge wildly and cause apps without their own
-    # 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 etc/pulse/daemon.conf
+  _pick jack $moddir/module-jack-{sink,source}.so
+  _pick jack $moddir/module-jackdbus-detect.so
 
-    # Superseded by socket activation
-    sed -e '/autospawn/iautospawn = no' \
-        -i etc/pulse/client.conf
+  _pick bluetooth $moddir/libbluez5-util.so
+  _pick bluetooth $moddir/module-bluetooth-{discover,policy}.so
+  _pick bluetooth $moddir/module-bluez5-{discover,device}.so
 
-    # 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 usr/bin/start-pulseaudio-x11
+  _pick equalizer $moddir/module-equalizer-sink.so
+  _pick equalizer usr/bin/qpaeq
+}
+
+package_libpulse-nosystemd-git() {
+  pkgdesc="$pkgdesc (client library)"
+  depends=(dbus libasyncns libcap libxtst libsm libsndfile)
+  provides=(libpulse{,-simple,-mainloop-glib}.so libpulse)
+  conflicts=(libpulse)
+  license=(LGPL)
+  backup=(etc/pulse/client.conf)
+
+  mv libpulse/* "$pkgdir"
+}
+
+package_pulseaudio-zeroconf-nosystemd-git(){
+  pkgdesc="Zeroconf support for PulseAudio"
+  provides=(pulseaudio-zeroconf)
+  conflicts=(pulseaudio-zeroconf)
+  depends=(pulseaudio avahi openssl)
+
+  mv zeroconf/* "$pkgdir"
+}
+
+package_pulseaudio-lirc-nosystemd-git(){
+  pkgdesc="IR (lirc) support for PulseAudio"
+  depends=(pulseaudio lirc)
+  provides=(pulseaudio-lirc)
+  conflicts=(pulseaudio-lirc)
 
-    # Required by qpaeq
-    sed -e '/Load several protocols/aload-module module-dbus-protocol' \
-        -i "$pkgdir/etc/pulse/default.pa"
+  mv lirc/* "$pkgdir"
+}
+
+package_pulseaudio-jack-nosystemd-git(){
+  pkgdesc="Jack support for PulseAudio"
+  depends=(pulseaudio jack)
+  provides=(pulseaudio-jack)
+  conflicts=(pulseaudio-jack)
+
+  mv jack/* "$pkgdir"
+}
 
-    rm -r etc/dbus-1
+package_pulseaudio-bluetooth-nosystemd-git(){
+  pkgdesc="Bluetooth support for PulseAudio"
+  depends=(pulseaudio bluez bluez-libs sbc)
+  provides=(pulseaudio-bluetooth)
+  conflicts=(pulseaudio-bluetooth)
 
+  mv bluetooth/* "$pkgdir"
 }
+
+package_pulseaudio-equalizer-nosystemd-git(){
+  pkgdesc="Equalizer for PulseAudio"
+  depends=(pulseaudio python-{pyqt5,dbus} fftw)
+  provides=(pulseaudio-equalizer)
+  conflicts=(pulseaudio-equalizer)
+
+  mv equalizer/* "$pkgdir"
+}
+
+# vim:set sw=2 et: