diff options
| -rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
| -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 5efd663f1..750767ba7 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" PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6" PREFERRED_VERSION_xvinfo ?= "1.0.2" PREFERRED_VERSION_xwininfo ?= "1.1.0" -PREFERRED_VERSION_mesa-dri ?= "7.8.2" +PREFERRED_VERSION_mesa-dri ?= "7.9" PREFERRED_VERSION_libdrm ?= "2.4.22" PREFERRED_VERSION_xcb-proto ?= "1.6" PREFERRED_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 caa9b2ecb..6f0f98402 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 LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" PROTO_DEPS = "xf86driproto glproto dri2proto" -LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \ + libxml2-native talloc" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native" -PR = "r2" +PR = "r0" -SRC_URI += "file://crossfix.patch" +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + file://crossfix.patch" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -21,16 +23,6 @@ LEAD_SONAME = "libGL.so.1" EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" -# We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" -do_configure_prepend() { - sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile -} - -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 @@ -41,13 +33,6 @@ python populate_packages_prepend() { COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -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" - -# -# 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 -# then run gen_matypes > matypes.h on device -# |