| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 1 | From 417ff3a03313aa003244990ed5c0188c421e6181 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 3/3] Allow enable DRI without DRI drivers |
| 5 | Organization: O.S. Systems Software LTDA. |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | |
| 9 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
| 10 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
| 11 | --- |
| 12 | meson.build | 2 +- |
| 13 | meson_options.txt | 6 ++++++ |
| 14 | 2 files changed, 7 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/meson.build b/meson.build |
| 17 | index 7a07974ba61..5c7cbe38376 100644 |
| 18 | --- a/meson.build |
| 19 | +++ b/meson.build |
| 20 | @@ -137,7 +137,7 @@ with_dri_r200 = dri_drivers.contains('r200') |
| 21 | with_dri_nouveau = dri_drivers.contains('nouveau') |
| 22 | with_dri_swrast = dri_drivers.contains('swrast') |
| 23 | |
| 24 | -with_dri = dri_drivers.length() != 0 and dri_drivers != [''] |
| 25 | +with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != ['']) |
| 26 | |
| 27 | gallium_drivers = get_option('gallium-drivers') |
| 28 | if gallium_drivers.contains('auto') |
| 29 | diff --git a/meson_options.txt b/meson_options.txt |
| 30 | index fcd49efea27..0529200b3bb 100644 |
| 31 | --- a/meson_options.txt |
| 32 | +++ b/meson_options.txt |
| 33 | @@ -34,6 +34,12 @@ option( |
| 34 | choices : ['auto', 'true', 'false'], |
| 35 | description : 'enable support for dri3' |
| 36 | ) |
| 37 | +option( |
| 38 | + 'dri', |
| 39 | + type : 'boolean', |
| 40 | + value : false, |
| 41 | + description : 'enable support for dri' |
| 42 | +) |
| 43 | option( |
| 44 | 'dri-drivers', |
| 45 | type : 'array', |
| 46 | -- |
| 47 | 2.22.0 |
| 48 | |