Wed Dec 19 02:48:18 PST 2012

2 files changed, 26 insertions, 10 deletions

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 0dad5f6fa..489dfeebd 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163774 2012-07-19 19:37:59Z heftig $
+# $Id: PKGBUILD 173315 2012-12-18 20:30:41Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,19 +7,19 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=2.1
-pkgrel=1
+pkgver=3.0
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(GPL LGPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core avahi bluez gconf intltool jack
+             speex tdb udev dbus-core avahi bluez gconf intltool jack sbc
              lirc-utils openssl fftw orc json-c gtk2 webrtc-audio-processing
-             libsystemd)
+             systemd check)
 options=(!emptydirs !libtool)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
         pulseaudio.xinit)
-sha256sums=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f'
+sha256sums=('c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d'
             'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
 
 build() {
@@ -31,7 +31,6 @@ build() {
     --localstatedir=/var \
     --with-udev-rules-dir=/usr/lib/udev/rules.d \
     --with-database=tdb \
-    --disable-hal \
     --disable-tcpwrap \
     --disable-rpath \
     --disable-default-build-tests
@@ -44,7 +43,7 @@ build() {
 
 package_pulseaudio() {
   depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc
-           libsamplerate webrtc-audio-processing libsystemd)
+           libsamplerate webrtc-audio-processing systemd sbc)
   optdepends=('avahi: zeroconf support'
               'bluez: bluetooth support'
               'gconf: configuration through gconf (paprefs)'
@@ -58,8 +57,10 @@ package_pulseaudio() {
   cd $pkgbase-$pkgver
   make -j1 DESTDIR="$pkgdir" install
 
+  # Speed up pulseaudio shutdown
   # Lower resample quality, saves CPU
-  sed -e '/resample-method/iresample-method=speex-float-0' \
+  sed -e '/exit-idle-time/iexit-idle-time=0' \
+      -e '/resample-method/iresample-method=speex-float-0' \
       -i "$pkgdir/etc/pulse/daemon.conf"
 
   # Disable cork-request module, can result in e.g. media players unpausing
@@ -78,12 +79,18 @@ package_pulseaudio() {
 
   rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
 
+  # cap is handled in .install
+  chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper"
+
 ### Split libpulse
 
-  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}}
+  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}}
 
   mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
 
+  mv "$pkgdir"/usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \
+     "$srcdir/libpulse/usr/bin"
+
   mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
      "$srcdir/libpulse/usr/lib"
 
@@ -96,6 +103,9 @@ package_pulseaudio() {
 
   mv {"$pkgdir","$srcdir/libpulse"}/usr/include
 
+  mv "$pkgdir"/usr/share/man/man1/pa{cat,ctl,dsp,play}.1 \
+     "$srcdir/libpulse/usr/share/man/man1"
+
   mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5
   mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala
 }
diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install
index 1dc4cefb3..0e599b856 100755
--- a/extra/pulseaudio/pulseaudio.install
+++ b/extra/pulseaudio/pulseaudio.install
@@ -1,4 +1,9 @@
+_common() {
+  setcap cap_net_raw=ep usr/lib/pulse/proximity-helper 2>/dev/null || chmod +s usr/lib/pulse/proximity-helper
+}
+
 post_install() {
+  _common
   cat << MES
 >>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
     on configuring your system for PulseAudio.
@@ -8,6 +13,7 @@ MES
 }
 
 post_upgrade() {
+  _common
   cat << MES
 >>> If you have per-user copies of configuration files (such as client.conf,
     daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync