summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-07-07 17:28:11 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-07-08 21:19:45 -0700
commitd1993fab7ccac5683ce218fe8ec86b42a7f691ac (patch)
treefd7f29d9baca045e68e4a9ef80bbd9a5d556b48e
parent7b46397e3ac0da35cd1fbb3af40f6394e93161d0 (diff)
downloadpoky-d1993fab7ccac5683ce218fe8ec86b42a7f691ac.tar.gz
mesa: upgrade to 7.8.2
upgrade from 7.4 to 7.8.2 the mesa-dri 7.5 & 7.7 is still kept since it is used by moblin distro. Signed-off-by: Yu Ke <ke.yu@intel.com>
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/packages/mesa/mesa-common.inc9
-rw-r--r--meta/packages/mesa/mesa-dri_7.8.2.bb (renamed from meta/packages/mesa/mesa-dri_7.4.bb)25
-rw-r--r--meta/packages/mesa/mesa-xlib_7.8.2.bb (renamed from meta/packages/mesa/mesa-xlib_7.4.bb)12
4 files changed, 31 insertions, 17 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index fe3e21ccac..f8cb2a1c0f 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.5"
136PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5" 136PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5"
137PREFERRED_VERSION_xvinfo ?= "1.0.2" 137PREFERRED_VERSION_xvinfo ?= "1.0.2"
138PREFERRED_VERSION_xwininfo ?= "1.0.5" 138PREFERRED_VERSION_xwininfo ?= "1.0.5"
139PREFERRED_VERSION_mesa-dri ?= "7.7" 139PREFERRED_VERSION_mesa-dri ?= "7.8.2"
140PREFERRED_VERSION_libdrm ?= "2.4.21" 140PREFERRED_VERSION_libdrm ?= "2.4.21"
141PREFERRED_VERSION_xcb-proto ?= "1.6" 141PREFERRED_VERSION_xcb-proto ?= "1.6"
142PREFERRED_VERSION_libxcb ?= "1.6" 142PREFERRED_VERSION_libxcb ?= "1.6"
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index 26ea671ed5..240f956b8a 100644
--- a/meta/packages/mesa/mesa-common.inc
+++ b/meta/packages/mesa/mesa-common.inc
@@ -1,11 +1,12 @@
1SECTION = "x11"
2
3DESCRIPTION = "An open source implementation of the OpenGL spec" 1DESCRIPTION = "An open source implementation of the OpenGL spec"
4HOMEPAGE = "http://mesa3d.org" 2HOMEPAGE = "http://mesa3d.org"
3BUGTRACKER = "https://bugs.freedesktop.org"
4SECTION = "x11"
5LICENSE = "MIT" 5LICENSE = "MIT"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ 7SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
8 ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " 8 ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 "
9
9S = "${WORKDIR}/Mesa-${PV}" 10S = "${WORKDIR}/Mesa-${PV}"
10 11
11PROVIDES = "virtual/libgl" 12PROVIDES = "virtual/libgl"
diff --git a/meta/packages/mesa/mesa-dri_7.4.bb b/meta/packages/mesa/mesa-dri_7.8.2.bb
index 43e4cb5527..2ea649af3e 100644
--- a/meta/packages/mesa/mesa-dri_7.4.bb
+++ b/meta/packages/mesa/mesa-dri_7.8.2.bb
@@ -1,11 +1,15 @@
1include mesa-common.inc 1include mesa-common.inc
2 2
3LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
4
3PROTO_DEPS = "xf86driproto glproto dri2proto" 5PROTO_DEPS = "xf86driproto glproto dri2proto"
4LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" 6LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
5 7
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 9
8PR = "r6" 10PR = "r0"
11
12SRC_URI += "file://crossfix.patch"
9 13
10# most of our targets do not have DRI so will use mesa-xlib 14# most of our targets do not have DRI so will use mesa-xlib
11DEFAULT_PREFERENCE = "-1" 15DEFAULT_PREFERENCE = "-1"
@@ -13,13 +17,9 @@ DEFAULT_PREFERENCE = "-1"
13# Netbooks have DRI support so use mesa-dri by default 17# Netbooks have DRI support so use mesa-dri by default
14DEFAULT_PREFERENCE_netbook = "1" 18DEFAULT_PREFERENCE_netbook = "1"
15 19
16PACKAGES =+ "${PN}-xprogs" 20LEAD_SONAME = "libGL.so.1"
17PACKAGES_DYNAMIC = "mesa-dri-driver-*"
18
19FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
20FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
21 21
22EXTRA_OECONF += "--with-driver=dri" 22EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
23 23
24do_install_append () { 24do_install_append () {
25 install -d ${D}/usr/bin 25 install -d ${D}/usr/bin
@@ -35,3 +35,14 @@ python populate_packages_prepend() {
35} 35}
36 36
37COMPATIBLE_HOST = '(i.86.*-linux)' 37COMPATIBLE_HOST = '(i.86.*-linux)'
38
39PACKAGES =+ "${PN}-xprogs"
40PACKAGES_DYNAMIC = "mesa-dri-driver-*"
41
42FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
43FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
44
45#
46# 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
47# then run gen_matypes > matypes.h on device
48#
diff --git a/meta/packages/mesa/mesa-xlib_7.4.bb b/meta/packages/mesa/mesa-xlib_7.8.2.bb
index 069446904c..093ad6ed7c 100644
--- a/meta/packages/mesa/mesa-xlib_7.4.bb
+++ b/meta/packages/mesa/mesa-xlib_7.8.2.bb
@@ -1,20 +1,22 @@
1include mesa-common.inc 1include mesa-common.inc
2 2
3LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
4
3PROTO_DEPS = "xf86driproto glproto" 5PROTO_DEPS = "xf86driproto glproto"
4LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" 6LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
5 7
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 9
8PE = "1" 10PE = "1"
9PR = "r3" 11PR = "r0"
10 12
11EXTRA_OECONF += "--with-driver=xlib" 13EXTRA_OECONF += "--with-driver=xlib"
12 14
13PACKAGES =+ "${PN}-xprogs"
14
15FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
16
17do_install_append () { 15do_install_append () {
18 install -d ${D}/${bindir} 16 install -d ${D}/${bindir}
19 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} 17 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
20} 18}
19
20PACKAGES =+ "${PN}-xprogs"
21
22FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"