xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 meson.build |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a692ded3d9fbf22092439eb1e61e80e5b449bee0
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Jan 25 10:22:42 2024 +0100

    build: Xwayland with GLAMOR requires libxshmfence
    
    Without libxshmfence, Xwayland cannot build with GLAMOR support.
    
    Make sure to catch that requirement in meson rather than failing the
    build later.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1626
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1253>

diff --git a/meson.build b/meson.build
index 83787b3ee..858d0de97 100644
--- a/meson.build
+++ b/meson.build
@@ -226,6 +226,7 @@ if (host_machine.system() != 'darwin' and
     ]
 
     if build_glamor
+        xwayland_dep += dependency('xshmfence', version: xshmfence_req, required: xwayland_required)
         xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required)
         xwayland_dep += dependency('epoxy', required: xwayland_required)
     endif
commit 2ebde20eef1cbca83115525e3a4dc15ee68d7a35
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Jan 25 10:20:27 2024 +0100

    build: Use a variable for the xshmfence version
    
    No functional change.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1253>

diff --git a/meson.build b/meson.build
index eb8f054e8..83787b3ee 100644
--- a/meson.build
+++ b/meson.build
@@ -67,6 +67,7 @@ wayland_req = '>= 1.21.0'
 wayland_protocols_req = '>= 1.30'
 gbm_req = '>= 10.2'
 xf86dgaproto_req = '>= 2.0.99.1'
+xshmfence_req = '>= 1.1'
 
 xproto_dep = dependency('xproto', version: '>= 7.0.31', fallback: ['xorgproto', 'ext_xorgproto'])
 randrproto_dep = dependency('randrproto', version: '>= 1.6.0', fallback: ['xorgproto', 'ext_xorgproto'])
@@ -94,7 +95,7 @@ xineramaproto_dep = dependency('xineramaproto', fallback: ['xorgproto', 'ext_xor
 xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0', fallback: ['xorgproto', 'ext_xorgproto'], required: get_option('xf86bigfont'))
 xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1', fallback: ['xorgproto', 'ext_xorgproto'])
 applewmproto_dep = dependency('applewmproto', version: '>= 1.4', fallback: ['xorgproto', 'ext_xorgproto'], required: false)
-xshmfence_dep = dependency('xshmfence', version: '>= 1.1', required: false)
+xshmfence_dep = dependency('xshmfence', version: xshmfence_req, required: false)
 xwaylandproto_dep = dependency('xwaylandproto', version: '>= 1.0', fallback: ['xorgproto', 'ext_xorgproto'], required: false)
 dpmsproto_dep = dependency('dpmsproto', version: '>= 1.2', required: get_option('dpms'))