From 2665bedf3b38c6d03d991b91a7b150601572b594 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 9 Feb 2015 19:23:46 -0800 Subject: mesa: update 10.4.3 -> 10.4.4 Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb | 11 ----------- meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb | 11 +++++++++++ meta/recipes-graphics/mesa/mesa_10.4.3.bb | 16 ---------------- meta/recipes-graphics/mesa/mesa_10.4.4.bb | 16 ++++++++++++++++ meta/recipes-graphics/mesa/mesa_git.bb | 6 ++---- 5 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_10.4.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa_10.4.4.bb diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb deleted file mode 100644 index 2acc21dce5..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_10.4.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - -PROVIDES = "virtual/libgl virtual/mesa" - -PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb b/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb new file mode 100644 index 0000000000..2acc21dce5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb @@ -0,0 +1,11 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" + +PROVIDES = "virtual/libgl virtual/mesa" + +PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa_10.4.3.bb b/meta/recipes-graphics/mesa/mesa_10.4.3.bb deleted file mode 100644 index 9669bcb40e..0000000000 --- a/meta/recipes-graphics/mesa/mesa_10.4.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" - -SRC_URI[md5sum] = "be86c4ee226f8ca28b7d4c728c350b01" -SRC_URI[sha256sum] = "ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad" - -S = "${WORKDIR}/Mesa-${PV}" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb new file mode 100644 index 0000000000..8140411752 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb @@ -0,0 +1,16 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" + +SRC_URI[md5sum] = "62faf98ac79c5587f8e917e187419e6c" +SRC_URI[sha256sum] = "f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c" + +S = "${WORKDIR}/Mesa-${PV}" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index e554ff4faa..cbe891118d 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -2,10 +2,8 @@ require ${BPN}.inc DEFAULT_PREFERENCE = "-1" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" - -SRCREV = "f70e4d4afd16e66506ce3b055edb3b71b1464890" -PV = "10.4.3+git${SRCPV}" +SRCREV = "62eb27ac8bbd979796f50e253f6c786d7d791242" +PV = "10.4.4+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4" -- cgit 1.2.3-korg