summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa-git.inc
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-13 10:48:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:11 +0100
commit303df74a95aee01eac2cc942fee6e6a755a99b24 (patch)
tree4561f4b9e28e28b88490dcffd2e92ef1a5c9dff5 /meta/recipes-graphics/mesa/mesa-git.inc
parentd7761be8ab9c19f75731e6fbbade22b3643d048e (diff)
downloadpoky-303df74a95aee01eac2cc942fee6e6a755a99b24.tar.gz
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 <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-git.inc')
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc39
1 files changed, 14 insertions, 25 deletions
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 @@
1SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ 1DEPENDS += "mesa-dri-glsl-native"
2 file://cross2.patch \
3 file://matypes.h"
4# file://mesa-DRI2Swapbuffer.patch "
5S = "${WORKDIR}/git"
6
7SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
8PV = "7.7+git${SRCPV}"
9
10PACKAGES =+ "${PN}-xprogs"
11 2
12FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" 3SRCREV = "983fa4ad523535debf2e94cf6ac1fd4c5630c0d2"
4PV = "7.11+gitr${SRCPV}"
13 5
14do_configure_prepend () { 6FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
15 cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
16 touch ${S}/src/mesa/x86/matypes.h
17}
18 7
19do_compile () { 8SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
20 oe_runmake clean 9SRC_URI += "file://uclibc.patch \
21 oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS="" 10 file://crossfix.patch \
22 mv ${S}/src/glsl/apps/compile ${S}/host_compile 11 "
23 oe_runmake clean 12S = "${WORKDIR}/git"
24 oe_runmake GLSL_CL="${S}/host_compile"
25}
26 13
27do_install_append () { 14do_configure_prepend() {
28 install -d ${D}/usr/bin 15 #check for python not python2, because python-native does not stage python2 binary/link
29 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ 16 sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
17 # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
18 sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
30} 19}