summaryrefslogtreecommitdiffstats
path: root/meta-pipewire/recipes-multimedia
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2019-10-04 22:24:29 +0300
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2019-10-04 22:25:08 +0300
commit7dee6ae22387c2c2d8c8062af00df9b2a983672b (patch)
tree327a7c0f6f523b488fb6f6071dd17247f66abef0 /meta-pipewire/recipes-multimedia
parent97f4713a5a269f4d069bd475e1bccd90cf594171 (diff)
Revert "pipewire config: enable bluez modules in pipewire and wireplumber"
This reverts commit 9fc6d8e9bbc9746777c03471b643992abcb182a5. Native bluetooth implementation is no longer there. Bug-AGL: SPEC-2792 Change-Id: Ib45a0a3036aae8f3ac6dd29ed4e1f49e041af057 Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Diffstat (limited to 'meta-pipewire/recipes-multimedia')
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf (renamed from meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf.in)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, 3 insertions, 11 deletions
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf.in b/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf
index ad9ab7e6..d09ee8ed 100644
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf.in
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire-conf-agl/pipewire.conf
@@ -2,7 +2,6 @@
# 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 a28c6534..2bb76f9d 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.in \
+ file://pipewire.conf \
file://client.env \
file://server.env \
"
@@ -17,11 +17,8 @@ do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install_append() {
- # 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
+ # if we are distributing our own configuration file,
+ # replace the one installed by pipewire
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 fcd1b877..76a57419 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,10 +32,6 @@ 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: