summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2019-06-12 18:12:57 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-14 22:48:22 +0100
commit2e395d80534dc0914989d81d51160fc34be3a2ec (patch)
tree95c860744881295d8417adb2aeb2d0920c0bbacc /meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
parentb87f4d28f925891b2e9473cfac0d0885748f7f4f (diff)
downloadpoky-2e395d80534dc0914989d81d51160fc34be3a2ec.tar.gz
mesa: Update 19.0.6 -> 19.1.0
Update all patches to apply on 19.1.0 version. See full mesa 19.0.1 changes here: - https://www.mesa3d.org/relnotes/19.1.0.html (From OE-Core rev: b16c6d0452c79dcc2fccc4a7b9b2d68d53d2b353) Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch')
-rw-r--r--meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch54
1 files changed, 54 insertions, 0 deletions
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
new file mode 100644
index 0000000000..81454aaa29
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
@@ -0,0 +1,54 @@
1From d31718999797ffc4dd177d14760ef7b8fd95ac2f 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 2/3] 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>
14---
15 meson.build | 4 +++-
16 meson_options.txt | 7 +++++++
17 2 files changed, 10 insertions(+), 1 deletion(-)
18
19diff --git a/meson.build b/meson.build
20index e11880f2902..7a07974ba61 100644
21--- a/meson.build
22+++ b/meson.build
23@@ -362,7 +362,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
24 endif
25 endif
26
27-pre_args += '-DGLX_USE_TLS'
28+if get_option('glx-tls')
29+ pre_args += '-DGLX_USE_TLS'
30+endif
31 if with_glx != 'disabled'
32 if not (with_platform_x11 and with_any_opengl)
33 error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
34diff --git a/meson_options.txt b/meson_options.txt
35index 1f72faabee8..fcd49efea27 100644
36--- a/meson_options.txt
37+++ b/meson_options.txt
38@@ -339,6 +339,13 @@ option(
39 value : true,
40 description : 'Enable direct rendering in GLX and EGL for DRI',
41 )
42+option(
43+ 'glx-tls',
44+ type : 'boolean',
45+ value : true,
46+ description : 'Enable TLS support in GLX',
47+)
48+
49 option(
50 'I-love-half-baked-turnips',
51 type : 'boolean',
52--
532.22.0
54