closer sync

13 files changed, 3 insertions, 187 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index de435c7bc..ab8f5bb8a 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -2,108 +2,7 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/xshmfence.h
-./usr/X11R6/include/epoxy/common.h
-./usr/X11R6/include/epoxy/egl.h
-./usr/X11R6/include/epoxy/egl_generated.h
-./usr/X11R6/include/epoxy/gl.h
-./usr/X11R6/include/epoxy/gl_generated.h
-./usr/X11R6/include/epoxy/glx.h
-./usr/X11R6/include/epoxy/glx_generated.h
-./usr/X11R6/include/gbm.h
-./usr/X11R6/include/libdrm/amdgpu.h
-./usr/X11R6/include/libdrm/amdgpu_drm.h
-./usr/X11R6/include/libdrm/drm.h
-./usr/X11R6/include/libdrm/drm_fourcc.h
-./usr/X11R6/include/libdrm/drm_mode.h
-./usr/X11R6/include/libdrm/drm_sarea.h
-./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/msm_drm.h
-./usr/X11R6/include/libdrm/nouveau/nouveau.h
-./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
-./usr/X11R6/include/libdrm/r600_pci_ids.h
-./usr/X11R6/include/libdrm/radeon_bo.h
-./usr/X11R6/include/libdrm/radeon_bo_gem.h
-./usr/X11R6/include/libdrm/radeon_bo_int.h
-./usr/X11R6/include/libdrm/radeon_cs.h
-./usr/X11R6/include/libdrm/radeon_cs_gem.h
-./usr/X11R6/include/libdrm/radeon_cs_int.h
-./usr/X11R6/include/libdrm/radeon_drm.h
-./usr/X11R6/include/libdrm/radeon_surface.h
-./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/virtgpu_drm.h
-./usr/X11R6/include/libdrm/vmwgfx_drm.h
-./usr/X11R6/include/xf86drm.h
-./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/lib/libEGL.a
-./usr/X11R6/lib/libEGL.so.1.1
-./usr/X11R6/lib/libEGL_p.a
-./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.17.1
-./usr/X11R6/lib/libGLESv1_CM.a
-./usr/X11R6/lib/libGLESv1_CM.so.2.0
-./usr/X11R6/lib/libGLESv1_CM_p.a
-./usr/X11R6/lib/libGLESv2.a
-./usr/X11R6/lib/libGLESv2.so.2.0
-./usr/X11R6/lib/libGLESv2_p.a
-./usr/X11R6/lib/libGLU.a
-./usr/X11R6/lib/libGLU.la
-./usr/X11R6/lib/libGLU.so.9.0
-./usr/X11R6/lib/libGL_p.a
-./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.11.0
-./usr/X11R6/lib/libOSMesa_p.a
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.8
-./usr/X11R6/lib/libdrm_amdgpu.la
-./usr/X11R6/lib/libdrm_amdgpu.so.1.9
-./usr/X11R6/lib/libdrm_nouveau.la
-./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
-./usr/X11R6/lib/libepoxy.so.4.0
-./usr/X11R6/lib/libgbm.a
-./usr/X11R6/lib/libgbm.so.0.4
-./usr/X11R6/lib/libgbm_p.a
-./usr/X11R6/lib/libglapi.a
-./usr/X11R6/lib/libglapi.so.0.3
-./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libxshmfence.a
-./usr/X11R6/lib/libxshmfence.la
-./usr/X11R6/lib/libxshmfence.so.0.0
-./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/egl.pc
-./usr/X11R6/lib/pkgconfig/epoxy.pc
-./usr/X11R6/lib/pkgconfig/gbm.pc
-./usr/X11R6/lib/pkgconfig/gl.pc
-./usr/X11R6/lib/pkgconfig/glesv1_cm.pc
-./usr/X11R6/lib/pkgconfig/glesv2.pc
-./usr/X11R6/lib/pkgconfig/glu.pc
-./usr/X11R6/lib/pkgconfig/glw.pc
-./usr/X11R6/lib/pkgconfig/libdrm.pc
-./usr/X11R6/lib/pkgconfig/libdrm_amdgpu.pc
-./usr/X11R6/lib/pkgconfig/libdrm_nouveau.pc
-./usr/X11R6/lib/pkgconfig/libdrm_radeon.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 69c3623d8..fcf03689c 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -297,8 +297,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libvulkan_intel.so
 ./usr/X11R6/lib/libvulkan_radeon.so
 ./usr/X11R6/lib/libxshmfence.a
