xserver: Branch 'master'

[GitLab Mirror]

 meson.build       |    2 +-
 meson_options.txt |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 722da1c62caad961ce09fc226daf84465f4b7a7e
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Fri Aug 6 15:21:53 2021 +0300

    meson: Add option to disable libdrm support
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/meson.build b/meson.build
index bdab9a9f3..a2cdd552f 100644
--- a/meson.build
+++ b/meson.build
@@ -482,7 +482,7 @@ else
     endif
 endif
 
-libdrm_required = build_dri1 or build_dri2 or build_dri3
+libdrm_required = (build_dri1 or build_dri2 or build_dri3) and get_option('drm') == true
 if not libdrm_dep.found() and libdrm_required
     error('DRI requested, but LIBDRM not found')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 2a8b7e373..cad3e3920 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -113,6 +113,8 @@ option('xf86-input-inputtest', type: 'boolean', value: true,
 option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
 option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
 option('dri3', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI3 extension (default: auto)')
+option('drm', type: 'boolean', value: 'true',
+        description: 'Build Xorg with libdrm support')
 
 option('apple-applications-dir', type: 'string', value: '/Applications/Utilities',
         description: 'Applications directory')