From 00e1562f5b90e5a8861b085daca926a5100b3bf1 Mon Sep 17 00:00:00 2001
From: "duncan.hopkins" <duncan.hopkins@foundry.com>
Date: Fri, 27 Oct 2023 11:26:47 +0100
Subject: [PATCH] gallium/dri: Switch xf86drm.h for util/libdrm.h to allow for
 the no-op shim to be used.

This patch allows MacOS to compile the dri[2] systems by switching from direct xf86drm.h to
the pre-existing util/libdrm.h.

Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28130>
---
 src/egl/drivers/dri2/platform_surfaceless.c | 2 +-
 src/gallium/frontends/dri/dri2.c            | 2 +-
 src/glx/dri2.h                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
index 65a81db626c..0668ec9285f 100644
--- a/src/egl/drivers/dri2/platform_surfaceless.c
+++ b/src/egl/drivers/dri2/platform_surfaceless.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <xf86drm.h>
+#include "util/libdrm.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
index 5ce777f3708..5017e9016b3 100644
--- a/src/gallium/frontends/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -28,7 +28,7 @@
  *    <wallbraker@gmail.com> Chia-I Wu <olv@lunarg.com>
  */
 
-#include <xf86drm.h>
+#include "util/libdrm.h"
 #include "git_sha1.h"
 #include "GL/mesa_glinterop.h"
 #include "GL/internal/mesa_interface.h"
diff --git a/src/glx/dri2.h b/src/glx/dri2.h
index 4be5bf8eb8e..aa3f458aee5 100644
--- a/src/glx/dri2.h
+++ b/src/glx/dri2.h
@@ -33,7 +33,7 @@
 #ifndef _DRI2_H_
 #define _DRI2_H_
 
-#include <xf86drm.h>
+#include "util/libdrm.h"
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/dri2tokens.h>