Re: [PATCH 2/2] Backports 9c746017af381884cc20c7cd563fc429c2c66112 to fido

[Martin Jansa <martin.jansa@gmail.com>]

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

On Thu, Jul 30, 2015 at 11:23:07AM -0700, Tobias Olausson wrote:
> Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>

You should use git cherry-pick from master branch commit (and only
resolve the conflicts), so that original commit message is preserved.

> ---
>  meta/recipes-graphics/mesa/mesa_10.4.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.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> index 8140411..da2f5c6 100644
> --- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> @@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}"
>  #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('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +        sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS$/#ifdef 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 cbe8911..5c35159 100644
> --- a/meta/recipes-graphics/mesa/mesa_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> @@ -13,6 +13,6 @@ S = "${WORKDIR}/git"
>  #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('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +        sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS$/#ifdef MESA_EGL_NO_X11_HEADERS || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
>      fi
>  }
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

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