Merge branch 'wip/abono/dma-buf' into 'main'

dmabufformats: Include gdkdmabuffourccprivate.h

See merge request GNOME/gtk!6896

gdk/gdkdmabuffourccprivate.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "config.h"
 #ifdef HAVE_DMABUF
 #include <drm_fourcc.h>
 #endif

gdk/gdkglcontext.c

@@ -79,6 +79,7 @@
 #include "gdkdebugprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdmabufeglprivate.h"
+#include "gdkdmabuffourccprivate.h"
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"
@@ -98,10 +99,6 @@
 #include <epoxy/egl.h>
 #endif
 
-#ifdef HAVE_DMABUF
-#include <drm_fourcc.h>
-#endif
-
 #include <math.h>
 
 #define DEFAULT_ALLOWED_APIS GDK_GL_API_GL | GDK_GL_API_GLES

modules/media/gtkgstsink.c

@@ -53,7 +53,7 @@
 #include <gst/gl/gstglfuncs.h>
 
 #ifdef HAVE_GSTREAMER_DRM
-#include <drm_fourcc.h>
+#include <gdk/gdkdmabuffourccprivate.h>
 #include <gst/allocators/gstdmabuf.h>
 #endif
 

tests/testdmabuf.c

@@ -4,7 +4,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <linux/dma-heap.h>
-#include <drm_fourcc.h>
+#include <gdk/gdkdmabuffourccprivate.h>
 
 #ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>

testsuite/gdk/dmabufformats.c

@@ -3,12 +3,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkdisplayprivate.h>
 #include <gdk/gdkglcontextprivate.h>
+#include <gdk/gdkdmabuffourccprivate.h>
 #include <gdk/gdkdmabuftextureprivate.h>
 
-#ifdef HAVE_DMABUF
-#include <drm_fourcc.h>
-#endif
-
 static void
 test_dmabuf_formats_basic (void)
 {

testsuite/gdk/dmabuftexture.c

@@ -3,12 +3,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkdisplayprivate.h>
 #include <gdk/gdkglcontextprivate.h>
+#include <gdk/gdkdmabuffourccprivate.h>
 #include <gdk/gdkdmabuftextureprivate.h>
 
-#ifdef HAVE_DMABUF
-#include <drm_fourcc.h>
-#endif
-
 static cairo_surface_t *
 make_surface (int width,
               int height)