Module Name: src
Committed By: mrg
Date: Wed Jun 5 00:52:23 UTC 2013
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libXi: Makefile shlib_version
Log Message:
adapt for libXi 1.7.1.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXi/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXi/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.50 src/distrib/sets/lists/xbase/shl.mi:1.51
--- src/distrib/sets/lists/xbase/shl.mi:1.50 Mon Jun 3 23:25:43 2013
+++ src/distrib/sets/lists/xbase/shl.mi Wed Jun 5 00:52:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.50 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: shl.mi,v 1.51 2013/06/05 00:52:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -245,7 +245,7 @@
./usr/X11R7/lib/libXft.so.3.0 -unknown- xorg
./usr/X11R7/lib/libXi.so -unknown- xorg
./usr/X11R7/lib/libXi.so.7 -unknown- xorg
-./usr/X11R7/lib/libXi.so.7.0 -unknown- xorg
+./usr/X11R7/lib/libXi.so.7.1 -unknown- xorg
./usr/X11R7/lib/libXinerama.so -unknown- xorg
./usr/X11R7/lib/libXinerama.so.2 -unknown- xorg
./usr/X11R7/lib/libXinerama.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.9 src/distrib/sets/lists/xdebug/shl.mi:1.10
--- src/distrib/sets/lists/xdebug/shl.mi:1.9 Mon Jun 3 23:25:43 2013
+++ src/distrib/sets/lists/xdebug/shl.mi Wed Jun 5 00:52:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.9 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: shl.mi,v 1.10 2013/06/05 00:52:23 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
@@ -83,7 +83,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/libXi/Makefile
diff -u src/external/mit/xorg/lib/libXi/Makefile:1.8 src/external/mit/xorg/lib/libXi/Makefile:1.9
--- src/external/mit/xorg/lib/libXi/Makefile:1.8 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libXi/Makefile Wed Jun 5 00:52:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/05 00:52:22 mrg Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@ LIB= Xi
.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
SRCS= XIAllowEvents.c \
+ XIBarrier.c \
XIGrabDevice.c \
XIQueryVersion.c \
XIQueryDevice.c \
@@ -81,5 +82,7 @@ COPTS.XSndExEv.c+= -Wno-error # XXX
CWARNFLAGS.clang+= -Wno-pointer-sign
+# XXX manuals
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libXi/shlib_version
diff -u src/external/mit/xorg/lib/libXi/shlib_version:1.2 src/external/mit/xorg/lib/libXi/shlib_version:1.3
--- src/external/mit/xorg/lib/libXi/shlib_version:1.2 Sun Jan 11 03:10:11 2009
+++ src/external/mit/xorg/lib/libXi/shlib_version Wed Jun 5 00:52:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
+# $NetBSD: shlib_version,v 1.3 2013/06/05 00:52:22 mrg Exp $
#
major=7
-minor=0
+minor=1
