mesa: reinstate granular packaging that got lost in poky merge

diff --git a/packages/mesa/mesa-common.inc b/packages/mesa/mesa-common.inc
index 4254ba5..9bb7d3e 100644 (file)
--- a/packages/mesa/mesa-common.inc
+++ b/packages/mesa/mesa-common.inc
@@ -17,6 +17,16 @@ EXTRA_OECONF = "--enable-glu \
                 --disable-glut \
                 --enable-glx-tls"
 
+PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libgl = "${libdir}/libGL.so.*"
+FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
+FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+
 do_stage() {
         autotools_stage_all
                install -d ${STAGING_INCDIR}/GL/        

diff --git a/packages/mesa/mesa-dri_7.2.bb b/packages/mesa/mesa-dri_7.2.bb
index d93fc30..13a22af 100644 (file)
--- a/packages/mesa/mesa-dri_7.2.bb
+++ b/packages/mesa/mesa-dri_7.2.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r5"
+PR = "r6"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"