From 63c6b83bc69eb8658aea8a200510ef8aadae1847 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller 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 --- .../recipes-multimedia/4a-mixer/4a-mixer_git.bb | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb (limited to 'meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb') 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