summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch12
-rw-r--r--meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch16
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc3
-rw-r--r--meta/recipes-graphics/mesa/mesa_20.1.2.bb (renamed from meta/recipes-graphics/mesa/mesa_20.0.7.bb)1
5 files changed, 15 insertions, 17 deletions
diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
index cd35a1f850..91e59d14ed 100644
--- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -1,4 +1,4 @@
1From df835389699b32bb6610b39972502e323f8e09e5 Mon Sep 17 00:00:00 2001 1From dd1d15c75f6ff8ee96cf1e7b74e582bff3183ef6 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair@alistair23.me> 2From: Alistair Francis <alistair@alistair23.me>
3Date: Thu, 14 Nov 2019 13:08:31 -0800 3Date: Thu, 14 Nov 2019 13:08:31 -0800
4Subject: [PATCH] meson.build: make TLS ELF optional 4Subject: [PATCH] meson.build: make TLS ELF optional
@@ -15,10 +15,10 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
15 2 files changed, 7 insertions(+), 1 deletion(-) 15 2 files changed, 7 insertions(+), 1 deletion(-)
16 16
17diff --git a/meson.build b/meson.build 17diff --git a/meson.build b/meson.build
18index 09e3759..a954118 100644 18index 261b588..311436e 100644
19--- a/meson.build 19--- a/meson.build
20+++ b/meson.build 20+++ b/meson.build
21@@ -387,7 +387,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat 21@@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
22 endif 22 endif
23 23
24 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. 24 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
@@ -28,10 +28,10 @@ index 09e3759..a954118 100644
28 endif 28 endif
29 29
30diff --git a/meson_options.txt b/meson_options.txt 30diff --git a/meson_options.txt b/meson_options.txt
31index 626baf3..637ff14 100644 31index ab43150..d7b1555 100644
32--- a/meson_options.txt 32--- a/meson_options.txt
33+++ b/meson_options.txt 33+++ b/meson_options.txt
34@@ -341,6 +341,12 @@ option( 34@@ -355,6 +355,12 @@ option(
35 value : true, 35 value : true,
36 description : 'Enable direct rendering in GLX and EGL for DRI', 36 description : 'Enable direct rendering in GLX and EGL for DRI',
37 ) 37 )
@@ -42,5 +42,5 @@ index 626baf3..637ff14 100644
42+ description : 'Enable TLS support in ELF', 42+ description : 'Enable TLS support in ELF',
43+) 43+)
44 option( 44 option(
45 'I-love-half-baked-turnips', 45 'prefer-iris',
46 type : 'boolean', 46 type : 'boolean',
diff --git a/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch b/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
index 901feca556..dacb1ea1c8 100644
--- a/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
+++ b/meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch
@@ -1,4 +1,4 @@
1From 38a313474e127d61e749866423e708fc86ed9ec5 Mon Sep 17 00:00:00 2001 1From 281a636353666bfdd373c62591e744087e750e89 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 Dec 2019 14:15:28 -0800 3Date: Wed, 4 Dec 2019 14:15:28 -0800
4Subject: [PATCH] vc4: use intmax_t for formatted output of timespec members 4Subject: [PATCH] vc4: use intmax_t for formatted output of timespec members
@@ -13,13 +13,14 @@ error: format specifies type 'long' but the argument has type 'time_t' (aka 'lon
13 13
14Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2966] 14Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2966]
15Signed-off-by: Khem Raj <raj.khem@gmail.com> 15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16
16--- 17---
17 src/gallium/drivers/v3d/v3d_bufmgr.c | 4 ++-- 18 src/gallium/drivers/v3d/v3d_bufmgr.c | 4 ++--
18 src/gallium/drivers/vc4/vc4_bufmgr.c | 4 ++-- 19 src/gallium/drivers/vc4/vc4_bufmgr.c | 4 ++--
19 2 files changed, 4 insertions(+), 4 deletions(-) 20 2 files changed, 4 insertions(+), 4 deletions(-)
20 21
21diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c 22diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c
22index b3e4d053cc0..c514bf00bf0 100644 23index 31a0803..cc2e2af 100644
23--- a/src/gallium/drivers/v3d/v3d_bufmgr.c 24--- a/src/gallium/drivers/v3d/v3d_bufmgr.c
24+++ b/src/gallium/drivers/v3d/v3d_bufmgr.c 25+++ b/src/gallium/drivers/v3d/v3d_bufmgr.c
25@@ -80,8 +80,8 @@ v3d_bo_dump_stats(struct v3d_screen *screen) 26@@ -80,8 +80,8 @@ v3d_bo_dump_stats(struct v3d_screen *screen)
@@ -27,27 +28,24 @@ index b3e4d053cc0..c514bf00bf0 100644
27 struct timespec time; 28 struct timespec time;
28 clock_gettime(CLOCK_MONOTONIC, &time); 29 clock_gettime(CLOCK_MONOTONIC, &time);
29- fprintf(stderr, " now: %ld\n", 30- fprintf(stderr, " now: %ld\n",
30- time.tv_sec); 31- (long)time.tv_sec);
31+ fprintf(stderr, " now: %jd\n", 32+ fprintf(stderr, " now: %jd\n",
32+ (intmax_t)time.tv_sec); 33+ (intmax_t)time.tv_sec);
33 } 34 }
34 } 35 }
35 36
36diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c 37diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c
37index 5ec360934c0..bf05f6cadd6 100644 38index a786e8e..975d49e 100644
38--- a/src/gallium/drivers/vc4/vc4_bufmgr.c 39--- a/src/gallium/drivers/vc4/vc4_bufmgr.c
39+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c 40+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c
40@@ -107,8 +107,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen) 41@@ -99,8 +99,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen)
41 42
42 struct timespec time; 43 struct timespec time;
43 clock_gettime(CLOCK_MONOTONIC, &time); 44 clock_gettime(CLOCK_MONOTONIC, &time);
44- fprintf(stderr, " now: %ld\n", 45- fprintf(stderr, " now: %ld\n",
45- time.tv_sec); 46- (long)time.tv_sec);
46+ fprintf(stderr, " now: %jd\n", 47+ fprintf(stderr, " now: %jd\n",
47+ (intmax_t)time.tv_sec); 48+ (intmax_t)time.tv_sec);
48 } 49 }
49 } 50 }
50 51
51--
522.24.0
53
diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb b/meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb
index e50782be1c..e50782be1c 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 965e12d17e..4fe5f025eb 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -23,8 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
23 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 23 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
24 " 24 "
25 25
26SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28" 26SRC_URI[sha256sum] = "283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb"
27SRC_URI[sha256sum] = "fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178"
28 27
29UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 28UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
30 29
diff --git a/meta/recipes-graphics/mesa/mesa_20.0.7.bb b/meta/recipes-graphics/mesa/mesa_20.1.2.bb
index d17d9eb04b..96e8aa38d6 100644
--- a/meta/recipes-graphics/mesa/mesa_20.0.7.bb
+++ b/meta/recipes-graphics/mesa/mesa_20.1.2.bb
@@ -1 +1,2 @@
1require ${BPN}.inc 1require ${BPN}.inc
2