From a63dc47e56d298f2f0d58fda675b77dc0df2b301 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 6 Dec 2012 12:23:32 +0000 Subject: mesa: upgrade to 8.0.5 Licence checksum change, use an upstream source file instead of a generated file: we were previously checksumming the Bison license. (From OE-Core rev: b85388ad0b6c3e7176295949d88c504abf0ba5cc) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-8.0.4.inc | 18 ------------------ meta/recipes-graphics/mesa/mesa-8.0.5.inc | 18 ++++++++++++++++++ .../mesa/mesa-dri-glsl-native_8.0.4.bb | 22 ---------------------- .../mesa/mesa-dri-glsl-native_8.0.5.bb | 22 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb | 4 ---- meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb | 4 ++++ 6 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-8.0.4.inc create mode 100644 meta/recipes-graphics/mesa/mesa-8.0.5.inc delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb diff --git a/meta/recipes-graphics/mesa/mesa-8.0.4.inc b/meta/recipes-graphics/mesa/mesa-8.0.4.inc deleted file mode 100644 index c6307dc603..0000000000 --- a/meta/recipes-graphics/mesa/mesa-8.0.4.inc +++ /dev/null @@ -1,18 +0,0 @@ -DEPENDS += "mesa-dri-glsl-native" - -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 \ - " -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}" - -S = "${WORKDIR}/Mesa-${PV}" - -SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46" -SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e" - -do_configure_prepend() { - # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" - sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile -} diff --git a/meta/recipes-graphics/mesa/mesa-8.0.5.inc b/meta/recipes-graphics/mesa/mesa-8.0.5.inc new file mode 100644 index 0000000000..b39b011f1e --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-8.0.5.inc @@ -0,0 +1,18 @@ +DEPENDS += "mesa-dri-glsl-native" + +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 \ + " +SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}" + +S = "${WORKDIR}/Mesa-${PV}" + +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)" + sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile +} 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.4.bb deleted file mode 100644 index d551598b1a..0000000000 --- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -require mesa-dri-glsl-native.inc - -LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9" - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" -SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46" -SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e" - -S = "${WORKDIR}/Mesa-${PV}/src/glsl/" - -inherit native - -# use default config for native build -do_configure_prepend() { - ln -sf ${S}/../../configs/default ${S}/../../configs/current -} - -do_install() { - install -d ${D}/${bindir}/glsl - install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler - install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler -} diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb new file mode 100644 index 0000000000..842d492843 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.5.bb @@ -0,0 +1,22 @@ +require mesa-dri-glsl-native.inc + +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] = "01305591073a76b65267f69f27d635a3" +SRC_URI[sha256sum] = "511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e" + +S = "${WORKDIR}/Mesa-${PV}/src/glsl/" + +inherit native + +# use default config for native build +do_configure_prepend() { + ln -sf ${S}/../../configs/default ${S}/../../configs/current +} + +do_install() { + install -d ${D}/${bindir}/glsl + install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler + install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler +} diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb deleted file mode 100644 index a5a592d86d..0000000000 --- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require mesa-common.inc -require mesa-${PV}.inc -require mesa-dri.inc -PR = "${INC_PR}.4" diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb new file mode 100644 index 0000000000..26b56e426c --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.5.bb @@ -0,0 +1,4 @@ +require mesa-common.inc +require mesa-${PV}.inc +require mesa-dri.inc +PR = "${INC_PR}.0" -- cgit v1.2.3-54-g00ecf