first step of a sync

4 files changed, 84 insertions, 30 deletions

diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index d97a4f44b..04f7d0286 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -46,8 +46,37 @@
 ./usr/X11R6/include/epoxy/glx.h
 ./usr/X11R6/include/epoxy/glx_generated.h
 ./usr/X11R6/include/gbm.h
-./usr/X11R6/include/intel_aub.h
-./usr/X11R6/include/intel_bufmgr.h
+./usr/X11R6/include/libdrm
+./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/intel_aub.h
+./usr/X11R6/include/libdrm/intel_bufmgr.h
+./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_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/via_drm.h
+./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
 ./usr/X11R6/include/txc_dxtn.h
@@ -142,10 +171,16 @@
 ./usr/X11R6/lib/libXxf86misc.so.6.0
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
-./usr/X11R6/lib/libdrm.a
+./usr/X11R6/lib/libdrm.la
 ./usr/X11R6/lib/libdrm.so.7.0
-./usr/X11R6/lib/libdrm_intel.a
-./usr/X11R6/lib/libdrm_intel.so.4.0
+./usr/X11R6/lib/libdrm_amdgpu.la
+./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_intel.la
+./usr/X11R6/lib/libdrm_intel.so.5.0
+./usr/X11R6/lib/libdrm_nouveau.la
+./usr/X11R6/lib/libdrm_nouveau.so.2.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.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
@@ -207,7 +242,9 @@
 ./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_intel.pc
+./usr/X11R6/lib/pkgconfig/libdrm_nouveau.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 3f4eeba0a..6b83ab6ae 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -46,8 +46,37 @@
 ./usr/X11R6/include/epoxy/glx.h
 ./usr/X11R6/include/epoxy/glx_generated.h
 ./usr/X11R6/include/gbm.h
-./usr/X11R6/include/intel_aub.h
-./usr/X11R6/include/intel_bufmgr.h
+./usr/X11R6/include/libdrm
+./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/intel_aub.h
+./usr/X11R6/include/libdrm/intel_bufmgr.h
+./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_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/via_drm.h
+./usr/X11R6/include/libdrm/vmwgfx_drm.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
 ./usr/X11R6/include/txc_dxtn.h
@@ -142,10 +171,16 @@
 ./usr/X11R6/lib/libXxf86misc.so.6.0
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libdmx.so.2.0
-./usr/X11R6/lib/libdrm.a
+./usr/X11R6/lib/libdrm.la
 ./usr/X11R6/lib/libdrm.so.7.0
-./usr/X11R6/lib/libdrm_intel.a
-./usr/X11R6/lib/libdrm_intel.so.4.0
+./usr/X11R6/lib/libdrm_amdgpu.la
+./usr/X11R6/lib/libdrm_amdgpu.so.1.0
+./usr/X11R6/lib/libdrm_intel.la
+./usr/X11R6/lib/libdrm_intel.so.5.0
+./usr/X11R6/lib/libdrm_nouveau.la
+./usr/X11R6/lib/libdrm_nouveau.so.2.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.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.1
@@ -207,7 +242,9 @@
 ./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_intel.pc
+./usr/X11R6/lib/pkgconfig/libdrm_nouveau.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 01b81d3ee..b4a5ded50 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -5,14 +5,6 @@
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
-./usr/X11R6/include/r600_pci_ids.h
-./usr/X11R6/include/radeon_bo.h
-./usr/X11R6/include/radeon_bo_gem.h
-./usr/X11R6/include/radeon_bo_int.h
-./usr/X11R6/include/radeon_cs.h
-./usr/X11R6/include/radeon_cs_gem.h
-./usr/X11R6/include/radeon_cs_int.h
-./usr/X11R6/include/radeon_surface.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/include/xorg/BT.h
 ./usr/X11R6/include/xorg/IBM.h
@@ -148,8 +140,6 @@
 ./usr/X11R6/include/xorg/xorgVersion.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
-./usr/X11R6/lib/libdrm_radeon.a
-./usr/X11R6/lib/libdrm_radeon.so.3.0
 ./usr/X11R6/lib/modules/dri/i915_dri.so
 ./usr/X11R6/lib/modules/dri/i965_dri.so
 ./usr/X11R6/lib/modules/dri/r200_dri.so
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index 9c942f1ab..46474145f 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -5,14 +5,6 @@
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
-./usr/X11R6/include/r600_pci_ids.h
-./usr/X11R6/include/radeon_bo.h
-./usr/X11R6/include/radeon_bo_gem.h
-./usr/X11R6/include/radeon_bo_int.h
-./usr/X11R6/include/radeon_cs.h
-./usr/X11R6/include/radeon_cs_gem.h
-./usr/X11R6/include/radeon_cs_int.h
-./usr/X11R6/include/radeon_surface.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/include/xorg/BT.h
 ./usr/X11R6/include/xorg/IBM.h
@@ -148,8 +140,6 @@
 ./usr/X11R6/include/xorg/xorgVersion.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
-./usr/X11R6/lib/libdrm_radeon.a
-./usr/X11R6/lib/libdrm_radeon.so.3.0
 ./usr/X11R6/lib/modules/dri/i915_dri.so
 ./usr/X11R6/lib/modules/dri/i965_dri.so
 ./usr/X11R6/lib/modules/dri/r200_dri.so