10cba7d546
Now that we can actually configure all of the directories xkb uses for finding things, we can (finally, but only with meson) finally make it so that with the correct meson configuration the Xserver will "just work" without any additional changes to the installation prefix after building. For the people like me who have since scripted this part out of their build process and forgotten about it, building and installing the X server into a non-standard prefix has always required the following (or something else that makes sure that X has a valid xkbcomp configuration) commands be run right after doing the installation: # start in root of prefix you installed X to mkdir -pv share/X11/xkb/rules ln -s /usr/share/X11/xkb/rules/evdev share/X11/xkb/rules/ rm -f bin/xkbcomp ln -s /usr/bin/xkbcomp bin/ The one last piece of getting rid of this post-install junk is making sure that we can control the directory that X uses for finding the xkbcomp binary from meson so we can point it at the system provided xkbcomp (/usr/bin/xkbcomp or similar). So, this patch adds a configuration option for controlling this called xkb_bin_dir. Signed-off-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
63 lines
3.2 KiB
Meson
63 lines
3.2 KiB
Meson
option('xorg', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
|
|
description: 'Enable Xorg X Server')
|
|
option('xephyr', type: 'boolean', value: false,
|
|
description: 'Enable Xephyr nested X server')
|
|
option('xwayland', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
|
|
description: 'Enable XWayland X server')
|
|
option('glamor', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
|
|
description: 'Enable glamor (default yes for Xorg/Xwayland builds)')
|
|
option('xnest', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
|
|
description: 'Enable Xnest nested X server')
|
|
option('dmx', type: 'boolean', value: false,
|
|
description: 'Enable DMX nested X server')
|
|
option('xvfb', type: 'boolean', value: true,
|
|
description: 'Enable Xvfb X server')
|
|
option('xwin', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
|
|
description: 'Enable XWin X server')
|
|
|
|
option('builder_addr', type: 'string', description: 'Builder address', value: 'xorg@lists.freedesktop.org')
|
|
option('builder_string', type: 'string', description: 'Additional builder string')
|
|
|
|
option('log_dir', type: 'string')
|
|
option('module_dir', type: 'string',
|
|
description: 'X.Org modules directory')
|
|
|
|
option('glx', type: 'boolean', value: true)
|
|
option('xdmcp', type: 'boolean', value: true)
|
|
option('xdm-auth-1', type: 'boolean', value: true)
|
|
option('ipv6', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto')
|
|
|
|
option('xkb_dir', type: 'string')
|
|
option('xkb_output_dir', type: 'string')
|
|
option('xkb_bin_dir', type: 'string')
|
|
option('xkb_default_rules', type: 'string', value: 'evdev')
|
|
option('xkb_default_model', type: 'string', value: 'pc105')
|
|
option('xkb_default_layout', type: 'string', value: 'us')
|
|
option('xkb_default_variant', type: 'string')
|
|
option('xkb_default_options', type: 'string')
|
|
|
|
option('vendor_name', type: 'string', value: 'The X.Org Foundation')
|
|
option('vendor_name_short', type: 'string', value: 'X.Org')
|
|
option('vendor_web', type: 'string', value: 'http://wiki.x.org')
|
|
option('os_vendor', type: 'string', value: '')
|
|
|
|
option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'disabled'],
|
|
value: 'auto',
|
|
description: 'Xorg int10 backend (default: usually x86emu)')
|
|
|
|
option('pciaccess', type: 'boolean', value: 'true',
|
|
description: 'Xorg pciaccess support')
|
|
option('udev', type: 'boolean', value: 'true')
|
|
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)')
|
|
option('dri3', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Build DRI3 extension (default: auto)')
|