summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAlistair Francis <alistair@alistair23.me>2019-11-14 12:22:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-21 23:08:19 +0000
commited3079a7351c5f7bef9018b47cdc0f6c313f1a1c (patch)
tree41f47ae727cdeff0c91d8c0bf7045dc53651cb98 /meta/recipes-graphics
parentb8c34f9a241b9d79907c5022d67600630e8ed430 (diff)
downloadpoky-ed3079a7351c5f7bef9018b47cdc0f6c313f1a1c.tar.gz
mesa: Upgrade to 19.2.4
Upgrade mesa and mesa-gl to 19.2.4. The license hash change was a trivial new line removal. The glx-tls option was removed as it isn't included in the meson.build file. It has been replaced with 'use-elf-tls' instead. I have backported the asm removal as an attempt to fix the musl build issue. (From OE-Core rev: 82c2acc1f658f039becac04aa3dae696418bd1de) Signed-off-by: Alistair Francis <alistair@alistair23.me> Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch21
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch46
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch52
-rw-r--r--meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch10
-rw-r--r--meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch147
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_19.2.4.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc12
-rw-r--r--meta/recipes-graphics/mesa/mesa_19.2.4.bb (renamed from meta/recipes-graphics/mesa/mesa_19.1.6.bb)7
8 files changed, 219 insertions, 76 deletions
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 9fba5da4b2..1869e11059 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,8 +1,7 @@
1From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001 1From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br> 2From: Alistair Francis <alistair.francis@wdc.com>
3Date: Wed, 12 Jun 2019 13:40:20 -0300 3Date: Mon, 11 Nov 2019 09:38:15 -0800
4Subject: [PATCH] meson.build: check for all linux host_os combinations 4Subject: [PATCH] meson.build: check for all linux host_os combinations
5Organization: O.S. Systems Software LTDA.
6 5
7Make sure that we are also looking for our host_os combinations like 6Make sure that we are also looking for our host_os combinations like
8linux-musl etc. when assuming support for DRM/KMS. 7linux-musl etc. when assuming support for DRM/KMS.
@@ -14,29 +13,31 @@ Upstream-Status: Pending
14Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> 14Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
16Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
17
17--- 18---
18 meson.build | 4 ++-- 19 meson.build | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-) 20 1 file changed, 2 insertions(+), 2 deletions(-)
20 21
21diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
22index 567a81afd6f..b33b430aed4 100644 23index d584152..a1f098c 100644
23--- a/meson.build 24--- a/meson.build
24+++ b/meson.build 25+++ b/meson.build
25@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 26@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
26 # 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
27 with_shared_glapi = get_option('shared-glapi') and with_any_opengl 28 with_shared_glapi = get_option('shared-glapi') and with_any_opengl
28 29
29-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system()) 30-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
30+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')
31 32
32 dri_drivers = get_option('dri-drivers') 33 dri_drivers = get_option('dri-drivers')
33 if dri_drivers.contains('auto') 34 if dri_drivers.contains('auto')
34@@ -845,7 +845,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', 35@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
35 endif 36 endif
36 37
37 # TODO: this is very incomplete 38 # TODO: this is very incomplete
38-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) 39-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
39+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux') 40+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux')
40 pre_args += '-D_GNU_SOURCE' 41 pre_args += '-D_GNU_SOURCE'
41 endif 42 elif host_machine.system() == 'sunos'
42 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
new file mode 100644
index 0000000000..199ed572d5
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -0,0 +1,46 @@
1From af6923544de02ded648a736e07b9bd8b7c52dba9 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@wdc.com>
3Date: Wed, 23 Oct 2019 09:46:28 -0700
4Subject: [PATCH] meson.build: make TLS ELF optional
5
6USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make
7TLS GLX optional again" patch updated to the latest mesa.
8
9Upstream-Status: Inappropriate [configuration]
10Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
11
12---
13 meson.build | 2 +-
14 meson_options.txt | 6 ++++++
15 2 files changed, 7 insertions(+), 1 deletion(-)
16
17diff --git a/meson.build b/meson.build
18index a1f098c..1e31eb4 100644
19--- a/meson.build
20+++ b/meson.build
21@@ -378,7 +378,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
22 endif
23
24 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
25-if not with_platform_android or get_option('platform-sdk-version') >= 29
26+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
27 pre_args += '-DUSE_ELF_TLS'
28 endif
29
30diff --git a/meson_options.txt b/meson_options.txt
31index b768c15..76cef24 100644
32--- a/meson_options.txt
33+++ b/meson_options.txt
34@@ -333,6 +333,12 @@ option(
35 value : true,
36 description : 'Enable direct rendering in GLX and EGL for DRI',
37 )
38+option(
39+ 'elf-tls',
40+ type : 'boolean',
41+ value : true,
42+ description : 'Enable TLS support in ELF',
43+)
44 option(
45 'I-love-half-baked-turnips',
46 type : 'boolean',
diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
deleted file mode 100644
index 641bacf1d9..0000000000
--- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 12 Jun 2019 14:15:57 -0300
4Subject: [PATCH] meson.build: make TLS GLX optional again
5Organization: O.S. Systems Software LTDA.
6
7This was optional with autotools, and needs to be disabled
8when using musl C library, for instance.
9
10Upstream-Status: Pending
11
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15---
16 meson.build | 4 +++-
17 meson_options.txt | 7 +++++++
18 2 files changed, 10 insertions(+), 1 deletion(-)
19
20diff --git a/meson.build b/meson.build
21index b33b430aed4..0e50bb26c0a 100644
22--- a/meson.build
23+++ b/meson.build
24@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
25 endif
26 endif
27
28-pre_args += '-DGLX_USE_TLS'
29+if get_option('glx-tls')
30+ pre_args += '-DGLX_USE_TLS'
31+endif
32 if with_glx != 'disabled'
33 if not (with_platform_x11 and with_any_opengl)
34 error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
35diff --git a/meson_options.txt b/meson_options.txt
36index 1f72faabee8..fcd49efea27 100644
37--- a/meson_options.txt
38+++ b/meson_options.txt
39@@ -339,6 +339,13 @@ option(
40 value : true,
41 description : 'Enable direct rendering in GLX and EGL for DRI',
42 )
43+option(
44+ 'glx-tls',
45+ type : 'boolean',
46+ value : true,
47+ description : 'Enable TLS support in GLX',
48+)
49+
50 option(
51 'I-love-half-baked-turnips',
52 type : 'boolean',
diff --git a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
index 346b217585..c20a1f7c52 100644
--- a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
+++ b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
@@ -1,24 +1,24 @@
1From f1482e88c2295b9c7288f5b273335a8e18039de8 Mon Sep 17 00:00:00 2001 1From 5ad6515238bc042cccf9959abad44fdee9aeb07f Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 12 Jun 2019 14:18:31 -0300 3Date: Wed, 12 Jun 2019 14:18:31 -0300
4Subject: [PATCH] Allow enable DRI without DRI drivers 4Subject: [PATCH] Allow enable DRI without DRI drivers
5Organization: O.S. Systems Software LTDA.
6 5
7Upstream-Status: Pending 6Upstream-Status: Pending
8 7
9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 8Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> 9Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 10Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11
12--- 12---
13 meson.build | 2 +- 13 meson.build | 2 +-
14 meson_options.txt | 6 ++++++ 14 meson_options.txt | 6 ++++++
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 0e50bb26c0a..de065c290d6 100644 18index 1e31eb4..512eec6 100644
19--- a/meson.build 19--- a/meson.build
20+++ b/meson.build 20+++ b/meson.build
21@@ -137,7 +137,7 @@ with_dri_r200 = dri_drivers.contains('r200') 21@@ -147,7 +147,7 @@ with_dri_r200 = dri_drivers.contains('r200')
22 with_dri_nouveau = dri_drivers.contains('nouveau') 22 with_dri_nouveau = dri_drivers.contains('nouveau')
23 with_dri_swrast = dri_drivers.contains('swrast') 23 with_dri_swrast = dri_drivers.contains('swrast')
24 24
@@ -28,7 +28,7 @@ index 0e50bb26c0a..de065c290d6 100644
28 gallium_drivers = get_option('gallium-drivers') 28 gallium_drivers = get_option('gallium-drivers')
29 if gallium_drivers.contains('auto') 29 if gallium_drivers.contains('auto')
30diff --git a/meson_options.txt b/meson_options.txt 30diff --git a/meson_options.txt b/meson_options.txt
31index fcd49efea27..0529200b3bb 100644 31index 76cef24..a8abd04 100644
32--- a/meson_options.txt 32--- a/meson_options.txt
33+++ b/meson_options.txt 33+++ b/meson_options.txt
34@@ -34,6 +34,12 @@ option( 34@@ -34,6 +34,12 @@ option(
diff --git a/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
new file mode 100644
index 0000000000..b5658d0c9d
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
@@ -0,0 +1,147 @@
1From 1b1cb6e5ea25eaa98573328b9565728a08245997 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair@alistair23.me>
3Date: Thu, 14 Nov 2019 09:06:02 -0800
4Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that
5 gen_matypes is gone."
6
7This reverts commit 20294dceebc23236e33b22578245f7e6f41b6997.
8
9Upstream-Status: Inappropriate [configuration]
10Signed-off-by: Alistair Francis <alistair@alistair23.me>
11
12---
13 meson.build | 94 ++++++++++++++++++++++++++++++-----------------
14 meson_options.txt | 6 +++
15 2 files changed, 67 insertions(+), 33 deletions(-)
16
17diff --git a/meson.build b/meson.build
18index 512eec6..a2bcc3a 100644
19--- a/meson.build
20+++ b/meson.build
21@@ -49,6 +49,7 @@ with_vulkan_icd_dir = get_option('vulkan-icd-dir')
22 with_tests = get_option('build-tests')
23 with_valgrind = get_option('valgrind')
24 with_libunwind = get_option('libunwind')
25+with_asm = get_option('asm')
26 with_glx_read_only_text = get_option('glx-read-only-text')
27 with_glx_direct = get_option('glx-direct')
28 with_osmesa = get_option('osmesa')
29@@ -985,41 +986,68 @@ endif
30
31 # TODO: shared/static? Is this even worth doing?
32
33+# When cross compiling we generally need to turn off the use of assembly,
34+# because mesa's assembly relies on building an executable for the host system,
35+# and running it to get information about struct sizes. There is at least one
36+# case of cross compiling where we can use asm, and that's x86_64 -> x86 when
37+# host OS == build OS, since in that case the build machine can run the host's
38+# binaries.
39+if with_asm and meson.is_cross_build()
40+ if build_machine.system() != host_machine.system()
41+ # TODO: It may be possible to do this with an exe_wrapper (like wine).
42+ message('Cross compiling from one OS to another, disabling assembly.')
43+ with_asm = false
44+ elif not (build_machine.cpu_family().startswith('x86') and host_machine.cpu_family() == 'x86')
45+ # FIXME: Gentoo always sets -m32 for x86_64 -> x86 builds, resulting in an
46+ # x86 -> x86 cross compile. We use startswith rather than == to handle this
47+ # case.
48+ # TODO: There may be other cases where the 64 bit version of the
49+ # architecture can run 32 bit binaries (aarch64 and armv7 for example)
50+ message('''
51+ Cross compiling to different architectures, and the host cannot run
52+ the build machine's binaries. Disabling assembly.
53+ ''')
54+ with_asm = false
55+ endif
56+endif
57+
58 with_asm_arch = ''
59-if host_machine.cpu_family() == 'x86'
60- if system_has_kms_drm or host_machine.system() == 'gnu'
61- with_asm_arch = 'x86'
62- pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM',
63- '-DUSE_SSE_ASM']
64-
65- if with_glx_read_only_text
66- pre_args += ['-DGLX_X86_READONLY_TEXT']
67+if with_asm
68+ if host_machine.cpu_family() == 'x86'
69+ if system_has_kms_drm or host_machine.system() == 'gnu'
70+ with_asm_arch = 'x86'
71+ pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM',
72+ '-DUSE_SSE_ASM']
73+
74+ if with_glx_read_only_text
75+ pre_args += ['-DGLX_X86_READONLY_TEXT']
76+ endif
77+ endif
78+ elif host_machine.cpu_family() == 'x86_64'
79+ if system_has_kms_drm
80+ with_asm_arch = 'x86_64'
81+ pre_args += ['-DUSE_X86_64_ASM']
82+ endif
83+ elif host_machine.cpu_family() == 'arm'
84+ if system_has_kms_drm
85+ with_asm_arch = 'arm'
86+ pre_args += ['-DUSE_ARM_ASM']
87+ endif
88+ elif host_machine.cpu_family() == 'aarch64'
89+ if system_has_kms_drm
90+ with_asm_arch = 'aarch64'
91+ pre_args += ['-DUSE_AARCH64_ASM']
92+ endif
93+ elif host_machine.cpu_family() == 'sparc64'
94+ if system_has_kms_drm
95+ with_asm_arch = 'sparc'
96+ pre_args += ['-DUSE_SPARC_ASM']
97+ endif
98+ elif host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little'
99+ if system_has_kms_drm
100+ with_asm_arch = 'ppc64le'
101+ pre_args += ['-DUSE_PPC64LE_ASM']
102 endif
103- endif
104-elif host_machine.cpu_family() == 'x86_64'
105- if system_has_kms_drm
106- with_asm_arch = 'x86_64'
107- pre_args += ['-DUSE_X86_64_ASM']
108- endif
109-elif host_machine.cpu_family() == 'arm'
110- if system_has_kms_drm
111- with_asm_arch = 'arm'
112- pre_args += ['-DUSE_ARM_ASM']
113- endif
114-elif host_machine.cpu_family() == 'aarch64'
115- if system_has_kms_drm
116- with_asm_arch = 'aarch64'
117- pre_args += ['-DUSE_AARCH64_ASM']
118- endif
119-elif host_machine.cpu_family() == 'sparc64'
120- if system_has_kms_drm
121- with_asm_arch = 'sparc'
122- pre_args += ['-DUSE_SPARC_ASM']
123- endif
124-elif host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little'
125- if system_has_kms_drm
126- with_asm_arch = 'ppc64le'
127- pre_args += ['-DUSE_PPC64LE_ASM']
128 endif
129 endif
130
131diff --git a/meson_options.txt b/meson_options.txt
132index a8abd04..0f4bd80 100644
133--- a/meson_options.txt
134+++ b/meson_options.txt
135@@ -233,6 +233,12 @@ option(
136 value : false,
137 description : 'Enable GLVND support.'
138 )
139+option(
140+ 'asm',
141+ type : 'boolean',
142+ value : true,
143+ description : 'Build assembly code if possible'
144+)
145 option(
146 'glx-read-only-text',
147 type : 'boolean',
diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_19.2.4.bb
index d4b1c1c454..d4b1c1c454 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_19.2.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index bf1492b422..5838207e6b 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org"
10BUGTRACKER = "https://bugs.freedesktop.org" 10BUGTRACKER = "https://bugs.freedesktop.org"
11SECTION = "x11" 11SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e"
14 14
15PE = "2" 15PE = "2"
16 16
@@ -57,12 +57,12 @@ PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v
57 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \ 57 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \
58 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ 58 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \
59 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ 59 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
60 glx-tls \ 60 elf-tls \
61 " 61 "
62PACKAGECONFIG_class-native ?= "gbm dri egl opengl glx-tls" 62PACKAGECONFIG_class-native ?= "gbm dri egl opengl elf-tls"
63PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl glx-tls" 63PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl elf-tls"
64 64
65PACKAGECONFIG_remove_libc-musl = "glx-tls" 65PACKAGECONFIG_remove_libc-musl = "elf-tls"
66 66
67# "gbm" requires "dri", "opengl" 67# "gbm" requires "dri", "opengl"
68PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false" 68PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false"
@@ -70,7 +70,7 @@ PACKAGECONFIG[gbm] = "-Dgbm=true,-Dgbm=false"
70X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" 70X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
71# "x11" requires "opengl" 71# "x11" requires "opengl"
72PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" 72PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
73PACKAGECONFIG[glx-tls] = "-Dglx-tls=true, -Dglx-tls=false" 73PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false"
74PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc" 74PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=true,-Dgallium-xvmc=false,libxvmc"
75PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" 75PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
76 76
diff --git a/meta/recipes-graphics/mesa/mesa_19.1.6.bb b/meta/recipes-graphics/mesa/mesa_19.2.4.bb
index 19221e9e25..f4b33df227 100644
--- a/meta/recipes-graphics/mesa/mesa_19.1.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_19.2.4.bb
@@ -2,12 +2,13 @@ require ${BPN}.inc
2 2
3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ 3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ 4 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
5 file://0002-meson.build-make-TLS-GLX-optional-again.patch \ 5 file://0002-meson.build-make-TLS-ELF-optional.patch \
6 file://0003-Allow-enable-DRI-without-DRI-drivers.patch \ 6 file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
7 file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "7dbb40b8d10e89bee0a5bfc85350647b" 10SRC_URI[md5sum] = "5c047732b81651ddb341597528b4b096"
10SRC_URI[sha256sum] = "2a369b7b48545c6486e7e44913ad022daca097c8bd937bf30dcf3f17a94d3496" 11SRC_URI[sha256sum] = "09000a0f7dbbd82e193b81a8f1bf0c118eab7ca975c0329181968596e548e30f"
11 12
12UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 13UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
13 14