package/meson: add patch to fix issue in conjunction with imx-gpu-viv
PATCH 1/1 package/meson: add patch to fix issue in conjunction with imx-gpu-viv
In file included from host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:39,
from ../libweston/renderer-gl/gl-renderer.h:36,
from ../libweston/backend-drm/drm-gbm.c:42:host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:144:10: fatal error: X11/Xlib.h: No such file or directory
144 | #include <X11/Xlib.h>
For discussion upstream see: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508
--- ...libweston-backend-drm-might-need-EGL.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/meson/0003-libweston-backend-drm-might-need-EGL.patch
package/meson/0003-libweston-backend-drm-might-need-EGL.patch new file +45 -0
@@ -0,0 +1,45 @@ +From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 +From: Heiko Thiery <[email protected]> +Date: Wed, 21 Oct 2020 13:33:25 +0200 +Subject: [PATCH] libweston/backend/drm: might need EGL + +gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns +includes egl.h. As such, dependencies for drm should include EGL if +it is available. + +This condition is modelled after a similar one in libweston/meson.build + +Reported-by: Gary Bisson <[email protected]> +Reported-by: Heiko Thiery <[email protected]> +Signed-off-by: Yann E. MORIN <[email protected]> +Cc: Refik Tuzakli <[email protected]> +Cc: Thomas Petazzoni <[email protected]> +Signed-off-by: Heiko Thiery <[email protected]> +--- +This patch should be a proper fix for the issue discribed in the patch from +Gary. Since the MR on meson upstream [2] is not merged now I add this patch +to have working meson with imx in buildroot. + +[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson at boundarydevices.com/ +[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 +--- + libweston/backend-drm/meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build +index 484c2702..e3e5b976 100644 +--- a/libweston/backend-drm/meson.build ++++ b/libweston/backend-drm/meson.build +@@ -53,6 +53,9 @@ if get_option('renderer-gl') + config_h.set('HAVE_GBM_FD_IMPORT', '1') + endif + deps_drm += dep_gbm ++ if dep_egl.found() ++ deps_drm += dep_egl ++ endif + srcs_drm += 'drm-gbm.c' + config_h.set('BUILD_DRM_GBM', '1') + endif +-- +2.20.1 +
Signature · 1 line
2.20.1
PATCH 1/1 package/meson: add patch to fix issue in conjunction with imx-gpu-viv
Hi all,
Am Mo., 26. Okt. 2020 um 09:11 Uhr schrieb Heiko Thiery <[email protected]>:
Quoted 57 lines
In file included from
host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:39,from ../libweston/renderer-gl/gl-renderer.h:36, from ../libweston/backend-drm/drm-gbm.c:42:
host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:144:10: fatal error:X11/Xlib.h: No such file or directory
144 | #include <X11/Xlib.h>For discussion upstream see: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508
Cc Gary Bisson <[email protected]>Cc Yann E. MORIN <[email protected]>Cc Refik Tuzakli <[email protected]>Cc Thomas Petazzoni <[email protected]>Signed-off-by Heiko Thiery <[email protected]>--- ...libweston-backend-drm-might-need-EGL.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/meson/0003-libweston-backend-drm-might-need-EGL.patchpackage/meson/0003-libweston-backend-drm-might-need-EGL.patch new file +32
-0@@ -0,0 +1,45 @@ +From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 +From: Heiko Thiery <[email protected]> +Date: Wed, 21 Oct 2020 13:33:25 +0200 +Subject: [PATCH] libweston/backend/drm: might need EGL + +gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns +includes egl.h. As such, dependencies for drm should include EGL if +it is available. + +This condition is modelled after a similar one in libweston/meson.build + +Reported-by: Gary Bisson <[email protected]> +Reported-by: Heiko Thiery <[email protected]> +Signed-off-by: Yann E. MORIN <[email protected]> +Cc: Refik Tuzakli <[email protected]> +Cc: Thomas Petazzoni <[email protected]> +Signed-off-by: Heiko Thiery <[email protected]> +--- +This patch should be a proper fix for the issue discribed in the patch from +Gary. Since the MR on meson upstream [2] is not merged now I add this patch +to have working meson with imx in buildroot. + +[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson at boundarydevices.com/ +[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 +--- + libweston/backend-drm/meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build +index 484c2702..e3e5b976 100644 +--- a/libweston/backend-drm/meson.build ++++ b/libweston/backend-drm/meson.build
package/meson/0003-libweston-backend-drm-might-need-EGL.patch line 42
Quoted 10 lines
package/meson/0003-libweston-backend-drm-might-need-EGL.patch new file +10
-0+@@ -53,6 +53,9 @@ if get_option('renderer-gl') + config_h.set('HAVE_GBM_FD_IMPORT', '1') + endif + deps_drm += dep_gbm ++ if dep_egl.found() ++ deps_drm += dep_egl ++ endif + srcs_drm += 'drm-gbm.c' + config_h.set('BUILD_DRM_GBM', '1') + endif
I blindly created this patch without testing it .. the patch was copied to the wrong package meson but it has to reside in the weston package. I will set this patch to a rejected state in patchwork and create a new one for the right package.
Sorry for the noise.
Signature · 1 line
Heiko