| From 417ff3a03313aa003244990ed5c0188c421e6181 Mon Sep 17 00:00:00 2001 |
| From: Fabio Berton <fabio.berton@ossystems.com.br> |
| Date: Wed, 12 Jun 2019 14:18:31 -0300 |
| Subject: [PATCH 3/3] Allow enable DRI without DRI drivers |
| Organization: O.S. Systems Software LTDA. |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
| Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
| --- |
| meson.build | 2 +- |
| meson_options.txt | 6 ++++++ |
| 2 files changed, 7 insertions(+), 1 deletion(-) |
| |
| diff --git a/meson.build b/meson.build |
| index 7a07974ba61..5c7cbe38376 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -137,7 +137,7 @@ with_dri_r200 = dri_drivers.contains('r200') |
| with_dri_nouveau = dri_drivers.contains('nouveau') |
| with_dri_swrast = dri_drivers.contains('swrast') |
| |
| -with_dri = dri_drivers.length() != 0 and dri_drivers != [''] |
| +with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != ['']) |
| |
| gallium_drivers = get_option('gallium-drivers') |
| if gallium_drivers.contains('auto') |
| diff --git a/meson_options.txt b/meson_options.txt |
| index fcd49efea27..0529200b3bb 100644 |
| --- a/meson_options.txt |
| +++ b/meson_options.txt |
| @@ -34,6 +34,12 @@ option( |
| choices : ['auto', 'true', 'false'], |
| description : 'enable support for dri3' |
| ) |
| +option( |
| + 'dri', |
| + type : 'boolean', |
| + value : false, |
| + description : 'enable support for dri' |
| +) |
| option( |
| 'dri-drivers', |
| type : 'array', |
| -- |
| 2.22.0 |
| |