summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-11-27 21:43:34 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-02 05:24:57 -0800
commit5d17116f5ecfb3f73a1dc6565ac1e3a597ef8133 (patch)
tree7945df628b913c53b02c540f7301e6928db12ccb
parent770cbc076e88f045d33fbba97ff2906e6de4d5fd (diff)
downloadpoky-5d17116f5ecfb3f73a1dc6565ac1e3a597ef8133.tar.gz
mesa: enable glu
GLU is needed by glew, which in turn needed by mesa-demos Signed-off-by: Yu Ke <ke.yu@intel.com>
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc5
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.9.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_7.9.bb2
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 240f956b8a..f029d3d6e7 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -13,7 +13,7 @@ PROVIDES = "virtual/libgl"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16EXTRA_OECONF = "--disable-glu \ 16EXTRA_OECONF = "--enable-glu \
17 --disable-glw \ 17 --disable-glw \
18 --disable-glut \ 18 --disable-glut \
19 --enable-glx-tls" 19 --enable-glx-tls"
@@ -21,4 +21,7 @@ EXTRA_OECONF = "--disable-glu \
21# Multiple virtual/gl providers being built breaks staging 21# Multiple virtual/gl providers being built breaks staging
22EXCLUDE_FROM_WORLD = "1" 22EXCLUDE_FROM_WORLD = "1"
23 23
24PACKAGES =+ "libglu libglu-dev"
24 25
26FILES_libglu = "${libdir}/libGLU.so.*"
27FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.9.bb b/meta/recipes-graphics/mesa/mesa-dri_7.9.bb
index 6f0f984022..313b655d21 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.9.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.9.bb
@@ -8,7 +8,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
8 8
9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" 9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native"
10 10
11PR = "r0" 11PR = "r1"
12 12
13SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 13SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
14 file://crossfix.patch" 14 file://crossfix.patch"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.9.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.9.bb
index c4d3b31e5c..a816e932ba 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.9.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.9.bb
@@ -10,6 +10,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes talloc libxml
10DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 10DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
11 11
12PE = "1" 12PE = "1"
13PR = "r0" 13PR = "r1"
14 14
15EXTRA_OECONF += "--with-driver=xlib" 15EXTRA_OECONF += "--with-driver=xlib"