From 521f7a5f31fa9e943e2ba4ca9e6f07e0be2d70ee Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 22 Mar 2012 08:33:14 +0100
Subject: [PATCH] pulseaudio: update to pulseaudio-1.99.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/audio/pulseaudio/build                | 1 +
 packages/audio/pulseaudio/config/default.pa    | 2 +-
 packages/audio/pulseaudio/init.d/91_PulseAudio | 2 ++
 packages/audio/pulseaudio/install              | 2 +-
 packages/audio/pulseaudio/meta                 | 7 ++++---
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/audio/pulseaudio/build b/packages/audio/pulseaudio/build
index 651f05e802..baf5c314cb 100755
--- a/packages/audio/pulseaudio/build
+++ b/packages/audio/pulseaudio/build
@@ -50,6 +50,7 @@ cd $PKG_BUILD
             --disable-oss-wrapper \
             --disable-coreaudio-output \
             --enable-alsa \
+            --disable-esound \
             --disable-solaris \
             --disable-waveout \
             --disable-glib2 \
diff --git a/packages/audio/pulseaudio/config/default.pa b/packages/audio/pulseaudio/config/default.pa
index 814f24e45a..bf35f1e65b 100644
--- a/packages/audio/pulseaudio/config/default.pa
+++ b/packages/audio/pulseaudio/config/default.pa
@@ -44,7 +44,7 @@ load-module module-augment-properties
 #load-module module-alsa-sink device=hw:1,7
 #load-module module-alsa-sink
 #load-module module-alsa-source device=hw:1,0
-load-module module-alsa-source device=hw:1,7
+#load-module module-alsa-source device=hw:1,7
 #load-module module-null-sink
 #load-module module-pipe-sink
 
diff --git a/packages/audio/pulseaudio/init.d/91_PulseAudio b/packages/audio/pulseaudio/init.d/91_PulseAudio
index dcc70b6e8a..c1cf1951cc 100644
--- a/packages/audio/pulseaudio/init.d/91_PulseAudio
+++ b/packages/audio/pulseaudio/init.d/91_PulseAudio
@@ -26,3 +26,5 @@ progress "starting PulseAudio daemon"
   pulseaudio --system --daemonize \
              --log-target=file:/var/log/pulseaudio.log \
              --log-level=debug >/dev/null 2>&1
+
+  export SDL_AUDIODRIVER=pulse
diff --git a/packages/audio/pulseaudio/install b/packages/audio/pulseaudio/install
index 4081798b17..7eb8d21747 100755
--- a/packages/audio/pulseaudio/install
+++ b/packages/audio/pulseaudio/install
@@ -48,7 +48,7 @@ mkdir -p $INSTALL/usr/lib/pulse
   cp -P $PKG_BUILD/src/.libs/libavahi-wrap.so $INSTALL/usr/lib/pulse
   cp -P $PKG_BUILD/src/.libs/libcli.so $INSTALL/usr/lib/pulse
   cp -P $PKG_BUILD/src/.libs/libprotocol-cli.so $INSTALL/usr/lib/pulse
-  cp -P $PKG_BUILD/src/.libs/libprotocol-esound.so $INSTALL/usr/lib/pulse
+#  cp -P $PKG_BUILD/src/.libs/libprotocol-esound.so $INSTALL/usr/lib/pulse
   cp -P $PKG_BUILD/src/.libs/libprotocol-http.so $INSTALL/usr/lib/pulse
   cp -P $PKG_BUILD/src/.libs/libprotocol-native.so $INSTALL/usr/lib/pulse
   cp -P $PKG_BUILD/src/.libs/libprotocol-simple.so $INSTALL/usr/lib/pulse
diff --git a/packages/audio/pulseaudio/meta b/packages/audio/pulseaudio/meta
index 952d5f3e46..1f0533eaf8 100644
--- a/packages/audio/pulseaudio/meta
+++ b/packages/audio/pulseaudio/meta
@@ -19,14 +19,15 @@
 ################################################################################
 
 PKG_NAME="pulseaudio"
-PKG_VERSION="1.1"
+#PKG_VERSION="1.1"
+PKG_VERSION="1.99.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
 PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl"
-PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl"
+PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl libcap"
+PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl libcap"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"