big fixes

2 files changed, 90 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67fe61fa22db..49368c59102f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,44 @@
 pkgbase = pulseaudio-nosystemd-minimal-git
 	pkgdesc = A featureful, general-purpose sound server
-	pkgver = 13.99.1+98+g460d0c0b7
+	pkgver = 14.2
 	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/PulseAudio/
 	arch = x86_64
 	license = GPL
-	makedepends = git
+	makedepends = libcap
 	makedepends = attr
+	makedepends = libxtst
+	makedepends = libsm
+	makedepends = libsndfile
 	makedepends = rtkit
-	makedepends = libcap
+	makedepends = speexdsp
 	makedepends = tdb
-	makedepends = intltool
-	makedepends = dconf
+	makedepends = dbus
+	makedepends = sbc
+	makedepends = lirc
+	makedepends = openssl
 	makedepends = orc
 	makedepends = check
+	makedepends = git
 	makedepends = meson
-	makedepends = speexdsp
-	optdepends = alsa-plugins: ALSA support
-	optdepends = pulseaudio-alsa: ALSA configuration (recommended)
-	options = !emptydirs
-	backup = etc/pulse/daemon.conf
-	backup = etc/pulse/default.pa
-	backup = etc/pulse/system.pa
-	backup = etc/pulse/client.conf
 	source = git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
 	sha256sums = SKIP
 
 pkgname = pulseaudio-nosystemd-minimal-git
+	depends = libpulse
+	depends = alsa-card-profiles
 	depends = rtkit
-	depends = libltdl
+	depends = speexdsp
 	depends = tdb
 	depends = orc
-	depends = speexdsp
-	depends = libpulse
+	depends = libxtst
 	optdepends = pulseaudio-alsa: ALSA configuration (recommended)
+	optdepends = pulseaudio-zeroconf: Zeroconf support
+	optdepends = pulseaudio-lirc: IR (lirc) support
+	optdepends = pulseaudio-jack: Jack support
+	optdepends = pulseaudio-bluetooth: Bluetooth support
+	optdepends = pulseaudio-equalizer: Graphical equalizer
+	optdepends = pulseaudio-rtp: RTP and RAOP support
 	provides = pulseaudio
 	conflicts = pulseaudio
 	replaces = pulseaudio-xen<=9.0
@@ -45,6 +50,7 @@ pkgname = pulseaudio-nosystemd-minimal-git
 pkgname = libpulse-nosystemd-minimal-git
 	pkgdesc = A featureful, general-purpose sound server (client library)
 	license = LGPL
+	depends = dbus
 	depends = libcap
 	depends = libxcb
 	depends = libsm
@@ -57,3 +63,9 @@ pkgname = libpulse-nosystemd-minimal-git
 	conflicts = libpulse
 	backup = etc/pulse/client.conf
 
+pkgname = alsa-card-profiles-nosystemd-minimal-git
+	pkgdesc = ALSA card profiles shared by PulseAudio
+	license = LGPL
+	provides = alsa-card-profiles
+	conflicts = alsa-card-profiles
+
diff --git a/PKGBUILD b/PKGBUILD
index 7d0bcf344883..6af0f0322d5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,18 @@
 # Maintainer:  Vincent Grande <shoober420@gmail.com>
-# Contributor: Jerome Leclanche <jerome@leclan.ch>
-# Contributor: Clément Démoulins <clement@archivel.fr>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com>
-# Contriubtor: Ben Morgan <neembi@gmail.com>
-# Contributor: Solomon Choina <shlomochoina@gmail.com>
-
-pkgname=(pulseaudio-nosystemd-minimal-git libpulse-nosystemd-minimal-git)
+# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+
+###  may require "ln -s /usr/include/locale.h /usr/include/xlocale.h"
+
+pkgname=(pulseaudio-nosystemd-minimal-git libpulse-nosystemd-minimal-git alsa-card-profiles-nosystemd-minimal-git)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=13.99.1+98+g460d0c0b7
+pkgver=14.2
 pkgrel=1
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
-makedepends=("git" "attr" "rtkit" "libcap"
-             "tdb" "intltool" "dconf"
-             "orc" "check" "meson" "speexdsp")
-optdepends=("alsa-plugins: ALSA support"
-            "pulseaudio-alsa: ALSA configuration (recommended)")
-backup=(etc/pulse/{daemon.conf,default.pa,system.pa,client.conf})
-options=(!emptydirs)
+makedepends=(libcap attr libxtst libsm libsndfile rtkit
+             speexdsp tdb dbus sbc
+             lirc openssl orc check git meson)
 source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git")
 sha256sums=('SKIP')
 
