Skip to contentSkip to conversation

mesa: update git recipe to 9.1.5 release

PATCH In review Jonathan Liu 2 participants 4 messages Jul 18, 2013

lore
Share & tools
lore

Jonathan Liu

author
#0 lore raw

PATCH 1/1 mesa: update git recipe to 9.1.5 release

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-graphics/mesa/mesa_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-graphics/mesa/mesa_git.bb +3 -2
index 52d3d81..d8db4e8 100644
@@ -5,14 +5,15 @@ DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
 
 PR = "${INC_PR}.0"
-SRCREV = "5a925cc5504575c22dbb7d29842d7fc5babcb5c7"
-PV = "9.1.3+git${SRCPV}"
+SRCREV = "42146f777b9aa89c3d2c01f2a5cde05749534508"
+PV = "9.1.5+git${SRCPV}"
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
            file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
            file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
            file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \
            file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \
+           file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.8.3.2
#1 lore raw
Quoted 1 line · Jonathan Liu

+ file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \

According to Martin when he upgraded mesa_git to 5a925cc5504575c22dbb7d29842d7fc5babcb5c7 that patch was merged upstream, and as it is only available in mesa-9.1.3/ even if it applied it won't be found.

Ross

#2 lore raw
In reply to Jonathan Liu

meta/recipes-graphics/mesa/mesa_git.bb DEFAULT_PREFERENCE = "-1" · line 8

Quoted 2 lines · Jonathan Liu
meta/recipes-graphics/mesa/mesa_git.bb +1 -1
-SRCREV = "5a925cc5504575c22dbb7d29842d7fc5babcb5c7"
+SRCREV = "42146f777b9aa89c3d2c01f2a5cde05749534508"

Oh, hang on, I knew something was bothering me.

$ git describe 42146f777b9aa89c3d2c01f2a5cde05749534508
mesa-9.1.5
$ git describe 5a925cc5504575c22dbb7d29842d7fc5babcb5c7
snb-magic-16820-g5a925cc

You've switched from a (random) commit on master from June 5th to 9.1.5, so that's not actually an upgrade.

Ross

author
#3 lore raw
Quoted 10 lines · Ross

meta/recipes-graphics/mesa/mesa_git.bb DEFAULT_PREFERENCE = "-1" · line 8

Quoted 2 lines · Jonathan Liu
meta/recipes-graphics/mesa/mesa_git.bb +1 -1
-SRCREV = "5a925cc5504575c22dbb7d29842d7fc5babcb5c7"
+SRCREV = "42146f777b9aa89c3d2c01f2a5cde05749534508"

Oh, hang on, I knew something was bothering me.

$ git describe 42146f777b9aa89c3d2c01f2a5cde05749534508
mesa-9.1.5
$ git describe 5a925cc5504575c22dbb7d29842d7fc5babcb5c7
snb-magic-16820-g5a925cc
Quoted 4 lines

You've switched from a (random) commit on master from June 5th to 9.1.5, so that's not actually an upgrade.

Ross

Please disregard the patch then.

Regards,
Jonathan