diff --git a/distrib/sets/lists/xbase/md.arm64 b/distrib/sets/lists/xbase/md.arm64
index e7ec456f2..ad196c5ee 100644
--- a/distrib/sets/lists/xbase/md.arm64
+++ b/distrib/sets/lists/xbase/md.arm64
@@ -292,8 +292,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libvulkan_radeon.so
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 9488a72b0..a9a67df37 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -292,8 +292,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 9ca3d8937..8241dc7cd 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -297,8 +297,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libvulkan_intel.so
 ./usr/X11R6/lib/libvulkan_radeon.so
 ./usr/X11R6/lib/libxshmfence.a
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 3dafa2754..471b2ff71 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -1,69 +1,8 @@
 ./usr/X11R6/bin/ucs2any
-./usr/X11R6/include/gbm.h
-./usr/X11R6/include/libdrm/amdgpu_drm.h
-./usr/X11R6/include/libdrm/drm.h
-./usr/X11R6/include/libdrm/drm_fourcc.h
-./usr/X11R6/include/libdrm/drm_mode.h
-./usr/X11R6/include/libdrm/drm_sarea.h
-./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/msm_drm.h
-./usr/X11R6/include/libdrm/nouveau_drm.h
-./usr/X11R6/include/libdrm/qxl_drm.h
-./usr/X11R6/include/libdrm/r128_drm.h
-./usr/X11R6/include/libdrm/radeon_drm.h
-./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/virtgpu_drm.h
-./usr/X11R6/include/libdrm/vmwgfx_drm.h
-./usr/X11R6/include/xf86drm.h
-./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86driproto.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/lib/libEGL.a
-./usr/X11R6/lib/libEGL.so.1.1
-./usr/X11R6/lib/libEGL_p.a
-./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.17.1
-./usr/X11R6/lib/libGLESv1_CM.a
-./usr/X11R6/lib/libGLESv1_CM.so.2.0
-./usr/X11R6/lib/libGLESv1_CM_p.a
-./usr/X11R6/lib/libGLESv2.a
-./usr/X11R6/lib/libGLESv2.so.2.0
-./usr/X11R6/lib/libGLESv2_p.a
-./usr/X11R6/lib/libGLU.a
-./usr/X11R6/lib/libGLU.la
-./usr/X11R6/lib/libGLU.so.9.0
-./usr/X11R6/lib/libGL_p.a
-./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.11.0
-./usr/X11R6/lib/libOSMesa_p.a
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.8
-./usr/X11R6/lib/libepoxy.a
-./usr/X11R6/lib/libepoxy.so.4.0
-./usr/X11R6/lib/libgbm.a
-./usr/X11R6/lib/libgbm.so.0.4
-./usr/X11R6/lib/libgbm_p.a
-./usr/X11R6/lib/libglapi.a
-./usr/X11R6/lib/libglapi.so.0.3
-./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/egl.pc
-./usr/X11R6/lib/pkgconfig/epoxy.pc
-./usr/X11R6/lib/pkgconfig/gbm.pc
-./usr/X11R6/lib/pkgconfig/gl.pc
-./usr/X11R6/lib/pkgconfig/glesv1_cm.pc
-./usr/X11R6/lib/pkgconfig/glesv2.pc
-./usr/X11R6/lib/pkgconfig/glu.pc
-./usr/X11R6/lib/pkgconfig/glw.pc
-./usr/X11R6/lib/pkgconfig/libdrm.pc
-./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 9da8de128..78429e061 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -285,8 +285,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index a97b0fea0..0524f100d 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -170,8 +170,6 @@
 ./usr/X11R6/include/xorg/xserver_poll.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 3c956cdf0..63701e9ea 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -286,8 +286,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index 94a5bbe44..7971fc341 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -122,8 +122,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
diff --git a/distrib/sets/lists/xbase/md.powerpc64 b/distrib/sets/lists/xbase/md.powerpc64
index be429710d..c1f2ed78c 100644
--- a/distrib/sets/lists/xbase/md.powerpc64
+++ b/distrib/sets/lists/xbase/md.powerpc64
@@ -285,8 +285,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 14e1ab74d..91443941d 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -285,8 +285,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 46142f2f0..5a6bdf1fc 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -286,8 +286,6 @@
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.3
 ./usr/X11R6/lib/libglapi_p.a
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0