[oe] [meta-qt5][PATCH] Pass -DMESA_EGL_NO_X11_HEADERS=1 when x is disabled

[Andre McCurdy]

On Thu, Mar 8, 2018 at 9:43 AM, Khem Raj <raj.khem at gmail.com> wrote:
> Some graphics drives e.g. mali/mesa depend on this define
> to use proper guards in eglplatform.h

Would it be better to patch the header directly rather than try to
arrange that every application which uses it defines the correct
CFLAGS?

> Fixes
>
> | In file included from /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/egl.h:36:0,
> |                  from .moc/../../../../../../git/src/plugins/videonode/egl/qsgvideonode_egl.h:48,
> |                  from .moc/moc_qsgvideonode_egl.cpp:9:
> | /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:125:10: fatal error: X11/Xlib.h: No such file or directory
> |  #include <X11/Xlib.h>
> |           ^~~~~~~~~~~~
> | compilation terminated.
> | make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1
>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  recipes-qt/qt5/qtmultimedia_git.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
> index 2cb1bd5..efe848f 100644
> --- a/recipes-qt/qt5/qtmultimedia_git.bb
> +++ b/recipes-qt/qt5/qtmultimedia_git.bb
> @@ -25,6 +25,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
>  # Disable GStreamer if completely disabled
>  EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
>
> +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}"
>  # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10
>  # 5.10.meta-qt5.2
>  SRC_URI += "\
> --
> 2.16.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel