From 31b6041d525f36c20f20e8f9b9d06fd515fe9d1a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 4 Feb 2021 21:51:07 +0100 Subject: weston: imx: fix use with fbdev/pixman If the imx fork is used on a i.MX 6ULL stopping weston may result in a segfault due to using already freed memory. Make sure to only call pixman_renderer_output_destroy() once and harden pixman_renderer_output_destroy() to not segfault should it be called twice. Related-to: ELB-3532 Signed-off-by: Max Krummenacher (cherry picked from commit 942c1d04fb1c57e0698620adc03fbd476c8fbe93) --- recipes-graphics/wayland/weston_9.0.0.imx.bbappend | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'recipes-graphics/wayland/weston_9.0.0.imx.bbappend') diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bbappend b/recipes-graphics/wayland/weston_9.0.0.imx.bbappend index d5609a3..d4c3eea 100644 --- a/recipes-graphics/wayland/weston_9.0.0.imx.bbappend +++ b/recipes-graphics/wayland/weston_9.0.0.imx.bbappend @@ -4,3 +4,9 @@ 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