[PATCH xserver] meson: Correct the disabled int10 option choice

Jon Turney jon.turney at dronecode.org.uk
Fri Dec 22 18:49:11 UTC 2017


hw/xfree/meson.build tests the int10 option against 'disabled', not 'false'
to see if it shouldn't be built at all.

Not noticed before as options weren't validated against choices until meson
0.43

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
---
 meson_options.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson_options.txt b/meson_options.txt
index d1341ede2..d6554d053 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -41,7 +41,7 @@ option('vendor_name_short', type: 'string', value: 'X.Org')
 option('vendor_web', type: 'string', value: 'http://wiki.x.org')
 option('os_vendor', type: 'string', value: '')
 
-option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'false'],
+option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'disabled'],
        value: 'auto',
        description: 'Xorg int10 backend (default: usually x86emu)')
 
-- 
2.15.1



More information about the xorg-devel mailing list