From 644a2d10516118f9a3bb3ae1c7392e9cf38bc650 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Sun, 9 Jun 2019 22:57:23 +0200
Subject: Changes to support the switch to pipewire
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This moves all soundmanager components off into meta-agl-devel/meta-audio-soundmanager-framework .
Soundmanager is not supported in HH.

Furthermore, I simplified the image and packagegroup recipes.

Feature templates were modified to reflect the change as well.

Bug-AGL: SPEC-2473

Change-Id: I48b437fb2ed727ed362d92af56596096df62dd8d
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 .../packagegroups/packagegroup-agl-demo-platform.bb          |  5 ++++-
 recipes-platform/packagegroups/packagegroup-agl-demo.bb      | 12 ++----------
 .../packagegroups/packagegroup-agl-ivi-multimedia.bb         | 10 +++++++---
 3 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'recipes-platform/packagegroups')

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index d7dddb7d..9039d478 100755
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -41,7 +41,6 @@ AGL_APPS = " \
     dashboard \
     hvac \
     mediaplayer \
-    virtual/mixer  \
     virtual/navigation \
     phone \
     poiapp \
@@ -51,6 +50,10 @@ AGL_APPS = " \
     agl-service-signal-composer \
     low-can-demo \
     "
+#
+# TODO: fix mixer for pipewire    virtual/mixer  \
+#
+
 
 AGL_APIS = " \
     libnaviapi-agl \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index fbdaab51..c21d3c94 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -17,24 +17,16 @@ SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \
 # packages from hmi-framework aka homescreen-2017
 HOMESCREEN = "packagegroup-hmi-framework"
 
+# removed: now all enablers are in meta-agl-devel/meta-audio-soundmanager-framework
 # old audio package
-AUDIO-OLD = "audiomanager"
-# packages from new 4A framework
-AUDIO-NEW = "packagegroup-agl-audio"
-
-PIPEWIRE = "${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', \
-    'packagegroup-pipewire', '', d)}"
+# AUDIO-OLD = "audiomanager"
 
 RDEPENDS_${PN} += "\
     libqtappfw \
     ${HOMESCREEN} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \
     udisks \
     ${SMARTDEVICELINK} \
-    ${PIPEWIRE} \
     "
-#    packagegroup-agl-appfw \
-#
 
 # fonts
 TTF_FONTS = " \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
index 7ee36044..34622efd 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb
@@ -16,8 +16,12 @@ RDEPENDS_${PN} += "\
     lightmediascanner-meta \
     "
 
+# for now: enable here for the AGL IVI demo (image-ivi and demo-platform)
+# tbd: change based on usage in profiles
+PIPEWIRE = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'packagegroup-pipewire', '', d)}\
+    "
+
 RDEPENDS_${PN} += "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', '', \
-        bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , \
-            bb.utils.contains('DISTRO_FEATURES','pulseaudio','virtual/pulseaudio-config','',d), d), d)} \
+    ${PIPEWIRE} \
     "
-- 
cgit 1.2.3-korg