mesa: enable glu

GLU is needed by glew, which in turn needed by mesa-demos

Signed-off-by: Yu Ke <ke.yu@intel.com>

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 240f956b8ac728f6bcb5734cf5a64b6865e29772..f029d3d6e7da16fd1a5fcbcc97a38aade48a68fd 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -13,7 +13,7 @@ PROVIDES = "virtual/libgl"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-glu \
+EXTRA_OECONF = "--enable-glu \
                 --disable-glw \
                 --disable-glut \
                 --enable-glx-tls"
@@ -21,4 +21,7 @@ EXTRA_OECONF = "--disable-glu \
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"
 
+PACKAGES =+ "libglu libglu-dev"
 
+FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_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 6f0f984022e81d92d3602cdb6dbb85e6b3e81534..313b655d21fff09917fc5e240f51650d137474bf 100644 (file)
--- 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
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} mesa-dri-glsl-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            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 c4d3b31e5c0c91caedbc8c3781380126c9eb0462..a816e932ba743f0cffdf391da441c513b3255d79 100644 (file)
--- 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
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "--with-driver=xlib"