Module Name: src
Committed By: mrg
Date: Wed Feb 23 07:53:30 UTC 2011
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/external/mit/xorg/lib/libX11: Makefile Makefile.libx11
src/external/mit/xorg/lib/libX11/dynamic: Makefile
Added Files:
src/external/mit/xorg/lib/libX11/libX11-xcb: Makefile shlib_version
Log Message:
enable USE_XCB in libX11.
install missing libX11-xcb and Xlib-xcb.h.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.122 -r1.123 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libX11/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/lib/libX11/dynamic/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile \
src/external/mit/xorg/lib/libX11/libX11-xcb/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.41 src/distrib/sets/lists/xbase/shl.mi:1.42
--- src/distrib/sets/lists/xbase/shl.mi:1.41 Wed Jan 19 16:31:23 2011
+++ src/distrib/sets/lists/xbase/shl.mi Wed Feb 23 07:53:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.41 2011/01/19 16:31:23 jmcneill Exp $
+# $NetBSD: shl.mi,v 1.42 2011/02/23 07:53:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -189,6 +189,9 @@
./usr/X11R7/lib/libX11.so -unknown- xorg
./usr/X11R7/lib/libX11.so.7 -unknown- xorg
./usr/X11R7/lib/libX11.so.7.0 -unknown- xorg
+./usr/X11R7/lib/libX11-xcb.so -unknown- xorg
+./usr/X11R7/lib/libX11-xcb.so.1 -unknown- xorg
+./usr/X11R7/lib/libX11-xcb.so.1.0 -unknown- xorg
./usr/X11R7/lib/libXRes.so -unknown- xorg
./usr/X11R7/lib/libXRes.so.2 -unknown- xorg
./usr/X11R7/lib/libXRes.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.122 src/distrib/sets/lists/xcomp/mi:1.123
--- src/distrib/sets/lists/xcomp/mi:1.122 Wed Jan 19 18:29:28 2011
+++ src/distrib/sets/lists/xcomp/mi Wed Feb 23 07:53:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.122 2011/01/19 18:29:28 jakllsch Exp $
+# $NetBSD: mi,v 1.123 2011/02/23 07:53:29 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5334,6 +5334,7 @@
./usr/X11R7/include/X11/Xfuncs.h -unknown- xorg
./usr/X11R7/include/X11/Xlcint.h -unknown- xorg
./usr/X11R7/include/X11/Xlib.h -unknown- xorg
+./usr/X11R7/include/X11/Xlib-xcb.h -unknown- xorg
./usr/X11R7/include/X11/XlibConf.h -unknown- xorg
./usr/X11R7/include/X11/Xlibint.h -unknown- xorg
./usr/X11R7/include/X11/Xlocale.h -unknown- xorg
@@ -6154,6 +6155,9 @@
./usr/X11R7/lib/libX11.a -unknown- xorg
./usr/X11R7/lib/libX11_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libX11_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libX11-xcb.a -unknown- xorg
+./usr/X11R7/lib/libX11-xcb_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libX11-xcb_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXRes.a -unknown- xorg
./usr/X11R7/lib/libXRes_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXRes_p.a -unknown- profile,xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.27 src/distrib/sets/lists/xcomp/shl.mi:1.28
--- src/distrib/sets/lists/xcomp/shl.mi:1.27 Wed Jan 19 16:31:23 2011
+++ src/distrib/sets/lists/xcomp/shl.mi Wed Feb 23 07:53:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.27 2011/01/19 16:31:23 jmcneill Exp $
+# $NetBSD: shl.mi,v 1.28 2011/02/23 07:53:29 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -55,6 +55,7 @@
./usr/X11R7/lib/libOSMesa_pic.a -unknown- xorg
./usr/X11R7/lib/libSM_pic.a -unknown- xorg
./usr/X11R7/lib/libX11_pic.a -unknown- xorg
+./usr/X11R7/lib/libX11-xcb_pic.a -unknown- xorg
./usr/X11R7/lib/libXRes_pic.a -unknown- xorg
./usr/X11R7/lib/libXTrap_pic.a -unknown- xorg
./usr/X11R7/lib/libXau_pic.a -unknown- xorg
@@ -196,6 +197,7 @@
./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libSM.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXRes.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXau.so.7.0.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.10 src/external/mit/xorg/lib/libX11/Makefile:1.11
--- src/external/mit/xorg/lib/libX11/Makefile:1.10 Sun Nov 28 07:47:53 2010
+++ src/external/mit/xorg/lib/libX11/Makefile Wed Feb 23 07:53:29 2011
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2010/11/28 07:47:53 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2011/02/23 07:53:29 mrg Exp $
.include <bsd.own.mk>
-SUBDIR= dynamic static \
+SUBDIR= dynamic .WAIT libX11-xcb static \
ximcp xlcDef xlcUTF8Load xlibi18n xlocale xomGeneric
-INCS= ImUtil.h XKBlib.h Xcms.h Xlib.h XlibConf.h Xlibint.h \
- Xlocale.h Xregion.h Xresource.h Xutil.h cursorfont.h \
- Xcmsint.h Xlcint.h
+INCS= ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \
+ Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \
+ Xcmsint.h Xlcint.h \
+ cursorfont.h
INCSDIR= ${X11INCDIR}/X11
MAN= AllPlanes.3 BlackPixelOfScreen.3 DisplayOfCCC.3 \
@@ -95,8 +96,8 @@
XlibConf.h: XlibConf.h.in
${_MKTARGET_CREATE}
- ${TOOL_SED} 's/#undef XTHREADS/#define XTHREADS/; \
- s/#undef XUSE_MTSAFE_API/#define XUSE_MTSAFE_API/ ' \
+ ${TOOL_SED} 's/#undef XTHREADS/#define XTHREADS 1/; \
+ s/#undef XUSE_MTSAFE_API/#define XUSE_MTSAFE_API 1/ ' \
< ${.ALLSRC} > ${.TARGET}
CLEANFILES+= XlibConf.h
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.7 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.8
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.7 Sat May 22 02:41:13 2010
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Wed Feb 23 07:53:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.7 2010/05/22 02:41:13 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.8 2011/02/23 07:53:29 mrg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -267,9 +267,6 @@
SRCS+= \
UIThrStubs.c
-SRCS+= \
- ConnDis.c \
- x11_trans.c
SRCS+= \
AddDIC.c \
@@ -397,6 +394,19 @@
CPPFLAGS+= -I${X11SRCDIR.X11}/src/xcms
CPPFLAGS+= -I${X11SRCDIR.X11}/src/xlibi18n
+# From libX11's config.h
+CPPFLAGS+= -DCOMPOSECACHE -DHAVE_DLOPEN -DHAVE_GETPAGESIZE
+CPPFLAGS+= -DHAVE_INTTYPES_H -DHAVE_MEMORY_H -DHAVE_MMAP
+CPPFLAGS+= -DHAVE_SOCKLEN_T -DHAVE_STDLIB_H -DHAVE_STRINGS_H
+CPPFLAGS+= -DHAVE_STRING_H -DHAVE_STRTOL -DHAVE_SYS_PARAM_H
+CPPFLAGS+= -DHAVE_SYS_SELECT_H -DHAVE_SYS_STAT_H -DHAVE_SYS_TYPES_H
+CPPFLAGS+= -DHAVE_UNISTD_H
+
+CPPFLAGS+= -DUSE_XCB
+SRCS+= \
+ xcb_disp.c \
+ xcb_io.c
+
CMS_DEFINES= -DXCMS -DXCMSDB=\"${X11LIBDIR}/Xcms.txt\"
CONN_DEFINES= ${X11FLAGS.CONNECTION}
EDB_DEFINES= -DERRORDB=\"${X11LIBDIR}/XErrorDB\"
Index: src/external/mit/xorg/lib/libX11/dynamic/Makefile
diff -u src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.1.1.1 src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.2
--- src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/lib/libX11/dynamic/Makefile Wed Feb 23 07:53:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/23 07:53:29 mrg Exp $
NOLINT= 1
NOPROFILE= 1
@@ -18,9 +18,10 @@
CPPFLAGS.CrPixmap.c= $(XCURSOR_DEFINES)
CPPFLAGS.PutImage.c= $(XCURSOR_DEFINES)
-LIBDPLIBS= \
+LIBDPLIBS+= \
+ xcb ${.CURDIR}/../../libxcb/libxcb \
Xdmcp ${.CURDIR}/../../libXdmcp \
- Xau ${.CURDIR}/../../libXau \
+ Xau ${.CURDIR}/../../libXau
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Added files:
Index: src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile:1.1
--- /dev/null Wed Feb 23 07:53:30 2011
+++ src/external/mit/xorg/lib/libX11/libX11-xcb/Makefile Wed Feb 23 07:53:30 2011
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2011/02/23 07:53:30 mrg Exp $
+
+NOLINT= 1
+
+.include <bsd.own.mk>
+
+LIB= X11-xcb
+
+SRCS+= x11_xcb.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+
+LIBDPLIBS+= \
+ X11 ${.CURDIR}/../../libX11/dynamic
+
+.PATH: ${X11SRCDIR.X11}/src
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libX11/libX11-xcb/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libX11/libX11-xcb/shlib_version:1.1
--- /dev/null Wed Feb 23 07:53:30 2011
+++ src/external/mit/xorg/lib/libX11/libX11-xcb/shlib_version Wed Feb 23 07:53:30 2011
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2011/02/23 07:53:30 mrg Exp $
+#
+major=1
+minor=0
