17 files changed, 134 insertions, 34 deletions
diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 31ec8ab45..bff7da632 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -162,6 +163,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -214,7 +218,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -235,7 +239,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -252,6 +256,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -345,6 +350,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index cd26e77bc..b0ba721cb 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -24,6 +24,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -170,6 +171,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -222,7 +226,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -243,7 +247,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -261,6 +265,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -354,6 +359,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 13e7b3e87..0a6fccc0a 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -161,6 +162,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -213,7 +217,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -234,7 +238,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -251,6 +255,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -343,6 +348,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 41c1a3691..a29d13f90 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -19,6 +19,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -143,6 +144,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -195,7 +199,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -216,7 +220,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -232,6 +236,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -269,6 +274,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 0a6c391e9..694c3e0a1 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -22,6 +22,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -134,6 +135,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -186,7 +190,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -207,7 +211,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -224,6 +228,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -260,6 +265,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 50cc4a7a2..685a825f8 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -24,6 +24,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -170,6 +171,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -222,7 +226,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -243,7 +247,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -261,6 +265,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -354,6 +359,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index e94d80014..a7821c0b1 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -138,6 +139,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -190,7 +194,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -211,7 +215,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -228,6 +232,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -318,6 +323,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 776bf26cd..199e51475 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -151,6 +152,8 @@
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-glx.a
@@ -186,7 +189,7 @@
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama.a
@@ -200,7 +203,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -216,6 +219,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -308,6 +312,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index cda0318fd..5159bf1d6 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -20,6 +20,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -151,6 +152,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -203,7 +207,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -224,7 +228,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -240,6 +244,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -279,6 +284,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 66c35bafc..d17d3ba6e 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -162,6 +163,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -214,7 +218,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -235,7 +239,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -252,6 +256,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -345,6 +350,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index a77a06c9f..893f44bd9 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -134,6 +135,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -186,7 +190,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -207,7 +211,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
@@ -224,6 +228,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -264,6 +269,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index df76bee31..7fe3d8a2a 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -6,6 +6,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -68,6 +69,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -120,7 +124,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -141,7 +145,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
@@ -151,6 +155,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -239,6 +244,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 38496cef8..c21decbbe 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -151,6 +152,8 @@
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-glx.a
@@ -186,7 +189,7 @@
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama.a
@@ -200,7 +203,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -216,6 +219,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -308,6 +312,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 0705df290..4c4b08945 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -161,6 +162,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -213,7 +217,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -234,7 +238,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -251,6 +255,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -343,6 +348,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index aaacb45df..3fdb6b4d1 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -161,6 +162,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -213,7 +217,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -234,7 +238,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -251,6 +255,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -343,6 +348,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 3618233e5..8804ab98d 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -162,6 +163,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -214,7 +218,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -235,7 +239,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -252,6 +256,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -345,6 +350,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 13e7b3e87..0a6fccc0a 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -23,6 +23,7 @@
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
 ./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/dri2.h
 ./usr/X11R6/include/xcb/glx.h
 ./usr/X11R6/include/xcb/randr.h
 ./usr/X11R6/include/xcb/record.h
@@ -161,6 +162,9 @@
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-dri2.a
+./usr/X11R6/lib/libxcb-dri2.so.0.0
+./usr/X11R6/lib/libxcb-dri2_pic.a
 ./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
@@ -213,7 +217,7 @@
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
 ./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
@@ -234,7 +238,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
 ./usr/X11R6/lib/libxcb.a
-./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
@@ -251,6 +255,7 @@
 ./usr/X11R6/lib/pkgconfig/xcb-composite.pc
 ./usr/X11R6/lib/pkgconfig/xcb-damage.pc
 ./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-dri2.pc
 ./usr/X11R6/lib/pkgconfig/xcb-event.pc
 ./usr/X11R6/lib/pkgconfig/xcb-glx.pc
 ./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
@@ -343,6 +348,7 @@
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
 ./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/dri2.xml
 ./usr/X11R6/share/xcb/glx.xml
 ./usr/X11R6/share/xcb/randr.xml
 ./usr/X11R6/share/xcb/record.xml