diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-08-10 15:44:27 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-08-20 18:27:45 +0200 |
| commit | 7b1164d7c33dd3009bc4758e0189b63c310752e1 (patch) | |
| tree | 583daa2ea68346973fdca3806eed966f085819c9 /recipes-graphics | |
| parent | cee4a6f7e3d2c7b7cdcefa923e75156302d5731e (diff) | |
weston 8: update to hash of nxp bsp 5.4.24-2.1.0
This also builds against the newer vivante components, so drop the patch
needed for the older BSP.
Related-to: ELB-2758
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch | 41 | ||||
| -rw-r--r-- | recipes-graphics/wayland/weston_8.0.0.imx.bbappend | 13 |
2 files changed, 7 insertions, 47 deletions
diff --git a/recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch b/recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch deleted file mode 100644 index 8215c4f..0000000 --- a/recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d4a8be56499162d76858a3ab65053435174c48d1 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 17 Jun 2020 09:14:20 +0000 -Subject: [PATCH] g2d-renderer: ignore G2D_TILED_STATUS - -weston 8.0.0.imx uses a G2D_TILED_STATUS feature which is unavailable -in older NXP BSPs. (4.14.98_2.3.0). - -Remove the relevant code from compilation. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - libweston/renderer-g2d/g2d-renderer.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libweston/renderer-g2d/g2d-renderer.c b/libweston/renderer-g2d/g2d-renderer.c -index 34a077b7..b9ede558 100644 ---- a/libweston/renderer-g2d/g2d-renderer.c -+++ b/libweston/renderer-g2d/g2d-renderer.c -@@ -477,6 +477,10 @@ get_g2dSurface(struct wl_viv_buffer *buffer, struct g2d_surfaceEx *g2dSurface) - g2dSurface->base.height = buffer->height; - g2dSurface->base.rot = G2D_ROTATION_0; - -+#if 1 -+ /* ignore tileStatus on i.MX8MM and i.MX6 */ -+ buffer->tileStatus_enabled = 0; -+#else - if(buffer->ts_addr && buffer->tileStatus_enabled) - { - g2dSurface->tiling |= G2D_TILED_STATUS; -@@ -485,6 +489,7 @@ get_g2dSurface(struct wl_viv_buffer *buffer, struct g2d_surfaceEx *g2dSurface) - g2dSurface->ts.fc_value = buffer->fcValue; - g2dSurface->ts.fc_value_upper = buffer->fcValueUpper; - } -+#endif - } - - static void --- -2.20.1 - diff --git a/recipes-graphics/wayland/weston_8.0.0.imx.bbappend b/recipes-graphics/wayland/weston_8.0.0.imx.bbappend index 393e58c..43037a4 100644 --- a/recipes-graphics/wayland/weston_8.0.0.imx.bbappend +++ b/recipes-graphics/wayland/weston_8.0.0.imx.bbappend @@ -1,7 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -# looks like weston-imx requires Vivante 6.4.0 g2d support to compile -# correctly, e.g. -# ../git/libweston/renderer-g2d/g2d-renderer.c:482:37: error: 'G2D_TILED_STATUS' undeclared (first use in this function) -# 482 | g2dSurface->tiling |= G2D_TILED_STATUS; +SRCREV = "27cde5253235104c45b8ce72963e7ae159134f89" -SRC_URI_append = "file://0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch" +# 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" |