summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bragg <bob@openedhand.com>2008-09-23 02:01:11 +0000
committerRobert Bragg <bob@openedhand.com>2008-09-23 02:01:11 +0000
commit604df9a96a5325170488710bf12fb458374829de (patch)
tree2fed5f3babeea3230c4f25a9bd92d0e281a2f9f9
parent9954f13fa723f43cb9db6318ed40016f5f54d617 (diff)
downloadpoky-604df9a96a5325170488710bf12fb458374829de.tar.gz
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
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/packages/mesa/mesa-common.inc3
-rw-r--r--meta/packages/mesa/mesa-dri_7.2.bb (renamed from meta/packages/mesa/mesa-dri_7.1.bb)9
-rw-r--r--meta/packages/mesa/mesa-dri_git.bb2
4 files changed, 12 insertions, 4 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 259f098b5a..143b4e5585 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"
135PREFERRED_VERSION_xtrans-sdk = "1.0.4" 135PREFERRED_VERSION_xtrans-sdk = "1.0.4"
136PREFERRED_VERSION_xvinfo = "1.0.2" 136PREFERRED_VERSION_xvinfo = "1.0.2"
137PREFERRED_VERSION_xwininfo = "1.0.3" 137PREFERRED_VERSION_xwininfo = "1.0.3"
138PREFERRED_VERSION_mesa-dri = "7.1" 138PREFERRED_VERSION_mesa-dri = "7.2"
139PREFERRED_VERSION_libdrm = "2.3.1" 139PREFERRED_VERSION_libdrm = "2.3.1"
140PREFERRED_VERSION_xcb-proto = "1.0" 140PREFERRED_VERSION_xcb-proto = "1.0"
141PREFERRED_VERSION_libxcb = "1.0" 141PREFERRED_VERSION_libxcb = "1.0"
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index b28d5b43e5..ebfb920b87 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"
4HOMEPAGE = "http://mesa3d.org" 4HOMEPAGE = "http://mesa3d.org"
5LICENSE = "MIT" 5LICENSE = "MIT"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2" 7SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
8 ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
8S = "${WORKDIR}/Mesa-${PV}" 9S = "${WORKDIR}/Mesa-${PV}"
9 10
10PROVIDES = "virtual/libgl" 11PROVIDES = "virtual/libgl"
diff --git a/meta/packages/mesa/mesa-dri_7.1.bb b/meta/packages/mesa/mesa-dri_7.2.bb
index 2514eb97f0..d753f33a8e 100644
--- a/meta/packages/mesa/mesa-dri_7.1.bb
+++ b/meta/packages/mesa/mesa-dri_7.2.bb
@@ -6,10 +6,17 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 7
8PE = "1" 8PE = "1"
9PR = "r1" 9PR = "r2"
10
11PACKAGES += "${PN}-xprogs"
10 12
11FILES_${PN} += "${libdir}/dri/*.so" 13FILES_${PN} += "${libdir}/dri/*.so"
12FILES_${PN}-dbg += "${libdir}/dri/.debug/*" 14FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
15FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
13 16
14EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" 17EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
15 18
19do_install_append () {
20 install -d ${D}/usr/bin
21 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
22}
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
index 59b845e6ba..d9e61d8a5c 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"
5 5
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 7
8PV = "7.1+git${SRCREV}" 8PV = "7.2+git${SRCREV}"
9PR = "r1" 9PR = "r1"
10 10
11DEFAULT_PREFERENCE = "-1" 11DEFAULT_PREFERENCE = "-1"