Commit 3203dd17 authored by Laurent Carlier's avatar Laurent Carlier Committed by Adam Jackson

meson: Make DPMS extension optional

Just mimic autoconf file, DPMS is disabled with Xquartz
Signed-off-by: Laurent Carlier's avatarLaurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent 2c3e137b
......@@ -163,7 +163,7 @@ conf_data.set('BIGREQS', '1')
conf_data.set('COMPOSITE', '1')
conf_data.set('DAMAGE', '1')
conf_data.set('DBE', '1')
conf_data.set('DPMSExtension', '1')
conf_data.set('DPMSExtension', build_dpms)
conf_data.set('DRI2', build_dri2)
conf_data.set('DRI3', build_dri3)
conf_data.set_quoted('DRI_DRIVER_PATH', dri_dep.get_pkgconfig_variable('dridriverdir'))
......
......@@ -335,10 +335,14 @@ else
build_vgahw = get_option('vgahw') == 'true'
endif
build_dpms = get_option('dpms')
if build_xquartz
build_dpms = false
endif
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_dpms = true
build_mitshm = true
build_res = true
build_screensaver = true
......
......@@ -57,6 +57,8 @@ option('vbe', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Xorg VBE module')
option('vgahw', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Xorg VGA access module')
option('dpms', type: 'boolean', value: true,
description: 'Xorg DPMS 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