CVS commit: src/external/mit/xorg/lib/xcb-util/atom
Module Name:src Committed By: apb Date: Thu Nov 8 08:46:26 UTC 2012 Modified Files: src/external/mit/xorg/lib/xcb-util/atom: atoms.c Log Message: Mark inline function in_word_set(str, len) as static. The function uses a static variable (stringpool_contents) and this is not allowed in an inline function with external linkage. Found by clang -Wstatic-in-inline. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/atom/atoms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xcb-util/atom/atoms.c diff -u src/external/mit/xorg/lib/xcb-util/atom/atoms.c:1.1 src/external/mit/xorg/lib/xcb-util/atom/atoms.c:1.2 --- src/external/mit/xorg/lib/xcb-util/atom/atoms.c:1.1 Sun Jul 18 07:01:38 2010 +++ src/external/mit/xorg/lib/xcb-util/atom/atoms.c Thu Nov 8 08:46:26 2012 @@ -322,6 +322,7 @@ static const struct stringpool_t stringp SECONDARY }; #define stringpool ((const char *) stringpool_contents) +static #ifdef __GNUC__ __inline #if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
CVS commit: src/external/mit/xorg/lib/xcb-util
Module Name:src
Committed By: mrg
Date: Sat Jan 7 02:07:59 UTC 2012
Modified Files:
src/external/mit/xorg/lib/xcb-util: Makefile xcb-util.mk
src/external/mit/xorg/lib/xcb-util/icccm: Makefile
src/external/mit/xorg/lib/xcb-util/image: Makefile
src/external/mit/xorg/lib/xcb-util/property: Makefile
src/external/mit/xorg/lib/xcb-util/render-util: Makefile
Log Message:
- reorder the SUBDIR list to have correct .WAIT-based dependancies.
- fix the handling of subdir additional LIBDPLIBS so they're present
when bsd.lib.mk is loaded. fixes missing shlib links relative to
what the normal package does. (noted by wiz.)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/xcb-util/Makefile \
src/external/mit/xorg/lib/xcb-util/xcb-util.mk
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/icccm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/xcb-util/image/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/property/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xcb-util/render-util/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xcb-util/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/Makefile:1.2 src/external/mit/xorg/lib/xcb-util/Makefile:1.3
--- src/external/mit/xorg/lib/xcb-util/Makefile:1.2 Sun Jul 18 10:58:07 2010
+++ src/external/mit/xorg/lib/xcb-util/Makefile Sat Jan 7 02:07:58 2012
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/07/18 10:58:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/07 02:07:58 mrg Exp $
-SUBDIR= atom property event aux .WAIT \
- reply image icccm keysyms render-util
+SUBDIR= reply keysyms render-util \
+ atom event aux .WAIT property .WAIT \
+ image icccm
.include bsd.subdir.mk
Index: src/external/mit/xorg/lib/xcb-util/xcb-util.mk
diff -u src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.2 src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.3
--- src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.2 Sun May 15 21:19:20 2011
+++ src/external/mit/xorg/lib/xcb-util/xcb-util.mk Sat Jan 7 02:07:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: xcb-util.mk,v 1.2 2011/05/15 21:19:20 christos Exp $
+# $NetBSD: xcb-util.mk,v 1.3 2012/01/07 02:07:58 mrg Exp $
# define XCBUTIL to something before including this
@@ -10,7 +10,8 @@ CPPFLAGS+= -DHAVE_VASPRINTF
LIBDPLIBS=\
xcb ${.CURDIR}/../../libxcb/libxcb \
Xau ${.CURDIR}/../../libXau \
- Xdmcp ${.CURDIR}/../../libXdmcp
+ Xdmcp ${.CURDIR}/../../libXdmcp \
+ ${XCBUTIL_EXTRA_DPLIBS}
SHLIB_MAJOR?= 0
SHLIB_MINOR?= 0
Index: src/external/mit/xorg/lib/xcb-util/icccm/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/icccm/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/icccm/Makefile:1.2
--- src/external/mit/xorg/lib/xcb-util/icccm/Makefile:1.1 Sun Jul 18 07:01:38 2010
+++ src/external/mit/xorg/lib/xcb-util/icccm/Makefile Sat Jan 7 02:07:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2012/01/07 02:07:58 mrg Exp $
XCBUTIL= icccm
@@ -6,13 +6,13 @@ SRCS= icccm.c
SHLIB_MAJOR= 1
-.include ../xcb-util.mk
-
-LIBDPLIBS+=\
+XCBUTIL_EXTRA_DPLIBS+=\
xcb-atom ${.CURDIR}/../atom \
xcb-property ${.CURDIR}/../property \
xcb-event ${.CURDIR}/../event
+.include ../xcb-util.mk
+
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/atom
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/property
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/event
Index: src/external/mit/xorg/lib/xcb-util/image/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/image/Makefile:1.2 src/external/mit/xorg/lib/xcb-util/image/Makefile:1.3
--- src/external/mit/xorg/lib/xcb-util/image/Makefile:1.2 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/xcb-util/image/Makefile Sat Jan 7 02:07:58 2012
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/07 02:07:58 mrg Exp $
XCBUTIL= image
SRCS= \
xcb_image.c
-.include ../xcb-util.mk
-
-LIBDPLIBS+=\
+XCBUTIL_EXTRA_DPLIBS+=\
xcb-shm ${.CURDIR}/../../libxcb/shm \
xcb-aux ${.CURDIR}/../aux
+.include ../xcb-util.mk
+
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/aux
CWARNFLAGS.clang+= -Wno-return-type
Index: src/external/mit/xorg/lib/xcb-util/property/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/property/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/property/Makefile:1.2
--- src/external/mit/xorg/lib/xcb-util/property/Makefile:1.1 Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/property/Makefile Sat Jan 7 02:07:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:39 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2012/01/07 02:07:58 mrg Exp $
XCBUTIL= property
@@ -6,9 +6,9 @@ SRCS= property.c
SHLIB_MAJOR= 1
-.include ../xcb-util.mk
-
-LIBDPLIBS+=\
+XCBUTIL_EXTRA_DPLIBS+=\
xcb-event ${.CURDIR}/../event
+.include
CVS commit: src/external/mit/xorg/lib/xcb-util
Module Name:src
Committed By: christos
Date: Sun May 15 21:19:20 UTC 2011
Modified Files:
src/external/mit/xorg/lib/xcb-util: xcb-util.mk
Log Message:
add HAVE_VASPRINTF so that we use it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/xcb-util.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xcb-util/xcb-util.mk
diff -u src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.1 src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.2
--- src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.1 Sun Jul 18 03:01:38 2010
+++ src/external/mit/xorg/lib/xcb-util/xcb-util.mk Sun May 15 17:19:20 2011
@@ -1,10 +1,11 @@
-# $NetBSD: xcb-util.mk,v 1.1 2010/07/18 07:01:38 mrg Exp $
+# $NetBSD: xcb-util.mk,v 1.2 2011/05/15 21:19:20 christos Exp $
# define XCBUTIL to something before including this
LIB= xcb-${XCBUTIL}
CPPFLAGS+= -I${X11SRCDIR.xcb-util}/${XCBUTIL}
+CPPFLAGS+= -DHAVE_VASPRINTF
LIBDPLIBS=\
xcb ${.CURDIR}/../../libxcb/libxcb \
CVS commit: src/external/mit/xorg/lib/xcb-util
Module Name:src
Committed By: mrg
Date: Sun Jul 18 07:01:39 UTC 2010
Added Files:
src/external/mit/xorg/lib/xcb-util: Makefile xcb-util.mk
src/external/mit/xorg/lib/xcb-util/atom: Makefile atoms.c
src/external/mit/xorg/lib/xcb-util/aux: Makefile
src/external/mit/xorg/lib/xcb-util/event: Makefile
src/external/mit/xorg/lib/xcb-util/icccm: Makefile
src/external/mit/xorg/lib/xcb-util/image: Makefile
src/external/mit/xorg/lib/xcb-util/keysyms: Makefile
src/external/mit/xorg/lib/xcb-util/property: Makefile
src/external/mit/xorg/lib/xcb-util/render-util: Makefile
src/external/mit/xorg/lib/xcb-util/reply: Makefile
Log Message:
add build infrastructure for xcb-utils 0.3.6.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/Makefile \
src/external/mit/xorg/lib/xcb-util/xcb-util.mk
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/atom/Makefile \
src/external/mit/xorg/lib/xcb-util/atom/atoms.c
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/aux/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/event/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/icccm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/image/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/keysyms/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/property/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xcb-util/render-util/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/reply/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/lib/xcb-util/Makefile
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/Makefile:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/Makefile Sun Jul 18 07:01:38 2010
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+
+SUBDIR= atom property event aux .WAIT \
+ reply image icccm keysyms render-util
+
+.include bsd.subdir.mk
Index: src/external/mit/xorg/lib/xcb-util/xcb-util.mk
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/xcb-util.mk Sun Jul 18 07:01:38 2010
@@ -0,0 +1,26 @@
+# $NetBSD: xcb-util.mk,v 1.1 2010/07/18 07:01:38 mrg Exp $
+
+# define XCBUTIL to something before including this
+
+LIB= xcb-${XCBUTIL}
+
+CPPFLAGS+= -I${X11SRCDIR.xcb-util}/${XCBUTIL}
+
+LIBDPLIBS=\
+ xcb ${.CURDIR}/../../libxcb/libxcb \
+ Xau ${.CURDIR}/../../libXau \
+ Xdmcp ${.CURDIR}/../../libXdmcp
+
+SHLIB_MAJOR?= 0
+SHLIB_MINOR?= 0
+
+PKGCONFIG?= xcb-${XCBUTIL}
+PKGCONFIG_VERSION.${PKGCONFIG}= 0.3.6
+
+# XXX totally fails
+NOLINT= # defined
+
+.include bsd.x11.mk
+.include bsd.lib.mk
+
+.PATH: ${X11SRCDIR.xcb-util}/${XCBUTIL}
Index: src/external/mit/xorg/lib/xcb-util/atom/Makefile
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/atom/Makefile:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/atom/Makefile Sun Jul 18 07:01:38 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+
+XCBUTIL= atom
+
+SRCS= atoms.c
+
+SHLIB_MAJOR= 1
+
+.include ../xcb-util.mk
Index: src/external/mit/xorg/lib/xcb-util/atom/atoms.c
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/atom/atoms.c:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/atom/atoms.c Sun Jul 18 07:01:38 2010
@@ -0,0 +1,836 @@
+/* C code produced by gperf version 3.0.4 */
+/* Command-line: gperf --output-file atoms.c atoms.gperf */
+/* Computed positions: -k'3,6,9,$' */
+
+#if !((' ' == 32) ('!' == 33) ('' == 34) ('#' == 35) \
+ ('%' == 37) ('' == 38) ('\'' == 39) ('(' == 40) \
+ (')' == 41) ('*' == 42) ('+' == 43) (',' == 44) \
+ ('-' == 45) ('.' == 46) ('/' == 47) ('0' == 48) \
+ ('1' == 49) ('2' == 50) ('3' == 51) ('4' == 52) \
+ ('5' == 53) ('6' == 54) ('7' == 55) ('8' == 56) \
+ ('9' == 57) (':' == 58) (';' == 59) ('' == 60) \
+ ('=' == 61) ('' == 62) ('?' == 63) ('A' == 65) \
+ ('B' == 66) ('C' == 67) ('D' == 68) ('E' == 69) \
+ ('F' == 70) ('G' == 71) ('H' == 72) ('I' == 73) \
+ ('J' == 74) ('K' == 75) ('L' == 76) ('M' == 77) \
+ ('N' == 78) ('O' == 79) ('P' == 80) ('Q' == 81) \
+ ('R' == 82) ('S' == 83) ('T' == 84) ('U' == 85) \
+ ('V' == 86) ('W' == 87) ('X' == 88) ('Y' == 89) \
+ ('Z' == 90) ('[' == 91) ('\\' == 92) (']' == 93) \
+ ('^' == 94) ('_' == 95) ('a' == 97) ('b' == 98) \
+ ('c' == 99) ('d' == 100) ('e' == 101) ('f' == 102) \
+ ('g' == 103) ('h' == 104) ('i' == 105) ('j' == 106) \
+ ('k' == 107) ('l' == 108) ('m' == 109) ('n' == 110) \
+ ('o' == 111) ('p' == 112)
