From fc722f8aea13246ce7779acbb3a59681b64131a6 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Thu, 11 Feb 2021 14:13:55 +0200 Subject: meta-pipewire: backport pipewire updates from master Bug-AGL: SPEC-3844 Bug-AGL: SPEC-3900 Bug-AGL: SPEC-3909 Signed-off-by: George Kiagiadakis Change-Id: I3c32d0083f31f94b49e33c3dd546515d39df7867 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26360 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- meta-pipewire/conf/include/agl-pipewire.inc | 3 +-- meta-pipewire/conf/layer.conf | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-pipewire/conf') 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 \ -- cgit 1.2.3-korg