From 63c6b83bc69eb8658aea8a200510ef8aadae1847 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 13 Jul 2018 11:46:51 +0200
Subject: Fix 4a-mixer parsing error on nogfx build variant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The nogfx build variant fails with 4a enabled ( https://gerrit.automotivelinux.org/gerrit/#/c/15051/ )
This is documented in SPEC-1588.
To fix this we apply a conditional inclusion in meta-audio-4a-framework to only pull-in the mixer if
we are including meta-agl-demo. Can be more fine-grained (profile-graphical-qt5 maybe) later.

Bug-AGL: SPEC-1588

Fast inclusion requested as it is a blocker for RC2 due to enabling 4a in CI.

Change-Id: I59b82748ba8e1736358318373d29f8f9fed2a5c5
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 meta-audio-4a-framework/conf/layer.conf            | 11 ++++++++++
 .../recipes-multimedia/4a-mixer/4a-mixer_git.bb    | 25 ++++++++++++++++++++++
 .../recipes-multimedia/4a-mixer/4a-mixer_git.bb    | 25 ----------------------
 3 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb
 delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb

diff --git a/meta-audio-4a-framework/conf/layer.conf b/meta-audio-4a-framework/conf/layer.conf
index 1b2ee279..7c3237a7 100644
--- a/meta-audio-4a-framework/conf/layer.conf
+++ b/meta-audio-4a-framework/conf/layer.conf
@@ -1,6 +1,17 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
+# Fix for SPEC-1588
+# Let us add layer-specific bbappends which are only applied when that
+# layer is included in our configuration -
+# e.g. only add layers if a bsp is present.
+# This is based on the BBFILE_COLLECTIONS name of the layer.
+BBFILES += "${@' '.join('${LAYERDIR}/meta-%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
+BBFILES += "${@' '.join('${LAYERDIR}/meta-%s/recipes*/*/*.bb' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
+
+
 # We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/recipes-*/*/*.bbappend"
diff --git a/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb b/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb
new file mode 100644
index 00000000..c784ea6e
--- /dev/null
+++ b/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb
@@ -0,0 +1,25 @@
+SUMMARY     = "Mixer for CES2017 AGL Demonstration"
+DESCRIPTION = "AGL HMI application for control of PulseAudio mixer elements"
+HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mixer"
+SECTION     = "apps"
+
+LICENSE     = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
+
+SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
+SRCREV  = "${AGL_APP_REVISION}"
+
+PV = "1.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
+
+# build-time dependencies
+DEPENDS += "qtquickcontrols2 \
+            qtwebsockets \
+            pulseaudio \
+            virtual/libhomescreen \
+            qlibwindowmanager \
+"
+
+RPROVIDES_${PN} += "virtual/mixer"
+
+inherit cmake_qt5 aglwgt
\ No newline at end of file
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb b/meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb
deleted file mode 100644
index c784ea6e..00000000
--- a/meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY     = "Mixer for CES2017 AGL Demonstration"
-DESCRIPTION = "AGL HMI application for control of PulseAudio mixer elements"
-HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mixer"
-SECTION     = "apps"
-
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-# build-time dependencies
-DEPENDS += "qtquickcontrols2 \
-            qtwebsockets \
-            pulseaudio \
-            virtual/libhomescreen \
-            qlibwindowmanager \
-"
-
-RPROVIDES_${PN} += "virtual/mixer"
-
-inherit cmake_qt5 aglwgt
\ No newline at end of file
-- 
cgit 1.2.3-korg