From: Saul Wold <sgw@linux.intel.com>
To: Ross Burton <ross.burton@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 2/2] mesa: upgrade to 8.0.5
Date: Wed, 05 Dec 2012 23:43:45 -0800 [thread overview]
Message-ID: <50C04CB1.30300@linux.intel.com> (raw)
In-Reply-To: <1354727906-16779-2-git-send-email-ross.burton@intel.com>
On 12/05/2012 09:18 AM, Ross Burton wrote:
> 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>
> ---
> .../recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 3 ---
> .../recipes-graphics/mesa/mesa-dri_8.0.5.bbappend | 3 +++
This need to be split into 2 patches and sent to the poky alias!
Thanks
Sau!
> 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 ++++
> 8 files changed, 47 insertions(+), 47 deletions(-)
> delete mode 100644 meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> create mode 100644 meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.5.bbappend
> 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-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> deleted file mode 100644
> index 7e8e773..0000000
> --- a/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# Atom PCs have DRI support so use mesa-dri by default
> -DEFAULT_PREFERENCE_atom-pc = "2"
> -
> diff --git a/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.5.bbappend b/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.5.bbappend
> new file mode 100644
> index 0000000..7e8e773
> --- /dev/null
> +++ b/meta-yocto-bsp/recipes-graphics/mesa/mesa-dri_8.0.5.bbappend
> @@ -0,0 +1,3 @@
> +# Atom PCs have DRI support so use mesa-dri by default
> +DEFAULT_PREFERENCE_atom-pc = "2"
> +
> 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 c6307dc..0000000
> --- 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 0000000..b39b011
> --- /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 d551598..0000000
> --- 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 0000000..842d492
> --- /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 a5a592d..0000000
> --- 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 0000000..26b56e4
> --- /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"
>
prev parent reply other threads:[~2012-12-06 7:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-05 17:18 [PATCH 1/2] mesa: merge internal libraries into mesa-dri package Ross Burton
2012-12-05 17:18 ` [PATCH 2/2] mesa: upgrade to 8.0.5 Ross Burton
2012-12-06 7:43 ` Saul Wold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50C04CB1.30300@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.