xserver: Branch 'master'

[GitLab Mirror]

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d73a8b59e0d01d1ee4cb484e4b43563cec2eee9
Author: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date:   Thu Dec 10 22:32:59 2020 +0100

    meson.build: KMS support also depends on dri2
    
    Kernel modesettings support also depends on dri2, see
    ./hw/xfree86/drivers/modesetting/meson.build
    
    So update meson.build to reflect the changes made in configure.ac by
    commit 9c81b8f5b5d7bc987f73e8ef01a81e61205e58ee
    
    Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

diff --git a/meson.build b/meson.build
index 136456710..46b76b182 100644
--- a/meson.build
+++ b/meson.build
@@ -485,7 +485,7 @@ if not libdrm_dep.found() and libdrm_required
     error('DRI requested, but LIBDRM not found')
 endif
 
-build_modesetting = libdrm_dep.found()
+build_modesetting = libdrm_dep.found() and dri2proto_dep.found()
 
 build_vgahw = false
 if get_option('vgahw') == 'auto'