3 files changed, 47 insertions, 1 deletions
diff --git a/packages/pulseaudio/files/asound.conf.pulseaudio b/packages/pulseaudio/files/asound.conf.pulseaudio
new file mode 100644
index 0000000000..71f01f2c3c
--- /dev/null
+++ b/packages/pulseaudio/files/asound.conf.pulseaudio
@@ -0,0 +1,7 @@
+pcm.pulse {
+    type pulse
+}
+
+ctl.pulse {
+    type pulse
+}
diff --git a/packages/pulseaudio/pulseaudio-alsa-wrapper.bb b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
new file mode 100644
index 0000000000..7a287da773
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Meta package to make alsa transparently use pulseaudio"
+LICENSE = "GPLv2"
+
+SRC_URI = "file://asound.conf.pulseaudio"
+
+RDEPENDS = "hal \
+	pulseaudio-server \
+	pulseaudio-misc \
+	pulseaudio-module-alsa-sink \
+	pulseaudio-module-alsa-source \
+	pulseaudio-module-hal-detect \
+	libasound-module-ctl-pulse \
+	libasound-module-pcm-pulse \
+"
+
+do_install() {
+	install -d ${D}/${sysconfdir}
+	install -m 0644 ${WORKDIR}/asound.conf.pulseaudio ${D}/${sysconfdir}
+}
+
+PACKAGE_ARCH = "all"
+
+pkg_postinst_${PN} () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+
+mkdir -p /etc/pulse || true
+# Remove existing entries
+if [ -e /etc/pulse/session ] ; then
+        sed -i -e /load-module\ module-hal-detect/d /etc/pulse/session
+fi
+# Load hal-detect module to avoid alsa->pulse-alsa-pulse->.. loops
+echo "load-module module-hal-detect" >> /etc/pulse/session
+}
+
diff --git a/packages/pulseaudio/pulseaudio-esd-wrapper.bb b/packages/pulseaudio/pulseaudio-esd-wrapper.bb
index 30164225df..d1ae362c14 100644
--- a/packages/pulseaudio/pulseaudio-esd-wrapper.bb
+++ b/packages/pulseaudio/pulseaudio-esd-wrapper.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "Drop-in Esound replacement"
 LICENSE = "GPLv2"
 
+PR = "r1"
+
 RCONFLICTS = "esd"
 RREPLACES = "esd"
 
@@ -31,7 +33,7 @@ fi
 mkdir -p /etc/pulse || true
 # Remove existing entries
 if [ -e /etc/pulse/session ] ; then
-        sed -i -e /load-module\ module-esound-protocol-unix/d e /load-module\ module-esound-protocol-tcp/d /etc/pulse/session
+        sed -i -e /load-module\ module-esound-protocol-unix/d -e /load-module\ module-esound-protocol-tcp/d /etc/pulse/session
 fi
 # Load esound modules
 echo "load-module module-esound-protocol-tcp" >> /etc/pulse/session