From 74b387be8d81928cace317e902c5c8efaa095d7f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 14 Nov 2017 15:37:40 -0500 Subject: Pulseaudio configuration fixes Some fixes to work when 4A is enabled: - Simplified the echo that adds /etc/pulse/default.d to /etc/pulse/default.pa, as it was resulting in "-e -n" in the file sometimes for reasons unknown. - PulseAudio does not like the /etc/pulse/default.d directory being empty, and additionally it was realized that the module unloads that are in module-router.pa are useful in all our usecases and should likely always be present. To kill two birds with one stone, the unload lines have been moved to a 10-unload-modules.pa file that is installed by the pulseaudio bbappend, and those lines have been removed from the module-router.pa files, which has been renamed to 20-module-router.pa so that ordering will be maintained if someone needs to reenable it. Change-Id: I70cd1d0dfc596b894009c1bdd7520ffe6394e60e Signed-off-by: Scott Murray --- .../pulseaudio-config-module-router/files/20-module-router.pa | 3 +++ .../pulseaudio-config-module-router/files/module-router.pa | 7 ------- .../pulseaudio-config-module-router_1.0.bb | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 recipes-multimedia/pulseaudio-config-module-router/files/20-module-router.pa delete mode 100644 recipes-multimedia/pulseaudio-config-module-router/files/module-router.pa (limited to 'recipes-multimedia/pulseaudio-config-module-router') diff --git a/recipes-multimedia/pulseaudio-config-module-router/files/20-module-router.pa b/recipes-multimedia/pulseaudio-config-module-router/files/20-module-router.pa new file mode 100644 index 00000000..4060feb4 --- /dev/null +++ b/recipes-multimedia/pulseaudio-config-module-router/files/20-module-router.pa @@ -0,0 +1,3 @@ +.ifexists module-router.so +load-module module-router +.endif diff --git a/recipes-multimedia/pulseaudio-config-module-router/files/module-router.pa b/recipes-multimedia/pulseaudio-config-module-router/files/module-router.pa deleted file mode 100644 index 4ead26e3..00000000 --- a/recipes-multimedia/pulseaudio-config-module-router/files/module-router.pa +++ /dev/null @@ -1,7 +0,0 @@ -.ifexists module-router.so -unload-module module-role-cork -unload-module module-device-restore -unload-module module-stream-restore -unload-module module-card-restore -load-module module-router -.endif diff --git a/recipes-multimedia/pulseaudio-config-module-router/pulseaudio-config-module-router_1.0.bb b/recipes-multimedia/pulseaudio-config-module-router/pulseaudio-config-module-router_1.0.bb index 710d82fb..d7c2f68b 100644 --- a/recipes-multimedia/pulseaudio-config-module-router/pulseaudio-config-module-router_1.0.bb +++ b/recipes-multimedia/pulseaudio-config-module-router/pulseaudio-config-module-router_1.0.bb @@ -2,11 +2,11 @@ SUMMARY = "PulseAudio configuration to enable router module" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = "file://module-router.pa" +SRC_URI = "file://20-module-router.pa" do_install () { install -d ${D}${sysconfdir}/pulse/default.d - install -m 0644 ${WORKDIR}/module-router.pa ${D}${sysconfdir}/pulse/default.d/ + install -m 0644 ${WORKDIR}/20-module-router.pa ${D}${sysconfdir}/pulse/default.d/ } RDEPENDS_${PN} = "module-router" -- cgit 1.2.3-korg