[OE-core] [oe-commits] Robert Yang : mesa: fix do_install_append

[Martin Jansa]

On Thu, May 14, 2015 at 10:44:21AM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 3a464d67b60f70b865f7db768e7edc53e40ff450
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3a464d67b60f70b865f7db768e7edc53e40ff450
> 
> Author: Robert Yang <liezhi.yang at windriver.com>
> Date:   Wed May  6 00:08:35 2015 -0700
> 
> mesa: fix do_install_append
> 
> "ifdef MESA_EGL_NO_X11_HEADERS" -> "if defined(MESA_EGL_NO_X11_HEADERS)"
> 
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> 
> ---
> 
>  meta/recipes-graphics/mesa/mesa_10.5.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.5.4.bb b/meta/recipes-graphics/mesa/mesa_10.5.4.bb
> index 150c664..03c9ecf 100644
> --- a/meta/recipes-graphics/mesa/mesa_10.5.4.bb
> +++ b/meta/recipes-graphics/mesa/mesa_10.5.4.bb
> @@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac
>  #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('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +        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
>      fi
>  }
> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
> index 0260617..8f70f67 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/^#ifdef 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 ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
>      fi

BTW: this is still breaking qtdeclarative which is using "None" symbol
which conflicts with "None" defined in Xlib.h

I've suggested renaming "None" in qtdeclarative to something more
specific, but it was rejected upstream (understandably as it's already
part of public API and needs changes in 5 qt components, see patch here:
https://github.com/webOS-ports/meta-webos-ports/commit/31aa85787a7513e279165a25f6f06ea72c576314)
and they suggested to undef None before qsgtexture.h is included.

Do you remember why we don't respect MESA_EGL_NO_X11_HEADERS here? If
it's to fix application not using pkg-config to pass
MESA_EGL_NO_X11_HEADERS shouldn't we respect both like this:
sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if defined(MESA_EGL_NO_X11_HEADERS) and ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h

+Valentin as it was introduced first in this commit (without any
explanation in commit message)

commit a5ebdb6ad8e4f94ac819275d55575230e057e4ae
Author: Valentin Popa <valentin.popa at intel.com>
Date:   Tue Feb 18 13:32:16 2014 +0200

    mesa: upgrade to 9.2.5
    
?

>  }
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150620/66da3346/attachment-0002.sig>