On 08/01/2018 19:31, Adam Jackson wrote:
On Fri, 2017-12-22 at 18:49 +0000, Jon Turney wrote:
hw/xfree/meson.build tests the int10 option against 'disabled', not 'false'
to see if it shouldn't be built at all.
I'd really prefer we be consistent that 'false' always turns things
off; could we change hw/xfree86/meson.build instead?
Sure. Amended patch attached.
From 4e8bb8a61be0b9126a348af4546bd13b686c51bd Mon Sep 17 00:00:00 2001
From: Jon Turney <[email protected]>
Date: Fri, 22 Dec 2017 18:44:01 +0000
Subject: [PATCH xserver] 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
Signed-off-by: Jon Turney <[email protected]>
---
hw/xfree86/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.15.1
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
