Skip to content

Commit 7488212

Browse files
author
msieben
committed
[mesa3d] : bump version
Patches are taken from upstream.
1 parent d22888d commit 7488212

7 files changed

+241
-1
lines changed

‎package/mesa3d/21.1.8/0001-c99_math-import-isinf-for-uclibc-based-toolchains.patch‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 705490763fcc052defa2d49a5c5200775cd12c54 Mon Sep 17 00:00:00 2001
2+
From: Peter Seiderer <[email protected]>
3+
Date: Wed, 4 Mar 2020 08:27:24 +0100
4+
Subject: [PATCH] c99_math: import isinf for uclibc based toolchains
5+
6+
The same fix as for glibc >= 2.23 is needed for uclibc
7+
based toolchains.
8+
9+
[Upstream suggested: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4042]
10+
Signed-off-by: Peter Seiderer <[email protected]>
11+
---
12+
include/c99_math.h | 2 +-
13+
1 file changed, 1 insertion(+), 1 deletion(-)
14+
15+
diff --git a/include/c99_math.h b/include/c99_math.h
16+
index e906c26aa54..c8a73a2d2c7 100644
17+
--- a/include/c99_math.h
18+
+++ b/include/c99_math.h
19+
@@ -190,7 +190,7 @@ fpclassify(double x)
20+
* undefines those functions, which in glibc 2.23, are defined as macros rather
21+
* than functions as in glibc 2.22.
22+
*/
23+
-#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23))
24+
+#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23) || defined(__UCLIBC__))
25+
#include <cmath>
26+
27+
using std::fpclassify;
28+
--
29+
2.25.1
30+

‎package/mesa3d/21.1.8/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001
2+
From: Romain Naour <[email protected]>
3+
Date: Wed, 17 Apr 2019 23:07:42 +0200
4+
Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR
5+
6+
LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation
7+
will look for OpenCL "headers" on the target, when building the OpenCL
8+
kernels.
9+
10+
The value returned by pkg-config for includedir is relevant when
11+
cross-compiling, on the build machine. But in this specific case, we
12+
really need a value that is valid on the target.
13+
14+
Those headers are installed by the libclc package in /usr/share so
15+
that they are not removed by Buildroot target-finalize logic.
16+
17+
Based on the patch for autotools provided by Valentin Korenblit.
18+
19+
Signed-off-by: Romain Naour <[email protected]>
20+
Signed-off-by: Bernd Kuhls <[email protected]>
21+
[rebased for 20.2.0 & 20.3.0]
22+
---
23+
src/gallium/frontends/clover/meson.build | 2 +-
24+
1 file changed, 1 insertion(+), 1 deletion(-)
25+
26+
diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build
27+
index 62ac5f5278d..ecdeb39669c 100644
28+
--- a/src/gallium/frontends/clover/meson.build
29+
+++ b/src/gallium/frontends/clover/meson.build
30+
@@ -27,7 +27,7 @@
31+
'-DCL_USE_DEPRECATED_OPENCL_2_0_APIS',
32+
'-DCL_USE_DEPRECATED_OPENCL_2_1_APIS',
33+
'-DCL_USE_DEPRECATED_OPENCL_2_2_APIS',
34+
- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')),
35+
+ '-DLIBCLC_INCLUDEDIR="/usr/share"',
36+
'-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir'))
37+
]
38+
clover_spirv_cpp_args = []
39+
--
40+
2.20.1
41+

