From 5d17116f5ecfb3f73a1dc6565ac1e3a597ef8133 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Sat, 27 Nov 2010 21:43:34 +0800 Subject: mesa: enable glu GLU is needed by glew, which in turn needed by mesa-demos Signed-off-by: Yu Ke --- meta/recipes-graphics/mesa/mesa-common.inc | 5 ++++- meta/recipes-graphics/mesa/mesa-dri_7.9.bb | 2 +- meta/recipes-graphics/mesa/mesa-xlib_7.9.bb | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'meta/recipes-graphics/mesa') 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" 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 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 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 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 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PE = "1" -PR = "r0" +PR = "r1" EXTRA_OECONF += "--with-driver=xlib" -- cgit v1.2.3