xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit da4ffb2f6a0b5a039ae1362ae71e9b47441f90d2
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Fri Dec 22 18:44:01 2017 +0000

    meson: Correct the option for disabled int10 from 'disabled' to 'false'
    
    Fix meson_option.txt to align with the check of the int10 option against
    'disabled', not 'false' in hw/xfree/meson.build, to see if it shouldn't be
    built at all.
    
    This keeps everything consistent that 'false' always turns things off.
    
    Not noticed before as options weren't validated against choices until meson
    0.43
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 3b1aa17ff..629daf977 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -110,7 +110,7 @@ subdir('fbdevhw')
 if gbm_dep.found()
     subdir('glamor_egl')
 endif
-if int10 != 'disabled'
+if int10 != 'false'
     if int10 == 'x86emu'
         subdir('x86emu')
     endif