From b0db8f5e35a65ac44fa8931cfbc8386e3db85cf1 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Wed, 4 Sep 2024 16:11:54 +0300 Subject: meta-pipewire: update wireplumber to 0.5.6 - use the wireplumber recipe from meta-openembedded (albeit copied here with the version changed, because 0.5.6 is not available in meta-openembedded) - rewrite configuration files as needed for 0.5.x - configure wireplumber with the main service masked, using only the template service files for a split-instance configuration. split-instance facilitates the multi-container setup that is used in the instrument cluster images. Bug-AGL: SPEC-4934 Change-Id: Ica83f869cdc9527a9edce25e63918a2ba97a4766 Signed-off-by: George Kiagiadakis Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30243 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller (cherry picked from commit 5dd43491b6e44664ad1d2e2fb596b6cb248c88fb) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30209 --- .../wireplumber/wireplumber-config-agl_git.bb | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb') diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb index 22ffe5bf3..db2c67dcf 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb @@ -6,12 +6,12 @@ SECTION = "multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "\ - file://bluetooth.lua.d/ \ - file://host.lua.d/ \ - file://00-functions.lua \ + file://20-AGL-log.conf \ + file://20-AGL-profiles.conf \ + file://30-AGL-alsa.conf \ + file://30-AGL-bluetooth.conf \ + file://50-AGL-pw-ic-ipc.conf \ file://alsa-suspend.lua \ - file://bluetooth.conf \ - file://wireplumber.conf \ file://wireplumber-bluetooth.conf \ " PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -19,27 +19,20 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" do_configure[noexec] = "1" do_compile[noexec] = "1" do_install:append() { - config_dir="${D}${sysconfdir}/wireplumber/" + config_dir="${D}${sysconfdir}/wireplumber/wireplumber.conf.d/" scripts_dir="${D}${datadir}/wireplumber/scripts/" dbus_config_dir="${D}${sysconfdir}/dbus-1/system.d/" systemd_dir="${D}${sysconfdir}/systemd/system/pipewire.service.wants/" + # install the configuration fragments install -d ${config_dir} - install -m 0644 ${WORKDIR}/00-functions.lua ${config_dir} + install -m 0644 ${WORKDIR}/20-AGL-log.conf ${config_dir} + install -m 0644 ${WORKDIR}/20-AGL-profiles.conf ${config_dir} + install -m 0644 ${WORKDIR}/30-AGL-alsa.conf ${config_dir} + install -m 0644 ${WORKDIR}/30-AGL-bluetooth.conf ${config_dir} + install -m 0644 ${WORKDIR}/50-AGL-pw-ic-ipc.conf ${config_dir} - # config of the main (host) instance - install -d ${config_dir}/host.lua.d/ - ln -s ../00-functions.lua ${config_dir}/host.lua.d/00-functions.lua - install -m 0644 ${WORKDIR}/host.lua.d/*.lua ${config_dir}/host.lua.d/ - install -m 0644 ${WORKDIR}/wireplumber.conf ${config_dir} - - # config of the bluetooth instance - install -d ${config_dir}/bluetooth.lua.d/ - ln -s ../00-functions.lua ${config_dir}/bluetooth.lua.d/00-functions.lua - install -m 0644 ${WORKDIR}/bluetooth.lua.d/*.lua ${config_dir}/bluetooth.lua.d/ - install -m 0644 ${WORKDIR}/bluetooth.conf ${config_dir} - - # install the alsa-suspend script, loaded by the main instance + # install the alsa-suspend script, loaded by the audio instance install -d ${scripts_dir} install -m 0644 ${WORKDIR}/alsa-suspend.lua ${scripts_dir} @@ -49,6 +42,8 @@ do_install:append() { # enable additional systemd services install -d ${systemd_dir} + ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@audio.service + ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@video-capture.service ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@bluetooth.service } -- cgit 1.2.3-korg