diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-02-20 10:28:07 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:47 +0000 |
commit | d6cd82a5a169b9b3a461193a0a2139ba02912b29 (patch) | |
tree | 21733ccd767082f59374a07241d46df8cbd0d055 | |
parent | eaa93567449293c482e0175158c5abef1dddcbdf (diff) | |
download | poky-d6cd82a5a169b9b3a461193a0a2139ba02912b29.tar.gz |
mesa: Upgrade 17.3.3 -> 17.3.5
The 17.3.5 release, published in February 19th, 2018 to fix a critical
regression from 17.3.4 release. They fix a number of issues since
17.3.3 release.
The release notes can be seen at:
https://www.mesa3d.org/relnotes/17.3.4.html
https://www.mesa3d.org/relnotes/17.3.5.html
(From OE-Core rev: 350ff6b0151afcca3a6e233d4840d41052bd826a)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch | 54 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_17.3.4.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_17.3.5.bb (renamed from meta/recipes-graphics/mesa/mesa_17.3.4.bb) | 6 |
4 files changed, 2 insertions, 85 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch b/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch deleted file mode 100644 index da7a81f253..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From b474abdd91158a52821c34865277d7de38880529 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Wed, 17 Jan 2018 15:53:29 +0200 | ||
4 | Subject: [PATCH] anv_icd.py: improve reproducible builds | ||
5 | |||
6 | Sort the output to ensure reproducibility | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
11 | --- | ||
12 | src/intel/vulkan/anv_icd.py | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/intel/vulkan/anv_icd.py b/src/intel/vulkan/anv_icd.py | ||
16 | index 4ed01fa..31bb068 100644 | ||
17 | --- a/src/intel/vulkan/anv_icd.py | ||
18 | +++ b/src/intel/vulkan/anv_icd.py | ||
19 | @@ -44,4 +44,4 @@ if __name__ == '__main__': | ||
20 | } | ||
21 | |||
22 | with open(args.out, 'w') as f: | ||
23 | - json.dump(json_data, f, indent = 4) | ||
24 | + json.dump(json_data, f, indent = 4, sort_keys=True) | ||
25 | -- | ||
26 | 2.4.0 | ||
27 | |||
diff --git a/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch b/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch deleted file mode 100644 index 38ddf49af6..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> | ||
3 | |||
4 | From 23ce168048698eeea3df6bb8c9de5be3ca4784cd Mon Sep 17 00:00:00 2001 | ||
5 | From: Igor Gnatenko <ignatenko@redhat.com> | ||
6 | Date: Mon, 1 Jan 2018 22:49:00 +0100 | ||
7 | Subject: [PATCH] link mesautil with pthreads | ||
8 | |||
9 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_setname': | ||
10 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:66: undefined reference to `pthread_setname_np' | ||
11 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_join': | ||
12 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:336: undefined reference to `pthread_join' | ||
13 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': | ||
14 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:48: undefined reference to `pthread_sigmask' | ||
15 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_create': | ||
16 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:296: undefined reference to `pthread_create' | ||
17 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': | ||
18 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' | ||
19 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' | ||
20 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `call_once': | ||
21 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:96: undefined reference to `pthread_once' | ||
22 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': | ||
23 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:84: undefined reference to `pthread_getcpuclockid' | ||
24 | collect2: error: ld returned 1 exit status | ||
25 | |||
26 | Reviewed-by: Adam Jackson <ajax@redhat.com> | ||
27 | Signed-off-by: Igor Gnatenko <ignatenko@redhat.com> | ||
28 | --- | ||
29 | src/util/Makefile.am | 2 ++ | ||
30 | 1 file changed, 2 insertions(+) | ||
31 | |||
32 | diff --git a/src/util/Makefile.am b/src/util/Makefile.am | ||
33 | index a5241ad27b..633907b9fd 100644 | ||
34 | --- a/src/util/Makefile.am | ||
35 | +++ b/src/util/Makefile.am | ||
36 | @@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \ | ||
37 | libxmlconfig.la | ||
38 | |||
39 | AM_CPPFLAGS = \ | ||
40 | + $(PTHREAD_CFLAGS) \ | ||
41 | -I$(top_srcdir)/include | ||
42 | |||
43 | libmesautil_la_CPPFLAGS = \ | ||
44 | @@ -50,6 +51,7 @@ libmesautil_la_SOURCES = \ | ||
45 | $(MESA_UTIL_GENERATED_FILES) | ||
46 | |||
47 | libmesautil_la_LIBADD = \ | ||
48 | + $(PTHREAD_LIBS) \ | ||
49 | $(CLOCK_LIB) \ | ||
50 | $(ZLIB_LIBS) \ | ||
51 | $(LIBATOMIC_LIBS) | ||
52 | -- | ||
53 | 2.14.3 | ||
54 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb index 73267eb4f0..73267eb4f0 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_17.3.4.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa_17.3.4.bb b/meta/recipes-graphics/mesa/mesa_17.3.5.bb index 623046e116..3ce7135f28 100644 --- a/meta/recipes-graphics/mesa/mesa_17.3.4.bb +++ b/meta/recipes-graphics/mesa/mesa_17.3.5.bb | |||
@@ -9,12 +9,10 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
9 | file://llvm-config-version.patch \ | 9 | file://llvm-config-version.patch \ |
10 | file://0001-winsys-svga-drm-Include-sys-types.h.patch \ | 10 | file://0001-winsys-svga-drm-Include-sys-types.h.patch \ |
11 | file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ | 11 | file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ |
12 | file://0001-anv_icd.py-improve-reproducible-builds.patch \ | ||
13 | file://0001-link-mesautil-with-pthreads.patch \ | ||
14 | " | 12 | " |
15 | 13 | ||
16 | SRC_URI[md5sum] = "139b5f608b371c0d4395596162f88791" | 14 | SRC_URI[md5sum] = "bf73288c33cf12abe62045c25e2196b4" |
17 | SRC_URI[sha256sum] = "41bac5de0ef6adc1f41a1ec0f80c19e361298ce02fa81b5f9ba4fdca33a9379b" | 15 | SRC_URI[sha256sum] = "eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a" |
18 | 16 | ||
19 | #because we cannot rely on the fact that all apps will use pkgconfig, | 17 | #because we cannot rely on the fact that all apps will use pkgconfig, |
20 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | 18 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |