xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/meson.build |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9d628ee5facf6318368d5b8ca181e083adcffe8c
Author: Roman Gilg <subdiff at gmail.com>
Date:   Wed May 2 21:32:48 2018 +0200

    modesetting: set gbm as dependency in meson build
    
    Modifiers support needs gbm as a dependency. Without setting the dependency
    included headers are not found reliably and the build might fail if the
    headers are not placed in the default system include paths.
    
    Signed-off-by: Roman Gilg <subdiff at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/drivers/modesetting/meson.build b/hw/xfree86/drivers/modesetting/meson.build
index 37fd8939f..5e13f1a53 100644
--- a/hw/xfree86/drivers/modesetting/meson.build
+++ b/hw/xfree86/drivers/modesetting/meson.build
@@ -19,6 +19,7 @@ shared_module(
         common_dep,
         udev_dep,
         libdrm_dep,
+        gbm_dep,
     ],
 
     install: true,