[Mesa-dev] [PATCH 1/5] intel: Move the DRM uapi headers to a non-Intel location.

[Eric Anholt]

I want to remove vc4's dependency on headers from libdrm as well, but
storing multiple copies of drm_fourcc.h in our tree would be silly.
---
 {src/intel/drm => include/drm-uapi}/README       | 0
 {src/intel/drm => include/drm-uapi}/drm.h        | 0
 {src/intel/drm => include/drm-uapi}/drm_fourcc.h | 0
 {src/intel/drm => include/drm-uapi}/drm_mode.h   | 0
 {src/intel/drm => include/drm-uapi}/i915_drm.h   | 0
 src/intel/Makefile.vulkan.am                     | 2 +-
 src/mesa/drivers/dri/i965/Makefile.am            | 2 +-
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename {src/intel/drm => include/drm-uapi}/README (100%)
 rename {src/intel/drm => include/drm-uapi}/drm.h (100%)
 rename {src/intel/drm => include/drm-uapi}/drm_fourcc.h (100%)
 rename {src/intel/drm => include/drm-uapi}/drm_mode.h (100%)
 rename {src/intel/drm => include/drm-uapi}/i915_drm.h (100%)

diff --git a/src/intel/drm/README b/include/drm-uapi/README
similarity index 100%
rename from src/intel/drm/README
rename to include/drm-uapi/README
diff --git a/src/intel/drm/drm.h b/include/drm-uapi/drm.h
similarity index 100%
rename from src/intel/drm/drm.h
rename to include/drm-uapi/drm.h
diff --git a/src/intel/drm/drm_fourcc.h b/include/drm-uapi/drm_fourcc.h
similarity index 100%
rename from src/intel/drm/drm_fourcc.h
rename to include/drm-uapi/drm_fourcc.h
diff --git a/src/intel/drm/drm_mode.h b/include/drm-uapi/drm_mode.h
similarity index 100%
rename from src/intel/drm/drm_mode.h
rename to include/drm-uapi/drm_mode.h
diff --git a/src/intel/drm/i915_drm.h b/include/drm-uapi/i915_drm.h
similarity index 100%
rename from src/intel/drm/i915_drm.h
rename to include/drm-uapi/i915_drm.h
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 3857a5dc628b..6550f6846f3b 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -84,7 +84,7 @@ VULKAN_CFLAGS = \
 VULKAN_CPPFLAGS = \
 	-I$(top_srcdir)/src/compiler \
 	-I$(top_srcdir)/src/intel/compiler \
-	-I$(top_srcdir)/src/intel/drm \
+	-I$(top_srcdir)/include/drm-uapi \
 	-I$(top_builddir)/src/intel/vulkan \
 	-I$(top_srcdir)/src/intel/vulkan \
 	-I$(top_srcdir)/src/vulkan/wsi \
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 4b56b4b0efec..ecc1e766f11c 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -38,7 +38,7 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/compiler/nir \
 	-I$(top_builddir)/src/intel \
 	-I$(top_srcdir)/src/intel \
-	-I$(top_srcdir)/src/intel/drm \
+	-I$(top_srcdir)/include/drm-uapi \
 	$(DEFINES) \
 	$(VISIBILITY_CFLAGS) \
 	$(LIBDRM_CFLAGS) \
-- 
2.11.0