From 00cb1f6650477dcf5904388e81a551cd4a2e2f22 Mon Sep 17 00:00:00 2001
From: Joel Winarske <joel.winarske@gmail.com>
Date: Fri, 15 Jul 2022 08:17:15 -0700
Subject: [PATCH] meta-agl-flutter:Application updates
-upstream is now pinning ivi-homescreen
-fix breaking change. Change --a to --b
-adds test apps to images: secure storage, EGL texture, and video_player
-adds Igalia homescreen to images
-add Pumped Fuel ped recipe to images
v2 (jsmoeller): fixup missing require in recipes
v3 (jsmoeller): rework duplication in recipes and use BBCLASSEXTEND
v4 (jsmoeller): add dependencies to application framework and pipewire
v5 (jsmoeller): update agl-image-flutter to use new naming
Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I924335eb2ceb9ad91944630b43b72a6fe296b98d
---
meta-agl-flutter/classes/flutterdebug.bbclass | 1 +
meta-agl-flutter/classes/flutterprofile.bbclass | 1 +
meta-agl-flutter/classes/flutterrelease.bbclass | 1 +
...git.bb => flutter-app-igalia-homescreen_git.bb} | 4 ++-
.../flutter-app-pumped-fuel-ped_git.bb | 34 ++++++++++++++++++++++
.../toyota/ivi-homescreen_aglflutter.inc | 5 ++--
.../images/agl-image-flutter-debug.bb | 10 ++++++-
.../images/agl-image-flutter-profile.bb | 10 ++++++-
.../recipes-platform/images/agl-image-flutter.bb | 10 ++++++-
templates/feature/agl-flutter/included.dep | 1 +
10 files changed, 70 insertions(+), 7 deletions(-)
create mode 100644 meta-agl-flutter/classes/flutterdebug.bbclass
create mode 100644 meta-agl-flutter/classes/flutterprofile.bbclass
create mode 100644 meta-agl-flutter/classes/flutterrelease.bbclass
rename meta-agl-flutter/recipes-graphics/flutter-apps/{flutter-app-homescreen_git.bb => flutter-app-igalia-homescreen_git.bb} (82%)
create mode 100644 meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-pumped-fuel-ped_git.bb
create mode 100644 templates/feature/agl-flutter/included.dep
diff --git a/meta-agl-flutter/classes/flutterdebug.bbclass b/meta-agl-flutter/classes/flutterdebug.bbclass
new file mode 100644
index 00000000..158ddb32
--- /dev/null
+++ b/meta-agl-flutter/classes/flutterdebug.bbclass
@@ -0,0 +1 @@
+FLUTTER_RUNTIME = "debug"
diff --git a/meta-agl-flutter/classes/flutterprofile.bbclass b/meta-agl-flutter/classes/flutterprofile.bbclass
new file mode 100644
index 00000000..38d114e6
--- /dev/null
+++ b/meta-agl-flutter/classes/flutterprofile.bbclass
@@ -0,0 +1 @@
+FLUTTER_RUNTIME = "profile"
diff --git a/meta-agl-flutter/classes/flutterrelease.bbclass b/meta-agl-flutter/classes/flutterrelease.bbclass
new file mode 100644
index 00000000..cf75bc13
--- /dev/null
+++ b/meta-agl-flutter/classes/flutterrelease.bbclass
@@ -0,0 +1 @@
+FLUTTER_RUNTIME = "release"
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-homescreen_git.bb b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-igalia-homescreen_git.bb
similarity index 82%
rename from meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-homescreen_git.bb
rename to meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-igalia-homescreen_git.bb
index c5c8b2ae..9047d603 100644
--- a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-homescreen_git.bb
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-igalia-homescreen_git.bb
@@ -1,5 +1,5 @@
SUMMARY = "Igalia Flutter Homescreen"
-DESCRIPTION = "Flutter Gallery Application"
+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"
@@ -20,3 +20,5 @@ 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
new file mode 100644
index 00000000..541bc8ec
--- /dev/null
+++ b/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-app-pumped-fuel-ped_git.bb
@@ -0,0 +1,34 @@
+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/toyota/ivi-homescreen_aglflutter.inc b/meta-agl-flutter/recipes-graphics/toyota/ivi-homescreen_aglflutter.inc
index 4c013419..a2ad49fa 100644
--- a/meta-agl-flutter/recipes-graphics/toyota/ivi-homescreen_aglflutter.inc
+++ b/meta-agl-flutter/recipes-graphics/toyota/ivi-homescreen_aglflutter.inc
@@ -1,5 +1,4 @@
-# Potentially pin SRCREV here. Use upstream's AUTOINC default for
-# development for now.
+# Upstream is now pinning ivi-homescreen
#SRCREV = ""
# For now disable gstreamer to avoid needing to enable "commercial"
@@ -7,7 +6,7 @@
PACKAGECONFIG:remove = "gstreamer"
# AGL specifics
-IVI_HOMESCREEN_APP_OVERRIDE = "--a=/usr/share/flutter/gallery"
+IVI_HOMESCREEN_APP_OVERRIDE = "--b=/usr/share/flutter/gallery"
SERVICE_UNIT = "Requires=agl-compositor.service\nAfter=agl-compositor.service"
SERVICE_INSTALL = "WantedBy=agl-session.target"
diff --git a/meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb b/meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb
index ef1b70e7..2c24699b 100644
--- a/meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb
+++ b/meta-agl-flutter/recipes-platform/images/agl-image-flutter-debug.bb
@@ -6,7 +6,15 @@ require agl-image-flutter.inc
IMAGE_INSTALL:append = "\
weston-ini-conf-landscape \
+ \
ivi-homescreen-debug \
- flutter-gallery-debug \
flutter-engine-debug \
+ \
+ flutter-gallery-debug \
+ flutter-test-secure-storage-debug \
+ flutter-test-texture-egl-debug \
+ flutter-test-video-player-debug \
+ \
+ flutter-app-igalia-homescreen-debug \
+ flutter-app-pumped-fuel-ped-debug \
"
diff --git a/meta-agl-flutter/recipes-platform/images/agl-image-flutter-profile.bb b/meta-agl-flutter/recipes-platform/images/agl-image-flutter-profile.bb
index 1ec164b0..33ae39c9 100644
--- a/meta-agl-flutter/recipes-platform/images/agl-image-flutter-profile.bb
+++ b/meta-agl-flutter/recipes-platform/images/agl-image-flutter-profile.bb
@@ -6,7 +6,15 @@ require agl-image-flutter.inc
IMAGE_INSTALL:append = "\
weston-ini-conf-landscape \
+ \
ivi-homescreen-profile \
- flutter-gallery-profile \
flutter-engine-profile \
+ \
+ flutter-gallery-profile \
+ flutter-test-secure-storage-profile \
+ flutter-test-texture-egl-profile \
+ flutter-test-video-player-profile \
+ \
+ flutter-app-igalia-homescreen-profile \
+ flutter-app-pumped-fuel-ped-profile \
"
diff --git a/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb b/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
index 8f85e25a..83809426 100644
--- a/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
+++ b/meta-agl-flutter/recipes-platform/images/agl-image-flutter.bb
@@ -6,7 +6,15 @@ require agl-image-flutter.inc
IMAGE_INSTALL:append = "\
weston-ini-conf-landscape \
+ \
ivi-homescreen-release \
- flutter-gallery-release \
flutter-engine-release \
+ \
+ flutter-gallery-release \
+ flutter-test-secure-storage-release \
+ flutter-test-texture-egl-release \
+ flutter-test-video-player-release \
+ \
+ flutter-app-igalia-homescreen-flutterrelease \
+ flutter-app-pumped-fuel-ped-flutterrelease \
"
diff --git a/templates/feature/agl-flutter/included.dep b/templates/feature/agl-flutter/included.dep
new file mode 100644
index 00000000..4f4e49ec
--- /dev/null
+++ b/templates/feature/agl-flutter/included.dep
@@ -0,0 +1 @@
+agl-pipewire agl-app-framework
--
2.16.6