summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
diff options
context:
space:
mode:
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.patch12
1 files changed, 5 insertions, 7 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
index 81454aaa29..641bacf1d9 100644
--- 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
@@ -1,7 +1,7 @@
1From d31718999797ffc4dd177d14760ef7b8fd95ac2f Mon Sep 17 00:00:00 2001 1From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 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:15:57 -0300 3Date: Wed, 12 Jun 2019 14:15:57 -0300
4Subject: [PATCH 2/3] meson.build: make TLS GLX optional again 4Subject: [PATCH] meson.build: make TLS GLX optional again
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7This was optional with autotools, and needs to be disabled 7This was optional with autotools, and needs to be disabled
@@ -11,16 +11,17 @@ Upstream-Status: Pending
11 11
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> 13Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
14--- 15---
15 meson.build | 4 +++- 16 meson.build | 4 +++-
16 meson_options.txt | 7 +++++++ 17 meson_options.txt | 7 +++++++
17 2 files changed, 10 insertions(+), 1 deletion(-) 18 2 files changed, 10 insertions(+), 1 deletion(-)
18 19
19diff --git a/meson.build b/meson.build 20diff --git a/meson.build b/meson.build
20index e11880f2902..7a07974ba61 100644 21index b33b430aed4..0e50bb26c0a 100644
21--- a/meson.build 22--- a/meson.build
22+++ b/meson.build 23+++ b/meson.build
23@@ -362,7 +362,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless) 24@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
24 endif 25 endif
25 endif 26 endif
26 27
@@ -49,6 +50,3 @@ index 1f72faabee8..fcd49efea27 100644
49 option( 50 option(
50 'I-love-half-baked-turnips', 51 'I-love-half-baked-turnips',
51 type : 'boolean', 52 type : 'boolean',
52--
532.22.0
54