Module Name: src
Committed By: mrg
Date: Tue Aug 16 00:55:09 UTC 2016
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/lib: Makefile
Log Message:
build libxshmfence.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.69 src/distrib/sets/lists/xbase/shl.mi:1.70
--- src/distrib/sets/lists/xbase/shl.mi:1.69 Mon May 16 22:20:10 2016
+++ src/distrib/sets/lists/xbase/shl.mi Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.69 2016/05/16 22:20:10 christos Exp $
+# $NetBSD: shl.mi,v 1.70 2016/08/16 00:55:09 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -447,3 +447,6 @@
./usr/X11R7/lib/libxkbui.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libxkbui.so.2 -unknown- xorg,compatx11file
./usr/X11R7/lib/libxkbui.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.so.1.0 -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.177 src/distrib/sets/lists/xcomp/mi:1.178
--- src/distrib/sets/lists/xcomp/mi:1.177 Mon May 16 22:20:10 2016
+++ src/distrib/sets/lists/xcomp/mi Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.177 2016/05/16 22:20:10 christos Exp $
+# $NetBSD: mi,v 1.178 2016/08/16 00:55:09 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5611,6 +5611,7 @@
./usr/X11R7/include/X11/extensions/xtraplib.h -unknown- xorg
./usr/X11R7/include/X11/extensions/xtraplibp.h -unknown- xorg
./usr/X11R7/include/X11/extensions/xtrapproto.h -unknown- xorg
+./usr/X11R7/include/X11/xshmfence.h -unknown- xorg
./usr/X11R7/include/X11/fonts/FS.h -unknown- xorg
./usr/X11R7/include/X11/fonts/FSlib.h -unknown- xorg
./usr/X11R7/include/X11/fonts/FSproto.h -unknown- xorg
@@ -6360,6 +6361,8 @@
./usr/X11R7/lib/libxkbfile_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libxkbui.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libxkbui_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxshmfence_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/pkgconfig/bigreqsproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/compositeproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/damageproto.pc -unknown- xorg
@@ -6479,6 +6482,7 @@
./usr/X11R7/lib/pkgconfig/xrender.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xres.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xscrnsaver.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xshmfence.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xt.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xtrans.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xtrap.pc -unknown- xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.43 src/distrib/sets/lists/xcomp/shl.mi:1.44
--- src/distrib/sets/lists/xcomp/shl.mi:1.43 Thu Jul 23 05:46:39 2015
+++ src/distrib/sets/lists/xcomp/shl.mi Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.43 2015/07/23 05:46:39 mrg Exp $
+# $NetBSD: shl.mi,v 1.44 2016/08/16 00:55:09 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -144,3 +144,4 @@
./usr/X11R7/lib/libxcb_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libxkbfile_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libxkbui_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxshmfence_pic.a -unknown- xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.21 src/distrib/sets/lists/xdebug/mi:1.22
--- src/distrib/sets/lists/xdebug/mi:1.21 Sat Sep 12 15:25:01 2015
+++ src/distrib/sets/lists/xdebug/mi Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.21 2015/09/12 15:25:01 snj Exp $
+# $NetBSD: mi,v 1.22 2016/08/16 00:55:09 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R6/lib/libFS_g.a -unknown- debuglib,x11
./usr/X11R6/lib/libGLU_g.a -unknown- debuglib,x11
@@ -146,6 +146,7 @@
./usr/X11R7/lib/libxcb_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libxkbfile_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libxkbui_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxshmfence_g.a -unknown- debuglib,xorg,compatx11file
./usr/libdata/debug/usr/X11R6/bin/Xdmx.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xnest.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xprt.debug -unknown- debug,x11
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.32 src/distrib/sets/lists/xdebug/shl.mi:1.33
--- src/distrib/sets/lists/xdebug/shl.mi:1.32 Mon May 16 22:20:10 2016
+++ src/distrib/sets/lists/xdebug/shl.mi Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.32 2016/05/16 22:20:10 christos Exp $
+# $NetBSD: shl.mi,v 1.33 2016/08/16 00:55:09 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -147,6 +147,7 @@
./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=i386
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.37 src/external/mit/xorg/lib/Makefile:1.38
--- src/external/mit/xorg/lib/Makefile:1.37 Sat Oct 24 14:30:28 2015
+++ src/external/mit/xorg/lib/Makefile Tue Aug 16 00:55:09 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2015/10/24 14:30:28 jmcneill Exp $
+# $NetBSD: Makefile,v 1.38 2016/08/16 00:55:09 mrg Exp $
# build libraries for xorg
.include <bsd.own.mk>
SUBDIR= libfontenc freetype libFS libICE libglapi \
- libXau libXdmcp libdrm libpciaccess libpthread-stubs .WAIT
+ libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel
.endif
