1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From f0794ab48d95d570077ece0f01c4ea5d15fc8e62 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Date: Wed, 2 Sep 2020 15:37:55 -0500
Subject: [PATCH] mesa: adapt meson script to restore compatibility with
release one
During this development cycle meson script was changed to stop accepting
empty values. This causes issues using some build options from OE-core's
mesa.inc. Restore this compatibility by patching in support for empty
values.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
meson_options.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson_options.txt b/meson_options.txt
index eb8eaa84b08..77c1494ec95 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -51,7 +51,7 @@ option(
'dri-drivers',
type : 'array',
value : ['auto'],
- choices : ['auto', 'i915', 'i965', 'r100', 'r200', 'nouveau', 'swrast'],
+ choices : ['', 'auto', 'i915', 'i965', 'r100', 'r200', 'nouveau', 'swrast'],
description : 'List of dri drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built'
)
option(
@@ -71,7 +71,7 @@ option(
type : 'array',
value : ['auto'],
choices : [
- 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno',
+ '', 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno',
'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl',
'swr', 'panfrost', 'iris', 'lima', 'zink', 'd3d12'
],
@@ -184,7 +184,7 @@ option(
'vulkan-drivers',
type : 'array',
value : ['auto'],
- choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'swrast'],
+ choices : ['', 'auto', 'amd', 'broadcom', 'freedreno', 'intel', 'swrast'],
description : 'List of vulkan drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built'
)
option(
|
