Commit ce4e20f8 authored by Laurent Carlier's avatar Laurent Carlier Committed by Adam Jackson
Browse files

meson: Make Xv and XvMC extensions optional

Just mimic autoconf file, XvMC can't be enabled without Xv
Signed-off-by: Laurent Carlier's avatarLaurent Carlier <>
parent 82d9e99b
......@@ -192,7 +192,7 @@ conf_data.set('XSYNC', '1')
conf_data.set('XTEST', '1')
conf_data.set('XV', build_xv)
conf_data.set('XvExtension', build_xv)
conf_data.set('XvMCExtension', build_xv)
conf_data.set('XvMCExtension', build_xvmc)
conf_data.set('HAVE_SHA1_IN_LIBNETTLE', '1') # XXX
......@@ -353,12 +353,17 @@ if build_xsecurity
build_xv = get_option('xv')
build_xvmc = get_option('xvmc')
if not build_xv
build_xvmc = false
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_mitshm = true
build_xselinux = false
build_xv = true
build_dga = false
build_xf86vidmode = xf86vidmodeproto_dep.found()
......@@ -71,6 +71,10 @@ option('xinerama', type: 'boolean', value: true,
description: 'Xinerama extension')
option('xcsecurity', type: 'boolean', value: false,
description: 'Security extension')
option('xv', type: 'boolean', value: true,
description: 'Xv extension')
option('xvmc', type: 'boolean', value: true,
description: 'XvMC extension')
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment