Patchwork [2/3] mesa: upgrade to 8.0.5

login
register
mail settings
Submitter Ross Burton
Date Dec. 6, 2012, 12:23 p.m.
Message ID <8cccc80457ab4e9c7ec120a2be99d74888c9cdea.1354796499.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/40575/
State Accepted
Commit a63dc47e56d298f2f0d58fda675b77dc0df2b301
Headers show

Comments

Ross Burton - Dec. 6, 2012, 12:23 p.m.
Licence checksum change, use an upstream source file instead of a generated
file: we were previously checksumming the Bison license.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/mesa/{mesa-8.0.4.inc => mesa-8.0.5.inc}    |    6 +++---
 ...sa-dri-glsl-native_8.0.4.bb => mesa-dri-glsl-native_8.0.5.bb} |    6 +++---
 .../mesa/{mesa-dri_8.0.4.bb => mesa-dri_8.0.5.bb}                |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-8.0.4.inc => mesa-8.0.5.inc} (80%)
 rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_8.0.4.bb => mesa-dri-glsl-native_8.0.5.bb} (66%)
 rename meta/recipes-graphics/mesa/{mesa-dri_8.0.4.bb => mesa-dri_8.0.5.bb} (78%)

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-8.0.4.inc b/meta/recipes-graphics/mesa/mesa-8.0.5.inc
similarity index 80%
rename from meta/recipes-graphics/mesa/mesa-8.0.4.inc
rename to meta/recipes-graphics/mesa/mesa-8.0.5.inc
index c6307dc..b39b011 100644
--- a/meta/recipes-graphics/mesa/mesa-8.0.4.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.5.inc
@@ -1,6 +1,6 @@ 
 DEPENDS += "mesa-dri-glsl-native"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://0001-Compile-with-uclibc.patch \
            file://0002-cross-compile.patch \
            file://0003-fix-for-x32.patch \
@@ -9,8 +9,8 @@  SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-ha
 
 S = "${WORKDIR}/Mesa-${PV}"
 
-SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
-SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
+SRC_URI[md5sum] = "01305591073a76b65267f69f27d635a3"
+SRC_URI[sha256sum] = "511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e"
 
 do_configure_prepend() {
   # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb
similarity index 66%
rename from meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
rename to meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb
index d551598..842d492 100644
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb
@@ -1,10 +1,10 @@ 
 require mesa-dri-glsl-native.inc
 
-LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
+LIC_FILES_CHKSUM = "file://glsl_parser.yy;beginline=2;endline=23;md5=a12a9c0208ee64a07ce314dfed4c81eb"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
-SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
-SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
+SRC_URI[md5sum] = "01305591073a76b65267f69f27d635a3"
+SRC_URI[sha256sum] = "511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e"
 
 S = "${WORKDIR}/Mesa-${PV}/src/glsl/"
 
diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb
similarity index 78%
rename from meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
rename to meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb
index a5a592d..26b56e4 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb
@@ -1,4 +1,4 @@ 
 require mesa-common.inc
 require mesa-${PV}.inc
 require mesa-dri.inc
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.0"