diff options
author | Scott Murray <scott.murray@konsulko.com> | 2022-07-27 19:19:58 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-07-29 23:01:27 +0000 |
commit | 71db09dfeb4ff55f1a95219be550708d4524c47d (patch) | |
tree | f0e7b506f2b0264fb6fb54fca626b49e4c0efe15 /meta-agl-flutter/recipes-graphics/toyota/files/0002-shell-configuration-Obey-json-configuration-file.patch | |
parent | eda84d25d819824d641cf89af1e4d61a5e946744 (diff) |
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 <scott.murray@konsulko.com>
Change-Id: I9f02f4312cf8c77ab224a3de8114c7fc3f4f6d36
Diffstat (limited to 'meta-agl-flutter/recipes-graphics/toyota/files/0002-shell-configuration-Obey-json-configuration-file.patch')
-rw-r--r-- | meta-agl-flutter/recipes-graphics/toyota/files/0002-shell-configuration-Obey-json-configuration-file.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta-agl-flutter/recipes-graphics/toyota/files/0002-shell-configuration-Obey-json-configuration-file.patch b/meta-agl-flutter/recipes-graphics/toyota/files/0002-shell-configuration-Obey-json-configuration-file.patch new file mode 100644 index 00000000..b9a864c5 --- /dev/null +++ b/meta-agl-flutter/recipes-graphics/toyota/files/0002-shell-configuration-Obey-json-configuration-file.patch @@ -0,0 +1,44 @@ +From 36c7deb35719d2219dc6e868ab14d9a4ce984d1f Mon Sep 17 00:00:00 2001 +From: Marius Vlad <marius.vlad@collabora.com> +Date: Mon, 25 Jul 2022 15:51:06 +0300 +Subject: [PATCH 2/3] shell/configuration: Obey json configuration file + +Setting the name of the application to kApplicationName, by default, +would cause the check in getCliOverrides to always be true, which in +turn will ignore whatever the user specified in the configuration file. + +Signed-off-by: Marius Vlad <marius.vlad@collabora.com> +--- + shell/configuration/configuration.cc | 2 ++ + shell/main.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/shell/configuration/configuration.cc b/shell/configuration/configuration.cc +index f8b1e13..616de48 100644 +--- a/shell/configuration/configuration.cc ++++ b/shell/configuration/configuration.cc +@@ -220,6 +220,8 @@ std::vector<struct Configuration::Config> Configuration::ParseConfig( + if (cfg.view.height == 0) { + cfg.view.height = kDefaultViewHeight; + } ++ if (cfg.app_id.empty()) ++ cfg.app_id = kApplicationName; + + res.emplace_back(cfg); + } +diff --git a/shell/main.cc b/shell/main.cc +index 65c3f37..6fdd907 100644 +--- a/shell/main.cc ++++ b/shell/main.cc +@@ -44,7 +44,7 @@ void RemoveArgument(std::vector<std::string>& args, const std::string& arg) { + + int main(int argc, char** argv) { + struct Configuration::Config config { +- .app_id = kApplicationName, .json_configuration_path{}, .cursor_theme{}, ++ .app_id = {}, .json_configuration_path{}, .cursor_theme{}, + .disable_cursor{}, .debug_backend{}, .view {} + }; + +-- +2.35.3 + |