Patchwork [dora] mesa: double check for eglplatform.h

login
register
mail settings
Submitter Valentin Popa
Date April 14, 2014, 11:18 a.m.
Message ID <1397474305-5411-1-git-send-email-valentin.popa@intel.com>
Download mbox | patch
Permalink /patch/70573/
State New
Headers show

Comments

Valentin Popa - April 14, 2014, 11:18 a.m.
Even if 'egl' is in PACKAGECONFIG, mesa egl support
can be disabled explicitly (using a .bbappend, for example).
This patch adds another check for the existence
of eglplatform.h before 'sed' can alter it.
---
 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(-)
Otavio Salvador - April 14, 2014, 1:48 p.m.
Hello Valentin,

On Mon, Apr 14, 2014 at 8:18 AM, Valentin Popa <valentin.popa@intel.com> wrote:
> Even if 'egl' is in PACKAGECONFIG, mesa egl support
> can be disabled explicitly (using a .bbappend, for example).
> This patch adds another check for the existence
> of eglplatform.h before 'sed' can alter it.

This is lacking the signed-off-by.

The patch seems fine but I cannot test it at this moment.
Valentin Popa - April 14, 2014, 1:51 p.m.
On 04/14/2014 04:48 PM, Otavio Salvador wrote:
> Hello Valentin,
>
> On Mon, Apr 14, 2014 at 8:18 AM, Valentin Popa <valentin.popa@intel.com> wrote:
>> Even if 'egl' is in PACKAGECONFIG, mesa egl support
>> can be disabled explicitly (using a .bbappend, for example).
>> This patch adds another check for the existence
>> of eglplatform.h before 'sed' can alter it.
> This is lacking the signed-off-by.
>
> The patch seems fine but I cannot test it at this moment.
>
>
I'll send a V2. Thanks!

Patch

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
 }