From a8d17bed539b573c7f6ac22cc8011fcbdac31ece Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 27 Aug 2022 10:51:39 +0200 Subject: weston: remove bbappend meta-freescale updated to weston_10.0.0.imx. The packageconfig fixes are for some time in the meta-freescale recipe and thus no longer needed. The patches address hickups seen with machines without a GPU which we now only support with imx-mainline-bsp, i.e. with upstream weston.. Signed-off-by: Max Krummenacher --- ...ackend-fbdev-fbdev.c-don-t-destroy-output.patch | 50 ---------------------- ...ston-pixman-renderer.c-zero-freed-pointer.patch | 42 ------------------ recipes-graphics/wayland/weston_9.0.0.imx.bbappend | 12 ------ 3 files changed, 104 deletions(-) delete mode 100644 recipes-graphics/wayland/weston/0001-libweston-backend-fbdev-fbdev.c-don-t-destroy-output.patch delete mode 100644 recipes-graphics/wayland/weston/0002-libweston-pixman-renderer.c-zero-freed-pointer.patch delete mode 100644 recipes-graphics/wayland/weston_9.0.0.imx.bbappend (limited to 'recipes-graphics') diff --git a/recipes-graphics/wayland/weston/0001-libweston-backend-fbdev-fbdev.c-don-t-destroy-output.patch b/recipes-graphics/wayland/weston/0001-libweston-backend-fbdev-fbdev.c-don-t-destroy-output.patch deleted file mode 100644 index 1469938..0000000 --- a/recipes-graphics/wayland/weston/0001-libweston-backend-fbdev-fbdev.c-don-t-destroy-output.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 52ec338ec27a3e3267442bcef36e0b9312441af5 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Thu, 4 Feb 2021 20:33:40 +0000 -Subject: [PATCH 1/2] libweston/backend-fbdev/fbdev.c: don't destroy output - twice - -This is currently unsupported and may result in a segfault. - -fbdev_output_disable(base) does call pixman_renderer_output_destroy(base) so -one should not do it a second time here. - -Observed on a colibri-imx6ull which actually uses pixman for rendering. - -Program received signal SIGSEGV, Segmentation fault. -_pixman_image_fini (image=0x636f6c2f) - at ../pixman-0.38.4/pixman/pixman-image.c:139 -139 ../pixman-0.38.4/pixman/pixman-image.c: Datei oder Verzeichnis nicht gefunden. -(gdb) bt - at ../pixman-0.38.4/pixman/pixman-image.c:139 - at ../pixman-0.38.4/pixman/pixman-image.c:211 - at ../git/libweston/pixman-renderer.c:971 - at ../git/libweston/backend-fbdev/fbdev.c:790 - at ../git/libweston/compositor.c:7607 - at ../git/libweston/backend-fbdev/fbdev.c:885 - at ../git/libweston/compositor.c:7949 - at ../git/compositor/main.c:3538 - from /srv/nfs/rootfs-colibri-imx6ull/lib/libc.so.6 - -Signed-off-by: Max Krummenacher ---- - libweston/backend-fbdev/fbdev.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/libweston/backend-fbdev/fbdev.c b/libweston/backend-fbdev/fbdev.c -index becc1488..6c6376c1 100644 ---- a/libweston/backend-fbdev/fbdev.c -+++ b/libweston/backend-fbdev/fbdev.c -@@ -786,8 +786,7 @@ fbdev_output_destroy(struct weston_output *base) - fbdev_output_disable(base); - - if (backend->use_pixman) { -- if (base->renderer_state != NULL) -- pixman_renderer_output_destroy(base); -+ ; - #if defined(ENABLE_IMXGPU) - #if defined(ENABLE_IMXG2D) - } else if (backend->use_g2d) { --- -2.20.1 - diff --git a/recipes-graphics/wayland/weston/0002-libweston-pixman-renderer.c-zero-freed-pointer.patch b/recipes-graphics/wayland/weston/0002-libweston-pixman-renderer.c-zero-freed-pointer.patch deleted file mode 100644 index 67d21a2..0000000 --- a/recipes-graphics/wayland/weston/0002-libweston-pixman-renderer.c-zero-freed-pointer.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1c9ad2f2bbd9ad99b89c330ee809f5752cb03877 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Thu, 4 Feb 2021 20:37:02 +0000 -Subject: [PATCH 2/2] libweston/pixman-renderer.c: zero freed pointer - -Setting struct elements in a struct just before the whole struct -is freed makes little sense, however zero the pointer to said struct -guards against using the no longer assigned memory. - -Signed-off-by: Max Krummenacher ---- - libweston/pixman-renderer.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libweston/pixman-renderer.c b/libweston/pixman-renderer.c -index 59b1f0ff..ec037e44 100644 ---- a/libweston/pixman-renderer.c -+++ b/libweston/pixman-renderer.c -@@ -967,6 +967,9 @@ pixman_renderer_output_destroy(struct weston_output *output) - { - struct pixman_output_state *po = get_output_state(output); - -+ if (!po) -+ return; -+ - if (po->shadow_image) - pixman_image_unref(po->shadow_image); - -@@ -975,9 +978,6 @@ pixman_renderer_output_destroy(struct weston_output *output) - - free(po->shadow_buffer); - -- po->shadow_buffer = NULL; -- po->shadow_image = NULL; -- po->hw_buffer = NULL; -- - free(po); -+ output->renderer_state = NULL; - } --- -2.20.1 - diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bbappend b/recipes-graphics/wayland/weston_9.0.0.imx.bbappend deleted file mode 100644 index a353ffc..0000000 --- a/recipes-graphics/wayland/weston_9.0.0.imx.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# Don't build and install the backends which display weston on top of an -# existing wayland or x11 server. (Otherwise weston will prefer the wayland -# backend over the fbdev one for the non drm enabled machines) -PACKAGECONFIG:remove = "wayland x11" - -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" - -FILESEXTRAPATHS:prepend := "${THISDIR}/weston/:" -SRC_URI:append = " \ - file://0001-libweston-backend-fbdev-fbdev.c-don-t-destroy-output.patch \ - file://0002-libweston-pixman-renderer.c-zero-freed-pointer.patch \ -" -- cgit v1.2.3