diff options
author | 2016-10-20 12:06:15 +0200 | |
---|---|---|
committer | 2016-10-28 11:27:33 +0100 | |
commit | 446da72c9d4ca8b4b5d9976fbe41686a7af1c260 (patch) | |
tree | bf9e9ac69ab85c23db4fc8625d8cd0ae6a6a5b27 /meta | |
parent | 798107887294072cacb23b668f446e151fe3c35f (diff) | |
download | openembedded-core-contrib-446da72c9d4ca8b4b5d9976fbe41686a7af1c260.tar.gz |
mesa: update to 12.0.3
* removed patch was applied mainline
* tested on RaspberryPi2 weston / lxqt / kde
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/mesa/files/clang-compile-PR89599.patch | 116 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_12.0.3.bb (renamed from meta/recipes-graphics/mesa/mesa_12.0.1.bb) | 5 |
3 files changed, 2 insertions, 119 deletions
diff --git a/meta/recipes-graphics/mesa/files/clang-compile-PR89599.patch b/meta/recipes-graphics/mesa/files/clang-compile-PR89599.patch deleted file mode 100644 index 48bd32567c..0000000000 --- a/meta/recipes-graphics/mesa/files/clang-compile-PR89599.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 5ec140c17b54c25920091501b665b9aa809cc5e8 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Mon, 11 Jul 2016 10:44:25 -0700 -Subject: mapi: Massage code to allow clang to compile. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -According to https://llvm.org/bugs/show_bug.cgi?id=19778#c3 this code -was violating the spec, resulting in it failing to compile. - -Cc: mesa-stable@lists.freedesktop.org -Co-authored-by: Tomasz Paweł Gajc <tpgxyz@gmail.com> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89599 -Reviewed-by: Emil Velikov <emil.velikov@collabora.com> - -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -diff --git a/configure.ac b/configure.ac -index 3799d8d..1ca8359 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,6 +226,7 @@ AX_GCC_FUNC_ATTRIBUTE([packed]) - AX_GCC_FUNC_ATTRIBUTE([pure]) - AX_GCC_FUNC_ATTRIBUTE([returns_nonnull]) - AX_GCC_FUNC_ATTRIBUTE([unused]) -+AX_GCC_FUNC_ATTRIBUTE([visibility]) - AX_GCC_FUNC_ATTRIBUTE([warn_unused_result]) - AX_GCC_FUNC_ATTRIBUTE([weak]) - -diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h -index 38faccc..c5262a1 100644 ---- a/src/mapi/entry_x86-64_tls.h -+++ b/src/mapi/entry_x86-64_tls.h -@@ -25,6 +25,11 @@ - * Chia-I Wu <olv@lunarg.com> - */ - -+#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY -+#define HIDDEN __attribute__((visibility("hidden"))) -+#else -+#define HIDDEN -+#endif - - __asm__(".text\n" - ".balign 32\n" -@@ -54,8 +59,8 @@ entry_patch_public(void) - { - } - --static char --x86_64_entry_start[]; -+extern char -+x86_64_entry_start[] HIDDEN; - - mapi_func - entry_get_public(int slot) -diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h -index 46d2ece..231b409 100644 ---- a/src/mapi/entry_x86_tls.h -+++ b/src/mapi/entry_x86_tls.h -@@ -27,6 +27,12 @@ - - #include <string.h> - -+#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY -+#define HIDDEN __attribute__((visibility("hidden"))) -+#else -+#define HIDDEN -+#endif -+ - __asm__(".text"); - - __asm__("x86_current_tls:\n\t" -@@ -71,8 +77,8 @@ __asm__(".text"); - extern unsigned long - x86_current_tls(); - --static char x86_entry_start[]; --static char x86_entry_end[]; -+extern char x86_entry_start[] HIDDEN; -+extern char x86_entry_end[] HIDDEN; - - void - entry_patch_public(void) -diff --git a/src/mapi/entry_x86_tsd.h b/src/mapi/entry_x86_tsd.h -index ea7bacb..03d9735 100644 ---- a/src/mapi/entry_x86_tsd.h -+++ b/src/mapi/entry_x86_tsd.h -@@ -25,6 +25,11 @@ - * Chia-I Wu <olv@lunarg.com> - */ - -+#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY -+#define HIDDEN __attribute__((visibility("hidden"))) -+#else -+#define HIDDEN -+#endif - - #define X86_ENTRY_SIZE 32 - -@@ -58,8 +63,8 @@ __asm__(".balign 32\n" - #include <string.h> - #include "u_execmem.h" - --static const char x86_entry_start[]; --static const char x86_entry_end[]; -+extern const char x86_entry_start[] HIDDEN; -+extern const char x86_entry_end[] HIDDEN; - - void - entry_patch_public(void) --- -cgit v0.10.2 - diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb index f06a3e9b58..f06a3e9b58 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb diff --git a/meta/recipes-graphics/mesa/mesa_12.0.1.bb b/meta/recipes-graphics/mesa/mesa_12.0.3.bb index 80189e3ff1..acc8353ddb 100644 --- a/meta/recipes-graphics/mesa/mesa_12.0.1.bb +++ b/meta/recipes-graphics/mesa/mesa_12.0.3.bb @@ -2,12 +2,11 @@ require ${BPN}.inc SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ file://replace_glibc_check_with_linux.patch \ - file://clang-compile-PR89599.patch \ file://disable-asm-on-non-gcc.patch \ " -SRC_URI[md5sum] = "972fd5ad5a63aeabf173fb9adefc6522" -SRC_URI[sha256sum] = "bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389" +SRC_URI[md5sum] = "1113699c714042d8c4df4766be8c57d8" +SRC_URI[sha256sum] = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |