summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.9.bb (renamed from meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb)25
2 files changed, 6 insertions, 21 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 5efd663f11..750767ba7a 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.6"
136PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6" 136PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
137PREFERRED_VERSION_xvinfo ?= "1.0.2" 137PREFERRED_VERSION_xvinfo ?= "1.0.2"
138PREFERRED_VERSION_xwininfo ?= "1.1.0" 138PREFERRED_VERSION_xwininfo ?= "1.1.0"
139PREFERRED_VERSION_mesa-dri ?= "7.8.2" 139PREFERRED_VERSION_mesa-dri ?= "7.9"
140PREFERRED_VERSION_libdrm ?= "2.4.22" 140PREFERRED_VERSION_libdrm ?= "2.4.22"
141PREFERRED_VERSION_xcb-proto ?= "1.6" 141PREFERRED_VERSION_xcb-proto ?= "1.6"
142PREFERRED_VERSION_libxcb ?= "1.7" 142PREFERRED_VERSION_libxcb ?= "1.7"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.9.bb
index caa9b2ecbc..6f0f984022 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.9.bb
@@ -3,13 +3,15 @@ include mesa-common.inc
3LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" 3LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
4 4
5PROTO_DEPS = "xf86driproto glproto dri2proto" 5PROTO_DEPS = "xf86driproto glproto dri2proto"
6LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" 6LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
7 libxml2-native talloc"
7 8
8DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" 9DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native"
9 10
10PR = "r2" 11PR = "r0"
11 12
12SRC_URI += "file://crossfix.patch" 13SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
14 file://crossfix.patch"
13 15
14# most of our targets do not have DRI so will use mesa-xlib 16# most of our targets do not have DRI so will use mesa-xlib
15DEFAULT_PREFERENCE = "-1" 17DEFAULT_PREFERENCE = "-1"
@@ -21,16 +23,6 @@ LEAD_SONAME = "libGL.so.1"
21 23
22EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" 24EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
23 25
24# We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
25do_configure_prepend() {
26 sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile
27}
28
29do_install_append () {
30 install -d ${D}/usr/bin
31 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
32}
33
34python populate_packages_prepend() { 26python populate_packages_prepend() {
35 import os.path 27 import os.path
36 28
@@ -41,13 +33,6 @@ python populate_packages_prepend() {
41 33
42COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 34COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
43 35
44PACKAGES =+ "${PN}-xprogs"
45PACKAGES_DYNAMIC = "mesa-dri-driver-*" 36PACKAGES_DYNAMIC = "mesa-dri-driver-*"
46 37
47FILES_${PN}-dbg += "${libdir}/dri/.debug/*" 38FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
48FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
49
50#
51# 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
52# then run gen_matypes > matypes.h on device
53#