Tue Mar 4 03:48:46 UTC 2014

3 files changed, 21 insertions, 70 deletions

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 7bb41eae2..528e99728 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198379 2013-10-30 14:30:54Z allan $
+# $Id: PKGBUILD 206632 2014-03-03 20:45:50Z 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,38 +7,34 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=4.0
-pkgrel=6
+pkgver=5.0
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(LGPL AGPL3)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc
-             lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing
+             speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack2-dbus sbc
+             lirc-utils openssl xenstore fftw orc json-c gtk3 webrtc-audio-processing
              check git)
 options=(!emptydirs)
-#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de
-        pulseaudio.xinit)
-sha256sums=('SKIP'
-            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
+source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz)
+sha256sums=('99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939')
 
 prepare() {
   cd $pkgbase-$pkgver
-  # ABI break https://bugs.freedesktop.org/show_bug.cgi?id=71047
-  git revert -n 16886bb b98a2e1
 }
 
 build() {
   cd $pkgbase-$pkgver
 
-  ./autogen.sh --prefix=/usr \
+  ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
     --with-udev-rules-dir=/usr/lib/udev/rules.d \
     --with-database=tdb \
     --disable-tcpwrap \
+    --disable-bluez4 \
     --disable-rpath \
     --disable-default-build-tests
 
@@ -49,27 +45,24 @@ build() {
 }
 
 package_pulseaudio() {
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc
+  depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb fftw orc
            libsamplerate webrtc-audio-processing sbc)
-  optdepends=('avahi: zeroconf support'
-              'bluez: bluetooth support'
-              'bluez-libs: bluetooth support'
-              'gconf: configuration through gconf (paprefs)'
-              'jack: jack support'
-              'lirc-utils: infra-red support'
-              'openssl: RAOP support'
-              'python-pyqt: Equalizer GUI (qpaeq)')
+  optdepends=('pulseaudio-alsa: ALSA configuration (recommended)'
+              'avahi: zeroconf publishing and discovery'
+              'bluez: Bluetooth'
+              'bluez-libs: Bluetooth'
+              'gconf: paprefs configuration'
+              'jack2-dbus: JACK support'
+              'lirc-utils: IR control'
+              'openssl: RAOP (AirPlay) output'
+              'python-pyqt4: Equalizer GUI (qpaeq)'
+              'xenstore: Xen paravirtual output')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
-  install=pulseaudio.install
 
   cd $pkgbase-$pkgver
   make -j1 DESTDIR="$pkgdir" install \
     bashcompletiondir=/usr/share/bash-completion/completions
 
-  # Disable autospawn by default
-  sed -e '/autospawn/iautospawn=no' \
-      -i "$pkgdir/etc/pulse/client.conf"
-
   # 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' \
@@ -80,8 +73,6 @@ package_pulseaudio() {
   sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
       -i "$pkgdir/usr/bin/start-pulseaudio-x11"
 
-  install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
-
   rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
 
   install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \
@@ -117,7 +108,7 @@ package_pulseaudio() {
 
 package_libpulse() {
   pkgdesc="$pkgdesc (client library)"
-  depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c)
+  depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c systemd)
   optdepends=('alsa-plugins: ALSA support'
               'avahi: zeroconf support')
   backup=(etc/pulse/client.conf)
diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install
deleted file mode 100755
index bed542ca8..000000000
--- a/extra/pulseaudio/pulseaudio.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  cat << MES
->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
-    on configuring your system for PulseAudio.
-
->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio.
-MES
-}
-
-post_upgrade() {
-  cat << MES
->>> If you have per-user copies of configuration files (such as client.conf,
-    daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you
-    keep them in sync with changes to the packaged files in /etc/pulse/.
-    Otherwise, PulseAudio may refuse to start due to configuration errors.
-MES
-  if (( $(vercmp $2 3.0-3) < 0 )); then
-    cat << MES
-
->>> Autospawn is now disabled by default. If you need to run PulseAudio outside
-    of an X session, either:
-      - Enable autospawn in client.conf, or
-      - Start it manually by executing 'pulseaudio --start'
-MES
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/pulseaudio/pulseaudio.xinit b/extra/pulseaudio/pulseaudio.xinit
deleted file mode 100644
index 2d30c0943..000000000
--- a/extra/pulseaudio/pulseaudio.xinit
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-case "$DESKTOP_SESSION" in
-  gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart
-  ;;
-  *)
-    # Extra checks in case DESKTOP_SESSION is not set correctly
-    if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then
-      /usr/bin/start-pulseaudio-x11
-    fi
-  ;;
-esac