Sat Jan 7 23:14:43 UTC 2012

1 files changed, 13 insertions, 9 deletions

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 6384fb1fd..47ce4369e 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140984 2011-10-20 15:35:19Z heftig $
+# $Id: PKGBUILD 146236 2012-01-06 17:00:30Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,14 +8,14 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack
-             lirc-utils openssl fftw orc json-c)
-options=(!emptydirs !libtool !makeflags)
+             speex tdb udev dbus-core avahi bluez gconf intltool jack
+             lirc-utils openssl fftw orc json-c gtk2)
+options=(!emptydirs !libtool)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
         $pkgbase.xinit)
 sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee'
@@ -34,6 +34,9 @@ build() {
     --disable-rpath \
     --disable-default-build-tests
 
+  # fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
@@ -49,8 +52,9 @@ package_pulseaudio() {
               'python2-pyqt: Equalizer GUI (qpaeq)')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
+
   cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make -j1 DESTDIR="$pkgdir" install
 
   # Lower resample quality, saves CPU
   sed -e '/resample-method/iresample-method=speex-float-0' \
@@ -61,9 +65,8 @@ package_pulseaudio() {
   sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
       -i "$pkgdir/usr/bin/start-pulseaudio-x11"
 
-  # Make some modules optional
+  # Make ConsoleKit optional
   sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
-      -e '/load-module module-jackdbus-detect/s/^/#/' \
       -i "$pkgdir/etc/pulse/default.pa"
 
   # Python fix
@@ -92,9 +95,10 @@ package_pulseaudio() {
 
 package_libpulse() {
   pkgdesc="$pkgdesc (client library)"
-  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile json-c)
+  depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c)
   optdepends=('alsa-plugins: ALSA support'
               'avahi: zeroconf support')
   backup=(etc/pulse/client.conf)
+
   mv "$srcdir"/libpulse/* "$pkgdir"
 }