diff options
| author |   George Kiagiadakis <george.kiagiadakis@collabora.com> | 2019-09-02 17:52:31 +0300 |
|---|---|---|
| committer |   Scott Murray <scott.murray@konsulko.com> | 2019-09-04 00:43:56 +0000 |
| commit | 14a240cc44d6f72bca6b389b00efc5e07ef465cf (patch) | |
| tree | bee49da6d5bc614763ce196c4b930846bf5c64ed /meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb | |
| parent | 6ed548d49be95ba0164d380b5e386f36536e6b79 (diff) | |
pipewire config: enable bluez modules in pipewire and wireplumber
In pipewire we only enable that if the bluez5 feature is enabled
because otherwise the module is not compiled and will error out
at runtime.
In wireplumber we always enable it since it does not depend on bluez.
Bug-AGL: SPEC-2792
Change-Id: I53bbc387bccd953633affd4fc34949a2fd488ed7
Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
(cherry picked from commit 9fc6d8e9bbc9746777c03471b643992abcb182a5)
Diffstat (limited to 'meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb')
| -rw-r--r-- | meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb b/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb index 2bb76f9d..a28c6534 100644 --- a/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb +++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = " \ - file://pipewire.conf \ + file://pipewire.conf.in \ file://client.env \ file://server.env \ " @@ -17,8 +17,11 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install_append() { - # if we are distributing our own configuration file, - # replace the one installed by pipewire + # enable optional features in the config + BLUEZ5=${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', '', '#', d)} + sed -e "s/#IF_BLUEZ5 /${BLUEZ5}/" ${WORKDIR}/pipewire.conf.in > ${WORKDIR}/pipewire.conf + + # install our custom config install -d ${D}/${sysconfdir}/pipewire/ install -m 0644 ${WORKDIR}/pipewire.conf ${D}${sysconfdir}/pipewire/pipewire.conf |