Module Name: src
Committed By: mrg
Date: Thu Jul 23 05:46:39 UTC 2015
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
Added Files:
src/external/mit/xorg/lib/libXpresent: Makefile shlib_version
Log Message:
build libXpresent.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXpresent/Makefile \
src/external/mit/xorg/lib/libXpresent/shlib_version
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.67 src/distrib/sets/lists/xbase/shl.mi:1.68
--- src/distrib/sets/lists/xbase/shl.mi:1.67 Mon Jul 20 04:10:40 2015
+++ src/distrib/sets/lists/xbase/shl.mi Thu Jul 23 05:46:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.67 2015/07/20 04:10:40 mrg Exp $
+# $NetBSD: shl.mi,v 1.68 2015/07/23 05:46:39 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -261,6 +261,9 @@
./usr/X11R7/lib/libXp.so -obsolete- obsolete
./usr/X11R7/lib/libXp.so.7 -obsolete- obsolete
./usr/X11R7/lib/libXp.so.7.0 -obsolete- obsolete
+./usr/X11R7/lib/libXpresent.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXpresent.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXpresent.so.1.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libXpm.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libXpm.so.5 -unknown- xorg,compatx11file
./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.172 src/distrib/sets/lists/xcomp/mi:1.173
--- src/distrib/sets/lists/xcomp/mi:1.172 Mon Jul 20 04:10:41 2015
+++ src/distrib/sets/lists/xcomp/mi Thu Jul 23 05:46:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.172 2015/07/20 04:10:41 mrg Exp $
+# $NetBSD: mi,v 1.173 2015/07/23 05:46:39 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5494,6 +5494,7 @@
./usr/X11R7/include/X11/extensions/Xfixes.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Xge.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Xinerama.h -unknown- xorg
+./usr/X11R7/include/X11/extensions/Xpresent.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Xrandr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Xrender.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Xv.h -unknown- xorg
@@ -6224,6 +6225,8 @@
./usr/X11R7/lib/libXmuu_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libXp.a -obsolete- obsolete,compatx11file
./usr/X11R7/lib/libXp_p.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXpresent.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXpresent_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libXpm.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libXpm_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libXprintAppUtil.a -obsolete- obsolete,compatx11file
@@ -6463,6 +6466,7 @@
./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg,xorg_server
./usr/X11R7/lib/pkgconfig/xorg-server.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xp.pc -obsolete- obsolete
+./usr/X11R7/lib/pkgconfig/xpresent.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xpm.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xprintapputil.pc -obsolete- obsolete
./usr/X11R7/lib/pkgconfig/xprintutil.pc -obsolete- obsolete
@@ -7095,6 +7099,7 @@
./usr/X11R7/man/cat3/XpStartDoc.0 -obsolete- obsolete
./usr/X11R7/man/cat3/XpStartJob.0 -obsolete- obsolete
./usr/X11R7/man/cat3/XpStartPage.0 -obsolete- obsolete
+./usr/X11R7/man/cat3/Xpresent.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/Xrandr.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XrmEnumerateDatabase.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/XrmGetFileDatabase.0 -unknown- .cat,xorg
@@ -8005,6 +8010,7 @@
./usr/X11R7/man/html3/XpStartDoc.html -obsolete- obsolete
./usr/X11R7/man/html3/XpStartJob.html -obsolete- obsolete
./usr/X11R7/man/html3/XpStartPage.html -obsolete- obsolete
+./usr/X11R7/man/html3/Xpresent.html -unknown- html,xorg
./usr/X11R7/man/html3/Xrandr.html -unknown- html,xorg
./usr/X11R7/man/html3/XrmEnumerateDatabase.html -unknown- html,xorg
./usr/X11R7/man/html3/XrmGetFileDatabase.html -unknown- html,xorg
@@ -8914,6 +8920,7 @@
./usr/X11R7/man/man3/XpStartDoc.3 -obsolete- obsolete
./usr/X11R7/man/man3/XpStartJob.3 -obsolete- obsolete
./usr/X11R7/man/man3/XpStartPage.3 -obsolete- obsolete
+./usr/X11R7/man/man3/Xpresent.3 -unknown- .man,xorg
./usr/X11R7/man/man3/Xrandr.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XrmEnumerateDatabase.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XrmGetFileDatabase.3 -unknown- .man,xorg
@@ -9291,6 +9298,7 @@
./usr/libdata/lint/llib-lXmuu.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXp.ln -obsolete- obsolete,xorg
./usr/libdata/lint/llib-lXp.ln -unknown- lint,x11
+./usr/libdata/lint/llib-lXpresent.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXpm.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXpm.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXprintAppUtil.ln -obsolete- obsolete
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.42 src/distrib/sets/lists/xcomp/shl.mi:1.43
--- src/distrib/sets/lists/xcomp/shl.mi:1.42 Sat Jun 27 20:27:03 2015
+++ src/distrib/sets/lists/xcomp/shl.mi Thu Jul 23 05:46:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.42 2015/06/27 20:27:03 matt Exp $
+# $NetBSD: shl.mi,v 1.43 2015/07/23 05:46:39 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -79,6 +79,7 @@
./usr/X11R7/lib/libXmuu_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXp_pic.a -obsolete- obsolete
./usr/X11R7/lib/libXpm_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXpresent_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXprintAppUtil_pic.a -obsolete- obsolete
./usr/X11R7/lib/libXprintUtil_pic.a -obsolete- obsolete
./usr/X11R7/lib/libXrandr_pic.a -unknown- xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.17 src/distrib/sets/lists/xdebug/mi:1.18
--- src/distrib/sets/lists/xdebug/mi:1.17 Sat Jun 27 17:07:59 2015
+++ src/distrib/sets/lists/xdebug/mi Thu Jul 23 05:46:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.17 2015/06/27 17:07:59 matt Exp $
+# $NetBSD: mi,v 1.18 2015/07/23 05:46:39 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
@@ -81,6 +81,7 @@
./usr/X11R7/lib/libXmuu_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXp_g.a -obsolete- obsolete
./usr/X11R7/lib/libXpm_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXpresent_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXprintAppUtil_g.a -obsolete- obsolete
./usr/X11R7/lib/libXprintUtil_g.a -obsolete- obsolete
./usr/X11R7/lib/libXrandr_g.a -unknown- debuglib,xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.29 src/distrib/sets/lists/xdebug/shl.mi:1.30
--- src/distrib/sets/lists/xdebug/shl.mi:1.29 Mon Jul 20 04:10:41 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Thu Jul 23 05:46:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.29 2015/07/20 04:10:41 mrg Exp $
+# $NetBSD: shl.mi,v 1.30 2015/07/23 05:46:39 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
@@ -88,6 +88,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXpresent.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXpm.so.5.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXrandr.so.3.2.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXrender.so.2.0.debug -unknown- xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.34 src/external/mit/xorg/lib/Makefile:1.35
--- src/external/mit/xorg/lib/Makefile:1.34 Wed Jun 24 22:20:25 2015
+++ src/external/mit/xorg/lib/Makefile Thu Jul 23 05:46:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/06/24 22:20:25 matt Exp $
+# $NetBSD: Makefile,v 1.35 2015/07/23 05:46:39 mrg Exp $
# build libraries for xorg
@@ -39,7 +39,7 @@ SUBDIR+=libchromeXvMCPro
SUBDIR+=libGLU libGLw libXaw6 libXaw libXcursor \
libXrandr \
.WAIT \
- libXft libglut \
+ libXpresent libXft libglut \
.WAIT \
libXdmGreet \
xcb-util
Added files:
Index: src/external/mit/xorg/lib/libXpresent/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libXpresent/Makefile:1.1
--- /dev/null Thu Jul 23 05:46:39 2015
+++ src/external/mit/xorg/lib/libXpresent/Makefile Thu Jul 23 05:46:39 2015
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 05:46:39 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= Xpresent
+.PATH: ${X11SRCDIR.${LIB}}/src
+.PATH: ${X11SRCDIR.${LIB}}/man
+.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
+
+SRCS= Xpresent.c
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB}
+
+LIBDPLIBS=\
+ Xext ${.CURDIR}/../libXext \
+ Xrandr ${.CURDIR}/../libXrandr \
+ Xfixes ${.CURDIR}/../libXfixes \
+ X11 ${.CURDIR}/../libX11/dynamic
+
+INCS= Xpresent.h
+
+INCSDIR=${X11INCDIR}/X11/extensions
+
+PKGDIST= ${LIB}
+
+MAN= Xpresent.3
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libXpresent/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libXpresent/shlib_version:1.1
--- /dev/null Thu Jul 23 05:46:39 2015
+++ src/external/mit/xorg/lib/libXpresent/shlib_version Thu Jul 23 05:46:39 2015
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2015/07/23 05:46:39 mrg Exp $
+#
+major=1
+minor=0
