[arch-commits] Commit in pulseaudio/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, December 29, 2011 @ 19:49:23
  Author: heftig
Revision: 145755

Fight overlinking, add gtk support

Modified:
  pulseaudio/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-29 22:32:13 UTC (rev 145754)
+++ PKGBUILD	2011-12-30 00:49:23 UTC (rev 145755)
@@ -8,13 +8,13 @@
 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 avahi bluez gconf intltool jack
-             lirc-utils openssl fftw orc json-c)
+             lirc-utils openssl fftw orc json-c gtk2)
 options=(!emptydirs !libtool)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
         $pkgbase.xinit)
@@ -34,6 +34,9 @@
     --disable-rpath \
     --disable-default-build-tests
 
+  # fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
@@ -51,7 +54,7 @@
   install=pulseaudio.install
 
   cd "$srcdir/$pkgbase-$pkgver"
-  make -j1 DESTDIR="$pkgdir" install 
+  make -j1 DESTDIR="$pkgdir" install
 
   # Lower resample quality, saves CPU
   sed -e '/resample-method/iresample-method=speex-float-0' \
@@ -62,9 +65,8 @@
   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
@@ -97,5 +99,6 @@
   optdepends=('alsa-plugins: ALSA support'
               'avahi: zeroconf support')
   backup=(etc/pulse/client.conf)
+
   mv "$srcdir"/libpulse/* "$pkgdir"
 }