‎package/mesa3d/21.1.8/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
From e3b47c1b84964c62b3e1fa782f1ffa4be0ae62f9 Mon Sep 17 00:00:00 2001
2+
From: Peter Seiderer <[email protected]>
3+
Date: Mon, 9 Mar 2020 13:01:14 +0100
4+
Subject: [PATCH] vc4: add meson option to disable optional neon support
5+
6+
Not all toolchains are able to compile the runtime
7+
optional vc4 neon support, so add an meson option
8+
to force disabling it at compile time.
9+
10+
[Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114]
11+
Signed-off-by: Peter Seiderer <[email protected]>
12+
Signed-off-by: Bernd Kuhls <[email protected]>
13+
[rebased for 20.2.0, 20.3.0 & 21.1.0]
14+
---
15+
meson_options.txt | 7 +++++++
16+
src/gallium/drivers/vc4/meson.build | 4 ++--
17+
src/gallium/drivers/vc4/vc4_tiling.h | 4 ++--
18+
3 files changed, 11 insertions(+), 4 deletions(-)
19+
20+
diff --git a/meson_options.txt b/meson_options.txt
21+
index a39596a6f19..0f6b6c62b55 100644
22+
--- a/meson_options.txt
23+
+++ b/meson_options.txt
24+
@@ -123,6 +123,13 @@ option(
25+
choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
26+
description : 'enable gallium va frontend.',
27+
)
28+
+option(
29+
+ 'gallium-vc4-neon',
30+
+ type : 'combo',
31+
+ value : 'auto',
32+
+ choices : ['auto', 'disabled'],
33+
+ description : 'enable gallium vc4 optional neon support.',
34+
+)
35+
option(
36+
'va-libs-path',
37+
type : 'string',
38+
diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build
39+
index 5ce5af5f6b4..e3f7d8d62ae 100644
40+
--- a/src/gallium/drivers/vc4/meson.build
41+
+++ b/src/gallium/drivers/vc4/meson.build
42+
@@ -84,7 +84,7 @@ files_libvc4 = files(
43+
vc4_c_args = []
44+
45+
libvc4_neon = []
46+
-if host_machine.cpu_family() == 'arm'
47+
+if host_machine.cpu_family() == 'arm' and get_option('gallium-vc4-neon') != 'disabled'
48+
libvc4_neon = static_library(
49+
'vc4_neon',
50+
'vc4_tiling_lt_neon.c',
51+
@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm'
52+
],
53+
c_args : '-mfpu=neon',
54+
)
55+
- vc4_c_args += '-DUSE_ARM_ASM'
56+
+ vc4_c_args += '-DVC4_TILING_LT_NEON'
57+
endif
58+
59+
if dep_simpenrose.found()
60+
diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h
61+
index 66767e7f1f8..7446f1c3d0c 100644
62+
--- a/src/gallium/drivers/vc4/vc4_tiling.h
63+
+++ b/src/gallium/drivers/vc4/vc4_tiling.h
64+
@@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride,
65+
void *src, uint32_t src_stride,
66+
int cpp, const struct pipe_box *box)
67+
{
68+
-#ifdef USE_ARM_ASM
69+
+#ifdef VC4_TILING_LT_NEON
70+
if (util_get_cpu_caps()->has_neon) {
71+
vc4_load_lt_image_neon(dst, dst_stride, src, src_stride,
72+
cpp, box);
73+
@@ -105,7 +105,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride,
74+
void *src, uint32_t src_stride,
75+
int cpp, const struct pipe_box *box)
76+
{
77+
-#ifdef USE_ARM_ASM
78+
+#ifdef VC4_TILING_LT_NEON
79+
if (util_get_cpu_caps()->has_neon) {
80+
vc4_store_lt_image_neon(dst, dst_stride, src, src_stride,
81+
cpp, box);
82+
--
83+
2.25.1
84+

‎package/mesa3d/21.1.8/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From fdc8b5a205e2116408aeb9fd305e57f656e2e89d Mon Sep 17 00:00:00 2001
2+
From: Bernd Kuhls <[email protected]>
3+
Date: Sun, 9 Aug 2020 17:06:26 +0200
4+
Subject: [PATCH] src/util/rand_xor: Include stddef.h to fix build error
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
Fixes
10+
11+
In file included from ../src/util/rand_xor.c:29:
12+
output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35:
13+
error: unknown type name ‘size_t’
14+
extern int getrandom(void *__buf, size_t count, unsigned int flags)
15+
16+
seen with gcc version 8.3.0 (Buildroot 2020.02) and uClibc.
17+
18+
Patch sent upstream:
19+
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6248
20+
21+
Signed-off-by: Bernd Kuhls <[email protected]>
22+
---
23+
src/util/rand_xor.c | 1 +
24+
1 file changed, 1 insertion(+)
25+
26+
diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c
27+
index 81b64f1ea71..fcb481487fa 100644
28+
--- a/src/util/rand_xor.c
29+
+++ b/src/util/rand_xor.c
30+
@@ -25,6 +25,7 @@
31+
#include "detect_os.h"
32+
33+
#if !DETECT_OS_WINDOWS
34+
+#include <stddef.h>
35+
#if defined(HAVE_GETRANDOM)
36+
#include <sys/random.h>
37+
#endif
38+
--
39+
2.27.0
40+

‎package/mesa3d/21.1.8/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From e501b7c17ada9c694d3f8302622b78d733485b38 Mon Sep 17 00:00:00 2001
2+
From: Fabrice Fontaine <[email protected]>
3+
Date: Sat, 21 Aug 2021 17:55:33 +0200
4+
Subject: [PATCH] src/util/futex.h: fix build on 32-bit architectures using
5+
64-bit time_t
6+
7+
Fix the following build failure on 32-bit architectures using 64-bit
8+
time_t (e.g. riscv32):
9+
10+
../src/util/futex.h: In function 'sys_futex':
11+
../src/util/futex.h:39:19: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'?
12+
39 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
13+
| ^~~~~~~~~
14+
| sys_futex
15+
16+
Fixes:
17+
- http://autobuild.buildroot.org/results/692700a5f967760a0b8cd358b1712f1d5a7b681e
18+
19+
Signed-off-by: Fabrice Fontaine <[email protected]>
20+
[Upstream status:
21+
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12496]
22+
---
23+
src/util/futex.h | 4 ++++
24+
1 file changed, 4 insertions(+)
25+
26+
diff --git a/src/util/futex.h b/src/util/futex.h
27+
index 43097f4cd5b..221eda9db0c 100644
28+
--- a/src/util/futex.h
29+
+++ b/src/util/futex.h
30+
@@ -34,6 +34,10 @@
31+
#include <sys/syscall.h>
32+
#include <sys/time.h>
33+
34+
+#ifndef SYS_futex
35+
+#define SYS_futex SYS_futex_time64
36+
+#endif
37+
+
38+
static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3)
39+
{
40+
return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
41+
--
42+
2.32.0
43+

‎package/mesa3d/mesa3d.hash‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
sha256 b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37 mesa-21.1.6.tar.xz
33
sha512 5daf389aad4fe7ab3574f6af3aabc62ba8b3034004a0a0853dcc18ef6c8003d2f2195cc377dc57b30863ae4cf158149e3156247445ca2b11e401700011cb878c mesa-21.1.6.tar.xz
44
sha256 d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a mesa-20.2.1.tar.xz
5+
sha256 5cd32f5d089dca75300578a3d771a656eaed652090573a2655fe4e7022d56bfc mesa-21.1.8.tar.xz
6+
sha512 80fcf2b1d59b49e384e9aa1ae63a3ce709833059af1ffd8eb821054c1976709134098cfc79fac1578a2f08a003223f1c96b38e2e650c5be49821c6f2fe1047af mesa-21.1.8.tar.xz
57

68
# License
79
sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst

‎package/mesa3d/mesa3d.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
################################################################################
66

77
# When updating the version, please also update mesa3d-headers
8-
MESA3D_VERSION = 21.1.6
8+
MESA3D_VERSION = 21.1.8
99
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
1010
MESA3D_SITE = https://mesa.freedesktop.org/archive
1111
MESA3D_LICENSE = MIT, SGI, Khronos

0 commit comments

Comments
 (0)