[PATCH xserver 5/7] meson: Make XV optional

[Jon Turney]

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
---
 meson.build       | 11 ++++++++++-
 meson_options.txt |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index c7c9c79c3..5f30b996c 100644
--- a/meson.build
+++ b/meson.build
@@ -251,6 +251,16 @@ if libdrm_dep.found()
   build_modesetting = dependency('libdrm', version: '>= 2.4.46', required: false).found()
 endif
 
+build_xv = false
+if get_option('xv') == 'auto'
+    if (host_machine.system() != 'windows' and
+        host_machine.system() != 'cygwin')
+        build_xv = true
+    endif
+else
+    build_xv = get_option('xv') == 'yes'
+endif
+
 # XXX: Allow configuration of these.
 build_apm = false
 build_acpi = false
@@ -265,7 +275,6 @@ build_xsecurity = true
 build_xf86bigfont = true
 build_xinerama = true
 build_xselinux = false
-build_xv = true
 build_dga = false
 build_xf86vidmode = xf86vidmodeproto_dep.found()
 
diff --git a/meson_options.txt b/meson_options.txt
index 88423e25e..c1fb50dbe 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -33,6 +33,9 @@ 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('xv', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
+       description: 'Xv extension')
+
 option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'disabled'],
        value: 'auto',
        description: 'Xorg int10 backend (default: usually x86emu)')
-- 
2.12.2