From 604df9a96a5325170488710bf12fb458374829de Mon Sep 17 00:00:00 2001
From: Robert Bragg <bob@openedhand.com>
Date: Tue, 23 Sep 2008 02:01:11 +0000
Subject: Bumps the mesa-dri revision to 7.2 and adds a mesa-xdemos package
 including e.g glxinfo

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5231 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../distro/include/preferred-xorg-versions.inc     |  2 +-
 meta/packages/mesa/mesa-common.inc                 |  3 ++-
 meta/packages/mesa/mesa-dri_7.1.bb                 | 15 ---------------
 meta/packages/mesa/mesa-dri_7.2.bb                 | 22 ++++++++++++++++++++++
 meta/packages/mesa/mesa-dri_git.bb                 |  2 +-
 5 files changed, 26 insertions(+), 18 deletions(-)
 delete mode 100644 meta/packages/mesa/mesa-dri_7.1.bb
 create mode 100644 meta/packages/mesa/mesa-dri_7.2.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 259f098b5..143b4e558 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -135,7 +135,7 @@ PREFERRED_VERSION_xtrans-native = "1.0.4"
 PREFERRED_VERSION_xtrans-sdk = "1.0.4"
 PREFERRED_VERSION_xvinfo = "1.0.2"
 PREFERRED_VERSION_xwininfo = "1.0.3"
-PREFERRED_VERSION_mesa-dri = "7.1"
+PREFERRED_VERSION_mesa-dri = "7.2"
 PREFERRED_VERSION_libdrm = "2.3.1"
 PREFERRED_VERSION_xcb-proto = "1.0"
 PREFERRED_VERSION_libxcb = "1.0"
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index b28d5b43e..ebfb920b8 100644
--- a/meta/packages/mesa/mesa-common.inc
+++ b/meta/packages/mesa/mesa-common.inc
@@ -4,7 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec"
 HOMEPAGE = "http://mesa3d.org"
 LICENSE = "MIT"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
+           ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
 S = "${WORKDIR}/Mesa-${PV}"
 
 PROVIDES = "virtual/libgl"
diff --git a/meta/packages/mesa/mesa-dri_7.1.bb b/meta/packages/mesa/mesa-dri_7.1.bb
deleted file mode 100644
index 2514eb97f..000000000
--- a/meta/packages/mesa/mesa-dri_7.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-include mesa-common.inc
-
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
-
-PE = "1"
-PR = "r1"
-
-FILES_${PN} += "${libdir}/dri/*.so"
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
-
diff --git a/meta/packages/mesa/mesa-dri_7.2.bb b/meta/packages/mesa/mesa-dri_7.2.bb
new file mode 100644
index 000000000..d753f33a8
--- /dev/null
+++ b/meta/packages/mesa/mesa-dri_7.2.bb
@@ -0,0 +1,22 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto dri2proto"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+PE = "1"
+PR = "r2"
+
+PACKAGES += "${PN}-xprogs"
+
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
+
+do_install_append () {
+    install -d ${D}/usr/bin
+    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
+}
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
index 59b845e6b..d9e61d8a5 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -5,7 +5,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PV = "7.1+git${SRCREV}"
+PV = "7.2+git${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
-- 
cgit v1.2.3