blob: 346b21758516a3101d03c39dca7ef1d7e72a726e [file] [log] [blame]
Brad Bishopa34c0302019-09-23 22:34:48 -04001From f1482e88c2295b9c7288f5b273335a8e18039de8 Mon Sep 17 00:00:00 2001
Brad Bishop15ae2502019-06-18 21:44:24 -04002From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 12 Jun 2019 14:18:31 -0300
Brad Bishopa34c0302019-09-23 22:34:48 -04004Subject: [PATCH] Allow enable DRI without DRI drivers
Brad Bishop15ae2502019-06-18 21:44:24 -04005Organization: O.S. Systems Software LTDA.
6
7Upstream-Status: Pending
8
9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Brad Bishopa34c0302019-09-23 22:34:48 -040011Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Brad Bishop15ae2502019-06-18 21:44:24 -040012---
13 meson.build | 2 +-
14 meson_options.txt | 6 ++++++
15 2 files changed, 7 insertions(+), 1 deletion(-)
16
17diff --git a/meson.build b/meson.build
Brad Bishopa34c0302019-09-23 22:34:48 -040018index 0e50bb26c0a..de065c290d6 100644
Brad Bishop15ae2502019-06-18 21:44:24 -040019--- a/meson.build
20+++ b/meson.build
21@@ -137,7 +137,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 != ['']
Brad Bishop64c979e2019-11-04 13:55:29 -050026+with_dri = get_option('dri') or (dri_drivers.length() != 0 and dri_drivers != [''])
Brad Bishop15ae2502019-06-18 21:44:24 -040027
28 gallium_drivers = get_option('gallium-drivers')
29 if gallium_drivers.contains('auto')
30diff --git a/meson_options.txt b/meson_options.txt
31index fcd49efea27..0529200b3bb 100644
32--- a/meson_options.txt
33+++ b/meson_options.txt
34@@ -34,6 +34,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',