summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-03-19 09:43:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-20 18:54:56 +0000
commit99438a57a9d90ff2b172589b691d2704be178788 (patch)
treefee242580f282d64b95f428622f0b6f8241fde0d
parent12aae17e43db8daf6125efbbd5f245a4e248cfaf (diff)
downloadpoky-99438a57a9d90ff2b172589b691d2704be178788.tar.gz
mesa: update 20.3.4 -> 21.0.0
0001-anv-fix-a-build-race-between-generating-a-header-and.patch merged upstream. osmesa is now a simple boolean option. Swrast has been removed from dri drivers, so as we need at least one driver to enable dri in native/nativesdk, replace it with nouveau (which does not take long to build). (From OE-Core rev: e4e4cc57a0a949400c557073af0cf78f977bd02d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch31
-rw-r--r--meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch12
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch14
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc10
-rw-r--r--meta/recipes-graphics/mesa/mesa_21.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa_20.3.4.bb)0
6 files changed, 17 insertions, 50 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch b/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch
deleted file mode 100644
index a61e7b2160..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From f148d4f1b5b13288b254ead07f1d008d997e2342 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 2 Nov 2020 23:23:53 +0100
4Subject: [PATCH] anv: fix a build race between generating a header and using
5 it
6
7anv_batch_chain.c includes genX_bits.h but doesn't ensure it gets
8generated first. This causes build failures, as observed here:
9https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1501/steps/8/logs/step2d
10
11Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7412]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 src/intel/vulkan/meson.build | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
18index 36e1689314e..b713d8eade3 100644
19--- a/src/intel/vulkan/meson.build
20+++ b/src/intel/vulkan/meson.build
21@@ -131,6 +131,7 @@ libanv_files = files(
22 anv_deps = [
23 dep_libdrm,
24 dep_valgrind,
25+ idep_genxml,
26 idep_nir_headers,
27 idep_vulkan_util_headers,
28 ]
29--
302.29.0
31
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 085254323c..b6f86743e1 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 @@
1From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001 1From 38e984073e4c23b6278d1a2ff21e894fda7b93c5 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:04:49 -0800 3Date: Thu, 14 Nov 2019 13:04:49 -0800
4Subject: [PATCH] meson.build: check for all linux host_os combinations 4Subject: [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
22diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
23index 898d025..09e3759 100644 23index 932eb13..efc6171 100644
24--- a/meson.build 24--- a/meson.build
25+++ b/meson.build 25+++ b/meson.build
26@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 26@@ -153,7 +153,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
@@ -32,12 +32,12 @@ index 898d025..09e3759 100644
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.contains('auto')
35@@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', 35@@ -970,7 +970,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
39-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd'].contains(host_machine.system()) 39-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system())
40+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux') 40+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux')
41 pre_args += '-D_GNU_SOURCE' 41 pre_args += '-D_GNU_SOURCE'
42 elif host_machine.system() == 'sunos' 42 elif host_machine.system() == 'sunos'
43 pre_args += '-D__EXTENSIONS__' 43 pre_args += '-D__EXTENSIONS__'
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 89c0d150fa..df2346d336 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 ce57ce220d9c377beabf4914f33c43118f672ffe Mon Sep 17 00:00:00 2001 1From 624f430dd0a91344146a2b8d49a69f23560c2fa2 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
@@ -30,23 +30,23 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
30 2 files changed, 7 insertions(+), 1 deletion(-) 30 2 files changed, 7 insertions(+), 1 deletion(-)
31 31
32diff --git a/meson.build b/meson.build 32diff --git a/meson.build b/meson.build
33index c5136ea..185270d 100644 33index efc6171..8450968 100644
34--- a/meson.build 34--- a/meson.build
35+++ b/meson.build 35+++ b/meson.build
36@@ -424,7 +424,7 @@ endif 36@@ -448,7 +448,7 @@ endif
37 37
38 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. 38 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
39 use_elf_tls = false 39 use_elf_tls = false
40-if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) 40-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
41+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') 41+if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
42 pre_args += '-DUSE_ELF_TLS' 42 pre_args += '-DUSE_ELF_TLS'
43 use_elf_tls = true 43 use_elf_tls = true
44 endif 44 endif
45diff --git a/meson_options.txt b/meson_options.txt 45diff --git a/meson_options.txt b/meson_options.txt
46index 2d39d13..72006eb 100644 46index fc73f6e..d7482c0 100644
47--- a/meson_options.txt 47--- a/meson_options.txt
48+++ b/meson_options.txt 48+++ b/meson_options.txt
49@@ -368,6 +368,12 @@ option( 49@@ -420,6 +420,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 )
diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb
index e50782be1c..e50782be1c 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 9f8ec112cf..e9b72ce063 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -19,10 +19,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
19 file://0002-meson.build-make-TLS-ELF-optional.patch \ 19 file://0002-meson.build-make-TLS-ELF-optional.patch \
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-anv-fix-a-build-race-between-generating-a-header-and.patch \
23 " 22 "
24 23
25SRC_URI[sha256sum] = "dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084" 24SRC_URI[sha256sum] = "e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84"
26 25
27UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 26UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
28 27
@@ -103,8 +102,8 @@ PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false"
103PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" 102PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc"
104PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" 103PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
105 104
106DRIDRIVERS_class-native = "swrast" 105DRIDRIVERS_class-native = "nouveau"
107DRIDRIVERS_class-nativesdk = "swrast" 106DRIDRIVERS_class-nativesdk = "nouveau"
108DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" 107DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915"
109DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" 108DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
110# "dri" requires "opengl" 109# "dri" requires "opengl"
@@ -168,8 +167,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '
168PACKAGECONFIG[panfrost] = "" 167PACKAGECONFIG[panfrost] = ""
169GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" 168GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}"
170 169
171OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}" 170PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false"
172PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none"
173 171
174PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" 172PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
175 173
diff --git a/meta/recipes-graphics/mesa/mesa_20.3.4.bb b/meta/recipes-graphics/mesa/mesa_21.0.0.bb
index 96e8aa38d6..96e8aa38d6 100644
--- a/meta/recipes-graphics/mesa/mesa_20.3.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_21.0.0.bb