From d6b997841f850681bf383d61bc76bff69bb3a630 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 20 Jun 2017 18:10:28 -0300 Subject: mesa: Update to 17.1.3 release 17.1.2 release includes fixes for: Bug 98833 - [REGRESSION, bisected] Wayland revert commit breaks non-Vsync fullscreen frame updates Bug 100741 - Chromium - Memory leak Bug 100877 - vulkan/tests/block_pool_no_free regression Bug 101110 - Build failure in GNOME Continuous 17.1.3 release includes fixes for: Bug 100988 - glXGetCurrentDisplay() no longer works for FakeGLX contexts? The 17.1.3 release includes the "util/rand_xor: add missing include statements" which is now merged upstream (thanks Nicolas Dechesne); the referred patch is then dropped from the recipe. (From OE-Core rev: a7417bab21d0fbe0746d9e2b840aa2d576149639) Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...l-rand_xor-add-missing-include-statements.patch | 35 ---------------------- meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb | 13 -------- meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb | 13 ++++++++ meta/recipes-graphics/mesa/mesa_17.1.1.bb | 20 ------------- meta/recipes-graphics/mesa/mesa_17.1.3.bb | 19 ++++++++++++ 5 files changed, 32 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.1.3.bb (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch b/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch deleted file mode 100644 index ffe8b96163..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a8a1081ec05634e667d6670ab7c128d536cc60a9 Mon Sep 17 00:00:00 2001 -From: Nicolas Dechesne -Date: Thu, 1 Jun 2017 11:59:42 +0200 -Subject: [PATCH] util/rand_xor: add missing include statements - -Fixes for: - -src/util/rand_xor.c:60:13: error: implicit declaration of function 'open' [-Werror=implicit-function-declaration] - int fd = open("/dev/urandom", O_RDONLY); - ^~~~ -src/util/rand_xor.c:60:34: error: 'O_RDONLY' undeclared (first use in this function) - int fd = open("/dev/urandom", O_RDONLY); - ^~~~~~~~ - -Upstream-Status: Submitted [ https://lists.freedesktop.org/archives/mesa-dev/2017-June/157542.html ] -Signed-off-by: Nicolas Dechesne ---- - src/util/rand_xor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c -index de05fa64b3..de04bbc284 100644 ---- a/src/util/rand_xor.c -+++ b/src/util/rand_xor.c -@@ -25,6 +25,7 @@ - #if defined(__linux__) - #include - #include -+#include - #else - #include - #endif --- -2.13.0 - diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb deleted file mode 100644 index e3604f30bb..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.1.1.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 ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb new file mode 100644 index 0000000000..e3604f30bb --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.1.3.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 ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa_17.1.1.bb b/meta/recipes-graphics/mesa/mesa_17.1.1.bb deleted file mode 100644 index 55c6f71ab4..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.1.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ - file://disable-asm-on-non-gcc.patch \ - file://0001-Use-wayland-scanner-in-the-path.patch \ - file://0001-util-rand_xor-add-missing-include-statements.patch \ - file://0002-hardware-gloat.patch \ -" - -SRC_URI[md5sum] = "a4844bc6052578574f9629458bcbb749" -SRC_URI[sha256sum] = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef" - -#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_17.1.3.bb b/meta/recipes-graphics/mesa/mesa_17.1.3.bb new file mode 100644 index 0000000000..d9860213f2 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.1.3.bb @@ -0,0 +1,19 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ + file://disable-asm-on-non-gcc.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ + file://0002-hardware-gloat.patch \ +" + +SRC_URI[md5sum] = "1946a93d543bc219427e2bebe2ac4752" +SRC_URI[sha256sum] = "5f1ee9a8aea2880f887884df2dea0c16dd1b13eb42fd2e52265db0dc1b380e8c" + +#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 v1.2.3-54-g00ecf