pipewire recipe plumbing

This does enhance the recipes for pipewire and wireplumber in 2 ways:
a) we add a separate package for the configuration and make it replaceable
   w/o recompiling pipewire or wireplumber itself
b) this in turn makes the recipes not AGL specific and upstreamable as-is.

v2: enhanced config recipes
v3 & v4: fix typo

Bug-AGL: SPEC-2473

Change-Id: I1f6f32d7cc64d9424706ca6bc87550f5e2c6d359
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

1 files changed, 15 insertions, 14 deletions

diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire.inc b/meta-pipewire/recipes-multimedia/pipewire/pipewire.inc
index c1916c10..f7a6136d 100644
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire.inc
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire.inc
@@ -49,13 +49,6 @@ PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreame
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native"
 
 do_install_append() {
-    # if we are distributing our own configuration file,
-    # replace the one installed by pipewire
-    if [ -f ${WORKDIR}/pipewire.conf ]
-    then
-        install -m 0644 ${WORKDIR}/pipewire.conf ${D}${sysconfdir}/pipewire/pipewire.conf
-    fi
-
     # only install the alsa config file if the alsa-lib plugin has been built
     # this avoids creating the pipewire-alsa package when the pipewire-alsa
     # feature is not enabled
@@ -66,24 +59,21 @@ do_install_append() {
     fi
 }
 
-PACKAGES += "\
-    lib${PN} \
-    lib${PN}-modules \
+PACKAGES =+ "\
     ${PN}-spa-plugins \
     ${PN}-alsa \
     ${PN}-pulseaudio \
     ${PN}-jack \
+    ${PN}-config \
     gstreamer${GST_VER}-${PN} \
+    lib${PN} \
+    lib${PN}-modules \
 "
 
 FILES_${PN} = "\
     ${bindir}/pipewire* \
-    ${sysconfdir}/pipewire/pipewire.conf \
     ${systemd_user_unitdir}/* \
 "
-CONFFILES_${PN} += "\
-    ${sysconfdir}/pipewire/pipewire.conf \
-"
 
 FILES_lib${PN} = "\
     ${libdir}/libpipewire-*.so.* \
@@ -112,3 +102,14 @@ FILES_gstreamer${GST_VER}-${PN} = "\
 "
 
 RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins"
+
+# The default pipewire config.
+# Replace in your own package using
+# "virtual/pipewire-config"
+FILES_${PN}-config = "\
+    ${sysconfdir}/pipewire/pipewire.conf \
+"
+CONFFILES_${PN}-config += "\
+    ${sysconfdir}/pipewire/pipewire.conf \
+"
+RPROVIDES_${PN}-config += "virtual/pipewire-config"