9 files changed, 36 insertions, 7 deletions
diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc
index 402a82a6b3..a88a07f019 100644
--- a/recipes/mesa/mesa-common-old.inc
+++ b/recipes/mesa/mesa-common-old.inc
@@ -3,8 +3,13 @@ PE = "2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
 	file://mklib-rpath-link.patch;patch=1"
+
 S = "${WORKDIR}/Mesa-${PV}"
 
+PROVIDES = "virtual/libgl"
+
 LICENSE = "LGPL"
 
+INC_PR = "r3"
+
 DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
diff --git a/recipes/mesa/mesa-dri_6.5.2.bb b/recipes/mesa/mesa-dri_6.5.2.bb
index f94ea8b3d2..594848fd8b 100644
--- a/recipes/mesa/mesa-dri_6.5.2.bb
+++ b/recipes/mesa/mesa-dri_6.5.2.bb
@@ -6,7 +6,7 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-PR = "r2"
+PR = "${INC_PR}.0"
 
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
diff --git a/recipes/mesa/mesa-dri_7.0.3.bb b/recipes/mesa/mesa-dri_7.0.3.bb
index 330efb23af..0cb2fe2cce 100644
--- a/recipes/mesa/mesa-dri_7.0.3.bb
+++ b/recipes/mesa/mesa-dri_7.0.3.bb
@@ -7,7 +7,7 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb
index bea43c3596..f69303a1c5 100644
--- a/recipes/mesa/mesa-dri_7.6.bb
+++ b/recipes/mesa/mesa-dri_7.6.bb
@@ -13,6 +13,8 @@ PR = "${INC_PR}.0"
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
+DEFAULT_PREFERENCE_om-gta01 = "2"
+
 # ASUS EeePC 901 has DRI support so use mesa-dri by default
 DEFAULT_PREFERENCE_eee901 = "1"
 
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index 732e2ae197..001b228bfd 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -23,5 +23,4 @@ FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_mesa-utils = "${bindir}/*"
 
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-EXTRA_OECONF_append_om-gta02 = " --disable-glx-tls --disable-gallium-intel "
+EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
diff --git a/recipes/mesa/mesa-xlib_7.2.bb b/recipes/mesa/mesa-xlib_7.2.bb
index f6c44ebdb0..1e752dce6f 100644
--- a/recipes/mesa/mesa-xlib_7.2.bb
+++ b/recipes/mesa/mesa-xlib_7.2.bb
@@ -5,7 +5,8 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PR = "r4"
+PE = "1"
+PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--with-driver=xlib"
 
diff --git a/recipes/mesa/mesa-xlib_7.4.bb b/recipes/mesa/mesa-xlib_7.4.bb
new file mode 100644
index 0000000000..1e752dce6f
--- /dev/null
+++ b/recipes/mesa/mesa-xlib_7.4.bb
@@ -0,0 +1,20 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--with-driver=xlib"
+
+PACKAGES =+ "${PN}-xprogs"
+
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+do_install_append () {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
+}
diff --git a/recipes/mesa/mesa_6.5.2.bb b/recipes/mesa/mesa_6.5.2.bb
index 79993cc1f1..66078e1a7b 100644
--- a/recipes/mesa/mesa_6.5.2.bb
+++ b/recipes/mesa/mesa_6.5.2.bb
@@ -1,7 +1,7 @@
-PR = "r1"
-
 include mesa-mesa.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
 
 
diff --git a/recipes/mesa/mesa_7.0.2.bb b/recipes/mesa/mesa_7.0.2.bb
index 3eb1fbef8b..66078e1a7b 100644
--- a/recipes/mesa/mesa_7.0.2.bb
+++ b/recipes/mesa/mesa_7.0.2.bb
@@ -1,5 +1,7 @@
 include mesa-mesa.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI_append = " file://fix-host-compile.patch;patch=1 "