xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 8d2117abebebd8e466662cbc24d7a644ccc8784c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 5 21:40:01 2024 +0100

    hw: xwayland: fix build if neither gbm nor eglstream available
    
    glamor needs to be disabled if neither gbm nor eglstream is available,
    otherwise build breaks.
    
    Closes: xorg/xserver#1631
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>

diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 8898f3e6c..cd608e1e1 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -103,7 +103,7 @@ endif
 
 xwayland_glamor = []
 eglstream_srcs = []
-if build_glamor
+if build_xwayland_glamor
     srcs += 'xwayland-glamor.c'
     if gbm_dep.found()
         srcs += [
diff --git a/include/meson.build b/include/meson.build
index 7799c61bc..8d0194fcb 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -414,8 +414,10 @@ configure_file(output : 'xwin-config.h',
                input : 'xwin-config.h.meson.in',
                configuration : xwin_data)
 
+build_xwayland_glamor = build_glamor and (gbm_dep.found() or build_eglstream)
+
 xwayland_data = configuration_data()
-xwayland_data.set('XWL_HAS_GLAMOR', build_glamor and (gbm_dep.found() or build_eglstream) ? '1' : false)
+xwayland_data.set('XWL_HAS_GLAMOR', build_xwayland_glamor ? '1' : false)
 xwayland_data.set('XWL_HAS_EGLSTREAM', build_eglstream ? '1' : false)
 xwayland_data.set('XWL_HAS_LIBDECOR', have_libdecor ? '1' : false)
 xwayland_data.set('XWL_HAS_XWAYLAND_EXTENSION', xwaylandproto_dep.found() ? '1' : false)