The commit changed an #ifdef to #if defined(), but the source
code for 10.4 branch of mesa still uses #ifdef.
This reverts commit 12e467f436fbc22f274558c753f0ac9756ce1071.
Signed-off-by: Tobias Olausson <tobias.olaus...@pelagicore.com>
---
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 90cccbe..8140411 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/^#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/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
${@bb.utils.contains('DISTRO_FEATURES', '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 1598019..cbe8911 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/^#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/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
${@bb.utils.contains('DISTRO_FEATURES', '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
