Re: [dora][PATCH_V3] mesa: double check for eglplatform.h

[Robert Yang <liezhi.yang@windriver.com>]

On 04/14/2014 10:51 PM, Valentin Popa wrote:
> Even if 'egl' is in PACKAGECONFIG, mesa egl support
> can be disabled explicitly (changing configure flags
> using a .bbappend, for example).
> On dora, meta-fsl-arm is an example of this kind.
> On master there are no known cases, and we should
> encourge package configuration through PACKAGECONFIG.
>
> This patch adds another check for the existence
> of eglplatform.h before 'sed' can alter it.
>
> Signed-off-by: Valentin Popa <valentin.popa@intel.com>

Reviewed and Tested by: Robert Yang <liezhi.yang@windriver.com>

// Robert

> ---
>   meta/recipes-graphics/mesa/mesa_9.1.6.bb | 4 +++-
>   meta/recipes-graphics/mesa/mesa_git.bb   | 4 +++-
>   2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa_9.1.6.bb b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
> index 6e9cd82..388cfd7 100644
> --- a/meta/recipes-graphics/mesa/mesa_9.1.6.bb
> +++ b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
> @@ -19,6 +19,8 @@ S = "${WORKDIR}/Mesa-${PV}"
>   #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
>   do_install_append() {
>       if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
> -        sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +        if [ -e "${D}${includedir}/EGL/eglplatform.h" ]; then
> +            sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +        fi
>       fi
>   }
> \ No newline at end of file
> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
> index 1babcc0..714911f 100644
> --- a/meta/recipes-graphics/mesa/mesa_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> @@ -23,6 +23,8 @@ S = "${WORKDIR}/git"
>   #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
>   do_install_append() {
>       if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
> -        sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +        if [ -e "${D}${includedir}/EGL/eglplatform.h" ]; then
> +            sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> +        fi
>       fi
>   }
>