From 940b6ec3d20f37b3db7fc61016c5ec177c32bfc4 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Fri, 16 Oct 2020 12:46:46 +0300 Subject: weston_8.0.%.bbappend: Remove unused patch This removes main-change-remoting-initialization-timing patch. We no longer use the weston as compositor so do not need to patch it up. Signed-off-by: Marius Vlad Change-Id: I54ebb3ff8222e704454bd8d350f37208d0219c30 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25449 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- ...ain-change-remoting-initialization-timing.patch | 40 ---------------------- .../recipes-graphics/wayland/weston_8.0.%.bbappend | 1 - 2 files changed, 41 deletions(-) delete mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland') 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 deleted file mode 100644 index 61772182c..000000000 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-main-change-remoting-initialization-timing.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0a0103f20437d9ed63b6cec500027a6d7bf6185f Mon Sep 17 00:00:00 2001 -From: Harunobu Kurokawa -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 -Signed-off-by: Harunobu Kurokawa -[Updated for Weston 8.0.0] -Signed-off-by: Scott Murray - ---- -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) diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.%.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.%.bbappend index e11d19641..cfb168721 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.%.bbappend +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_8.0.%.bbappend @@ -7,7 +7,6 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI_append = "\ file://0001-Allow-regular-users-to-launch-Weston_7.0.0.patch \ file://0001-libweston-Expose-weston_output_damage-in-libweston.patch \ - file://0004-main-change-remoting-initialization-timing.patch \ file://smack-weston \ " -- cgit 1.2.3-korg