[Buildroot] [PATCH 1/1] package/weston: add patch to fix issue in conjunction with imx-gpu-viv

[Yann E. MORIN]

Heiko, All,

On 2020-10-26 13:40 +0100, Heiko Thiery spake thusly:
> 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
>  such file or directory
>   144 | #include <X11/Xlib.h>
> 
> For the discussion upstream see: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508
> 
> Cc: Gary Bisson <gary.bisson at boundarydevices.com>
> Cc: Yann E. MORIN <yann.morin.1998 at free.fr>
> Cc: Refik Tuzakli <tuzakli.refik at gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
> Signed-off-by: Heiko Thiery <heiko.thiery at gmail.com>

Even if upstream is still discussing the details of a proper patch, they
have unformally validated this as a correct fix for the time-being.

So, applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...libweston-backend-drm-might-need-EGL.patch | 47 +++++++++++++++++++
>  1 file changed, 47 insertions(+)
>  create mode 100644 package/weston/0002-libweston-backend-drm-might-need-EGL.patch
> 
> diff --git a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch
> new file mode 100644
> index 0000000000..f504e1145b
> --- /dev/null
> +++ b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch
> @@ -0,0 +1,47 @@
> +From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001
> +From: Heiko Thiery <heiko.thiery at gmail.com>
> +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 <gary.bisson at boundarydevices.com>
> +Reported-by: Heiko Thiery <heiko.thiery at gmail.com>
> +Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
> +Cc: Refik Tuzakli <tuzakli.refik at gmail.com>
> +Cc: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
> +Signed-off-by: Heiko Thiery <heiko.thiery at gmail.com>
> +---
> +This patch should be a proper fix for the issue discribed in the patch from
> +Gary [1].
> +
> +Since the MR on weston upstream [2] is not merged now I add this patch
> +to have working weston with imx in buildroot.
> +
> +[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson@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
> +
> -- 
> 2.20.1
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'