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 <george.kiagiadakis@collabora.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30243
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

1 files changed, 5 insertions, 11 deletions

diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb
index 1a031160e..7973a0a33 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb
@@ -6,26 +6,20 @@ SECTION     = "multimedia"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 SRC_URI = "\
-    file://policy.lua.d \
-    file://00-functions.lua \
-    file://policy.conf \
+    file://50-AGL-equalizer.conf \
+    file://50-AGL-media-role-nodes.conf \
 "
 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/"
     systemd_dir="${D}${sysconfdir}/systemd/system/pipewire.service.wants"
 
     install -d ${config_dir}
-    install -m 0644 ${WORKDIR}/00-functions.lua ${config_dir}
-
-    # config of the policy instance
-    install -d ${config_dir}/policy.lua.d/
-    ln -s ../00-functions.lua ${config_dir}/policy.lua.d/00-functions.lua
-    install -m 0644 ${WORKDIR}/policy.lua.d/*.lua ${config_dir}/policy.lua.d/
-    install -m 0644 ${WORKDIR}/policy.conf ${config_dir}
+    install -m 0644 ${WORKDIR}/50-AGL-equalizer.conf ${config_dir}
+    install -m 0644 ${WORKDIR}/50-AGL-media-role-nodes.conf ${config_dir}
 
     # enable additional systemd services
     install -d ${systemd_dir}