sync

14 files changed, 35 insertions, 24 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 821286b5d..043f3cedb 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -103,9 +103,9 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_nouveau.la
 ./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
@@ -193,6 +193,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 7103aeef2..6ad77c694 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -271,9 +271,9 @@
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libXvMCr600.so.1.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_intel.la
 ./usr/X11R6/lib/libdrm_intel.so.5.4
 ./usr/X11R6/lib/libdrm_nouveau.la
@@ -364,6 +364,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.arm64 b/distrib/sets/lists/xbase/md.arm64
index fd793bff8..5151ad114 100644
--- a/distrib/sets/lists/xbase/md.arm64
+++ b/distrib/sets/lists/xbase/md.arm64
@@ -266,9 +266,9 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_freedreno.la
 ./usr/X11R6/lib/libdrm_freedreno.so.1.0
 ./usr/X11R6/lib/libdrm_nouveau.la
@@ -360,6 +360,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 3e110f674..8917ed8b8 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -244,7 +244,7 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libgbm.la
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 5fcd578ef..2d6fbca0e 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -243,7 +243,7 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libgbm.la
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 287160a11..51039a07e 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -271,9 +271,9 @@
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libXvMCr600.so.1.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_intel.la
 ./usr/X11R6/lib/libdrm_intel.so.5.4
 ./usr/X11R6/lib/libdrm_nouveau.la
@@ -364,6 +364,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 70aeaacd9..34e561ddb 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -86,7 +86,7 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libepoxy.a
 ./usr/X11R6/lib/libepoxy.so.2.0
 ./usr/X11R6/lib/libgbm.la
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index c954d3ed3..5008b8828 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -262,9 +262,9 @@
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libXvMCr600.so.1.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_nouveau.la
 ./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
@@ -349,6 +349,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 954b2aa3e..0991628cb 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -263,9 +263,9 @@
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libXvMCr600.so.1.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_nouveau.la
 ./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
@@ -353,6 +353,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7
 ./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index ae5677e1d..69e70db8c 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -103,9 +103,9 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_nouveau.la
 ./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
@@ -193,6 +193,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7
 ./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be64.cache-7
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 3095340fd..d59005ce5 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -261,9 +261,9 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_nouveau.la
 ./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
@@ -348,6 +348,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7
 ./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be64.cache-7
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 745132055..871ceb250 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -261,9 +261,9 @@
 ./usr/X11R6/lib/libOSMesa.la
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_nouveau.la
 ./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
@@ -348,6 +348,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7
 ./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 563840dfd..af8253a33 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -263,9 +263,9 @@
 ./usr/X11R6/lib/libOSMesa.so.10.1
 ./usr/X11R6/lib/libXvMCr600.so.1.0
 ./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.4
+./usr/X11R6/lib/libdrm.so.7.5
 ./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.3
+./usr/X11R6/lib/libdrm_amdgpu.so.1.4
 ./usr/X11R6/lib/libdrm_nouveau.la
 ./usr/X11R6/lib/libdrm_nouveau.so.3.0
 ./usr/X11R6/lib/libdrm_radeon.la
@@ -354,6 +354,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7
 ./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be64.cache-7
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 8d7dc1241..7be66d372 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -115,10 +115,10 @@
 ./usr/X11R6/bin/xcompmgr
 ./usr/X11R6/bin/xconsole
 ./usr/X11R6/bin/xcutsel
-./usr/X11R6/bin/xenodm
 ./usr/X11R6/bin/xdpr
 ./usr/X11R6/bin/xdpyinfo
 ./usr/X11R6/bin/xedit
+./usr/X11R6/bin/xenodm
 ./usr/X11R6/bin/xev
 ./usr/X11R6/bin/xeyes
 ./usr/X11R6/bin/xfd
@@ -507,6 +507,7 @@
 ./usr/X11R6/share/X11/app-defaults/Xmessage
 ./usr/X11R6/share/X11/app-defaults/Xmessage-color
 ./usr/X11R6/share/X11/app-defaults/Xvidtune
+./usr/X11R6/share/libdrm
 ./usr/X11R6/share/xcb
 ./usr/X11R6/share/xcb/xcb.xsd
 ./usr/X11R6/share/xcb/xkb.xml