meta-agl-flutter: Simplify AGL integration

Changes:
- Remove Igalia homescreen and Pumped Fuel app recipes since they
  duplicate what is in meta-flutter.  Now that there is a AGL
  Flutter demo image in meta-agl, any recipes or bbappends for
  apps should go there except for the flutter-gallery integration
  for agl-image-flutter (see below).
- Move flutter-gallery systemd unit changes out of flutter-auto
  bbappend to a new flutter-gallery bbappend to simplify using
  flutter-auto on its own.  To facilitate interoperation with the
  use of flutter-gallery in the agl-ivi-demo-platform-flutter image,
  the systemd files are split out into a -init package that has been
  added to agl-image-flutter.
- Added back a reworked version of the app-id command-line option
  patch in the flutter-auto bbappend with the option changed to
  --xdg-shell-app-id per upstream request.  This wil be submitted
  upstream as time permits.  The merged patches that were deleted have
  been removed from SRC_URI.

The intent of the above is to move to meta-agl-flutter just having the
minimal set of changes to integrate flutter-auto with AGL use, with
the agl-image-flutter image kept as a simple smoketest / example.

Bug-AGL: SPEC-4485

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I171852820be404774d7580778643c801e8fad34f

8 files changed, 82 insertions, 58 deletions

diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-igalia-homescreen_git.bb b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-igalia-homescreen_git.bb
deleted file mode 100644
index 9047d603..00000000
--- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-igalia-homescreen_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Igalia Flutter Homescreen"
-DESCRIPTION = "A prototype home screen for automotive grade Linux."
-AUTHOR = "Igalia"
-HOMEPAGE = "https://github.com/felipeerias/flutter_homescreen"
-BUGTRACKER = "https://github.com/felipeerias/flutter_homescreen/issues"
-SECTION = "graphics"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/felipeerias/flutter_homescreen.git;protocol=https;branch=main"
-
-SRCREV = "08bf271f7f1f14153a41005718a2090fa8e783f0"
-
-S = "${WORKDIR}/git"
-
-PUBSPEC_APPNAME = "flutter_homescreen"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
-
-FLUTTER_BUILD_ARGS = "bundle -v"
-
-inherit flutter-app
-
-BBCLASSEXTEND = "flutterrelease flutterprofile flutterdebug"
\ No newline at end of file
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-pumped-fuel-ped_git.bb b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-pumped-fuel-ped_git.bb
deleted file mode 100644
index 541bc8ec..00000000
--- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-pumped-fuel-ped_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "Pumped End Device"
-DESCRIPTION = "Pumped is a combination of 3 core projects to connect \
-               vehicle drivers with retail merchants, initially starting \
-               with fuel stations. Our objective is to offer the best fuel \
-               prices, closest stations, friendliest service, cleanest restrooms, \
-               tastiest coffee and so much more, direct to vehicle drivers."
-AUTHOR = "Pumped Fuel"
-HOMEPAGE = "https://github.com/bernardpumped/ped"
-BUGTRACKER = "https://github.com/bernardpumped/ped/issues"
-SECTION = "graphics"
-
-RDEPENDS:${PN} += "\
-    geoclue \
-    libsecret \
-    xdg-user-dirs \
-    "
-
-LICENSE = "GPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e49f4652534af377a713df3d9dec60cb"
-
-SRC_URI = "git://github.com/bernardpumped/ped.git;protocol=https;branch=main"
-
-SRCREV = "7a670295d5a94508862316e045e789e0dfd01b20"
-
-S = "${WORKDIR}/git"
-
-PUBSPEC_APPNAME = "pumped_end_device"
-FLUTTER_APPLICATION_INSTALL_PREFIX = "/flutter"
-
-FLUTTER_BUILD_ARGS = "bundle -v"
-
-inherit flutter-app
-
-BBCLASSEXTEND += "flutterrelease flutterdebug flutterprofile"
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service
new file mode 100644
index 00000000..71ab791d
--- /dev/null
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service
@@ -0,0 +1,10 @@
+[Unit]
+Requires=agl-compositor.service
+After=agl-compositor.service
+
+[Service]
+ExecStart=/usr/bin/flutter-auto --j=/usr/share/flutter/default.json
+Restart=on-failure
+
+[Install]
+WantedBy=agl-session.target
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-debug.json b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-debug.json
new file mode 100644
index 00000000..5a84a0bd
--- /dev/null
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-debug.json
@@ -0,0 +1,11 @@
+{
+        "view" : [ {
+                "window_type" : "BG",
+                "bundle_path" : "/usr/share/flutter/gallery",
+                "vm_args":["--observatory-host", "0.0.0.0", "--observatory-port", "1234"],
+                "width" : 1920,
+                "height": 1080,
+                "fullscreen": true
+                }
+        ]
+}
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-profile.json b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-profile.json
new file mode 100644
index 00000000..3309fde4
--- /dev/null
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-profile.json
@@ -0,0 +1,11 @@
+{
+        "view" : [ {
+                "window_type" : "BG",
+                "bundle_path" : "/usr/share/flutter/gallery",
+                "vm_args":["--observatory-host", "0.0.0.0", "--observatory-port", "1234", "--start-paused"],
+                "width" : 1920,
+                "height": 1080,
+                "fullscreen": true
+                }
+        ]
+}
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-release.json b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-release.json
new file mode 100644
index 00000000..6a2a8448
--- /dev/null
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/gallery_on_bg-release.json
@@ -0,0 +1,10 @@
+{
+        "view" : [ {
+                "window_type" : "BG",
+                "bundle_path" : "/usr/share/flutter/gallery",
+                "width" : 1920,
+                "height": 1080,
+                "fullscreen": true
+                }
+        ]
+}
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_%.bbappend b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_%.bbappend
new file mode 100644
index 00000000..835e86e6
--- /dev/null
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agl-flutter', 'flutter-gallery_aglflutter.inc', '', d)}
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc
new file mode 100644
index 00000000..533bdd71
--- /dev/null
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc
@@ -0,0 +1,39 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/flutter-gallery:"
+
+SRC_URI += " \
+    file://flutter-gallery.service \
+    file://gallery_on_bg-debug.json \
+    file://gallery_on_bg-profile.json \
+    file://gallery_on_bg-release.json \
+"
+
+APP_CONFIG = "gallery_on_bg-release.json"
+APP_CONFIG:class-runtimedebug = "gallery_on_bg-debug.json"
+APP_CONFIG:class-runtimeprofile = "gallery_on_bg-profile.json"
+
+# To avoid conflicts with the systemd template scheme added via bbappend in
+# meta-agl-demo, package the standalone systemd unit separately.  This is not
+# needed when meta-agl-flutter is used without meta-agl-demo, but that is not
+# going to be the default usecase for most users, so this still allows them to
+# build working agl-image-flutter images in the same build tree.
+#
+# This can be dropped if/when flutter-gallery is no longer packaged as a demo
+# in meta-agl-demo.
+
+#SYSTEMD_SERVICE:${PN}-init = "flutter-gallery.service"
+
+do_install:append() {
+    install -D -m 0644 ${WORKDIR}/flutter-gallery.service ${D}${systemd_user_unitdir}/flutter-gallery.service
+    install -d ${D}${systemd_user_unitdir}/agl-session.target.wants
+    ln -s ../flutter-gallery.service ${D}${systemd_user_unitdir}/agl-session.target.wants/flutter-gallery.service
+
+    install -D -m 0644 ${WORKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/default.json
+}
+
+PACKAGE_BEFORE_PN += "${PN}-init"
+
+FILES:${PN} += "${datadir}"
+
+FILES:${PN}-init = "${systemd_user_unitdir}"
+
+RDEPENDS:${PN}-init = "${PN}"
\ No newline at end of file