diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | recipes/mesa/mesa-dri_git.bb | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 09ffd85748..929c87ea97 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -158,8 +158,6 @@ SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907" SRCREV_pn-matchbox-stroke ?= "1820" SRCREV_pn-matchbox-terminal ?= "1612" SRCREV_pn-matchbox-wm-2 ?= "2087" -SRCREV_pn-mesa-dri ?= "c02cd82b463661def7842f910dc561313559df80" -SRCREV_pn-mesa-dri_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e" SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794" SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2f03f7" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb index ceea1227c1..090cf2fd07 100644 --- a/recipes/mesa/mesa-dri_git.bb +++ b/recipes/mesa/mesa-dri_git.bb @@ -3,16 +3,18 @@ include mesa-common.inc PROTO_DEPS = "xf86driproto glproto dri2proto" LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native mesa-dri-glsl-native" -PV = "7.6.1+gitr${SRCREV}" -PR = "${INC_PR}.3" +PV = "7.7.999" +PR = "${INC_PR}.0" +PR_append = "+gitr${SRCREV}" PE = "1" DEFAULT_PREFERENCE = "-2" DEFAULT_PREFERENCE_om-gta02 = "2" -SRCREV_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e" +SRCREV_pn-mesa-dri ?= "196214bf2b677a83653d49f79d03752f29df44ec" +SRCREV_pn-mesa-dri_om-gta02 ?= "1ac166895fef47806c9e9286d2a6356b4db8398d" SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo" @@ -24,4 +26,11 @@ FILES_${PN} += "${libdir}/dri/*.so" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_mesa-utils = "${bindir}/*" -EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" +EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" +EXTRA_OECONF_om-gta02 += "--with-driver=dri --disable-glx-tls --disable-gallium --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" + +# 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_compile\[0\].abspath + '#'${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/SConscript + sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile +} |