diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-10-28 22:05:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-30 13:22:49 +0000 |
commit | b6da9774f3ab9ce54869633b97c0ee7f6528f58d (patch) | |
tree | 39d373fded0c3a742a7f7b7fedd7118f98381095 /meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch | |
parent | afbdf052cb36c4d9d207868c793dfff34766cf86 (diff) | |
download | poky-b6da9774f3ab9ce54869633b97c0ee7f6528f58d.tar.gz |
mesa: update 20.1.8 -> 20.2.1
Build tweaks:
- drop separate dri option and the patch that adds it; just setting -Ddri-drivers='' is enough
- strip leading/trailing commas from drivers' lists, as upstream no longer allows blank entries if the list
is not empty (e.g. -Ddri-drivers=,driver1,driver2 is now producing an error).
- drop the long-obsolete llvm 3.3/3.2 logic
License-Update: reformatted into rst
(From OE-Core rev: 8682024ef029241c75e224174fd0b93835f88df3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch | 46 |
1 files changed, 0 insertions, 46 deletions
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 deleted file mode 100644 index a0536c87ac..0000000000 --- a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 7eaa21a79ce6d6e92f6bf98c28b68e3fcb4d7874 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
3 | Date: Wed, 12 Jun 2019 14:18:31 -0300 | ||
4 | Subject: [PATCH] Allow enable DRI without DRI drivers | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
9 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
10 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
11 | |||
12 | --- | ||
13 | meson.build | 2 +- | ||
14 | meson_options.txt | 6 ++++++ | ||
15 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index a954118..62864c6 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -154,7 +154,7 @@ with_dri_r200 = dri_drivers.contains('r200') | ||
22 | with_dri_nouveau = dri_drivers.contains('nouveau') | ||
23 | with_dri_swrast = dri_drivers.contains('swrast') | ||
24 | |||
25 | -with_dri = dri_drivers.length() != 0 and dri_drivers != [''] | ||
26 | +with_dri = get_option('dri') or (dri_drivers.length() != 0 and dri_drivers != ['']) | ||
27 | |||
28 | gallium_drivers = get_option('gallium-drivers') | ||
29 | if gallium_drivers.contains('auto') | ||
30 | diff --git a/meson_options.txt b/meson_options.txt | ||
31 | index 637ff14..700c34c 100644 | ||
32 | --- a/meson_options.txt | ||
33 | +++ b/meson_options.txt | ||
34 | @@ -35,6 +35,12 @@ option( | ||
35 | choices : ['auto', 'true', 'false'], | ||
36 | description : 'enable support for dri3' | ||
37 | ) | ||
38 | +option( | ||
39 | + 'dri', | ||
40 | + type : 'boolean', | ||
41 | + value : false, | ||
42 | + description : 'enable support for dri' | ||
43 | +) | ||
44 | option( | ||
45 | 'dri-drivers', | ||
46 | type : 'array', | ||