From 7d5759aa4429c626e66f65e8e0807a999d324e6f Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 14 Apr 2009 12:50:03 +0100
Subject: mesa: Upgrade 7.2 -> 7.4

---
 .../distro/include/preferred-xorg-versions.inc     |  2 +-
 meta/packages/mesa/mesa-dri_7.2.bb                 | 37 ----------------------
 meta/packages/mesa/mesa-dri_7.4.bb                 | 37 ++++++++++++++++++++++
 meta/packages/mesa/mesa-xlib_7.2.bb                | 20 ------------
 meta/packages/mesa/mesa-xlib_7.4.bb                | 20 ++++++++++++
 5 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 meta/packages/mesa/mesa-dri_7.2.bb
 create mode 100644 meta/packages/mesa/mesa-dri_7.4.bb
 delete mode 100644 meta/packages/mesa/mesa-xlib_7.2.bb
 create mode 100644 meta/packages/mesa/mesa-xlib_7.4.bb

(limited to 'meta')

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index f50f2b19a..141d98364 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -136,7 +136,7 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.2"
 PREFERRED_VERSION_xtrans-sdk ?= "1.2.2"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.0.4"
-PREFERRED_VERSION_mesa-dri ?= "7.3.0+git${SRCREV}"
+PREFERRED_VERSION_mesa-dri ?= "7.4"
 PREFERRED_VERSION_libdrm ?= "2.4.4"
 PREFERRED_VERSION_xcb-proto ?= "1.2"
 PREFERRED_VERSION_libxcb ?= "1.1.91"
diff --git a/meta/packages/mesa/mesa-dri_7.2.bb b/meta/packages/mesa/mesa-dri_7.2.bb
deleted file mode 100644
index 43e4cb552..000000000
--- a/meta/packages/mesa/mesa-dri_7.2.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-include mesa-common.inc
-
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
-
-PR = "r6"
-
-# 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"
-
-EXTRA_OECONF += "--with-driver=dri"
-
-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)'
diff --git a/meta/packages/mesa/mesa-dri_7.4.bb b/meta/packages/mesa/mesa-dri_7.4.bb
new file mode 100644
index 000000000..43e4cb552
--- /dev/null
+++ b/meta/packages/mesa/mesa-dri_7.4.bb
@@ -0,0 +1,37 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto dri2proto"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+PR = "r6"
+
+# 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"
+
+EXTRA_OECONF += "--with-driver=dri"
+
+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)'
diff --git a/meta/packages/mesa/mesa-xlib_7.2.bb b/meta/packages/mesa/mesa-xlib_7.2.bb
deleted file mode 100644
index 069446904..000000000
--- a/meta/packages/mesa/mesa-xlib_7.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-include mesa-common.inc
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
-
-PE = "1"
-PR = "r3"
-
-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/meta/packages/mesa/mesa-xlib_7.4.bb b/meta/packages/mesa/mesa-xlib_7.4.bb
new file mode 100644
index 000000000..069446904
--- /dev/null
+++ b/meta/packages/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 = "r3"
+
+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}
+}
-- 
cgit v1.2.3