Merge branch 'master' of vparabola:~/abslibre-pre-mips64el

Conflicts:
	community/distcc/PKGBUILD
	community/lxtask/PKGBUILD
	community/ushare/PKGBUILD
	extra/catdoc/PKGBUILD
	extra/curl/PKGBUILD
	extra/ethstatus/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/metacity/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/x2x/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/wine/PKGBUILD
	testing/alex/PKGBUILD
	testing/ghc/PKGBUILD
	testing/haskell-cgi/PKGBUILD
	testing/haskell-deepseq/PKGBUILD
	testing/haskell-fgl/PKGBUILD
	testing/haskell-glut/PKGBUILD
	testing/haskell-haskell-src/PKGBUILD
	testing/haskell-html/PKGBUILD
	testing/haskell-http/PKGBUILD
	testing/haskell-hunit/PKGBUILD
	testing/haskell-mtl/PKGBUILD
	testing/haskell-network/PKGBUILD
	testing/haskell-opengl/PKGBUILD
	testing/haskell-parallel/PKGBUILD
	testing/haskell-parsec/PKGBUILD
	testing/haskell-platform/PKGBUILD
	testing/haskell-quickcheck/PKGBUILD
	testing/haskell-regex-base/PKGBUILD
	testing/haskell-regex-compat/PKGBUILD
	testing/haskell-regex-posix/PKGBUILD
	testing/haskell-stm/PKGBUILD
	testing/haskell-syb/PKGBUILD
	testing/haskell-text/PKGBUILD
	testing/haskell-transformers/PKGBUILD
	testing/haskell-xhtml/PKGBUILD
	testing/haskell-zlib/PKGBUILD
	testing/perl/ChangeLog
	testing/perl/PKGBUILD
	testing/perl/perlbin.sh
	testing/pidgin/PKGBUILD
	testing/spamassassin/PKGBUILD

2 files changed, 12 insertions, 15 deletions

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index a8dd4c997..73cc1d3a2 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103255 2010-12-17 00:02:37Z heftig $
+# $Id: PKGBUILD 128442 2011-06-23 23:49:30Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -6,18 +6,18 @@
 
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
-pkgver=0.9.22
-pkgrel=2
+pkgver=0.9.23
+pkgrel=1
 arch=(i686 x86_64 'mips64el')
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
-makedepends=(libasyncns libcap attr libxtst libsm tcp_wrappers libsndfile
-             libtool rtkit speex libsamplerate tdb udev dbus-core xcb-util
-             avahi bluez gconf intltool jack lirc-utils pkgconfig openssl)
+makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit
+             speex libsamplerate tdb udev dbus-core xcb-util avahi bluez
+             gconf intltool jack lirc-utils openssl)
 options=(!emptydirs !libtool !makeflags)
-source=("http://0pointer.de/lennart/projects/$pkgbase/$pkgbase-$pkgver.tar.gz"
+source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz"
         $pkgbase.xinit)
-md5sums=('ca85ab470669b05e100861654cf5eb3c'
+md5sums=('7391205a337d1e04a9ff38025f684034'
          'eb1cfae28eb2e4d3fdbe45a90e4318ab')
 
 build() {
@@ -32,6 +32,7 @@ build() {
     --localstatedir=/var \
     --with-database=tdb \
     --disable-hal \
+    --disable-tcpwrap \
     --disable-rpath \
     --disable-default-build-tests
 
@@ -53,7 +54,7 @@ package_pulseaudio() {
   cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # Lower resample quality
+  # Lower resample quality, saves CPU
   sed -e '/resample-method/iresample-method=speex-float-0' \
       -i "$pkgdir/etc/pulse/daemon.conf"
 
@@ -63,7 +64,7 @@ package_pulseaudio() {
       -i "$pkgdir/usr/bin/start-$pkgbase-x11"
 
   # Make module-console-kit optional
-  sed -e $'/module-console-kit/{i.nofail\n;a.fail\n;}' \
+  sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
       -i "$pkgdir/etc/pulse/default.pa"
 
   install -Dm755 "$srcdir/$pkgbase.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/$pkgbase"
@@ -89,8 +90,7 @@ package_pulseaudio() {
 
 package_libpulse() {
   pkgdesc="A featureful, general-purpose sound server (client library)"
-  depends=(tcp_wrappers dbus-core xcb-util libasyncns libcap libxtst libsm
-           libsndfile)
+  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile)
   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
index 67a346759..fd7db3b36 100755
--- a/extra/pulseaudio/pulseaudio.install
+++ b/extra/pulseaudio/pulseaudio.install
@@ -4,9 +4,6 @@ post_install() {
     on configuring your system for PulseAudio.
 
 >>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio.
-
->>> You might want to blacklist the "snd-pcm-oss" module in /etc/rc.conf to
-    keep ALSA's OSS emulation from interfering with ALSA or PulseAudio. 
 MES
 }