summaryrefslogtreecommitdiff
path: root/meson_options.txt
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2019-07-23 14:33:45 -0400
committerAdam Jackson <ajax@redhat.com>2019-10-02 10:03:26 -0400
commitb2de577f6388c6dd7a463e5cebb8b1366bb45d1f (patch)
tree17045289d20a4fe028d56eaf7ac69f5d8c931ce0 /meson_options.txt
parente7b5af451c101608d8cc003e8dd0ff83ded17146 (diff)
xfree86: Merge vbe into int10
There's not really a good reason to keep these separate, the vbe code requires int10 and is not very large. This change eliminates the build-time options for vbe; if you build int10, you get vbe. Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692 Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt
index 94a782a92..209587cd0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -72,8 +72,6 @@ option('hal', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable HAL integration')
option('systemd_logind', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable systemd-logind integration')
-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,