diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-06-17 14:32:30 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-06-20 13:07:20 +0100 |
| commit | fb212f2c1bcfb015112aa665dd1f25d9b80f86fc (patch) | |
| tree | 43d5392da6653ea9f6c0262d49aa460c326e2d39 | |
| parent | 6d2b7d33678e7a881ebdb5ceb4a32509ad3ee930 (diff) | |
meson: Make VBE and VGAHW modules optional
Don't build them on platforms where they aren't meaningful.
Note that autoconf defines WITH_VGAHW when building the VGAHW module, but
that doesn't seem to be used anywhere, so we just drop that.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | meson.build | 24 | ||||
| -rw-r--r-- | meson_options.txt | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/meson.build b/meson.build index f0b1ef0a2..79da23740 100644 --- a/meson.build +++ b/meson.build @@ -260,6 +260,28 @@ if libdrm_dep.found() build_modesetting = libdrm_dep.version().version_compare('>= 2.4.46') endif +build_vbe = false +if get_option('vbe') == 'auto' + if (host_machine.system() != 'darwin' and + host_machine.system() != 'windows' and + host_machine.system() != 'cygwin') + build_vbe = true + endif +else + build_vbe = get_option('vbe') == 'yes' +endif + +build_vgahw = false +if get_option('vgahw') == 'auto' + if (host_machine.system() != 'darwin' and + host_machine.system() != 'windows' and + host_machine.system() != 'cygwin') + build_vgahw = true + endif +else + build_vgahw = get_option('vgahw') == 'yes' +endif + # XXX: Allow configuration of these. build_apm = false build_acpi = false @@ -267,8 +289,6 @@ build_dpms = true build_mitshm = true build_res = true build_screensaver = true -build_vbe = true -build_vgahw = true build_xace = true build_xsecurity = true build_xf86bigfont = true diff --git a/meson_options.txt b/meson_options.txt index 56d5afa19..fc66f9f08 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -49,6 +49,10 @@ option('hal', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable HAL integration') option('systemd_logind', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable systemd-logind integration') +option('vbe', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', + description: 'Xorg VBE module') +option('vgahw', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', + description: 'Xorg VGA access module') option('dri1', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)') option('dri2', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)') |