From 60822a633926554e43319e8f2f5cc4fb8a5cab16 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 3 Apr 2018 18:01:46 -0300 Subject: mesa: Upgrade 17.3.7 -> 17.3.8 This version has been published at April 03, 2018, and it is a bugfix only release. The release includes several important fixes that were made as part of 18.0.1 development cycle. Full list of bug fixes can be see online at: https://www.mesa3d.org/relnotes/17.3.8.html (From OE-Core rev: 782fb864349d4f5c07a38f0e117659bfb841d3c2) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- .../files/replace_glibc_check_with_linux.patch | 28 ---------------------- meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb | 9 ------- meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb | 9 +++++++ meta/recipes-graphics/mesa/mesa_17.3.7.bb | 24 ------------------- meta/recipes-graphics/mesa/mesa_17.3.8.bb | 23 ++++++++++++++++++ 5 files changed, 32 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.3.7.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.3.8.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch deleted file mode 100644 index 30f55f4dac..0000000000 --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Otavio Salvador -Subject: [PATCH] endianness check is OS wide and not specific to libc - -Upstream-Status: Accepted [https://cgit.freedesktop.org/mesa/mesa/commit/?id=cbee1bfb34274668a05995b9d4c78ddec9e5ea4c] - -Signed-off-by: Khem Raj -Signed-off-by: Jussi Kukkonen -Signed-off-by: Otavio Salvador ---- - src/util/u_endian.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/u_endian.h b/src/util/u_endian.h -index 9e09f80181..3148033fae 100644 ---- a/src/util/u_endian.h -+++ b/src/util/u_endian.h -@@ -27,7 +27,7 @@ - #ifndef U_ENDIAN_H - #define U_ENDIAN_H - --#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) -+#if defined(__linux__) - #include - - #if __BYTE_ORDER == __LITTLE_ENDIAN --- -2.15.1 - diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb deleted file mode 100644 index 73267eb4f0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.3.7.bb +++ /dev/null @@ -1,9 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb new file mode 100644 index 0000000000..73267eb4f0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb @@ -0,0 +1,9 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa_17.3.7.bb b/meta/recipes-graphics/mesa/mesa_17.3.7.bb deleted file mode 100644 index 9c75d6c693..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.3.7.bb +++ /dev/null @@ -1,24 +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://Use-Python-3-to-execute-the-scripts.patch \ - file://0001-Use-wayland-scanner-in-the-path.patch \ - file://0002-hardware-gloat.patch \ - file://llvm-config-version.patch \ - file://0001-winsys-svga-drm-Include-sys-types.h.patch \ - file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ - file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \ - " - -SRC_URI[md5sum] = "769137f2538562c300c4b76bcb097377" -SRC_URI[sha256sum] = "0595904a8fba65a8fe853a84ad3c940205503b94af41e8ceed245fada777ac1e" - -#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.3.8.bb b/meta/recipes-graphics/mesa/mesa_17.3.8.bb new file mode 100644 index 0000000000..2d3fd3ca38 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.3.8.bb @@ -0,0 +1,23 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://disable-asm-on-non-gcc.patch \ + file://Use-Python-3-to-execute-the-scripts.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ + file://0002-hardware-gloat.patch \ + file://llvm-config-version.patch \ + file://0001-winsys-svga-drm-Include-sys-types.h.patch \ + file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \ + " + +SRC_URI[md5sum] = "203d1a79156ab6926f2d253b377e9d9d" +SRC_URI[sha256sum] = "8f9d9bf281c48e4a8f5228816577263b4c655248dc7666e75034ab422951a6b1" + +#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