diff options
author | Scott Murray <scott.murray@konsulko.com> | 2020-05-25 15:01:08 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2020-05-26 14:35:39 +0000 |
commit | 30063de420b4f6c993dd3f2021ab84f622d69320 (patch) | |
tree | 5e28638cc9b04449b1131ff111c5a5e7937b23e2 /meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch | |
parent | 10f6f30fdb15bdcd3707b3fc2e086782dd7aa69f (diff) |
Cluster demo support updates
Changes include:
- Add agl-weston-remoting feature that sets "weston-remoting" distro
feature. The intent is to replace agl-gstrecorder in meta-agl-devel
with something more generic.
- Add weston remoting initialization timing patch to weston bbappend
in meta-agl-profile-graphical, conditional on "weston-remoting"
distro feature.
- The 0004-unconditionally-include-mman.h.patch weston patch is no
longer required after the SMACK labeling changes, remove it as
cleanup.
- Enable the weston "remoting" PACKAGECONFIG in weston bbappend, also
conditional on "weston-remoting". A redefinition of the "remoting"
PACKAGECONFIG option is required to fix a recipe bug that will have
a fix sent upstream.
- Rename virtualoutput.cfg weston.ini fragment to remote-output.cfg
to better reflect its current contents.
Bug-AGL: SPEC-3395
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I9c0579670d81296492b3b8bed93aafb3f7ffc15c
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24567
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch')
-rw-r--r-- | meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch new file mode 100644 index 000000000..61772182c --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch @@ -0,0 +1,40 @@ +From 0a0103f20437d9ed63b6cec500027a6d7bf6185f Mon Sep 17 00:00:00 2001 +From: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> +Date: Mon, 20 May 2019 18:31:32 +0900 +Subject: [PATCH] main: change remoting initialization timing + +Upstream-Status: Pending[1] + +[1]: https://gitlab.freedesktop.org/wayland/weston/issues/246 + +Signed-off-by: Tomohito Esaki <etom@igel.co.jp> +Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> +[Updated for Weston 8.0.0] +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +--- +diff --git a/compositor/main.c b/compositor/main.c +index 8eb8a47..22686b0 100644 +--- a/compositor/main.c ++++ b/compositor/main.c +@@ -2518,9 +2518,6 @@ load_drm_backend(struct weston_compositor *c, + ret = weston_compositor_load_backend(c, WESTON_BACKEND_DRM, + &config.base); + +- /* remoting */ +- load_remoting(c, wc); +- + /* pipewire */ + load_pipewire(c, wc); + +@@ -3278,6 +3275,10 @@ wet_main(int argc, char *argv[]) + if (wet.init_failed) + goto out; + ++ /* remoting: only support on drm-backend */ ++ if (strstr(backend, "drm-backend.so")) ++ load_remoting(wet.compositor, config); ++ + if (idle_time < 0) + weston_config_section_get_int(section, "idle-time", &idle_time, -1); + if (idle_time < 0) |