summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/pulseaudio/pulseaudio-meta/asound.conf8
-rw-r--r--packages/pulseaudio/pulseaudio-meta_0.9.10.bb17
2 files changed, 22 insertions, 3 deletions
diff --git a/packages/pulseaudio/pulseaudio-meta/asound.conf b/packages/pulseaudio/pulseaudio-meta/asound.conf
new file mode 100644
index 0000000000..b435184575
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-meta/asound.conf
@@ -0,0 +1,8 @@
+# set default output to pulseaudio
+pcm.!default {
+ type pulse
+}
+
+ctl.!default {
+ type pulse
+}
diff --git a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
index e99654a44b..0f1dd6a5b6 100644
--- a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
+++ b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
@@ -11,16 +11,21 @@ RDEPENDS = "\
pulseaudio-module-cli-protocol-unix \
pulseaudio-module-suspend-on-idle \
gst-plugin-pulse \
+ libasound-module-ctl-pulse \
+ libasound-module-pcm-pulse \
"
-PR = "r0"
+PR = "r1"
inherit update-rc.d
INITSCRIPT_NAME = "pulseaudio"
INITSCRIPT_PARAMS = "defaults 35"
-SRC_URI = "file://pulseaudio \
- file://session"
+SRC_URI = "\
+ file://pulseaudio \
+ file://session \
+ file://asound.conf \
+"
S = "${WORKDIR}"
do_install() {
@@ -28,6 +33,12 @@ do_install() {
install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
install -d ${D}/${sysconfdir}/pulse
install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+ install -m 0644 ${WORKDIR}/asound.conf ${D}/${sysconfdir}
}
PACKAGE_ARCH = "all"
+
+CONFFILES_${PN} = "\
+ ${sysconfdir}/pulse/session \
+ ${sysconfdir}/asound.conf \
+"