diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-06-09 22:57:23 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-06-11 13:53:50 +0000 |
| commit | 644a2d10516118f9a3bb3ae1c7392e9cf38bc650 (patch) | |
| tree | 92923deb9221ac97df0a248a2b65a03fa0578378 /recipes-platform | |
| parent | 3f479f2489be1f038b2ce2b51117d8b3a0dfa9e4 (diff) | |
Changes to support the switch to pipewire
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>
Diffstat (limited to 'recipes-platform')
4 files changed, 13 insertions, 15 deletions
diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb index 0909f1439..088b4cc49 100755 --- a/recipes-platform/images/agl-demo-platform-crosssdk.bb +++ b/recipes-platform/images/agl-demo-platform-crosssdk.bb @@ -34,7 +34,6 @@ TOOLCHAIN_HOST_TASK += " \ TOOLCHAIN_TARGET_TASK += " \ pciutils-dev \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-dev' , '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', 'libavirt-staticdev' , '', d)} \ cairo-dev \ nss-dev \ cups-dev \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index d7dddb7db..9039d4781 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 fbdaab512..c21d3c94c 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 7ee360442..34622efd0 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} \ " |