5 files changed, 35 insertions, 15 deletions
diff --git a/packages/pulseaudio/files/fix-dbus-without-hal.patch b/packages/pulseaudio/files/fix-dbus-without-hal.patch
new file mode 100644
index 0000000000..f8ac5674a6
--- /dev/null
+++ b/packages/pulseaudio/files/fix-dbus-without-hal.patch
@@ -0,0 +1,15 @@
+Index: pulseaudio-0.9.8/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.8.orig/src/Makefile.am
++++ pulseaudio-0.9.8/src/Makefile.am
+@@ -1424,8 +1424,8 @@
+ # HAL
+ libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
+ libdbus_util_la_LDFLAGS = -avoid-version
+-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
+-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
++libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la
++libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
+ 
+ module_hal_detect_la_SOURCES = modules/module-hal-detect.c
+ module_hal_detect_la_LDFLAGS = -module -avoid-version
diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index f765bec1a1..b6b622d9c6 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -3,8 +3,7 @@ HOMEPAGE = "http://www.pulseaudio.org"
 AUTHOR = "Lennart Poettering"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-
-DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
+DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal"
 # optional
 DEPENDS += "alsa-lib glib-2.0"
 
@@ -21,6 +20,7 @@ EXTRA_OECONF = "\
 		--with-glib \
 		--with-alsa \
 		--with-oss \
+                --with-hal \
 		"
 
 PARALLEL_MAKE = ""
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
index a93c8ee251..aa07afe6fe 100644
--- a/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,4 +1,4 @@
 require pulse.inc
 
-PR = "r5"
+PR = "r6"
 
diff --git a/packages/pulseaudio/pulseaudio_0.9.7.bb b/packages/pulseaudio/pulseaudio_0.9.7.bb
deleted file mode 100644
index d466086b50..0000000000
--- a/packages/pulseaudio/pulseaudio_0.9.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require pulse.inc
-
-# this is not correct (see below)
-SRC_URI += "file://disable-using-glibc-tls.patch;patch=1"
-
-PR = "r0"
-
-# problems w/ pulseaudio 0.9.7 atm:
-# 1.) needs libtool 1.2.24 (which miscompiles plugins in OE, hence we can't make it the default yet)
-# 2.) doesn't build w/ glibc TLS support (hence patched out)
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/packages/pulseaudio/pulseaudio_0.9.8.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb
new file mode 100644
index 0000000000..93c8ffb849
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio_0.9.8.bb
@@ -0,0 +1,17 @@
+require pulse.inc
+
+DEPENDS += "dbus"
+
+# this is not correct (see below)
+SRC_URI += "\
+  file://disable-using-glibc-tls.patch;patch=1 \
+  file://fix-dbus-without-hal.patch;patch=1 \
+"            
+
+PR = "r0"
+
+# problems w/ pulseaudio 0.9.8 atm:
+# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
+# 2.) doesn't build w/ glibc TLS support (hence patched out)
+DEFAULT_PREFERENCE = "-1"
+