sync

16 files changed, 135 insertions, 45 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 1b1b7eebc..7cb07881f 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -57,7 +57,16 @@
 ./usr/X11R6/include/libdrm/i915_drm.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -73,6 +82,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -132,11 +142,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 337d0b753..16e0eb448 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -62,7 +62,16 @@
 ./usr/X11R6/include/libdrm/intel_debug.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -78,6 +87,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -302,13 +312,13 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_intel.la
-./usr/X11R6/lib/libdrm_intel.so.5.0
+./usr/X11R6/lib/libdrm_intel.so.5.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 04d18fa2d..72c3dda8a 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -293,7 +293,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index eadf1c7f3..d1590c9fa 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -282,7 +282,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 4bb31ab55..73d34c38e 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -281,7 +281,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index c5490acdf..2ca8b5d45 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -62,7 +62,16 @@
 ./usr/X11R6/include/libdrm/intel_debug.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -78,6 +87,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -302,13 +312,13 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_intel.la
-./usr/X11R6/lib/libdrm_intel.so.5.0
+./usr/X11R6/lib/libdrm_intel.so.5.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index a1c8847b9..1fd3c726e 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -122,7 +122,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 714b5481d..efd92f13b 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -57,7 +57,16 @@
 ./usr/X11R6/include/libdrm/i915_drm.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -73,6 +82,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -292,11 +302,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index a350d215c..abe468747 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -279,7 +279,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 8c1f152f0..3db24343b 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -57,7 +57,16 @@
 ./usr/X11R6/include/libdrm/i915_drm.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -73,6 +82,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -294,11 +304,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index e8f0d4500..1207afd30 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -57,7 +57,16 @@
 ./usr/X11R6/include/libdrm/i915_drm.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -73,6 +82,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -132,11 +142,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index f3429d076..0ed6a02e0 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -57,7 +57,16 @@
 ./usr/X11R6/include/libdrm/i915_drm.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -73,6 +82,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -292,11 +302,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 60835ea47..903a01ff6 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -57,7 +57,16 @@
 ./usr/X11R6/include/libdrm/i915_drm.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -73,6 +82,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -292,11 +302,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 887f0e9f4..88765c078 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -282,7 +282,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 73c480922..f0fedd5de 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -57,7 +57,16 @@
 ./usr/X11R6/include/libdrm/i915_drm.h
 ./usr/X11R6/include/libdrm/mach64_drm.h
 ./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau.h
+./usr/X11R6/include/libdrm/nouveau
+./usr/X11R6/include/libdrm/nouveau/nouveau.h
+./usr/X11R6/include/libdrm/nouveau/nvif
+./usr/X11R6/include/libdrm/nouveau/nvif/cl0080.h
+./usr/X11R6/include/libdrm/nouveau/nvif/cl9097.h
+./usr/X11R6/include/libdrm/nouveau/nvif/class.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0002.h
+./usr/X11R6/include/libdrm/nouveau/nvif/if0003.h
+./usr/X11R6/include/libdrm/nouveau/nvif/ioctl.h
+./usr/X11R6/include/libdrm/nouveau/nvif/unpack.h
 ./usr/X11R6/include/libdrm/nouveau_drm.h
 ./usr/X11R6/include/libdrm/qxl_drm.h
 ./usr/X11R6/include/libdrm/r128_drm.h
@@ -73,6 +82,7 @@
 ./usr/X11R6/include/libdrm/savage_drm.h
 ./usr/X11R6/include/libdrm/sis_drm.h
 ./usr/X11R6/include/libdrm/tegra_drm.h
+./usr/X11R6/include/libdrm/vc4_drm.h
 ./usr/X11R6/include/libdrm/via_drm.h
 ./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
@@ -294,11 +304,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_amdgpu.so.1.1
 ./usr/X11R6/lib/libdrm_nouveau.la
-./usr/X11R6/lib/libdrm_nouveau.so.2.0
+./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
 ./usr/X11R6/lib/libdrm_radeon.so.4.0
 ./usr/X11R6/lib/libepoxy.a
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index eadf1c7f3..d1590c9fa 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -282,7 +282,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.0
+./usr/X11R6/lib/libdrm.so.7.1
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1