Re: [oe-commits] Robert Yang : mesa: fix do_install_append

Re: [oe-commits] Robert Yang : mesa: fix do_install_append

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3811 bytes --]

On Thu, May 14, 2015 at 10:44:21AM +0000, git@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@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@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@intel.com>
Date:   Tue Feb 18 13:32:16 2014 +0200

    mesa: upgrade to 9.2.5
    
?

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

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

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

[Martin Jansa]

* 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.

Signed-off-by: Martin Jansa <Martin.Jansa@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

Re: [PATCH] mesa: respect MESA_EGL_NO_X11_HEADERS even with x11 in PACKAGECONFIG

[Tobias Olausson]

[-- Attachment #1: Type: text/plain, Size: 4016 bytes --]

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@gmail.com> wrote:

> * 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.
>
> Signed-off-by: Martin Jansa <Martin.Jansa@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@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@pelagicore.com
IRC: wto @ FreeNode

[-- Attachment #2: Type: text/html, Size: 6215 bytes --]

Re: [PATCH] mesa: respect MESA_EGL_NO_X11_HEADERS even with x11 in PACKAGECONFIG

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

On 20 July 2015 at 22:27, Tobias Olausson <tobias.olausson@pelagicore.com>
wrote:

> 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?


Yes, please do.

Ross

[-- Attachment #2: Type: text/html, Size: 829 bytes --]