diff options
| author |   Carlos Rafael Giani <crg7475@mailbox.org> | 2022-02-16 21:55:02 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-02-17 11:12:44 -0800 |
| commit | 6c6b8d97b4dd6dd3e951e9e0f66bf5ad505d73f8 (patch) | |
| tree | d5be1b89b606661338362627bda8a11375489b61 /meta-multimedia | |
| parent | 5c379cf62588c4e2365570010bcb115d5360e930 (diff) | |
| download | meta-openembedded-contrib-6c6b8d97b4dd6dd3e951e9e0f66bf5ad505d73f8.tar.gz | |
wireplumber: Improve configuration
By default, the WirePlumber lua scripts try to access a session DBus, which
is not available if WirePlumber is run system wide. Add a small script
that turns off the bits that require session DBus. These involve reserving
ALSA devices (only useful in multi-user desktop setups) and Flatpak.
Also, fix the configuration file paths (WirePlumber uses /usr/share instead
of /etc) and add the correct files to CONFFILES:${PN}.
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua | 5 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua b/meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua new file mode 100644 index 0000000000..353a49c0b5 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua @@ -0,0 +1,5 @@ +-- These features require a session DBus instance, which is not available +-- by default in OE generated images. The absence of such a DBus instance +-- causes WirePlumber to fail to start. Turn these off to prevent that. +alsa_monitor.properties["alsa.reserve"] = false +default_access.properties["enable-flatpak-portal"] = false diff --git a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb index 4d26e33608..2310c3a780 100644 --- a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb +++ b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb @@ -13,7 +13,8 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ SRCREV = "e14bb72dcc85e2130d0ea96768e5ae3b375a041e" SRC_URI = "git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ - " + file://90-OE-disable-session-dbus-dependent-features.lua \ + " S = "${WORKDIR}/git" @@ -50,6 +51,12 @@ PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends " WP_MODULE_SUBDIR = "wireplumber-0.4" +add_custom_lua_config_scripts() { + install -m 0644 ${WORKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d +} + +do_install[postfuncs] += "add_custom_lua_config_scripts" + python split_dynamic_packages () { # Create packages for each WirePlumber module. wp_module_libdir = d.expand('${libdir}/${WP_MODULE_SUBDIR}') @@ -117,12 +124,8 @@ PACKAGES_DYNAMIC = "^${PN}-modules.*" SYSTEMD_SERVICE:${PN} = "wireplumber.service" CONFFILES:${PN} += " \ - ${sysconfdir}/wireplumber/config.lua \ - ${sysconfdir}/wireplumber/config.lua.d/* \ -" -FILES:${PN} += " \ - ${sysconfdir}/wireplumber/config.lua \ - ${sysconfdir}/wireplumber/config.lua.d/* \ + ${datadir}/wireplumber/wireplumber.conf \ + ${datadir}/wireplumber/*.lua.d/* \ " # Add pipewire to RRECOMMENDS, since WirePlumber expects a PipeWire daemon to # be present. While in theory any application that uses libpipewire can configure |