xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit b84e7f1c2293f22bd9fcd92a6a82601f94a060a5
Author: Lyude Paul <lyude at redhat.com>
Date:   Thu Sep 6 16:40:06 2018 -0400

    meson: Fix building with -Ddga=false
    
    We forget to assign a value to xf86dgaproto_dep if -Ddga=false, which
    causes the meson build to fail:
    
    meson.build:448:0: ERROR:  Unknown variable "xf86dgaproto_dep".
    
    A full log can be found at /home/lyudess/build/xserver/meson-logs/meson-log.txt
    FAILED: build.ninja
    
    So, just set it to an empty dependency to fix that.
    
    Signed-off-by: Lyude Paul <lyude at redhat.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/meson.build b/meson.build
index 53cdbe2be..29794f083 100644
--- a/meson.build
+++ b/meson.build
@@ -407,6 +407,7 @@ if not build_xv
 endif
 
 build_dga = false
+xf86dgaproto_dep = dependency('', required: false)
 if get_option('dga') == 'auto'
     xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1', required: false)
     if xf86dgaproto_dep.found()