xserver: Branch 'master'

[GitLab Mirror]

 meson.build |   53 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

New commits:
commit d266274ca9b7d0307402bdbe12a52fd7738eff58
Author: orbea <orbea at riseup.net>
Date:   Tue Jan 24 11:06:59 2023 -0800

    meson: wayland_client_dep is false when wayland is disabled
    
    Signed-off-by: orbea <orbea at riseup.net>

diff --git a/meson.build b/meson.build
index 73c2bf9b1..01e22b6a9 100644
--- a/meson.build
+++ b/meson.build
@@ -205,36 +205,35 @@ libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], requir
 
 build_xwayland = false
 if (host_machine.system() != 'darwin' and
-    host_machine.system() != 'windows')
-    if get_option('xwayland') != 'false'
-        xwayland_required = get_option('xwayland') == 'true'
-        build_glamor = glamor_option == 'true' or glamor_option == 'auto'
-
-        xwayland_path = get_option('xwayland-path')
-        if (xwayland_path == '')
-            xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
-        endif
-
-        wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
-        xwayland_dep = [
-            wayland_client_dep,
-            dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
-            dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
-        ]
+    host_machine.system() != 'windows' and
+    get_option('xwayland') != 'false')
+    xwayland_required = get_option('xwayland') == 'true'
+    build_glamor = glamor_option == 'true' or glamor_option == 'auto'
+
+    xwayland_path = get_option('xwayland-path')
+    if (xwayland_path == '')
+        xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
+    endif
 
-        if build_glamor
-            xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required)
-            xwayland_dep += dependency('epoxy', required: xwayland_required)
-        endif
+    wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
+    xwayland_dep = [
+        wayland_client_dep,
+        dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
+        dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
+    ]
 
-        build_xwayland = true
-        # check for all the deps being found, to handle 'auto' mode.
-        foreach d: xwayland_dep
-            if not d.found()
-                build_xwayland = false
-            endif
-        endforeach
+    if build_glamor
+        xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required)
+        xwayland_dep += dependency('epoxy', required: xwayland_required)
     endif
+
+    build_xwayland = true
+    # check for all the deps being found, to handle 'auto' mode.
+    foreach d: xwayland_dep
+        if not d.found()
+            build_xwayland = false
+        endif
+    endforeach
 else
     wayland_client_dep = dependency('', required: false)
 endif