From 4bc95c3f87907f918eec3b83c475054a5bdef376 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 27 Jan 2020 12:36:33 -0500 Subject: meta-agl-profile-graphical: update weston and weston-init Update weston and weston-init bbappends to handle weston 6.0.0 to 7.0.0 upgrade and other upstream changes: - weston 6.0.0 bbappend renamed for weston 7.0.0. - Wildcard weston_%.bbappend removed, as none of its changes are required with the latest upstream recipe. - Update weston patches for 7.0.0. Notable changes are that the patch to allow launching weston as a non-root user has been reworked for the switch to meson for weston builds, and the compositor backend patch for Waltham has been disabled until someone more familiar with the code can update it. - weston-init changes and udev rules updated to work with upstream support for running weston as non-root. The major rework is to simplify things such that all AGL configuration is done as an over-ride to the new upstream weston@.service file. The ability to specify which TTY to run weston on has been removed in favor of upstream's hard-coded tty7 as part of this change, to cut down on the amount of extra configuration required. Bug-AGL: SPEC-2932 Change-Id: I6f8b213bacb2de7526aa1a3c01b1482be78becef Signed-off-by: Scott Murray --- .../recipes-graphics/wayland/weston_7.0.0.bbappend | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend') diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend new file mode 100644 index 000000000..c2e52798d --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend @@ -0,0 +1,14 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" + +# NOTE: +# file://0003-compositor-drm-introduce-drm_get_dmafd_from_view.patch +# has been removed until someone more familiar with weston internals +# and waltham can take a look and update it. +SRC_URI_append = "\ + file://0001-Allow-regular-users-to-launch-Weston_7.0.0.patch \ + file://use-XDG_RUNTIMESHARE_DIR.patch \ + file://0002-ivi-shell-Fix-crash-due-no-transmitter-screen.patch \ + file://0001-config-parser-Export-get_full_path-and-destroy.patch \ + " + +EXTRA_OEMESON_append = " -Denable-user-start=true" -- cgit 1.2.3-korg From 8787f82ce32a5fe42c56513ce32e8d1d94ce3e3e Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 12 Feb 2020 14:08:51 +0200 Subject: recipes-graphics/wayland/weston: Expose weston_output_damage() Seems that we can damage all the outputs, but not individual and output so patch libweston to include that declaration. The symbol's already exported. Bug-AGL: SPEC-3179 Change-Id: I6f765304c61d4ef288ebf015a131d9e138d50e97 Signed-off-by: Marius Vlad --- ...-Expose-weston_output_damage-in-libweston.patch | 30 ++++++++++++++++++++++ .../recipes-graphics/wayland/weston_7.0.0.bbappend | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-libweston-Expose-weston_output_damage-in-libweston.patch (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend') diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-libweston-Expose-weston_output_damage-in-libweston.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-libweston-Expose-weston_output_damage-in-libweston.patch new file mode 100644 index 000000000..32755c4b3 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-libweston-Expose-weston_output_damage-in-libweston.patch @@ -0,0 +1,30 @@ +From 7e5fb58591a29d60657158262a0772796bfd3461 Mon Sep 17 00:00:00 2001 +From: Marius Vlad +Date: Wed, 12 Feb 2020 13:18:19 +0200 +Subject: [PATCH] libweston: Expose weston_output_damage() in libweston + +We have weston_compositor_damage_all() exported and declared but users +might need weston_output_damage() to refer to an individual output. The +symbol already exported so just declare it. + +Signed-off-by: Marius Vlad +--- + include/libweston/libweston.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h +index 1439775e..9fac5be0 100644 +--- a/include/libweston/libweston.h ++++ b/include/libweston/libweston.h +@@ -1604,6 +1604,8 @@ weston_compositor_schedule_repaint(struct weston_compositor *compositor); + void + weston_compositor_damage_all(struct weston_compositor *compositor); + void ++weston_output_damage(struct weston_output *woutput); ++void + weston_compositor_wake(struct weston_compositor *compositor); + void + weston_compositor_sleep(struct weston_compositor *compositor); +-- +2.20.1 + diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend index c2e52798d..67ce0ba5e 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_7.0.0.bbappend @@ -9,6 +9,7 @@ SRC_URI_append = "\ file://use-XDG_RUNTIMESHARE_DIR.patch \ file://0002-ivi-shell-Fix-crash-due-no-transmitter-screen.patch \ file://0001-config-parser-Export-get_full_path-and-destroy.patch \ + file://0001-libweston-Expose-weston_output_damage-in-libweston.patch \ " EXTRA_OEMESON_append = " -Denable-user-start=true" -- cgit 1.2.3-korg