From 71db09dfeb4ff55f1a95219be550708d4524c47d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 27 Jul 2022 19:19:58 -0400 Subject: ivi-homescreen: improve AGL integration Changes: - For now add local patches for three changes that Marius has submitted upstream that fix issues with respect to running as a normal application against agl-compositor and configuration via the JSON configuration file. The first of these patches has been merged upstream, but bumping the level of meta-flutter to get it brings other rework that it seems perhaps better to wait on a tagged upstream release for. - Add another patch to add a '--app-id' command-line option to the embedder. This avoids needing to use a JSON configuration file for simple (i.e. non-homescreen) applications when running multiple apps against agl-compositor. The use of the example JSON file for the ivi-homescreen recipe itself has been left alone for now since it provides a reference for doing so. - Rename the embedder binary from "homescreen" to "flutter" to avoid collision with the existing Qt homescreen application in meta-agl-demo. This allows integrating Flutter applications into images using the Qt homescreen for testing in the period while a Flutter replacement is worked on. Discussion about possibly renaming the embedder to something more generic along these lines has started with upstream. - Split the embedder binary into a separate package from the ivi-homescreen package that contains the systemd unit file. We do not want the "homescreen" systemd unit when using the embedder in other images that use applaunchd, so this split seems the most straightforward way to avoid pulling it in. - Remove installing the "homescreen" system level systemd unit, as it does not get used in agl-image-flutter (it is installed as a user unit instead). Bug-AGL: SPEC-4485 Signed-off-by: Scott Murray Change-Id: I9f02f4312cf8c77ab224a3de8114c7fc3f4f6d36 --- ...ll-configuration-Fixes-to-general-options.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 meta-agl-flutter/recipes-graphics/toyota/files/0003-shell-configuration-Fixes-to-general-options.patch (limited to 'meta-agl-flutter/recipes-graphics/toyota/files/0003-shell-configuration-Fixes-to-general-options.patch') diff --git a/meta-agl-flutter/recipes-graphics/toyota/files/0003-shell-configuration-Fixes-to-general-options.patch b/meta-agl-flutter/recipes-graphics/toyota/files/0003-shell-configuration-Fixes-to-general-options.patch new file mode 100644 index 00000000..f06d4548 --- /dev/null +++ b/meta-agl-flutter/recipes-graphics/toyota/files/0003-shell-configuration-Fixes-to-general-options.patch @@ -0,0 +1,52 @@ +From a3a1421c3986bbafd9f91997eec7f2606ef67fc3 Mon Sep 17 00:00:00 2001 +From: Marius Vlad +Date: Mon, 25 Jul 2022 15:53:17 +0300 +Subject: [PATCH 3/3] shell/configuration: Fixes to general options + +This patch avoids an automatic overwrite of the debug_backend and +disable_cursor entries. If enabled in the configuration file, the test +will always return true, basically overwriting to false. + +Also, use the correct entry in the README file for debug_backend. + +Signed-off-by: Marius Vlad +--- + README.md | 2 +- + shell/configuration/configuration.cc | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/README.md b/README.md +index 7c162eb..d459f4c 100644 +--- a/README.md ++++ b/README.md +@@ -175,7 +175,7 @@ Loads Single View + + { + "disable_cursor":true, +- "backend_debug":true, ++ "debug_backend":true, + "accessibility_features":31, + "view":{ + "bundle_path":"/home/joel/development/gallery/.homescreen/x86/release", +diff --git a/shell/configuration/configuration.cc b/shell/configuration/configuration.cc +index 616de48..773724c 100644 +--- a/shell/configuration/configuration.cc ++++ b/shell/configuration/configuration.cc +@@ -152,10 +152,12 @@ void Configuration::getCliOverrides(Config& instance, Config& cli) { + if (!cli.cursor_theme.empty()) { + instance.cursor_theme = cli.cursor_theme; + } +- if (cli.disable_cursor != instance.disable_cursor) { ++ if (cli.disable_cursor == true && ++ cli.disable_cursor != instance.disable_cursor) { + instance.disable_cursor = cli.disable_cursor; + } +- if (cli.debug_backend != instance.debug_backend) { ++ if (cli.debug_backend == true && ++ cli.debug_backend != instance.debug_backend) { + instance.debug_backend = cli.debug_backend; + } + if (!cli.view.vm_args.empty()) { +-- +2.35.3 + -- cgit 1.2.3-korg