summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-04-21 18:30:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-28 07:56:55 +0100
commite34662860479ebb1255c2f9a7f35d88cbff7b8c5 (patch)
treee77b21ab843a221ed57653c55c7d2cd3ba174a12 /meta/recipes-graphics
parent9686a10207db2354e280c1198080b338ffbd9058 (diff)
downloadpoky-e34662860479ebb1255c2f9a7f35d88cbff7b8c5.tar.gz
mesa: respect x11 in PACKAGECONFIG not DISTRO_FEATURES
* default value of PACKAGECONFIG is set from DISTRO_FEATURES, but in the end we should respect what user sets in PACKAGECONFIG (From OE-Core rev: 684eaa7f87d321c7965d1393cc5da2190c4acac5) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/mesa_10.4.4.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb2
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 8472408001..7b22bb0d44 100644
--- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
@@ -14,6 +14,6 @@ S = "${WORKDIR}/Mesa-${PV}"
14#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 14#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
15do_install_append() { 15do_install_append() {
16 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 16 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
17 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 17 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
18 fi 18 fi
19} 19}
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index cbe891118d..a6d2880be9 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -13,6 +13,6 @@ S = "${WORKDIR}/git"
13#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 13#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
14do_install_append() { 14do_install_append() {
15 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 15 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
16 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 16 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
17 fi 17 fi
18} 18}