From 5954c4e593070be7b1b8e26c1df0ec808a9366bd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 30 Jul 2015 13:50:03 -0700 Subject: mesa: respect MESA_EGL_NO_X11_HEADERS even with x11 in PACKAGECONFIG * commit a5ebdb6ad8e4f94ac819275d55575230e057e4ae Author: Valentin Popa Date: Tue Feb 18 13:32:16 2014 +0200 Subject: mesa: upgrade to 9.2.5 introduced this do_install_append, but doesn't explain why it doesn't respect MESA_EGL_NO_X11_HEADERS flag anymore. Not respecting MESA_EGL_NO_X11_HEADERS breaks any build which is using qtdeclarative+egl in distribution which has x11 in mesa PACKAGECONFIG (e.g. my bitbake world builds). The problem is that qtdeclarative is using "None" symbol in QSGTexture::Filtering enum, it's possible to rename it in qtdeclarative, but it's quite invasive and changes qtdeclarative public APIs, see: https://github.com/webOS-ports/meta-webos-ports/commit/31aa85787a7513e279165a25f6f06ea72c576314 so it was rejected by upstream and I don't want to maintain it in meta-qt5 - changing public API in OE build is even worse than if upstream does it. * This change returns MESA_EGL_NO_X11_HEADERS flag so it's relatively easy to resolve this conflict in such setups by preventing Xlib.h inclusion. (From OE-Core rev: e5bf7aeac6f6855040e462d0b7cea8c4ea64805a) Signed-off-by: Martin Jansa Signed-off-by: Ross Burton Signed-off-by: Tobias Olausson Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 +- meta/recipes-graphics/mesa/mesa_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb index 8140411752..077cdbea5a 100644 --- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb @@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}" #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h fi } diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index cbe891118d..31a2b6dcd9 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -13,6 +13,6 @@ S = "${WORKDIR}/git" #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h fi } -- cgit v1.2.3-54-g00ecf