From 303df74a95aee01eac2cc942fee6e6a755a99b24 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 13 Oct 2011 10:48:46 +0200 Subject: mesa-git: upgrade from 7.7+git to 7.11+git * progs package is also gone like in 7.11 (moved to separate recipe) * uclibc.patch was updated a bit to apply again (From OE-Core rev: 3b37ed1ff769bac53777c037b624338691861aac) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-git.inc | 39 ++++++++++++--------------------- 1 file changed, 14 insertions(+), 25 deletions(-) (limited to 'meta/recipes-graphics/mesa/mesa-git.inc') diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc index 2f27ef1a16..c9b17a9cae 100644 --- a/meta/recipes-graphics/mesa/mesa-git.inc +++ b/meta/recipes-graphics/mesa/mesa-git.inc @@ -1,30 +1,19 @@ -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ - file://cross2.patch \ - file://matypes.h" -# file://mesa-DRI2Swapbuffer.patch " -S = "${WORKDIR}/git" - -SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" -PV = "7.7+git${SRCPV}" - -PACKAGES =+ "${PN}-xprogs" +DEPENDS += "mesa-dri-glsl-native" -FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" +SRCREV = "983fa4ad523535debf2e94cf6ac1fd4c5630c0d2" +PV = "7.11+gitr${SRCPV}" -do_configure_prepend () { - cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86 - touch ${S}/src/mesa/x86/matypes.h -} +FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:" -do_compile () { - oe_runmake clean - oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS="" - mv ${S}/src/glsl/apps/compile ${S}/host_compile - oe_runmake clean - oe_runmake GLSL_CL="${S}/host_compile" -} +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" +SRC_URI += "file://uclibc.patch \ + file://crossfix.patch \ + " +S = "${WORKDIR}/git" -do_install_append () { - install -d ${D}/usr/bin - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ +do_configure_prepend() { + #check for python not python2, because python-native does not stage python2 binary/link + sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac + # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" + sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile } -- cgit v1.2.3-54-g00ecf