From c9ac28cabcdbcba1539498bd166d78db10f53326 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 12 Jun 2019 14:18:31 -0300 Subject: [PATCH] Allow enable DRI without DRI drivers Upstream-Status: Pending Signed-off-by: Andrei Gherzan Signed-off-by: Fabio Berton Signed-off-by: Otavio Salvador --- meson.build | 2 +- meson_options.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e5ecf107971..077af8eed31 100644 --- a/meson.build +++ b/meson.build @@ -186,7 +186,7 @@ with_dri_r100 = dri_drivers.contains('r100') with_dri_r200 = dri_drivers.contains('r200') with_dri_nouveau = dri_drivers.contains('nouveau') -with_dri = dri_drivers.length() != 0 +with_dri = get_option('dri') or (dri_drivers.length() != 0 and dri_drivers != ['']) gallium_drivers = get_option('gallium-drivers') if gallium_drivers.contains('auto') diff --git a/meson_options.txt b/meson_options.txt index a3d690d5be6..d9a6f808bc2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -41,6 +41,12 @@ option( choices : ['auto', 'true', 'false', 'disabled', 'enabled'], description : 'enable support for dri3' ) +option( + 'dri', + type : 'boolean', + value : false, + description : 'enable support for dri' +) option( 'dri-drivers', type : 'array',