diff options
11 files changed, 59 insertions, 110 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch b/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch index 8bedbac669..3b0bfa323b 100644 --- a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch +++ b/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8973e297f2f9b17498b9dc0e37a19481d4bb7df9 Mon Sep 17 00:00:00 2001 | 1 | From 253b042d2bf10e9abfa9cc508e0782aefd834145 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 16 Oct 2020 11:03:47 -0700 | 3 | Date: Fri, 16 Oct 2020 11:03:47 -0700 |
4 | Subject: [PATCH] futex.h: Define __NR_futex if it does not exist | 4 | Subject: [PATCH] futex.h: Define __NR_futex if it does not exist |
@@ -12,10 +12,13 @@ working | |||
12 | 12 | ||
13 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | |||
15 | --- | 16 | --- |
16 | src/util/futex.h | 4 ++++ | 17 | src/util/futex.h | 4 ++++ |
17 | 1 file changed, 4 insertions(+) | 18 | 1 file changed, 4 insertions(+) |
18 | 19 | ||
20 | diff --git a/src/util/futex.h b/src/util/futex.h | ||
21 | index 43097f4..941b0ec 100644 | ||
19 | --- a/src/util/futex.h | 22 | --- a/src/util/futex.h |
20 | +++ b/src/util/futex.h | 23 | +++ b/src/util/futex.h |
21 | @@ -34,6 +34,10 @@ | 24 | @@ -34,6 +34,10 @@ |
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch index 15485feb71..b08e4d86c2 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch | |||
@@ -1,16 +1,17 @@ | |||
1 | From bb2f0bea553d51d659a9bc46f7ae186885405151 Mon Sep 17 00:00:00 2001 | 1 | From d34bdbd80e5a1f309d2ba280cdc66ff0ee0e5c43 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 13 Jan 2020 15:23:47 -0800 | 3 | Date: Mon, 13 Jan 2020 15:23:47 -0800 |
4 | Subject: [PATCH] meson misdetects 64bit atomics on mips/clang | 4 | Subject: [PATCH] meson misdetects 64bit atomics on mips/clang |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | src/util/u_atomic.c | 2 +- | 10 | src/util/u_atomic.c | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 12 | ||
12 | diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c | 13 | diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c |
13 | index e4bffa8..58e1ddd 100644 | 14 | index 5a5eab4..e499516 100644 |
14 | --- a/src/util/u_atomic.c | 15 | --- a/src/util/u_atomic.c |
15 | +++ b/src/util/u_atomic.c | 16 | +++ b/src/util/u_atomic.c |
16 | @@ -21,7 +21,7 @@ | 17 | @@ -21,7 +21,7 @@ |
@@ -22,6 +23,3 @@ index e4bffa8..58e1ddd 100644 | |||
22 | 23 | ||
23 | #include <stdint.h> | 24 | #include <stdint.h> |
24 | #include <pthread.h> | 25 | #include <pthread.h> |
25 | -- | ||
26 | 2.24.1 | ||
27 | |||
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index b6f86743e1..aea23d0ec2 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 38e984073e4c23b6278d1a2ff21e894fda7b93c5 Mon Sep 17 00:00:00 2001 | 1 | From f9c597a2c517eb85c23cbeeb2e95c55794c74cda Mon Sep 17 00:00:00 2001 |
2 | From: Alistair Francis <alistair@alistair23.me> | 2 | From: Alistair Francis <alistair@alistair23.me> |
3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 | 3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 |
4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations |
@@ -20,10 +20,10 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> | |||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 21 | ||
22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
23 | index 932eb13..efc6171 100644 | 23 | index bca6b1f..70d06c0 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -153,7 +153,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 | 26 | @@ -172,7 +172,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
27 | # Only build shared_glapi if at least one OpenGL API is enabled | 27 | # Only build shared_glapi if at least one OpenGL API is enabled |
28 | with_shared_glapi = with_shared_glapi and with_any_opengl | 28 | with_shared_glapi = with_shared_glapi and with_any_opengl |
29 | 29 | ||
@@ -31,8 +31,8 @@ index 932eb13..efc6171 100644 | |||
31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') | 31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
32 | 32 | ||
33 | dri_drivers = get_option('dri-drivers') | 33 | dri_drivers = get_option('dri-drivers') |
34 | if dri_drivers.contains('auto') | 34 | if dri_drivers.length() != 0 |
35 | @@ -970,7 +970,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', | 35 | @@ -1074,7 +1074,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', |
36 | endif | 36 | endif |
37 | 37 | ||
38 | # TODO: this is very incomplete | 38 | # TODO: this is very incomplete |
diff --git a/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch b/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch index 80b9af08e8..5c6165c281 100644 --- a/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch +++ b/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4febda271c6bb0dc69ebf573446c6922a1ec35fb Mon Sep 17 00:00:00 2001 | 1 | From fdb2face4eeac3c20eedcca7520f4e7014225fb4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 2 Dec 2021 19:57:42 -0800 | 3 | Date: Thu, 2 Dec 2021 19:57:42 -0800 |
4 | Subject: [PATCH] util/format: Check for NEON before using it | 4 | Subject: [PATCH] util/format: Check for NEON before using it |
@@ -13,13 +13,14 @@ In file included from ../mesa-21.3.0/src/util/format/u_format_unpack_neon.c:35: | |||
13 | 13 | ||
14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14032] | 14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14032] |
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
16 | |||
16 | --- | 17 | --- |
17 | src/util/format/u_format.c | 2 +- | 18 | src/util/format/u_format.c | 2 +- |
18 | src/util/format/u_format_unpack_neon.c | 2 +- | 19 | src/util/format/u_format_unpack_neon.c | 2 +- |
19 | 2 files changed, 2 insertions(+), 2 deletions(-) | 20 | 2 files changed, 2 insertions(+), 2 deletions(-) |
20 | 21 | ||
21 | diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c | 22 | diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c |
22 | index 36c5e52008e..f0a00971691 100644 | 23 | index 36c5e52..f0a0097 100644 |
23 | --- a/src/util/format/u_format.c | 24 | --- a/src/util/format/u_format.c |
24 | +++ b/src/util/format/u_format.c | 25 | +++ b/src/util/format/u_format.c |
25 | @@ -1138,7 +1138,7 @@ static void | 26 | @@ -1138,7 +1138,7 @@ static void |
@@ -32,7 +33,7 @@ index 36c5e52008e..f0a00971691 100644 | |||
32 | if (unpack) { | 33 | if (unpack) { |
33 | util_format_unpack_table[format] = unpack; | 34 | util_format_unpack_table[format] = unpack; |
34 | diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c | 35 | diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c |
35 | index a4a5cb1f723..1e4f794a295 100644 | 36 | index a4a5cb1..1e4f794 100644 |
36 | --- a/src/util/format/u_format_unpack_neon.c | 37 | --- a/src/util/format/u_format_unpack_neon.c |
37 | +++ b/src/util/format/u_format_unpack_neon.c | 38 | +++ b/src/util/format/u_format_unpack_neon.c |
38 | @@ -23,7 +23,7 @@ | 39 | @@ -23,7 +23,7 @@ |
@@ -44,6 +45,3 @@ index a4a5cb1f723..1e4f794a295 100644 | |||
44 | 45 | ||
45 | /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics | 46 | /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics |
46 | * unless you tell it "no really". | 47 | * unless you tell it "no really". |
47 | -- | ||
48 | 2.34.1 | ||
49 | |||
diff --git a/meta/recipes-graphics/mesa/files/0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch b/meta/recipes-graphics/mesa/files/0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch deleted file mode 100644 index e87d7d7311..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From e2e2fe86dd61b6fae682a1fec31bd0755ced5cd5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 7 Dec 2021 11:13:27 -0800 | ||
4 | Subject: [PATCH] v3dv: account for 64bit time_t on 32bit arches | ||
5 | |||
6 | This makes is a bit more portable, especially on 32bit architectures | ||
7 | with 64bit time_t defaults. Especially on musl its a must. | ||
8 | |||
9 | Fixes | ||
10 | ../mesa-21.3.0/src/broadcom/vulkan/v3dv_bo.c:71:15: error: format specifies type 'long' but the argument has type 'time_t' (aka 'long long') [-Werror,-Wformat] | ||
11 | time.tv_sec); | ||
12 | ^~~~~~~~~~~ | ||
13 | |||
14 | Also reported here [1] | ||
15 | |||
16 | [1] https://github.com/agherzan/meta-raspberrypi/issues/969 | ||
17 | |||
18 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14118] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | src/broadcom/vulkan/v3dv_bo.c | 4 ++-- | ||
22 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/src/broadcom/vulkan/v3dv_bo.c b/src/broadcom/vulkan/v3dv_bo.c | ||
25 | index 71679ce..dc5e7f5 100644 | ||
26 | --- a/src/broadcom/vulkan/v3dv_bo.c | ||
27 | +++ b/src/broadcom/vulkan/v3dv_bo.c | ||
28 | @@ -67,8 +67,8 @@ bo_dump_stats(struct v3dv_device *device) | ||
29 | |||
30 | struct timespec time; | ||
31 | clock_gettime(CLOCK_MONOTONIC, &time); | ||
32 | - fprintf(stderr, " now: %ld\n", | ||
33 | - time.tv_sec); | ||
34 | + fprintf(stderr, " now: %lld\n", | ||
35 | + (long long)time.tv_sec); | ||
36 | } | ||
37 | |||
38 | if (cache->size_list_size) { | ||
39 | -- | ||
40 | 2.34.1 | ||
41 | |||
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 35ab8d5a72..af11baee86 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 @@ | |||
1 | From 8f2f48b41aa17eec3c4d63685e3296f28e60b980 Mon Sep 17 00:00:00 2001 | 1 | From bf41fa026ae3d378e62fd83d03a6f5933b52ca04 Mon Sep 17 00:00:00 2001 |
2 | From: Alistair Francis <alistair@alistair23.me> | 2 | From: Alistair Francis <alistair@alistair23.me> |
3 | Date: Thu, 14 Nov 2019 13:08:31 -0800 | 3 | Date: Thu, 14 Nov 2019 13:08:31 -0800 |
4 | Subject: [PATCH] meson.build: make TLS ELF optional | 4 | Subject: [PATCH] meson.build: make TLS ELF optional |
@@ -17,36 +17,36 @@ Traceback (most recent call last): | |||
17 | File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs | 17 | File "/home/pokybuild/yocto-worker/musl-qemux86/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 378, in test_parselogs |
18 | self.assertEqual(errcount, 0, msg=self.msg) | 18 | self.assertEqual(errcount, 0, msg=self.msg) |
19 | AssertionError: 1 != 0 : Log: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log | 19 | AssertionError: 1 != 0 : Log: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/qemux86-poky-linux-musl/core-image-sato-sdk/1.0-r0/target_logs/Xorg.0.log |
20 | ----------------------- | ||
21 | Central error: [ 10.477] (EE) Failed to load /usr/lib/xorg/modules/extensions/libglx.so: Error relocating /usr/lib/libGL.so.1: alphasort: initial-exec TLS resolves to dynamic definition in /usr/lib/libGL.so.1 | ||
22 | *********************** | ||
23 | 20 | ||
24 | Upstream-Status: Inappropriate [configuration] | 21 | Upstream-Status: Inappropriate [configuration] |
25 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | ||
26 | |||
27 | --- | 22 | --- |
28 | meson.build | 2 +- | 23 | meson.build | 7 +++++-- |
29 | meson_options.txt | 6 ++++++ | 24 | meson_options.txt | 6 ++++++ |
30 | 2 files changed, 7 insertions(+), 1 deletion(-) | 25 | 2 files changed, 11 insertions(+), 2 deletions(-) |
31 | 26 | ||
32 | diff --git a/meson.build b/meson.build | 27 | diff --git a/meson.build b/meson.build |
33 | index 23618c1..c8cc5e3 100644 | 28 | index 70d06c0..1441611 100644 |
34 | --- a/meson.build | 29 | --- a/meson.build |
35 | +++ b/meson.build | 30 | +++ b/meson.build |
36 | @@ -476,7 +476,7 @@ endif | 31 | @@ -490,8 +490,11 @@ foreach platform : _platforms |
37 | use_elf_tls = false | 32 | pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper()) |
38 | if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and | 33 | endforeach |
39 | (not with_platform_android or get_option('platform-sdk-version') >= 29) and | 34 | |
40 | - (not with_platform_windows or not with_shared_glapi)) | 35 | -use_elf_tls = true |
41 | + (not with_platform_windows or not with_shared_glapi) and get_option('elf-tls')) | 36 | -pre_args += '-DUSE_ELF_TLS' |
42 | pre_args += '-DUSE_ELF_TLS' | 37 | +use_elf_tls = false |
43 | use_elf_tls = true | 38 | +if get_option('elf-tls') |
39 | + use_elf_tls = true | ||
40 | + pre_args += '-DUSE_ELF_TLS' | ||
41 | +endif | ||
44 | 42 | ||
43 | if with_platform_android and get_option('platform-sdk-version') >= 29 | ||
44 | # By default the NDK compiler, at least, emits emutls references instead of | ||
45 | diff --git a/meson_options.txt b/meson_options.txt | 45 | diff --git a/meson_options.txt b/meson_options.txt |
46 | index 29c402c..f70d9b2 100644 | 46 | index 1f6ef38..99cc5cb 100644 |
47 | --- a/meson_options.txt | 47 | --- a/meson_options.txt |
48 | +++ b/meson_options.txt | 48 | +++ b/meson_options.txt |
49 | @@ -455,6 +455,12 @@ option( | 49 | @@ -440,6 +440,12 @@ option( |
50 | value : true, | 50 | value : true, |
51 | description : 'Enable direct rendering in GLX and EGL for DRI', | 51 | description : 'Enable direct rendering in GLX and EGL for DRI', |
52 | ) | 52 | ) |
@@ -56,6 +56,6 @@ index 29c402c..f70d9b2 100644 | |||
56 | + value : true, | 56 | + value : true, |
57 | + description : 'Enable TLS support in ELF', | 57 | + description : 'Enable TLS support in ELF', |
58 | +) | 58 | +) |
59 | option( | 59 | option('egl-lib-suffix', |
60 | 'prefer-iris', | 60 | type : 'string', |
61 | type : 'boolean', | 61 | value : '', |
diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.3.7.bb b/meta/recipes-graphics/mesa/mesa-gl_21.3.7.bb deleted file mode 100644 index 142bb743b1..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_21.3.7.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require mesa.inc | ||
2 | |||
3 | SUMMARY += " (OpenGL only, no EGL/GLES)" | ||
4 | |||
5 | PROVIDES = "virtual/libgl virtual/mesa" | ||
6 | |||
7 | S = "${WORKDIR}/mesa-${PV}" | ||
8 | |||
9 | # At least one DRI rendering engine is required to build mesa. | ||
10 | # When no X11 is available, use osmesa for the rendering engine. | ||
11 | PACKAGECONFIG ??= "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" | ||
12 | PACKAGECONFIG:class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" | ||
13 | |||
14 | # 21.0.0 version fails to build when any driver is enabled in DRIDRIVERS | ||
15 | # ./mesa-21.0.0/meson.build:519:4: ERROR: Problem encountered: building dri drivers require at least one windowing system | ||
16 | DRIDRIVERS ?= "" | ||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_22.0.0.bb new file mode 100644 index 0000000000..f2bc8f6b5b --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_22.0.0.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require mesa.inc | ||
2 | |||
3 | SUMMARY += " (OpenGL only, no EGL/GLES)" | ||
4 | |||
5 | PROVIDES = "virtual/libgl virtual/mesa" | ||
6 | |||
7 | S = "${WORKDIR}/mesa-${PV}" | ||
8 | |||
9 | # At least one DRI rendering engine is required to build mesa. | ||
10 | # When no X11 is available, use osmesa for the rendering engine. | ||
11 | PACKAGECONFIG ??= "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" | ||
12 | PACKAGECONFIG:class-target = "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" | ||
13 | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 2f79e8b34d..2a89b8e8f0 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org" | |||
10 | BUGTRACKER = "https://bugs.freedesktop.org" | 10 | BUGTRACKER = "https://bugs.freedesktop.org" |
11 | SECTION = "x11" | 11 | SECTION = "x11" |
12 | LICENSE = "MIT" | 12 | LICENSE = "MIT" |
13 | LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f" | 13 | LIC_FILES_CHKSUM = "file://docs/license.rst;md5=9a383ee9f65a4e939d6630e9b067ff58" |
14 | 14 | ||
15 | PE = "2" | 15 | PE = "2" |
16 | 16 | ||
@@ -20,10 +20,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
20 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 20 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
21 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ | 21 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ |
22 | file://0001-util-format-Check-for-NEON-before-using-it.patch \ | 22 | file://0001-util-format-Check-for-NEON-before-using-it.patch \ |
23 | file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \ | ||
24 | " | 23 | " |
25 | 24 | ||
26 | SRC_URI[sha256sum] = "b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d" | 25 | SRC_URI[sha256sum] = "e6c41928b5b9917485bd67cec22d15e62cad7a358bf4c711a647979987601250" |
27 | 26 | ||
28 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
29 | 28 | ||
@@ -84,7 +83,7 @@ def strip_comma(s): | |||
84 | return s.strip(',') | 83 | return s.strip(',') |
85 | 84 | ||
86 | PACKAGECONFIG:class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ | 85 | PACKAGECONFIG:class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ |
87 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium virgl', '', d)} \ | 86 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm gallium virgl', '', d)} \ |
88 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ | 87 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ |
89 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ | 88 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ |
90 | elf-tls \ | 89 | elf-tls \ |
@@ -94,7 +93,7 @@ PACKAGECONFIG:class-nativesdk ?= "gbm gallium egl opengl elf-tls x11" | |||
94 | 93 | ||
95 | PACKAGECONFIG:remove:libc-musl = "elf-tls" | 94 | PACKAGECONFIG:remove:libc-musl = "elf-tls" |
96 | 95 | ||
97 | # "gbm" requires "dri", "opengl" | 96 | # "gbm" requires "opengl" |
98 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" | 97 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" |
99 | 98 | ||
100 | X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" | 99 | X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" |
@@ -104,8 +103,6 @@ PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false" | |||
104 | PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" | 103 | PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" |
105 | PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" | 104 | PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" |
106 | 105 | ||
107 | # "dri" requires "opengl" | ||
108 | PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm" | ||
109 | PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence" | 106 | PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence" |
110 | 107 | ||
111 | # Vulkan drivers need dri3 enabled | 108 | # Vulkan drivers need dri3 enabled |
@@ -122,7 +119,7 @@ PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" | |||
122 | # "gles" requires "opengl" | 119 | # "gles" requires "opengl" |
123 | PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled" | 120 | PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled" |
124 | 121 | ||
125 | # "egl" requires "dri", "opengl" | 122 | # "egl" requires "opengl" |
126 | PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" | 123 | PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" |
127 | 124 | ||
128 | PACKAGECONFIG[broadcom] = "" | 125 | PACKAGECONFIG[broadcom] = "" |
@@ -230,7 +227,7 @@ python __anonymous() { | |||
230 | if "-native" in d.getVar("PN"): | 227 | if "-native" in d.getVar("PN"): |
231 | suffix = "-native" | 228 | suffix = "-native" |
232 | for p in (("egl", "libegl", "libegl1"), | 229 | for p in (("egl", "libegl", "libegl1"), |
233 | ("dri", "libgl", "libgl1"), | 230 | ("opengl", "libgl", "libgl1"), |
234 | ("gles", "libgles1", "libglesv1-cm1"), | 231 | ("gles", "libgles1", "libglesv1-cm1"), |
235 | ("gles", "libgles2", "libglesv2-2"), | 232 | ("gles", "libgles2", "libglesv2-2"), |
236 | ("gles", "libgles3",)): | 233 | ("gles", "libgles3",)): |
diff --git a/meta/recipes-graphics/mesa/mesa_21.3.7.bb b/meta/recipes-graphics/mesa/mesa_21.3.7.bb deleted file mode 100644 index 4cb7e80eb5..0000000000 --- a/meta/recipes-graphics/mesa/mesa_21.3.7.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | DRIDRIVERS ??= "" | ||
3 | DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965" | ||
4 | DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965" | ||
5 | |||
diff --git a/meta/recipes-graphics/mesa/mesa_22.0.0.bb b/meta/recipes-graphics/mesa/mesa_22.0.0.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_22.0.0.bb | |||
@@ -0,0 +1,2 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||