xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit ac5d3a200a6d4bdb9ae4a9ef6f2238cf185d38e5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Sep 10 17:28:36 2019 -0700

    meson: don't require xf86bigfontproto if not building xf86bigfont support
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/meson.build b/meson.build
index bd2ed3010..acd77234e 100644
--- a/meson.build
+++ b/meson.build
@@ -88,7 +88,7 @@ xf86driproto_dep = dependency('xf86driproto', version: '>= 2.1.0', required: get
 dri2proto_dep = dependency('dri2proto', version: '>= 2.8', required: get_option('dri2') == 'true')
 dri3proto_dep = dependency('dri3proto', version: '>= 1.2', required: get_option('dri3') == 'true')
 xineramaproto_dep = dependency('xineramaproto')
-xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0')
+xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0', required: get_option('xf86bigfont'))
 xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1')
 applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false)
 xshmfence_dep = dependency('xshmfence', version: '>= 1.1', required: false)