MIRRORS/meta-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/meta-imx.git synced 2026-01-27 11:32:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

xwayland: Update 23.1.1.imx -> 23.2.5 [YOCIMX-8255]

Browse Source 
Use latest xwayland from OE-Core instead of older version in
meta-freescale.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
This commit is contained in:
Tom Hochstein 2024-09-05 09:07:48 -05:00
parent d91b8b91fd
commit 99ceb057fc
4 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-imx-bsp/conf/machine/include/imx-base-extend.inc
View File

@ -82,6 +82,8 @@ PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.32.imx"
PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.32.imx"
PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.32.imx"
PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= ""
PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.275.0"
PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.275.0"
PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.275.0"

31
meta-imx-bsp/recipes-graphics/xwayland/xwayland/0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch Normal file
View File

@ -0,0 +1,31 @@
From e75a4d7b4474529967490de6e75ae4f1b7128937 Mon Sep 17 00:00:00 2001
From: Xianzhong <xianzhong.li@nxp.com>
Date: Sat, 22 Jan 2022 17:57:59 +0800
Subject: [PATCH 1/3] Prefer to create GLES2 context for glamor EGL
created the initial patch for xwayland-21.1.2
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
---
hw/xwayland/xwayland-glamor-gbm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 12d820e44..8a89919be 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -866,8 +866,8 @@ xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen)
goto error;
}
- if (!xwl_glamor_try_big_gl_api(xwl_screen) &&
- !xwl_glamor_try_gles_api(xwl_screen)) {
+ if (!xwl_glamor_try_gles_api(xwl_screen) &&
+ !xwl_glamor_try_big_gl_api(xwl_screen)) {
ErrorF("Cannot use neither GL nor GLES2\n");
goto error;
}
--
2.17.1

1
meta-imx-bsp/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend
View File

@ -1 +0,0 @@
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx95-nxp-bsp = "glamor glx"

18
meta-imx-bsp/recipes-graphics/xwayland/xwayland_23.2.5.bbappend Normal file
View File

@ -0,0 +1,18 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI:append:imxgpu = " \
file://0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch \
"
OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}"
OPENGL_PKGCONFIGS_REMOVE_IMXGPU = ""
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx"
OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx"
# links with imx-gpu libs which are pre-built for glibc
# gcompat will address it during runtime
LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat"
PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}"