summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-05-06 02:17:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:43:57 +0100
commit5f21aa0776bef90142116344cbb6280434bf4eec (patch)
treee7c16112797fb0ab584f9ec4bd2d35b2f21f4fec
parentd5f7e09a89b319ac8c72acc55536ca5b449b62ae (diff)
downloadpoky-5f21aa0776bef90142116344cbb6280434bf4eec.tar.gz
mesa-demos: only enable glu when x11 in DISTRO_FEATURES
Fixed when no x11 in DISTRO_FEATURES: checking for GL/glu.h... no configure: error: GLU not found The GL/glu.h is provided by libglu, and libglu requires libGL.so which is provided by mesa, but mesa doesn't build out libGL.so without x11 in DISTRO_FEATURES, so only enable glu when x11 in DISTRO_FEATURES. (From OE-Core rev: 3905be16940ea642244935517f121a84e28aac0f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
index 1caa50bc1b..e565442fc6 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
@@ -25,8 +25,8 @@ SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f
25 25
26inherit autotools pkgconfig 26inherit autotools pkgconfig
27 27
28PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 glu \ 28PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew', '', d)}" 29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew glu', '', d)}"
30 30
31# The Wayland code doesn't work with Wayland 1.0, so disable it for now 31# The Wayland code doesn't work with Wayland 1.0, so disable it for now
32#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" 32#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"