xserver: Branch 'master'

[GitLab Mirror]

 hw/meson.build |    4 ++--
 meson.build    |   15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 4966fbb55a1a127e76bc1614b8baa1d675671104
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Mar 19 12:14:25 2025 +1000

    meson.build: print a summary of the DDX to build
    
    Makes it easier to detect accidentally "oops, i'm not building Xwayland"
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1869>

diff --git a/hw/meson.build b/hw/meson.build
index 0f43ab6e2..f9605a5b7 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,8 +1,8 @@
-if get_option('xephyr')
+if build_xephyr
     subdir('kdrive')
 endif
 
-if get_option('xvfb')
+if build_xvfb
     subdir('vfb')
 endif
 
diff --git a/meson.build b/meson.build
index 67abb482d..abab17ed3 100644
--- a/meson.build
+++ b/meson.build
@@ -287,6 +287,21 @@ if build_xquartz
     build_rootless = true
 endif
 
+build_xephyr = get_option('xephyr')
+build_xvfb = get_option('xvfb')
+
+summary({
+        'Xorg': build_xorg,
+        'Xwayland': build_xwayland,
+        'Xnest': build_xnest,
+        'Xvfb': build_xvfb,
+        'Xwin': build_xwin,
+        'Xquartz': build_xquartz,
+    },
+    section: 'DDX',
+    bool_yn: true,
+)
+
 # IPv6 support
 have_AF_INET6 = cc.compiles('''
 #ifdef WIN32