<div dir="ltr"><div><div>Hi,<br><br></div>I like this patch. I would like a similar patch to be made available in the fido branch, but changing "#if defined()" to "#ifdef" The defines seems to have been changed between mesa 10.4 and 10.5, so the current patch only works for 10.5 - in 10.4 ifdef is used instead so the sed does nothing. Should I submit another patch for that?<br><br></div>//Tobias<br></div><div class="gmail_extra"><br><div class="gmail_quote">On 2 July 2015 at 06:03, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">* commit a5ebdb6ad8e4f94ac819275d55575230e057e4ae<br>
Author: Valentin Popa <<a href="mailto:valentin.popa@intel.com">valentin.popa@intel.com</a>><br>
Date: Tue Feb 18 13:32:16 2014 +0200<br>
Subject: mesa: upgrade to 9.2.5<br>
<br>
introduced this do_install_append, but doesn't explain why it doesn't<br>
respect MESA_EGL_NO_X11_HEADERS flag anymore.<br>
<br>
Not respecting MESA_EGL_NO_X11_HEADERS breaks any build which is using<br>
qtdeclarative+egl in distribution which has x11 in mesa PACKAGECONFIG<br>
(e.g. my bitbake world builds).<br>
<br>
The problem is that qtdeclarative is using "None" symbol in<br>
QSGTexture::Filtering enum, it's possible to rename it in qtdeclarative,<br>
but it's quite invasive and changes qtdeclarative public APIs, see:<br>
<a href="https://github.com/webOS-ports/meta-webos-ports/commit/31aa85787a7513e279165a25f6f06ea72c576314" rel="noreferrer" target="_blank">https://github.com/webOS-ports/meta-webos-ports/commit/31aa85787a7513e279165a25f6f06ea72c576314</a><br>
so it was rejected by upstream and I don't want to maintain it in<br>
meta-qt5 - changing public API in OE build is even worse than if upstream<br>
does it.<br>
<br>
* This change returns MESA_EGL_NO_X11_HEADERS flag so it's relatively<br>
easy to resolve this conflict in such setups by preventing Xlib.h<br>
inclusion.<br>
<br>
Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
---<br>
meta/recipes-graphics/mesa/<a href="http://mesa_10.5.8.bb" rel="noreferrer" target="_blank">mesa_10.5.8.bb</a> | 2 +-<br>
meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a> | 2 +-<br>
2 files changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa_10.5.8.bb" rel="noreferrer" target="_blank">mesa_10.5.8.bb</a> b/meta/recipes-graphics/mesa/<a href="http://mesa_10.5.8.bb" rel="noreferrer" target="_blank">mesa_10.5.8.bb</a><br>
index 7cfef0c..072cde9 100644<br>
--- a/meta/recipes-graphics/mesa/<a href="http://mesa_10.5.8.bb" rel="noreferrer" target="_blank">mesa_10.5.8.bb</a><br>
+++ b/meta/recipes-graphics/mesa/<a href="http://mesa_10.5.8.bb" rel="noreferrer" target="_blank">mesa_10.5.8.bb</a><br>
@@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663<br>
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER<br>
do_install_append() {<br>
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then<br>
- 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<br>
+ 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<br>
fi<br>
}<br>
diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a> b/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a><br>
index 8f70f67..c034517 100644<br>
--- a/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a><br>
+++ b/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a><br>
@@ -17,6 +17,6 @@ inherit pythonnative<br>
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER<br>
do_install_append() {<br>
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then<br>
- 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<br>
+ 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<br>
fi<br>
}<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.4.4<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div>Tobias Olausson<br></div><div>M.Sc</div><div>Software Engineer</div><div><div><br></div><div>PELAGICORE | Experience Change</div><div>Ekelundsgatan 4, 6tr, SE-411 18 Gothenburg, Sweden<br></div><div>Mobile: +46(0)735-873444<br>E-Mail: <a href="mailto:tobias.olausson@pelagicore.com" target="_blank">tobias.olausson@pelagicore.com</a> <br></div></div><div>IRC: wto @ FreeNode</div></div></div></div></div></div>
</div>