From d18a28c09aaa6c15c806d598e0ae03c5e4ebbd21 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 15 Jul 2016 10:13:31 +0300 Subject: mesa: Upgrade 11.2.2 -> 12.0.1 Massive mesa upgrade (OpenGL 4.3, GLVND support, vulkan driver for intel etc), although many new things are disabled by default. License file change does not change the actual licenses. piglit results (with piglit update on ML) on an old NUC with Intel HD5000 for reference: pass: 33972 fail: 306 crash: 2 skip: 30857 warn: 7 total: 65144 (From OE-Core rev: 6da724dc9cb72e77aa8b1613c3ad71fefc81903f) Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_11.2.2.bb | 16 ---------------- meta/recipes-graphics/mesa/mesa_12.0.1.bb | 16 ++++++++++++++++ 5 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_11.2.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa_12.0.1.bb diff --git a/meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb b/meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb deleted file mode 100644 index f06a3e9b58..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb new file mode 100644 index 0000000000..f06a3e9b58 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb @@ -0,0 +1,13 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1d084c0b85..e4880ffedd 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d5" PE = "2" diff --git a/meta/recipes-graphics/mesa/mesa_11.2.2.bb b/meta/recipes-graphics/mesa/mesa_11.2.2.bb deleted file mode 100644 index a864b54af8..0000000000 --- a/meta/recipes-graphics/mesa/mesa_11.2.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ -" - -SRC_URI[md5sum] = "e0ec73f7273662a74366f0d76dd19ac3" -SRC_URI[sha256sum] = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4" - -#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/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_12.0.1.bb b/meta/recipes-graphics/mesa/mesa_12.0.1.bb new file mode 100644 index 0000000000..ad872b38ec --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_12.0.1.bb @@ -0,0 +1,16 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ +" + +SRC_URI[md5sum] = "972fd5ad5a63aeabf173fb9adefc6522" +SRC_URI[sha256sum] = "bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389" + +#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/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit 1.2.3-korg