summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-07-02 15:03:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:09:19 +0100
commit8bffb5a88b46e4daf3c0598571042ab24039fc2e (patch)
tree90bf9252dc72f169c75f3d4c398ca31dbc419893 /meta
parent3f9658a48261d2bb6be2781e81c84dd709f15754 (diff)
downloadpoky-8bffb5a88b46e4daf3c0598571042ab24039fc2e.tar.gz
mesa: respect MESA_EGL_NO_X11_HEADERS even with x11 in PACKAGECONFIG
* commit a5ebdb6ad8e4f94ac819275d55575230e057e4ae Author: Valentin Popa <valentin.popa@intel.com> 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: 9c746017af381884cc20c7cd563fc429c2c66112) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa_10.5.8.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa_10.5.8.bb b/meta/recipes-graphics/mesa/mesa_10.5.8.bb
index 7cfef0c6a1..072cde9395 100644
--- a/meta/recipes-graphics/mesa/mesa_10.5.8.bb
+++ b/meta/recipes-graphics/mesa/mesa_10.5.8.bb
@@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663
9#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 9#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
10do_install_append() { 10do_install_append() {
11 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 11 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
12 sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h 12 sed -i -e 's/^#if defined(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
13 fi 13 fi
14} 14}
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 8f70f6721b..c0345178c4 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -17,6 +17,6 @@ inherit pythonnative
17#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 17#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
18do_install_append() { 18do_install_append() {
19 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 19 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
20 sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h 20 sed -i -e 's/^#if defined(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
21 fi 21 fi
22} 22}