From 41666ddba78ff1f094310589489e0a070e0094d8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 8 Mar 2018 09:43:16 -0800 Subject: qtmultimedia: Pass -DMESA_EGL_NO_X11_HEADERS=1 when x is disabled Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h 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 | ^~~~~~~~~~~~ | compilation terminated. | make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1 Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- 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 2cb1bd57..efe848f0 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 += "\ -- cgit v1.2.3