X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-platform%2Fpackagegroups%2Fpackagegroup-agl-demo.bb;h=0a648592071ffab334f9ac6daa45edd8292f4cd7;hb=refs%2Fchanges%2F31%2F15631%2F3;hp=9182491f62a4d5742011ed2e3e555e57749cb961;hpb=b38057354fcc2e99f37bb3391d83b562faae59c2;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 9182491f6..0a6485920 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -14,12 +14,25 @@ ALLOW_EMPTY_${PN} = "1"
 SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \
     'packagegroup-agl-smartdevicelink', '', d)}"
 
+# old homescreen package
+HOMESCREEN-OLD = "homescreen"
+# packages from hmi-framework aka homescreen-2017
+HOMESCREEN-NEW = "packagegroup-hmi-framework packagegroup-hmi-framework-dev"
+
+# old audio package
+AUDIO-OLD = "audiomanager"
+# packages from new 4A framework
+AUDIO-NEW = "packagegroup-agl-audio"
+
 RDEPENDS_${PN} += "\
-    packagegroup-agl-appfw \
-    homescreen \
+    libqtappfw \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', '${HOMESCREEN-NEW}', '${HOMESCREEN-OLD}', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '${AUDIO-NEW}', '${AUDIO-OLD}', d)} \
     udisks \
     ${SMARTDEVICELINK} \
     "
+#    packagegroup-agl-appfw \
+#
 
 # fonts
 TTF_FONTS = " \
@@ -27,8 +40,20 @@ TTF_FONTS = " \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \
     ttf-dejavu-serif \
+    source-han-sans-cn-fonts \
+    source-han-sans-jp-fonts \
+    source-han-sans-tw-fonts \
     "
 
+#EXTRA_APPS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'qtwebengine', '', d)}"
+#EXTRA_APPS_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles"
+#IMAGE_INSTALL_append = " qtwebengine-examples"
+
+# add support for websocket in Qt and QML
+EXTRA_APPS_append = " qtwebsockets qtwebsockets-qmlplugins"
+PREFERRED_PROVIDER_virtual/webruntime = "web-runtime"
+
+
 RDEPENDS_${PN} += " \
     linux-firmware-ath9k \
     can-utils \
@@ -36,4 +61,8 @@ RDEPENDS_${PN} += " \
     python-curses \
     dhcp-client \
     ${TTF_FONTS} \
+    ${EXTRA_APPS} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webruntime', 'virtual/webruntime', '', d)} \
     "
+
+