@@ -38,6 +28,7 @@ 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 \
@@ -68,13 +59,11 @@ build() {
     -D adrian-aec=false \
     -D webrtc-aec=disabled 
   meson compile -C build
-
-# glib needed for libpulse.so to be created
 }
 
 #check() {
 #  meson test -C build --print-errorlogs
-#  ninja -C build test-daemon
+#  ninja $NINJAFLAGS -C build test-daemon
 #}
 
 _pick() {
@@ -88,11 +77,18 @@ _pick() {
 }
 
 package_pulseaudio-nosystemd-minimal-git() {
-  depends=(rtkit libltdl tdb orc speexdsp libpulse)
-  optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
-  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
+  depends=(libpulse alsa-card-profiles rtkit speexdsp
+           tdb orc libxtst)
+  optdepends=('pulseaudio-alsa: ALSA configuration (recommended)'
+              'pulseaudio-zeroconf: Zeroconf support'
+              'pulseaudio-lirc: IR (lirc) support'
+              'pulseaudio-jack: Jack support'
+              'pulseaudio-bluetooth: Bluetooth support'
+              'pulseaudio-equalizer: Graphical equalizer'
+              'pulseaudio-rtp: RTP and RAOP support')
   provides=(pulseaudio)
   conflicts=(pulseaudio)
+  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   replaces=('pulseaudio-xen<=9.0' 'pulseaudio-gconf<=11.1')
 
   local pulsever=$(cd pulseaudio; ./git-version-gen .tarball-version)
@@ -118,20 +114,47 @@ package_pulseaudio-nosystemd-minimal-git() {
   sed -e '/Load several protocols/aload-module module-dbus-protocol' \
       -i etc/pulse/default.pa
 
+  rm -r etc/dbus-1
 
-### Split libpulse
+  # Split packages
   _pick libpulse etc/pulse/client.conf
-  _pick libpulse usr/bin/pa{cat,ctl,mon,play,rec,record}
+  _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/libpulsecommon-*.so
+  _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
+
+  _pick alsa-card-profiles usr/share/alsa-card-profile
+
+  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
+
+  _pick lirc $moddir/module-lirc.so
+
+  _pick jack $moddir/module-jack-{sink,source}.so
+  _pick jack $moddir/module-jackdbus-detect.so
+
+  _pick bluetooth $moddir/libbluez5-util.so
+  _pick bluetooth $moddir/module-bluetooth-{discover,policy}.so
+  _pick bluetooth $moddir/module-bluez5-{discover,device}.so
+
+  _pick equalizer $moddir/module-equalizer-sink.so
+  _pick equalizer usr/bin/qpaeq
+
+  _pick rtp $moddir/lib{rtp,raop}.so
+  _pick rtp $moddir/module-rtp-{send,recv}.so
+  _pick rtp $moddir/module-raop-sink.so
 }
 
 package_libpulse-nosystemd-minimal-git() {
   pkgdesc="$pkgdesc (client library)"
-  depends=(libcap libxcb libsm libsndfile)
+  depends=(dbus libcap libxcb libsm libsndfile)
   optdepends=('glib2: mainloop integration')
   provides=(libpulse{,-simple,-mainloop-glib}.so libpulse)
   conflicts=(libpulse)
@@ -140,4 +163,14 @@ package_libpulse-nosystemd-minimal-git() {
 
   mv libpulse/* "$pkgdir"
 }
+
+package_alsa-card-profiles-nosystemd-minimal-git() {
+  pkgdesc="ALSA card profiles shared by PulseAudio"
+  provides=(alsa-card-profiles)
+  conflicts=(alsa-card-profiles)
+  license=(LGPL)
+
+  mv alsa-card-profiles/* "$pkgdir"
+}
+
 # vim:set sw=2 et: