xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/xwayland/meson.build |    1 +
 meson.build             |    8 +++++++-
 present/meson.build     |    6 ------
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 8fe15a60c5e4e1950594309fd343354ebeddc4ae
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Tue Aug 13 10:22:35 2024 +0200

    build: Fix DRI3 on DragonFly and OpenBSD
    
    Commit 96bdc156 added a check for <sys/eventfd.h> to enable DRI3.
    
    DragonFly and OpenBSD however rely on epoll-shim for <sys/eventfd.h>,
    so that must be added as a dependency for the <sys/eventfd.h> check.
    
    Fixes: commit 96bdc156 - xwayland: Do not enable DRI3 without eventfd
    Suggested-by: Jan Beich <jbeich at freebsd.org>
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1642>

diff --git a/meson.build b/meson.build
index d3466d5ae..4bc67bcbb 100644
--- a/meson.build
+++ b/meson.build
@@ -511,7 +511,7 @@ else
    epoll_dep = []
 endif
 
-have_eventfd = cc.has_header('sys/eventfd.h')
+have_eventfd = cc.has_header('sys/eventfd.h', dependencies: epoll_dep)
 if get_option('dri3') == 'auto'
     build_dri3 = dri3proto_dep.found() and xshmfence_dep.found() and libdrm_dep.found() and have_eventfd
 else
commit 7bcf2bcafc7bf2ec0d089687e5d6291df816e0c6
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Tue Aug 13 10:29:33 2024 +0200

    build: Add epoll to Xwayland for DragonFly and OpenBSD
    
    DragonFly and OpenBSD rely on epoll-shim for <sys/eventfd>, add a
    optional dependency to build Xwayland.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1642>

diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 460c57300..0ccb32a75 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -139,6 +139,7 @@ xwayland_server = executable(
     include_directories: wayland_inc,
     dependencies: [
         common_dep,
+        epoll_dep,
         xwayland_dep,
         xwaylandproto_dep,
     ],
commit 673b56e61c9c80d8484128827bd51b26d3120a3f
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Tue Aug 13 10:18:38 2024 +0200

    build: Move epoll dependency check
    
    DragonFly and OpenBSD rely on epoll-shim to provide eventfd.
    
    Move the check for epoll dependency to the root meson.build script so
    that we can use that for the <sys/evenfd.h> check as well.
    
    This is preparation work for the following commits, no functional change
    intended at this point.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1642>

diff --git a/meson.build b/meson.build
index 85627e3a6..d3466d5ae 100644
--- a/meson.build
+++ b/meson.build
@@ -505,6 +505,12 @@ else
     build_dri2 = get_option('dri2') == 'true'
 endif
 
+if host_machine.system() in ['freebsd', 'openbsd']
+   epoll_dep = dependency('epoll-shim')
+else
+   epoll_dep = []
+endif
+
 have_eventfd = cc.has_header('sys/eventfd.h')
 if get_option('dri3') == 'auto'
     build_dri3 = dri3proto_dep.found() and xshmfence_dep.found() and libdrm_dep.found() and have_eventfd
diff --git a/present/meson.build b/present/meson.build
index ec5d4cc6e..bc806a668 100644
--- a/present/meson.build
+++ b/present/meson.build
@@ -16,12 +16,6 @@ hdrs_present = [
     'presentext.h',
 ]
 
-if host_machine.system() in ['freebsd', 'openbsd']
-   epoll_dep = dependency('epoll-shim')
-else
-   epoll_dep = []
-endif
-
 libxserver_present = static_library('libxserver_present',
     srcs_present,
     include_directories: inc,