sync

16 files changed, 22 insertions, 12 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 97041f115..157e87fdf 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -121,6 +121,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -139,6 +140,7 @@
 ./usr/X11R6/lib/pkgconfig/libdrm_radeon.pc
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 15c12adf8..71bcbdcf5 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -293,6 +293,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -312,6 +313,7 @@
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.arm64 b/distrib/sets/lists/xbase/md.arm64
index 49129bdea..0bd223b2b 100644
--- a/distrib/sets/lists/xbase/md.arm64
+++ b/distrib/sets/lists/xbase/md.arm64
@@ -288,6 +288,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -308,6 +309,7 @@
 ./usr/X11R6/lib/pkgconfig/libdrm_vc4.pc
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 725be434f..e72b6ef95 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -288,6 +288,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -308,6 +309,7 @@
 ./usr/X11R6/lib/pkgconfig/libdrm_vc4.pc
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 8f3e01e1a..084dd1b07 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -40,7 +40,6 @@
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/X11/extensions/dri3proto.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
@@ -101,7 +100,6 @@
 ./usr/X11R6/include/xorg/dixstruct.h
 ./usr/X11R6/include/xorg/dri.h
 ./usr/X11R6/include/xorg/dri2.h
-./usr/X11R6/include/xorg/dri3.h
 ./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/edid.h
 ./usr/X11R6/include/xorg/events.h
@@ -257,8 +255,6 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
-./usr/X11R6/lib/libxshmfence.la
-./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 15a4d406e..84a92b94e 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -293,6 +293,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -312,6 +313,7 @@
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 2c9a83e93..ab3649843 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -41,7 +41,6 @@
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/X11/extensions/dri3proto.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
@@ -99,8 +98,6 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
-./usr/X11R6/lib/libxshmfence.la
-./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 8e6d7a048..15c1fbcd8 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -282,6 +282,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -297,6 +298,7 @@
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index 9bbd4f4fa..72c4739fa 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -3,7 +3,6 @@
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri3proto.h
-./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/include/xorg/BT.h
 ./usr/X11R6/include/xorg/IBM.h
@@ -165,8 +164,6 @@
 ./usr/X11R6/include/xorg/xserver_poll.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
-./usr/X11R6/lib/libxshmfence.la
-./usr/X11R6/lib/libxshmfence.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 f07ef9ba5..44cedc574 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -283,6 +283,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -301,6 +302,7 @@
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index 461bbe65f..2dbaf1b5e 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -122,6 +122,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -140,6 +141,7 @@
 ./usr/X11R6/lib/pkgconfig/libdrm_radeon.pc
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 268c586df..7c8c070b0 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -281,6 +281,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -296,6 +297,7 @@
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index aaa8c68ca..31c0d9ea6 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -281,6 +281,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -296,6 +297,7 @@
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 432dfc838..bbb7d0aef 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -283,6 +283,7 @@
 ./usr/X11R6/lib/libglapi.so.0.2
 ./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
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -302,6 +303,7 @@
 ./usr/X11R6/lib/pkgconfig/osmesa.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
+./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 2d0c0056b..b2a945dc9 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -408,7 +408,6 @@
 ./usr/X11R6/lib/libxkbui.a
 ./usr/X11R6/lib/libxkbui.la
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/libxshmfence.a
 ./usr/X11R6/lib/locate
 ./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 86b18f7a7..fc68360b3 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -757,7 +757,6 @@
 ./usr/X11R6/lib/pkgconfig/xrender.pc
 ./usr/X11R6/lib/pkgconfig/xres.pc
 ./usr/X11R6/lib/pkgconfig/xscrnsaver.pc
-./usr/X11R6/lib/pkgconfig/xshmfence.pc
 ./usr/X11R6/lib/pkgconfig/xt.pc
 ./usr/X11R6/lib/pkgconfig/xtrans.pc
 ./usr/X11R6/lib/pkgconfig/xtst.pc