summaryrefslogtreecommitdiffstats
path: root/meta-pipewire/conf
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2021-02-11 14:13:55 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-05-26 19:50:23 +0000
commitfc722f8aea13246ce7779acbb3a59681b64131a6 (patch)
treef0ca74bffa3ed887affd3731bf1e57f6ceca614e /meta-pipewire/conf
parentb81c6beb388cafa6de9ca1baa13c3d529ca2f2d8 (diff)
meta-pipewire: backport pipewire updates from master
Bug-AGL: SPEC-3844 Bug-AGL: SPEC-3900 Bug-AGL: SPEC-3909 Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com> Change-Id: I3c32d0083f31f94b49e33c3dd546515d39df7867 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26360 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-pipewire/conf')
-rw-r--r--meta-pipewire/conf/include/agl-pipewire.inc3
-rw-r--r--meta-pipewire/conf/layer.conf1
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-pipewire/conf/include/agl-pipewire.inc b/meta-pipewire/conf/include/agl-pipewire.inc
index edd893115..7234633ff 100644
--- a/meta-pipewire/conf/include/agl-pipewire.inc
+++ b/meta-pipewire/conf/include/agl-pipewire.inc
@@ -1,3 +1,2 @@
DISTRO_FEATURES_append = " pipewire"
-PREFERRED_RPROVIDER_virtual/pipewire-config = "pipewire-conf-agl"
-PREFERRED_RPROVIDER_virtual/wireplumber-config = "wireplumber-board-config-agl"
+PREFERRED_RPROVIDER_virtual/wireplumber-config = "wireplumber-config-agl"
diff --git a/meta-pipewire/conf/layer.conf b/meta-pipewire/conf/layer.conf
index 5fe2ee2fd..850a5922c 100644
--- a/meta-pipewire/conf/layer.conf
+++ b/meta-pipewire/conf/layer.conf
@@ -10,6 +10,7 @@ BBFILE_PATTERN_meta-pipewire = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-pipewire = "71"
LAYERSERIES_COMPAT_meta-pipewire = "dunfell"
+LAYERDEPENDS_meta-pipewire = "openembedded-layer"
BBFILES_DYNAMIC += " \
app-framework:${LAYERDIR}/dynamic-layers/meta-app-framework/*/*/*.bb \