3 files changed, 52 insertions, 3 deletions

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index d0e4751706..e88453d423 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -9,14 +9,14 @@ PREFERRED_VERSION_gtk+ ?= "2.18.5"
 PREFERRED_VERSION_pango = "1.26.0"
 PREFERRED_VERSION_udev ?= "145"
 
-PREFERRED_VERSION_mesa-dri ?= "7.5"
+PREFERRED_VERSION_mesa-dri ?= "7.7"
 PREFERRED_VERSION_xf86-video-intel ?= "2.7.1"
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0"
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
 PREFERRED_VERSION_libx11-trim ?= "1.2.1"
 
-PREFERRED_VERSION_libdrm ?= ""
+PREFERRED_VERSION_libdrm ?= "2.4.15"
 PREFERRED_VERSION_xf86-input-keyboard ?= ""
 PREFERRED_VERSION_dri2proto ?= ""
 
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 4cb59646e5..1cc5cd8444 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -74,7 +74,7 @@ SRCREV_pn-twitter-glib ?= "${AUTOREV}"
 SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}"
 
 SRCREV_pn-libdrm ?= "${AUTOREV}"
-PREFERRED_VERSION_libdrm ?= "2.4.7+git%"
+PREFERRED_VERSION_libdrm ?= "2.4.15+git%"
 SRCREV_pn-mesa-dri ?= "${AUTOREV}"
 PREFERRED_VERSION_mesa-dri ?= "7.5+git%"
 SRCREV_pn-xf86-video-intel ?= "${AUTOREV}"
diff --git a/meta/packages/mesa/mesa-dri_7.7.bb b/meta/packages/mesa/mesa-dri_7.7.bb
new file mode 100644
index 0000000000..b4344037ed
--- /dev/null
+++ b/meta/packages/mesa/mesa-dri_7.7.bb
@@ -0,0 +1,49 @@
+include mesa-common.inc
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaLib-${PV}.tar.bz2 \
+           ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaDemos-${PV}.tar.bz2  \
+           file://crossfix.patch;patch=1"
+
+PROTO_DEPS = "xf86driproto glproto dri2proto"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+PR = "r11"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+# Netbooks have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_netbook = "1"
+
+PACKAGES =+ "${PN}-xprogs"
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+LEAD_SONAME = "libGL.so.1"
+
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
+
+do_install_append () {
+    install -d ${D}/usr/bin
+    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
+}
+
+python populate_packages_prepend() {
+        import os.path
+
+        dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+        do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+COMPATIBLE_HOST = '(i.86.*-linux)'
+
+
+#
+# Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl
+# then run gen_matypes > matypes.h on device
+#
\ No newline at end of file