[OE-core] [PATCH] mesa: respect MESA_EGL_NO_X11_HEADERS even with x11 in PACKAGECONFIG

[Tobias Olausson]

Hi,

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?

//Tobias

On 2 July 2015 at 06:03, Martin Jansa <martin.jansa at gmail.com> wrote:

> * commit a5ebdb6ad8e4f94ac819275d55575230e057e4ae
>   Author: Valentin Popa <valentin.popa at 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.
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  meta/recipes-graphics/mesa/mesa_10.5.8.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.5.8.bb
> b/meta/recipes-graphics/mesa/mesa_10.5.8.bb
> index 7cfef0c..072cde9 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
>  #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/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> ${D}${includedir}/EGL/eglplatform.h
> +        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
>      fi
>  }
> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb
> b/meta/recipes-graphics/mesa/mesa_git.bb
> index 8f70f67..c034517 100644
> --- a/meta/recipes-graphics/mesa/mesa_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> @@ -17,6 +17,6 @@ inherit pythonnative
>  #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/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> ${D}${includedir}/EGL/eglplatform.h
> +        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
>      fi
>  }
> --
> 2.4.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>



-- 
Tobias Olausson
M.Sc
Software Engineer

PELAGICORE | Experience Change
Ekelundsgatan 4, 6tr, SE-411 18 Gothenburg, Sweden
Mobile: +46(0)735-873444
E-Mail: tobias.olausson at pelagicore.com
IRC: wto @ FreeNode
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150720/18f3750e/attachment-0002.html>