sync

2025-12-11 03:39:26 +00:00 · 2014-07-23 02:34:11 +00:00
parent 75f9a26241
commit fc8314e989
18 changed files with 21 additions and 17 deletions
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -37,6 +37,7 @@
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
+./usr/X11R6/include/intel_aub.h
 ./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
@@ -147,7 +148,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.aviion
+++ b/distrib/sets/lists/xbase/md.aviion
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -101,7 +101,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -37,6 +37,7 @@
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
+./usr/X11R6/include/intel_aub.h
 ./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
@@ -147,7 +148,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -101,7 +101,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -46,7 +46,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
 ./usr/X11R6/lib/libxcb-cursor.la
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -341,3 +341,5 @@
 ./var/cache
 ./var/cache/fontconfig
 ./var/cache/fontconfig/CACHEDIR.TAG
+./var/db/sysmerge
+./var/db/sysmerge/xetcsum