From dfb3e553f2b87951b1807ce972bea53dc3b167bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 15 May 2021 17:49:00 +0200
Subject: [PATCH] spotify / spotify-qt: Add only if meta-rust is in layers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise meta-rust is a hard dependency

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 750a9937b66e6f836de3a296d00c26557fb9fda6)
---
 conf/layer.conf                                              | 5 +++++
 .../spotify => dynamic-layers/meta-rust}/spotify-qt.bb       | 0
 .../spotify => dynamic-layers/meta-rust}/spotifyd.bb         | 0
 recipes-support/packagegroups/musicians-world.bb             | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)
 rename {recipes-streaming/spotify => dynamic-layers/meta-rust}/spotify-qt.bb (100%)
 rename {recipes-streaming/spotify => dynamic-layers/meta-rust}/spotifyd.bb (100%)

diff --git a/conf/layer.conf b/conf/layer.conf
index 32c4151..e770bcd 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,6 +6,11 @@ BBFILES += "${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/
 # appends
 BBFILES += "${LAYERDIR}/appends/*/*.bbappend"
 
+
+BBFILES_DYNAMIC += "\
+    rust-layer:${LAYERDIR}/dynamic-layers/meta-rust/*.bb \
+"
+
 BBFILE_COLLECTIONS += "meta-musicians"
 BBFILE_PATTERN_meta-musicians := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-musicians = "20"
diff --git a/recipes-streaming/spotify/spotify-qt.bb b/dynamic-layers/meta-rust/spotify-qt.bb
similarity index 100%
rename from recipes-streaming/spotify/spotify-qt.bb
rename to dynamic-layers/meta-rust/spotify-qt.bb
diff --git a/recipes-streaming/spotify/spotifyd.bb b/dynamic-layers/meta-rust/spotifyd.bb
similarity index 100%
rename from recipes-streaming/spotify/spotifyd.bb
rename to dynamic-layers/meta-rust/spotifyd.bb
diff --git a/recipes-support/packagegroups/musicians-world.bb b/recipes-support/packagegroups/musicians-world.bb
index d4eb86f..374e853 100644
--- a/recipes-support/packagegroups/musicians-world.bb
+++ b/recipes-support/packagegroups/musicians-world.bb
@@ -192,7 +192,7 @@ RDEPENDS_${PN} += " \
     ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion-dssi zyn-fusion-lv2 zyn-fusion-vst zyn-fusion-standalone", "zynaddsubfx-dssi zynaddsubfx-lv2 zynaddsubfx-vst zynaddsubfx-standalone",d)} \
     \
     \
-    spotifyd spotify-qt \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'rust-layer', 'spotifyd spotify-qt', '', d)} \
 "