xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-glamor-gbm.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f0748b05dce8120c7216b6c011a87c55dc712f74
Author: Jan Beich <jbeich at FreeBSD.org>
Date:   Tue Apr 9 17:45:36 2024 +0200

    xwayland: avoid Linux-only headers on non-Linux
    
    hw/xwayland/xwayland-glamor-gbm.c:38:10: fatal error: 'linux/dma-buf.h' file not found
       38 | #include <linux/dma-buf.h>
          |          ^~~~~~~~~~~~~~~~~
    
    Fixes: 3df236a3d538 ("xwayland: add functions to import and export dma-buf implicit fences")
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1481>

diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 745a9ed38..570fbc54a 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -35,9 +35,11 @@
 #include <sys/stat.h>
 #include <xf86drm.h>
 #include <drm_fourcc.h>
+#if defined(__linux__)
 #include <linux/dma-buf.h>
 #include <linux/sync_file.h>
 #include <sys/ioctl.h>
+#endif
 
 #define MESA_EGL_NO_X11_HEADERS
 #define EGL_NO_X11