xserver: Branch 'master'

[GitLab Mirror]

 meson.build |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit ab701418b2c00d30905ce692f1919167d8febe25
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Jun 27 09:59:11 2024 +0200

    meson.build: disable udev on platforms not having it
    
    Several more platforms lacking udev haven't been catched yet.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1577>

diff --git a/meson.build b/meson.build
index 2a66fb13c..8810846a2 100644
--- a/meson.build
+++ b/meson.build
@@ -174,15 +174,18 @@ else
     default_font_path = dfp
 endif
 
-hal_option = get_option('hal')
 glamor_option = get_option('glamor')
 
+hal_option = get_option('hal')
+if ['windows', 'darwin', 'cygwin'].contains(host_machine.system())
+    hal_option = 'false'
+endif
+
 build_udev = get_option('udev')
 build_udev_kms = get_option('udev_kms')
-if ['windows',  'darwin', 'cygwin'].contains(host_machine.system())
+if ['windows', 'darwin', 'cygwin', 'freebsd', 'netbsd', 'openbsd', 'sunos'].contains(host_machine.system())
     build_udev = false
     build_udev_kms = false
-    hal_option = 'false'
 endif
 
 if get_option('systemd_logind') == 'auto'