qt-cluster-receiver: Added new recipe for the qt cluster receiver application 08/25008/2 9.99.3 9.99.4 jellyfish/9.99.3 jellyfish/9.99.4 jellyfish_9.99.3 jellyfish_9.99.4
authorMarius Vlad <marius.vlad@collabora.com>
Mon, 13 Jul 2020 15:43:59 +0000 (18:43 +0300)
committerMarius Vlad <marius.vlad@collabora.com>
Tue, 14 Jul 2020 16:20:41 +0000 (19:20 +0300)
And enable it in the cluster-demo-platform. Swaps depedencies between
the native C application and the Qt version.

Bug-AGL: SPEC-3382

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I147113eb0d3a0fbb6759225706ee856d76304ac8

recipes-demo-hmi/cluster-receiver/cluster-receiver_git.bb
recipes-demo-hmi/cluster-receiver/qt-cluster-receiver_git.bb [new file with mode: 0644]
recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb

index 1e21565..e339388 100644 (file)
@@ -4,8 +4,7 @@ HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/a
 SECTION     = "apps"
 
 LICENSE     = "Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
-                    file://app/surface.hpp;beginline=5;endline=21;md5=5351c531a191f0e3463aafcd0a6a00a3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=374fee6a7817f1e1a5a7bfb7b7989553"
 
 SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "${AGL_APP_REVISION}"
@@ -15,11 +14,9 @@ S  = "${WORKDIR}/git"
 
 # build-time dependencies
 DEPENDS += "wayland wayland-native \
-           qtwayland qtwayland-native \
-           qtquickcontrols2 qtwebsockets qtbase qtdeclarative \
            gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 
-inherit cmake_qt5 pkgconfig aglwgt
+inherit cmake pkgconfig aglwgt
 
 RDEPENDS_${PN} += " \
        gstreamer1.0-plugins-base \
diff --git a/recipes-demo-hmi/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo-hmi/cluster-receiver/qt-cluster-receiver_git.bb
new file mode 100644 (file)
index 0000000..10728d5
--- /dev/null
@@ -0,0 +1,28 @@
+SUMMARY     = "Instrument Cluster Receiver AGL Demonstration"
+DESCRIPTION = "AGL HMI Application for demonstrating instrument cluster remote display"
+HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/admin/repos/apps/agl-qt-cluster-demo-receiver"
+SECTION     = "apps"
+
+LICENSE     = "Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984 \
+                    file://app/surface.hpp;beginline=5;endline=21;md5=5351c531a191f0e3463aafcd0a6a00a3"
+
+SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-qt-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH}"
+SRCREV  = "${AGL_APP_REVISION}"
+
+PV = "1.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
+
+# build-time dependencies
+DEPENDS += "wayland wayland-native \
+           qtwayland qtwayland-native \
+           qtquickcontrols2 qtwebsockets qtbase qtdeclarative \
+           gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
+
+inherit cmake_qt5 pkgconfig aglwgt
+
+RDEPENDS_${PN} += " \
+       gstreamer1.0-plugins-base \
+       gstreamer1.0-plugins-good \
+       gstreamer1.0-plugins-bad \
+"
index 13ffb72..2ca89e4 100644 (file)
@@ -22,6 +22,7 @@ RDEPENDS_${PN} += "\
 AGL_APPS = " \
     cluster-dashboard \
     cluster-receiver \
+    qt-cluster-receiver \
     "
 
 AGL_APIS = " \