diff options
| author | Laurent Carlier <lordheavym@gmail.com> | 2018-02-18 10:58:35 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-02-19 13:14:43 -0500 |
| commit | 5ba0ba93e127a8c460b013e3c6851dd186377c27 (patch) | |
| tree | 4ab1f073d07b8a911637f6cb56b2e75fb3bf67dc | |
| parent | e790bc621b8f55489e35b1de260c649d8d105d63 (diff) | |
meson: Make DGA extension optional
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
| -rw-r--r-- | include/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 13 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/include/meson.build b/include/meson.build index 4d09e7dff..83778c69b 100644 --- a/include/meson.build +++ b/include/meson.build @@ -163,6 +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('DGA', build_dga) conf_data.set('DPMSExtension', build_dpms) conf_data.set('DRI2', build_dri2) conf_data.set('DRI3', build_dri3) @@ -184,6 +185,7 @@ conf_data.set('XF86BIGFONT', build_xf86bigfont) conf_data.set('XF86DRI', build_dri1) conf_data.set('XF86VIDMODE', build_xf86vidmode) conf_data.set('XFIXES', '1') +conf_data.set('XFreeXDGA', build_dga) conf_data.set('XINERAMA', build_xinerama) conf_data.set('XINPUT', '1') conf_data.set('XRECORD', '1') diff --git a/meson.build b/meson.build index 364c6148e..492d8cd9d 100644 --- a/meson.build +++ b/meson.build @@ -81,7 +81,6 @@ dri2proto_dep = dependency('dri2proto', version: '>= 2.8', required: get_option( dri3proto_dep = dependency('dri3proto', version: '>= 1.0', required: get_option('dri3') == 'true') xineramaproto_dep = dependency('xineramaproto') xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0') -xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1', required: false) xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1', required: false) windowswmproto_dep = dependency('windowswmproto', required: false) applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false) @@ -359,12 +358,22 @@ if not build_xv build_xvmc = false endif +build_dga = false +if get_option('dga') == 'auto' + xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1', required: false) + if xf86dgaproto_dep.found() + build_dga = true + endif +elif get_option('dga') == 'true' + xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1', required: true) + build_dga = true +endif + # XXX: Allow configuration of these. build_apm = false build_acpi = false build_mitshm = true build_xselinux = false -build_dga = false build_xf86vidmode = xf86vidmodeproto_dep.found() m_dep = cc.find_library('m', required : false) diff --git a/meson_options.txt b/meson_options.txt index 8ba6edf3f..52d02ab4e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -75,6 +75,8 @@ option('xv', type: 'boolean', value: true, description: 'Xv extension') option('xvmc', type: 'boolean', value: true, description: 'XvMC extension') +option('dga', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', + description: 'DGA 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)') |