Patchwork mesa: update git recipe to 9.1.5 release

login
register
mail settings
Submitter Jonathan Liu
Date July 18, 2013, 2:18 p.m.
Message ID <1374157097-20939-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/53961/
State Rejected, archived
Headers show

Comments

Ross Burton - July 18, 2013, 2:06 p.m.
On 18 July 2013 15:18, Jonathan Liu <net147@gmail.com> wrote:
> +           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
Ross Burton - July 18, 2013, 2:12 p.m.
On 18 July 2013 15:18, Jonathan Liu <net147@gmail.com> wrote:
> -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
Jonathan Liu - July 18, 2013, 2:18 p.m.
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 meta/recipes-graphics/mesa/mesa_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Jonathan Liu - July 18, 2013, 2:21 p.m.
On 19/07/2013 12:12 AM, Burton, Ross wrote:
> On 18 July 2013 15:18, Jonathan Liu <net147@gmail.com> wrote:
>> -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
Please disregard the patch then.

Regards,
Jonathan

Patch

diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 52d3d81..d8db4e8 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -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"