diff options
Diffstat (limited to 'recipes-multimedia/pulseaudio')
3 files changed, 4 insertions, 60 deletions
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/0001-disable-module-role-cork-by-default.patch b/recipes-multimedia/pulseaudio/pulseaudio/0001-disable-module-role-cork-by-default.patch deleted file mode 100644 index 7472b47b..00000000 --- a/recipes-multimedia/pulseaudio/pulseaudio/0001-disable-module-role-cork-by-default.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9cbdc0472973c23b4e93200ed30afecbd0ef24d6 Mon Sep 17 00:00:00 2001 -From: Matt Porter <mporter@konsulko.com> -Date: Tue, 27 Jun 2017 21:50:23 +0300 -Subject: [PATCH] disable module-role-cork by default - -module-role-cork's hardcoded default corking policies can conflict -with module-router and AudioManager's configurable routing policies. -Disable it to avoid unwanted corking changes on streams. - -Signed-off-by: Matt Porter <mporter@konsulko.com> ---- - src/daemon/default.pa.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in -index d46bd5e..023e680 100755 ---- a/src/daemon/default.pa.in -+++ b/src/daemon/default.pa.in -@@ -151,7 +151,7 @@ load-module module-systemd-login - load-module module-position-event-sounds - - ### Cork music/video streams when a phone stream is active --load-module module-role-cork -+#load-module module-role-cork - - ### Modules to allow autoloading of filters (such as echo cancellation) - ### on demand. module-filter-heuristics tries to determine what filters --- -2.11.0 - diff --git a/recipes-multimedia/pulseaudio/pulseaudio/0006-auto-load-module-router.patch b/recipes-multimedia/pulseaudio/pulseaudio/0006-auto-load-module-router.patch deleted file mode 100644 index e1ae914f..00000000 --- a/recipes-multimedia/pulseaudio/pulseaudio/0006-auto-load-module-router.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in -index 783e326..3c68638 100755 ---- a/src/daemon/default.pa.in -+++ b/src/daemon/default.pa.in -@@ -35,9 +35,9 @@ load-sample-dir-lazy %WINDIR%\Media\*.wav - .fail - - ### Automatically restore the volume of streams and devices --load-module module-device-restore --load-module module-stream-restore --load-module module-card-restore -+#load-module module-device-restore -+#load-module module-stream-restore -+#load-module module-card-restore - - ### Automatically augment property information from .desktop files - ### stored in /usr/share/application -@@ -195,3 +195,8 @@ ifelse(@HAVE_X11@, 1, [dnl - ### Make some devices default - #set-default-sink output - #set-default-source input -+ -+.ifexists module-router.so -+load-module module-router -+.endif -+ diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index 98630548..5b779b76 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0006-auto-load-module-router.patch" -SRC_URI += "file://0001-disable-module-role-cork-by-default.patch" +# Add .include directive to default.pa so optional configuration can be added +do_install_append () { + echo -n "\n.include ${sysconfdir}/pulse/default.d\n" >> ${D}${sysconfdir}/pulse/default.pa +} |