summaryrefslogtreecommitdiffstats
path: root/meta-pipewire
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2019-09-02 17:52:31 +0300
committerScott Murray <scott.murray@konsulko.com>2019-09-04 00:43:56 +0000
commit14a240cc44d6f72bca6b389b00efc5e07ef465cf (patch)
treebee49da6d5bc614763ce196c4b930846bf5c64ed /meta-pipewire
parent6ed548d49be95ba0164d380b5e386f36536e6b79 (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')
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf.in (renamed from meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf)1
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl_git.bb9
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in4
3 files changed, 11 insertions, 3 deletions
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf b/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf.in
index d09ee8ed..ad9ab7e6 100644
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf.in
@@ -2,6 +2,7 @@
# distributed by Automotive Grade Linux
load-module libpipewire-module-protocol-native
load-module libpipewire-module-spa-monitor alsa/libspa-alsa alsa-monitor alsa
+#IF_BLUEZ5 load-module libpipewire-module-spa-monitor bluez5/libspa-bluez5 bluez5-monitor bluez5
load-module libpipewire-module-client-node
load-module libpipewire-module-access
load-module libpipewire-module-audio-dsp
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
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in
index 76a57419..fcd1b877 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/wireplumber.conf.in
@@ -32,6 +32,10 @@ load-module C libwireplumber-module-pw-alsa-udev {
# and creates simple-endpoints for each one of them
load-module C libwireplumber-module-pw-audio-client
+# Monitors the Bluetooth devices that are discovered via pipewire
+# and creates simple-endpoints for each one of them
+load-module C libwireplumber-module-pw-bluez
+
# Implements linking clients to devices and maintains
# information about the devices to be used.
# Notes: