Update to xserver 1.20.5. Tested by jsg@

1 files changed, 100 insertions, 0 deletions

diff --git a/xserver/meson_options.txt b/xserver/meson_options.txt
new file mode 100644
index 000000000..3453b8df5
--- /dev/null
+++ b/xserver/meson_options.txt
@@ -0,0 +1,100 @@
+option('xorg', type: 'combo', choices: ['true', 'false', '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: ['true', 'false', 'auto'], value: 'auto',
+       description: 'Enable XWayland X server')
+option('glamor', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+       description: 'Enable glamor (default yes for Xorg/Xwayland builds)')
+option('xwayland_eglstream', type: 'combo', choices: ['true', 'false', 'auto'],
+       value: 'auto', description: 'Enable EGLStream support for glamor on Xwayland')
+option('xnest', type: 'combo', choices: ['true', 'false', '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: ['true', 'false', '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', value: 'xorg/modules',
+       description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)')
+option('default_font_path', type: 'string')
+
+option('glx', type: 'boolean', value: true)
+option('xdmcp', type: 'boolean', value: true)
+option('xdm-auth-1', type: 'boolean', value: true)
+option('secure-rpc', type: 'boolean', value: true)
+option('ipv6', type: 'combo', choices: ['true', 'false', '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('listen_tcp', type: 'boolean', value: false,
+       description: 'Listen on TCP by default')
+option('listen_unix', type: 'boolean', value: true,
+       description: 'Listen on Unix by default')
+option('listen_local', type: 'boolean', value: true,
+       description: 'Listen on local by default')
+
+option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'false'],
+       value: 'auto',
+       description: 'Xorg int10 backend (default: usually x86emu)')
+option('suid_wrapper', type: 'boolean', value: 'false',
+       description: 'SUID wrapper for legacy driver support')
+option('pciaccess', type: 'boolean', value: 'true',
+       description: 'Xorg pciaccess support')
+option('udev', type: 'boolean', value: 'true')
+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,
+       description: 'Xorg DPMS extension')
+option('xf86bigfont', type: 'boolean', value: false,
+       description: 'XF86 Big Font extension')
+option('screensaver', type: 'boolean', value: true,
+       description: 'ScreenSaver extension')
+option('xres', type: 'boolean', value: true,
+       description: 'XRes extension')
+option('xace', type: 'boolean', value: true,
+       description: 'X-ACE extension')
+option('xinerama', type: 'boolean', value: true,
+       description: 'Xinerama extension')
+option('xcsecurity', type: 'boolean', value: false,
+       description: 'Security extension')
+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('linux_apm', type: 'boolean', value: true,
+       description: 'APM support on Linux')
+option('linux_acpi', type: 'boolean', value: true,
+       description: 'ACPI support on Linux')
+option('mitshm', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+       description: 'SHM 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)')
+option('dri3', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI3 extension (default: auto)')