From ab559762e86055ead1ffa2a5f93c91a4f743f9c4 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Sat, 10 Sep 2022 13:11:15 -0400
Subject: [PATCH] Switch Qt demo apps to gRPC launcher API

Changes:
- Update SRCREV in libqtappfw, launcher, and homescreen recipes to
  pick up gRPC API changes.
- Update libqtappfw recipe for switch to meson instead of CMake, and
  add new protobuf and gRPC dependencies.
- Update launcher recipe to pull in new libqtappfw dependency, and
  update some formatting for consistency with the other recipes.

Bug-AGL: SPEC-4559

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I6ec0f53a0cc68bcf9b434086d99e8849c11198f3
---
 recipes-demo/homescreen/homescreen_git.bb |  2 +-
 recipes-demo/launcher/launcher_git.bb     | 16 ++++++++--------
 recipes-demo/libqtappfw/libqtappfw_git.bb |  9 +++++++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb
index c8f5eee65..39e55eab7 100644
--- a/recipes-demo/homescreen/homescreen_git.bb
+++ b/recipes-demo/homescreen/homescreen_git.bb
@@ -25,7 +25,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=http
            file://homescreen.conf \
            file://homescreen.token \
 "
-SRCREV = "e490ff1e1e31b4a837cb8063f7346dc65ffe073e"
+SRCREV = "20f629dd6d8628611d950073c4f7a0446c40365a"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-demo/launcher/launcher_git.bb b/recipes-demo/launcher/launcher_git.bb
index 3c27fab96..96aa0efbd 100644
--- a/recipes-demo/launcher/launcher_git.bb
+++ b/recipes-demo/launcher/launcher_git.bb
@@ -9,7 +9,7 @@ DEPENDS = "\
         qtbase \
         qtdeclarative \
         qtquickcontrols2 \
-        qtwebsockets \
+        libqtappfw \
         wayland-native \
         wayland \
         qtwayland \
@@ -19,15 +19,14 @@ DEPENDS = "\
         applaunchd \
 "
 
-PV      = "1.0+git${SRCPV}"
+PV = "1.0+git${SRCPV}"
 
-SRC_URI = " \
-        git://gerrit.automotivelinux.org/gerrit/apps/launcher;protocol=https;branch=${AGL_BRANCH} \
-        file://launcher.service \
-        "
-SRCREV  = "fd578508fe8f59a0bf11916ea99561125dcfc4ba"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/launcher;protocol=https;branch=${AGL_BRANCH} \
+           file://launcher.service \
+"
+SRCREV = "5e828161fc1571323e2812a344f6714ae9331b2c"
 
-S       = "${WORKDIR}/git"
+S = "${WORKDIR}/git"
 
 inherit qmake5 systemd pkgconfig
 
@@ -42,6 +41,7 @@ do_install:append() {
 FILES:${PN} += " ${systemd_user_unitdir}"
 
 RDEPENDS:${PN} += " \
+    libqtappfw \
     applaunchd \
     homescreen \
 "
diff --git a/recipes-demo/libqtappfw/libqtappfw_git.bb b/recipes-demo/libqtappfw/libqtappfw_git.bb
index 326685fef..a390d027b 100644
--- a/recipes-demo/libqtappfw/libqtappfw_git.bb
+++ b/recipes-demo/libqtappfw/libqtappfw_git.bb
@@ -8,22 +8,27 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 DEPENDS = " \
     qtbase \
+    qtbase-native \
     qtdeclarative \
     qtwebsockets \
     glib-2.0 \
     bluez-glib \
     connman-glib \
     libmpdclient \
+    protobuf-native \
+    grpc-native \
+    protobuf \
+    grpc \
 "
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libqtappfw;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "a2d991a54f77017ced1558d289bcb83d73fe2a35"
+SRCREV  = "5bf2b9d30ccea0f5468b22abedbe1629691eab15"
 S       = "${WORKDIR}/git"
 
 # PV needs to be modified with SRCPV to work AUTOREV correctly
 PV = "2.0+git${SRCPV}"
 
-inherit cmake_qt5 pkgconfig
+inherit meson pkgconfig
 
 RRECOMMENDS:${PN} += "bluez5 connman mpd"
 
-- 
2.16.6