XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson.build: Don't silently change the user's option regarding udev support

Browse Source 
This can cause issues like: #397

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2025-07-28 20:56:46 +03:00
committed by Enrico Weigelt
parent fa72f05928
commit 19917e3e15
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
meson.build
View File

@@ -182,13 +182,30 @@ if ['windows', 'darwin', 'cygwin'].contains(host_machine.system())
hal_option = 'false'
endif
build_udev = get_option('udev')
build_udev_kms = get_option('udev_kms')
udev_option = get_option('udev')
udev_kms_option = get_option('udev_kms')
if ['windows', 'darwin', 'netbsd', 'openbsd', 'sunos'].contains(host_machine.system())
build_udev = false
build_udev_kms = false
if udev_option == 'auto'
udev_option = 'false'
endif
if udev_kms_option == 'auto'
udev_kms_option = 'false'
endif
if udev_option == 'true' or udev_kms_option == 'true'
message('WARNING: udev is not supported on your platform')
endif
else
if udev_option == 'auto'
udev_option = 'true'
endif
if udev_kms_option == 'auto'
udev_kms_option = 'true'
endif
endif
build_udev = (udev_option == 'true')
build_udev_kms = (udev_kms_option == 'true')
if get_option('systemd_logind') == 'auto'
build_systemd_logind = build_udev_kms and dbus_dep.found()
else

6
meson_options.txt
View File

@@ -64,8 +64,10 @@ 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('udev_kms', type: 'boolean', value: true)
option('udev', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable udev hotplugging support')
option('udev_kms', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable udev kms support')
option('hal', type: 'combo', choices: ['true', 'false', 'auto'], value: 'false',
description: 'Enable HAL integration')
option('systemd_notify', type: 'combo', choices: ['true', 'false', 'auto'], value: 'false',