kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add pkgsrc diffs for libX11 and cairo to use XCB.

Browse source
This commit is contained in:
Blair Sadewitz 2008-03-25 20:49:06 +00:00 committed by Thomas Klausner
parent 423df4a66e
commit 60ab26f8f4
8 changed files with 1169 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libxcb/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.7 2008/03/24 21:08:59 bsadewitz Exp $
# $NetBSD: Makefile,v 1.8 2008/03/25 20:49:06 bsadewitz Exp $
#
DISTNAME= libxcb-1.1
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
EXTRACT_SUFX= .tar.bz2
@ -17,7 +17,7 @@ BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
USE_TOOLS+= pkg-config automake
CONFIGURE_ARGS+= --disable-build-docs # or needs doxygen
CONFIGURE_ARGS+= --disable-doxygen
@ -52,20 +52,35 @@ BUILDLINK_API_DEPENDS.xcb-proto+= xcb-proto>=1.1
.include "../../mk/pthread.buildlink3.mk"
###
### XXX Adding this here for redundancy--it very well may not be necessary.
### However, I don't think it could hurt much. We don't include
### PTHREAD_CFLAGS because it could be -pthread. My intention here
### is mainly to pass down the appropriate flags should something
### go awry.
###
XTHREADLIB=${${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}:L:M*}
.if empty(PTHREAD_CPPFLAGS)
XTHREAD_CFLAGS= -D_REENTRANT
XTHREAD_CFLAGS= -D_REENTRANT # XXX Is this OK?
.else
XTHREAD_CFLAGS= ${PTHREAD_CFLAGS}
XTHREAD_CPPFLAGS= ${PTHREAD_CPPFLAGS}
.endif
SUBST_CLASSES+= pc
SUBST_FILES.pc= xcb.pc.in
SUBST_MESSAGE.pc= Configuring threading in xcb.pc.in.
SUBST_STAGE.pc= pre-configure
SUBST_VARS.pc= XTHREADLIB XTHREAD_CFLAGS
SUBST_VARS.pc= XTHREADLIB XTHREAD_CPPFLAGS
pre-configure:
cd ${WRKSRC} && autoreconf -v -i -f
###
### XXX needed to build from scratch, but we're patching right now
### so it's not needed (nor should it ever be, really).
###
#.include "../../devel/gperf/buildlink3.mk"
.include "../../wip/xcb-proto/buildlink3.mk"
.include "../../x11/libXdmcp/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"

59
libxcb/cairo-xcb.diff Normal file
View file

@ -0,0 +1,59 @@
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairo/PLIST,v
retrieving revision 1.17
diff -u -b -r1.17 PLIST
--- PLIST 15 Jun 2007 17:47:59 -0000 1.17
+++ PLIST 25 Mar 2008 20:46:55 -0000
@@ -8,7 +8,9 @@
include/cairo/cairo-ps.h
${CARBON}include/cairo/cairo-quartz.h
include/cairo/cairo-svg.h
+${XCB}include/cairo/cairo-xcb-xrender.h
${X11}include/cairo/cairo-xlib-xrender.h
+${XCB}include/cairo/cairo-xcb.h
${X11}include/cairo/cairo-xlib.h
include/cairo/cairo.h
lib/libcairo.la
@@ -20,6 +22,7 @@
lib/pkgconfig/cairo-ps.pc
${CARBON}lib/pkgconfig/cairo-quartz.pc
lib/pkgconfig/cairo-svg.pc
+${XCB}lib/pkgconfig/cairo-xcb.pc
${X11}lib/pkgconfig/cairo-xlib-xrender.pc
${X11}lib/pkgconfig/cairo-xlib.pc
lib/pkgconfig/cairo.pc
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairo/Makefile,v
retrieving revision 1.59
diff -u -b -r1.59 Makefile
--- Makefile 12 Mar 2008 20:48:11 -0000 1.59
+++ Makefile 25 Mar 2008 20:46:55 -0000
@@ -16,7 +16,7 @@
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= src/cairo.pc.in src/cairo-backend.pc.in
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-xcb
+
CONFIGURE_ARGS+= --enable-glitz
CONFIGURE_ARGS+= --enable-pdf
CONFIGURE_ARGS+= --enable-ps
@@ -38,6 +38,17 @@
TEST_TARGET= check
+.include "../../x11/libX11/buildlink3.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libX11:U:Mxcb)
+CONFIGURE_ARGS+= --enable-xcb
+PLIST_SUBST+= XCB=""
+.include "../../wip/xcb-util/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-xcb
+PLIST_SUBST+= XCB="@comment "
+.endif
+
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"

15
libxcb/distinfo
View file

@ -1,9 +1,14 @@
$NetBSD: distinfo,v 1.5 2008/03/24 21:08:59 bsadewitz Exp $
$NetBSD: distinfo,v 1.6 2008/03/25 20:49:06 bsadewitz Exp $
SHA1 (libxcb-1.1.tar.bz2) = b27c7eb86fd2ea43cea83cadcf20cc77abf5defe
RMD160 (libxcb-1.1.tar.bz2) = 1c8c1d83ec71f7d1906373a679906615d9440f01
Size (libxcb-1.1.tar.bz2) = 442755 bytes
SHA1 (patch-aa) = 6423ec954db44b82347d58e0f042db5b0f4c91bb
SHA1 (patch-ab) = 6dce717f05a968bd171faf174cda7017ef7a84ce
SHA1 (patch-ac) = e28deeabea9cb5b4227725a9ec1a4f85c7fc1153
SHA1 (patch-ad) = 003ffb07352ec9027224b7b3d6ad99f8cbed1426
SHA1 (patch-aa) = f0bb8121b9166111484e38f54bfef958adc6e4e7
SHA1 (patch-ab) = a65753a35470d51793c603be23ac2e43cd95ef9e
SHA1 (patch-ac) = 9c200415e09a760e17d3e1e33dd8017d54cd423c
SHA1 (patch-ad) = ffa5eade4fd5874d2c74d67705272e6dba142cdb
SHA1 (patch-ae) = a375bb61981cd3ff74b5916b2d5112c8d93fd747
SHA1 (patch-af) = 607eacf0329a0322ae1f4a49ba71d5fa06ec7c1e
SHA1 (patch-ag) = 60f41498ffd7ea88ce6b0c6895756c6451b65085
SHA1 (patch-ah) = 8959c92787338f8c4f6f3f37cd574ccfb1db786a
SHA1 (patch-ai) = 6c030296b818b2740c055a908eef0e8d250c2e59

528
libxcb/libX11-xcb.diff Normal file
View file

@ -0,0 +1,528 @@
? options.mk
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/Makefile,v
retrieving revision 1.9
diff -u -b -r1.9 Makefile
--- Makefile 5 Aug 2007 22:39:38 -0000 1.9
+++ Makefile 25 Mar 2008 20:48:19 -0000
@@ -1,7 +1,7 @@
# $NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
#
-DISTNAME= libX11-1.1.3
+DISTNAME= libX11-1.1.4
CATEGORIES= x11 devel
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +20,6 @@
USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --enable-man-pages=3
-CONFIGURE_ARGS+= --without-xcb
PKGCONFIG_OVERRIDE+= x11.pc.in
.include "../../mk/bsd.prefs.mk"
@@ -33,6 +32,8 @@
MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
.endif
+.include "options.mk"
+
.include "../../x11/bigreqsproto/buildlink3.mk"
.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/kbproto/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/PLIST,v
retrieving revision 1.3
diff -u -b -r1.3 PLIST
--- PLIST 12 Jul 2007 15:02:00 -0000 1.3
+++ PLIST 25 Mar 2008 20:48:20 -0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
+@comment $NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
include/X11/ImUtil.h
include/X11/XKBlib.h
include/X11/Xcms.h
+${XCB}include/X11/Xlib-xcb.h
include/X11/Xlib.h
include/X11/XlibConf.h
include/X11/Xlibint.h
@@ -11,7 +12,9 @@
include/X11/Xutil.h
include/X11/cursorfont.h
lib/X11/Xcms.txt
+${XCB}lib/libX11-xcb.la
lib/libX11.la
+${XCB}lib/pkgconfig/x11-xcb.pc
lib/pkgconfig/x11.pc
man/man3/AllPlanes.3
man/man3/BitmapBitOrder.3
@@ -831,6 +834,9 @@
share/X11/locale/C/Compose
share/X11/locale/C/XI18N_OBJS
share/X11/locale/C/XLC_LOCALE
+share/X11/locale/am_ET.UTF-8/Compose
+share/X11/locale/am_ET.UTF-8/XI18N_OBJS
+share/X11/locale/am_ET.UTF-8/XLC_LOCALE
share/X11/locale/armscii-8/Compose
share/X11/locale/armscii-8/XI18N_OBJS
share/X11/locale/armscii-8/XLC_LOCALE
@@ -1058,8 +1064,9 @@
@dirrm share/X11/locale/en_US.UTF-8
@dirrm share/X11/locale/el_GR.UTF-8
@dirrm share/X11/locale/armscii-8
+@dirrm share/X11/locale/am_ET.UTF-8
@dirrm share/X11/locale/C
@dirrm share/X11/locale
-@comment @dirrm share/X11
-@comment @dirrm lib/X11
-@comment @dirrm include/X11
+@comment dirrm share/X11
+@comment dirrm lib/X11
+@comment dirrm include/X11
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/buildlink3.mk,v
retrieving revision 1.5
diff -u -b -r1.5 buildlink3.mk
--- buildlink3.mk 15 Dec 2007 15:21:53 -0000 1.5
+++ buildlink3.mk 25 Mar 2008 20:48:20 -0000
@@ -24,8 +24,14 @@
X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib
+
+pkgbase:= libX11
+. include "../../mk/pkg-build-options.mk"
.endif # LIBX11_BUILDLINK3_MK
+.if !empty(PKG_BUILD_OPTIONS.libX11:Mxcb)
+. include "../../wip/libxcb/buildlink3.mk"
+.endif
.include "../../x11/kbproto/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXdmcp/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/distinfo,v
retrieving revision 1.8
diff -u -b -r1.8 distinfo
--- distinfo 14 Jan 2008 07:12:53 -0000 1.8
+++ distinfo 25 Mar 2008 20:48:20 -0000
@@ -1,13 +1,14 @@
$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
-SHA1 (libX11-1.1.3.tar.bz2) = 235f69172b262f874d2a2d7bd17e8197aea5b767
-RMD160 (libX11-1.1.3.tar.bz2) = fcb8d5d31befa0ae227210dc7274c17b30c37fad
-Size (libX11-1.1.3.tar.bz2) = 1526958 bytes
-SHA1 (patch-aa) = 7c1905781ca9467adfb45e2cad9b710533bbcd17
-SHA1 (patch-ab) = 000f81dd5d21cbabf38e91b5066e8f1ce43ff957
-SHA1 (patch-ac) = 9b3bea367661efeef337f8b9ae62d5f430a2204e
+SHA1 (libX11-1.1.4.tar.bz2) = e91092e22c3b48371c3549afba1b6a457acb2d7e
+RMD160 (libX11-1.1.4.tar.bz2) = 42776389986e0b158f703a9b88fdf95bb5095d1f
+Size (libX11-1.1.4.tar.bz2) = 1576030 bytes
+SHA1 (patch-aa) = 21d7c4bcbe0b1f3430bc731e6b5321bfcfa30b1a
+SHA1 (patch-ab) = e9050a4ab84d993760019e176c7e4e3de45a5176
+SHA1 (patch-ac) = 533b965ac592395e5fd6672ab293e1cdc29fbf55
SHA1 (patch-ad) = 58645e734f48334ce5cbf62f5870d087d95194ee
-SHA1 (patch-ae) = 124c47038ac2c12dd37f3f63606396b9ed976822
+SHA1 (patch-ae) = 75ad0db24f56b9ebdc06d163f7beb23584c0efbb
SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
-SHA1 (patch-ag) = 0d1cf4804049fd3640d627ddfbab7b717f20b445
-SHA1 (patch-ah) = 3565c046484ba7b7d18cd5ddc3265870f143ffda
+SHA1 (patch-ag) = a38a3cd74686576fd9f96c1adcdfa6cdeb256ad1
+SHA1 (patch-ah) = fc98136ac32d819aeac13cd532a5644128aa5f02
+SHA1 (patch-ai) = 3b9fec409570986f9d025c6b4fcaf9fa5fec1f88
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/patches/patch-aa,v
retrieving revision 1.3
diff -u -b -r1.3 patch-aa
--- patches/patch-aa 1 Aug 2007 16:48:41 -0000 1.3
+++ patches/patch-aa 25 Mar 2008 20:48:20 -0000
@@ -1,8 +1,57 @@
$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
---- configure.ac.orig 2007-07-27 18:02:55.000000000 +0200
+--- configure.ac.orig 2008-03-06 15:48:26.000000000 -0500
+++ configure.ac
-@@ -304,6 +304,8 @@ else
+@@ -189,8 +189,8 @@ if test x$xthreads = xyes ; then
+ linux*|openbsd*|gnu*|k*bsd*-gnu)
+ XTHREADLIB=-lpthread ;;
+ netbsd*)
+- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
+- XTHREADLIB="-lpthread" ;;
++ XTHREAD_CFLAGS="-D_REENTRANT"
++ XTHREADLIB="-pthread" ;;
+ freebsd*)
+ XTHREAD_CFLAGS="-D_THREAD_SAFE"
+ XTHREADLIB="-pthread" ;;
+@@ -220,31 +220,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ # Find keysymdef.h
+ #
+-KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
+- ;;
+- esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
++dir=`pkg-config --variable=includedir xproto`
++KEYSYMDEF="$dir/X11/keysymdef.h"
++if test -f "$KEYSYMDEF"; then
++ AC_MSG_RESULT([$KEYSYMDEF])
++else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
+- AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
+@@ -322,6 +305,8 @@ else
fi
AC_SUBST(XKBPROTO_REQUIRES)
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/patches/patch-ab,v
retrieving revision 1.1
diff -u -b -r1.1 patch-ab
--- patches/patch-ab 12 Jul 2007 15:02:09 -0000 1.1
+++ patches/patch-ab 25 Mar 2008 20:48:20 -0000
@@ -1,20 +1,13 @@
-$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
+$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
+
+--- src/ConnDis.c.orig 2008-03-06 15:45:06.000000000 -0500
++++ src/ConnDis.c
+@@ -1143,7 +1143,7 @@ GetAuthorization(
+
+ /* In the case of v4 mapped addresses send the v4
+ part of the address - addr is already in network byte order */
+- if (memcmp(addr+8, ipv4mappedprefix, 12) == 0) {
++ if (memcmp((char*)addr+8, ipv4mappedprefix, 12) == 0) {
+ for (i = 20 ; i < 24; i++)
+ xdmcp_data[j++] = ((char *)addr)[i];
---- src/Xrm.c.orig 2006-09-25 12:57:47.000000000 +0200
-+++ src/Xrm.c
-@@ -808,6 +808,7 @@ void XrmCombineDatabase(
- }
- }
- (from->methods->destroy)(from->mbstate);
-+ _XUnlockMutex(&from->linfo);
- _XFreeMutex(&from->linfo);
- Xfree((char *)from);
- _XUnlockMutex(&(*into)->linfo);
-@@ -2656,6 +2657,7 @@ void XrmDestroyDatabase(
- else
- DestroyNTable(table);
- }
-+ _XUnlockMutex(&db->linfo);
- _XFreeMutex(&db->linfo);
- (*db->methods->destroy)(db->mbstate);
- Xfree((char *)db);
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/patches/patch-ac,v
retrieving revision 1.2
diff -u -b -r1.2 patch-ac
--- patches/patch-ac 5 Aug 2007 22:39:38 -0000 1.2
+++ patches/patch-ac 25 Mar 2008 20:48:20 -0000
@@ -1,8 +1,8 @@
$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
---- configure.orig 2007-08-06 00:08:02.000000000 +0200
+--- configure.orig 2008-03-06 15:48:42.000000000 -0500
+++ configure
-@@ -926,6 +926,8 @@ XKB_FALSE
+@@ -927,6 +927,8 @@ XKB_FALSE
XKBPROTO_CFLAGS
XKBPROTO_LIBS
XKBPROTO_REQUIRES
@@ -11,7 +11,27 @@
LINT
LINT_FLAGS
LINT_TRUE
-@@ -23423,6 +23425,15 @@ else
+@@ -22905,7 +22907,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char pthread_self ();
++#include <pthread.h>
+ int
+ main ()
+ {
+@@ -22966,8 +22968,8 @@ if test x$xthreads = xyes ; then
+ linux*|openbsd*|gnu*|k*bsd*-gnu)
+ XTHREADLIB=-lpthread ;;
+ netbsd*)
+- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
+- XTHREADLIB="-lpthread" ;;
++ XTHREAD_CFLAGS="-D_REENTRANT"
++ XTHREADLIB="-pthread" ;;
+ freebsd*)
+ XTHREAD_CFLAGS="-D_THREAD_SAFE"
+ XTHREADLIB="-pthread" ;;
+@@ -23507,6 +23509,15 @@ else
fi
@@ -27,7 +47,7 @@
for ac_header in stdlib.h unistd.h
-@@ -24523,6 +24534,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -24641,6 +24652,13 @@ echo "$as_me: error: conditional \"XKB\"
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -41,7 +61,7 @@
if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -25339,6 +25357,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
+@@ -25466,6 +25486,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
XKBPROTO_CFLAGS!$XKBPROTO_CFLAGS$ac_delim
XKBPROTO_LIBS!$XKBPROTO_LIBS$ac_delim
XKBPROTO_REQUIRES!$XKBPROTO_REQUIRES$ac_delim
@@ -50,12 +70,12 @@
LINT!$LINT$ac_delim
LINT_FLAGS!$LINT_FLAGS$ac_delim
LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -25360,7 +25380,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -25490,7 +25512,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/patches/patch-ae,v
retrieving revision 1.2
diff -u -b -r1.2 patch-ae
--- patches/patch-ae 5 Aug 2007 22:39:39 -0000 1.2
+++ patches/patch-ae 25 Mar 2008 20:48:20 -0000
@@ -1,6 +1,6 @@
$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
---- src/util/Makefile.in.orig 2007-08-06 00:07:57.000000000 +0200
+--- src/util/Makefile.in.orig 2008-03-06 15:48:52.000000000 -0500
+++ src/util/Makefile.in
@@ -34,7 +34,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -10,17 +10,7 @@
subdir = src/util
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -53,6 +52,9 @@ makekeys_LDADD = $(LDADD)
- makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-+xmakekeys_SOURCES = xmakekeys.c
-+xmakekeys_OBJECTS = xmakekeys.$(OBJEXT)
-+xmakekeys_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -62,8 +64,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+@@ -62,8 +61,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
@@ -34,7 +24,7 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -223,10 +228,9 @@ sysconfdir = @sysconfdir@
+@@ -225,10 +227,9 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -47,7 +37,7 @@
EXTRA_DIST = mkks.sh
# Check source code with tools like lint & sparse
-@@ -276,6 +280,9 @@ clean-noinstPROGRAMS:
+@@ -278,6 +279,9 @@ clean-noinstPROGRAMS:
makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES)
@rm -f makekeys$(EXEEXT)
$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
@@ -57,7 +47,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -284,6 +291,7 @@ distclean-compile:
+@@ -286,6 +290,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@
@@ -65,7 +55,7 @@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -503,6 +511,10 @@ uninstall-am:
+@@ -504,6 +509,10 @@ uninstall-am:
pdf pdf-am ps ps-am tags uninstall uninstall-am
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/patches/patch-ag,v
retrieving revision 1.2
diff -u -b -r1.2 patch-ag
--- patches/patch-ag 5 Aug 2007 22:39:39 -0000 1.2
+++ patches/patch-ag 25 Mar 2008 20:48:20 -0000
@@ -1,18 +1,20 @@
$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
---- src/Makefile.in.orig 2007-08-06 00:07:52.000000000 +0200
+--- src/Makefile.in.orig 2008-03-06 15:48:51.000000000 -0500
+++ src/Makefile.in
-@@ -512,6 +512,8 @@ libX11_la_LIBADD = \
+@@ -517,6 +517,10 @@ libX11_la_LIBADD = \
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+@CROSS_COMPILING_FALSE@MAKEKEYS = $(top_builddir)/src/util/makekeys
+@CROSS_COMPILING_TRUE@MAKEKEYS = $(top_builddir)/src/util/xmakekeys
- all: $(BUILT_SOURCES) config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-@@ -1214,7 +1216,7 @@ preprocess: $(patsubst %.c,%.ii,$(libX11
- @LINT_TRUE@ done
++
++
+ @MAKE_LINT_LIB_TRUE@lintlibdir = $(libdir)
+ @MAKE_LINT_LIB_TRUE@lintlib_DATA = $(LINTLIB)
+ @MAKE_LINT_LIB_TRUE@lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
+@@ -1243,7 +1247,7 @@ preprocess: $(patsubst %.c,%.ii,$(libX11
+ @MAKE_LINT_LIB_TRUE@ $(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
- $(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libX11/patches/patch-ah,v
retrieving revision 1.2
diff -u -b -r1.2 patch-ah
--- patches/patch-ah 14 Jan 2008 07:12:53 -0000 1.2
+++ patches/patch-ah 25 Mar 2008 20:48:20 -0000
@@ -1,6 +1,6 @@
$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
---- src/XlibInt.c.orig 2007-07-21 10:45:39.000000000 +0200
+--- src/XlibInt.c.orig 2008-03-23 11:27:47.000000000 -0400
+++ src/XlibInt.c
@@ -138,8 +138,13 @@ xthread_t (*_Xthread_self_fn)(void) = NU
#ifdef ISC
@@ -16,3 +16,60 @@
#define ESET(val) errno = val
#endif
#endif
+@@ -201,8 +206,6 @@ static char *_XAsyncReply(
+ Bool discard);
+ #endif /* !USE_XCB */
+
+-#define SEQLIMIT (65535 - (BUFSIZE / SIZEOF(xReq)) - 10)
+-
+ /*
+ * The following routines are internal routines used by Xlib for protocol
+ * packet transmission and reception.
+@@ -565,33 +568,42 @@ _XWaitForReadable(
+ }
+ #endif /* !USE_XCB */
+
++static int sync_hazard(Display *dpy)
++{
++ unsigned long span = dpy->request - dpy->last_request_read;
++ unsigned long hazard = min((dpy->bufmax - dpy->buffer) / SIZEOF(xReq), 65535 - 10);
++ return span >= 65535 - hazard - 10;
++}
++
+ static
+ int _XSeqSyncFunction(
+ register Display *dpy)
+ {
+ xGetInputFocusReply rep;
+ register xReq *req;
++ int sent_sync = 0;
+
+ LockDisplay(dpy);
+- if ((dpy->request - dpy->last_request_read) >= (BUFSIZE / SIZEOF(xReq))) {
++ if ((dpy->request - dpy->last_request_read) >= (65535 - BUFSIZE/SIZEOF(xReq))) {
+ GetEmptyReq(GetInputFocus, req);
+ (void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
++ sent_sync = 1;
+ }
+ /* could get XID handler while waiting for reply in MT env */
+- if (dpy->synchandler == _XSeqSyncFunction) {
++ if (dpy->synchandler == _XSeqSyncFunction && !sync_hazard(dpy)) {
+ dpy->synchandler = dpy->savedsynchandler;
+ dpy->flags &= ~XlibDisplayPrivSync;
+ }
+ UnlockDisplay(dpy);
+- SyncHandle();
++ if (sent_sync)
++ SyncHandle();
+ return 0;
+ }
+
+ void _XSetSeqSyncFunction(
+ register Display *dpy)
+ {
+- if ((dpy->request - dpy->last_request_read) >= SEQLIMIT &&
+- !(dpy->flags & XlibDisplayPrivSync)) {
++ if (!(dpy->flags & XlibDisplayPrivSync) && sync_hazard(dpy)) {
+ dpy->savedsynchandler = dpy->synchandler;
+ dpy->synchandler = _XSeqSyncFunction;
+ dpy->flags |= XlibDisplayPrivSync;
Index: patches/patch-ai
===================================================================
RCS file: patches/patch-ai
diff -N patches/patch-ai
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ai 25 Mar 2008 20:48:20 -0000
@@ -0,0 +1,15 @@
+$NetBSD: libX11-xcb.diff,v 1.1 2008/03/25 20:49:06 bsadewitz Exp $
+
+--- include/X11/Xlibint.h.orig 2008-03-06 15:45:05.000000000 -0500
++++ include/X11/Xlibint.h
+@@ -40,6 +40,10 @@ from The Open Group.
+ * Warning, there be dragons here....
+ */
+
++#ifdef __NetBSD__
++#include <unistd.h>
++#endif
++
+ #include <X11/Xlib.h>
+ #include <X11/Xproto.h> /* to declare xEvent */
+ #include <X11/XlibConf.h> /* for configured options like XTHREADS */

132
libxcb/patches/patch-aa
View file

@ -1,13 +1,125 @@
$NetBSD: patch-aa,v 1.3 2008/03/24 21:09:00 bsadewitz Exp $
$NetBSD: patch-aa,v 1.4 2008/03/25 20:49:06 bsadewitz Exp $
--- configure.ac.orig 2007-11-04 18:17:11.000000000 -0500
+++ configure.ac
@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
--- Makefile.am.orig 2007-10-23 12:44:59.000000000 -0400
+++ Makefile.am
@@ -4,51 +4,77 @@ pkgconfigdir = $(libdir)/pkgconfig
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
-NEEDED="pthread-stubs xau >= 0.99.2"
+NEEDED="xau >= 0.99.2"
PKG_CHECK_MODULES(NEEDED, $NEEDED)
pkgconfig_DATA = \
xcb.pc \
-xcb-xlib.pc \
-xcb-composite.pc \
-xcb-damage.pc \
-xcb-dpms.pc \
-xcb-glx.pc \
-xcb-randr.pc \
-xcb-record.pc \
-xcb-render.pc \
-xcb-res.pc \
-xcb-screensaver.pc \
-xcb-shape.pc \
-xcb-shm.pc \
-xcb-sync.pc \
-xcb-xevie.pc \
-xcb-xf86dri.pc \
-xcb-xfixes.pc \
-xcb-xinerama.pc \
-xcb-xprint.pc \
-xcb-xtest.pc \
-xcb-xv.pc \
-xcb-xvmc.pc
+xcb-xlib.pc
+
+if BUILD_COMPOSITE
+pkgconfig_DATA += xcb-composite.pc
+endif
+if BUILD_DAMAGE
+pkgconfig_DATA += xcb-damage.pc
+endif
+if BUILD_DPMS
+pkgconfig_DATA += xcb-dpms.pc
+endif
+if BUILD_GLX
+pkgconfig_DATA += xcb-glx.pc
+endif
+if BUILD_RANDR
+pkgconfig_DATA += xcb-randr.pc
+endif
+if BUILD_RECORD
+pkgconfig_DATA += xcb-record.pc
+endif
+if BUILD_RENDER
+pkgconfig_DATA += xcb-render.pc
+endif
+if BUILD_RES
+pkgconfig_DATA += xcb-res.pc
+endif
+if BUILD_SCREENSAVER
+pkgconfig_DATA += xcb-screensaver.pc
+endif
+if BUILD_SHAPE
+pkgconfig_DATA += xcb-shape.pc
+endif
+if BUILD_SHM
+pkgconfig_DATA += xcb-shm.pc
+endif
+if BUILD_SYNC
+pkgconfig_DATA += xcb-sync.pc
+endif
+if BUILD_XEVIE
+pkgconfig_DATA += xcb-xevie.pc
+endif
+if BUILD_XF86DRI
+pkgconfig_DATA += xcb-xf86dri.pc
+endif
+if BUILD_XFIXES
+pkgconfig_DATA += xcb-xfixes.pc
+endif
+if BUILD_XINERAMA
+pkgconfig_DATA += xcb-xinerama.pc
+endif
+if BUILD_XINPUT
+pkgconfig_DATA += xcb-xinput.pc
+endif
+if BUILD_XPRINT
+pkgconfig_DATA += xcb-xprint.pc
+endif
+if BUILD_SELINUX
+pkgconfig_DATA += xcb-xselinux.pc
+endif
+if BUILD_XTEST
+pkgconfig_DATA += xcb-xtest.pc
+endif
+if BUILD_XV
+pkgconfig_DATA += xcb-xv.pc
+endif
+if BUILD_XVMC
+pkgconfig_DATA += xcb-xvmc.pc
+endif
+
have_xdmcp="no"
EXTRA_DIST = \
-xcb.pc.in \
-xcb-xlib.pc.in \
-xcb-composite.pc.in \
-xcb-damage.pc.in \
-xcb-dpms.pc.in \
-xcb-glx.pc.in \
-xcb-randr.pc.in \
-xcb-record.pc.in \
-xcb-render.pc.in \
-xcb-res.pc.in \
-xcb-screensaver.pc.in \
-xcb-shape.pc.in \
-xcb-shm.pc.in \
-xcb-sync.pc.in \
-xcb-xevie.pc.in \
-xcb-xinerama.pc.in \
-xcb-xf86dri.pc.in \
-xcb-xfixes.pc.in \
-xcb-xprint.pc.in \
-xcb-xtest.pc.in \
-xcb-xv.pc.in \
-xcb-xvmc.pc.in \
tools/README \
tools/api_conv.pl \
tools/constants \

89
libxcb/patches/patch-ab
View file

@ -1,28 +1,69 @@
$NetBSD: patch-ab,v 1.3 2008/03/24 21:09:00 bsadewitz Exp $
$NetBSD: patch-ab,v 1.4 2008/03/25 20:49:06 bsadewitz Exp $
--- src/xcb_util.c.orig 2007-10-23 12:44:59.000000000 -0400
+++ src/xcb_util.c
@@ -249,13 +249,22 @@ static int _xcb_open_unix(char *protocol
if (protocol && strcmp("unix",protocol))
return -1;
--- configure.ac.orig 2007-11-04 18:17:11.000000000 -0500
+++ configure.ac
@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
- strcpy(addr.sun_path, file);
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
-NEEDED="pthread-stubs xau >= 0.99.2"
+NEEDED="xau >= 0.99.2"
PKG_CHECK_MODULES(NEEDED, $NEEDED)
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if(fd == -1)
return -1;
+
+ /* try the abstract socket first */
+ strcpy(addr.sun_path + 1, file);
+ if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) != -1)
+ return fd;
+
+ strcpy(addr.sun_path, file);
if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
return -1;
+
return fd;
}
have_xdmcp="no"
@@ -86,8 +86,54 @@ AC_PREREQ([2.59c], [], [AC_SUBST([htmldi
])])
AM_CHECK_DOXYGEN()
+AC_ARG_ENABLE(composite, AS_HELP_STRING([--enable-composite], [Build XCB Composite Extension (default: yes)]), [BUILD_COMPOSITE=$enableval], [BUILD_COMPOSITE=yes])
+AM_CONDITIONAL(BUILD_COMPOSITE, [test "x$BUILD_COMPOSITE" = xyes])
+AC_ARG_ENABLE(damage, AS_HELP_STRING([--enable-damage], [Build XCB Damage Extension (default: yes)]), [BUILD_DAMAGE=$enableval], [BUILD_DAMAGE=yes])
+AM_CONDITIONAL(BUILD_DAMAGE, [test "x$BUILD_DAMAGE" = xyes])
+AC_ARG_ENABLE(dpms, AS_HELP_STRING([--enable-dpms], [Build XCB DPMS Extension (default: yes)]), [BUILD_DPMS=$enableval], [BUILD_DPMS=yes])
+AM_CONDITIONAL(BUILD_DPMS, [test "x$BUILD_DPMS" = xyes])
+AC_ARG_ENABLE(glx, AS_HELP_STRING([--enable-glx], [Build XCB GLX Extension (default: yes)]), [BUILD_GLX=$enableval], [BUILD_GLX=yes])
+AM_CONDITIONAL(BUILD_GLX, [test "x$BUILD_GLX" = xyes])
+AC_ARG_ENABLE(randr, AS_HELP_STRING([--enable-randr], [Build XCB RandR Extension (default: yes)]), [BUILD_RANDR=$enableval], [BUILD_RANDR=yes])
+AM_CONDITIONAL(BUILD_RANDR, [test "x$BUILD_RANDR" = xyes])
+AC_ARG_ENABLE(record, AS_HELP_STRING([--enable-record], [Build XCB Record Extension (default: yes)]), [BUILD_RECORD=$enableval], [BUILD_RECORD=yes])
+AM_CONDITIONAL(BUILD_RECORD, [test "x$BUILD_RECORD" = xyes])
+AC_ARG_ENABLE(render, AS_HELP_STRING([--enable-render], [Build XCB Render Extension (default: yes)]), [BUILD_RENDER=$enableval], [BUILD_RENDER=yes])
+AM_CONDITIONAL(BUILD_RENDER, [test "x$BUILD_RENDER" = xyes])
+AC_ARG_ENABLE(res, AS_HELP_STRING([--enable-res], [Build XCB X-Resource Extension (default: yes)]), [BUILD_RES=$enableval], [BUILD_RES=yes])
+AM_CONDITIONAL(BUILD_RES, [test "x$BUILD_RES" = xyes])
+AC_ARG_ENABLE(screensaver, AS_HELP_STRING([--enable-screensaver], [Build XCB Screensaver Extension (default: yes)]), [BUILD_SCREENSAVER=$enableval], [BUILD_SCREENSAVER=yes])
+AM_CONDITIONAL(BUILD_SCREENSAVER, [test "x$BUILD_SCREENSAVER" = xyes])
+AC_ARG_ENABLE(shape, AS_HELP_STRING([--enable-shape], [Build XCB Shape Extension (default: yes)]), [BUILD_SHAPE=$enableval], [BUILD_SHAPE=yes])
+AM_CONDITIONAL(BUILD_SHAPE, [test "x$BUILD_SHAPE" = xyes])
+AC_ARG_ENABLE(shm, AS_HELP_STRING([--enable-shm], [Build XCB Shm Extension (default: yes)]), [BUILD_SHM=$enableval], [BUILD_SHM=yes])
+AM_CONDITIONAL(BUILD_SHM, [test "x$BUILD_SHM" = xyes])
+AC_ARG_ENABLE(sync, AS_HELP_STRING([--enable-sync], [Build XCB Sync Extension (default: yes)]), [BUILD_SYNC=$enableval], [BUILD_SYNC=yes])
+AM_CONDITIONAL(BUILD_SYNC, [test "x$BUILD_SYNC" = xyes])
+AC_ARG_ENABLE(xevie, AS_HELP_STRING([--enable-xevie], [Build XCB Xevie Extension (default: yes)]), [BUILD_XEVIE=$enableval], [BUILD_XEVIE=yes])
+AM_CONDITIONAL(BUILD_XEVIE, [test "x$BUILD_XEVIE" = xyes])
+AC_ARG_ENABLE(xf86dri, AS_HELP_STRING([--enable-xf86dri], [Build XCB XFree86-DRI Extension (default: yes)]), [BUILD_XF86DRI=$enableval], [BUILD_XF86DRI=yes])
+AM_CONDITIONAL(BUILD_XF86DRI, [test "x$BUILD_XF86DRI" = xyes])
+AC_ARG_ENABLE(xfixes, AS_HELP_STRING([--enable-xfixes], [Build XCB XFixes Extension (default: yes)]), [BUILD_XFIXES=$enableval], [BUILD_XFIXES=yes])
+AM_CONDITIONAL(BUILD_XFIXES, [test "x$BUILD_XFIXES" = xyes])
+AC_ARG_ENABLE(xinerama, AS_HELP_STRING([--enable-xinerama], [Build XCB Xinerama Extension (default: yes)]), [BUILD_XINERAMA=$enableval], [BUILD_XINERAMA=yes])
+AM_CONDITIONAL(BUILD_XINERAMA, [test "x$BUILD_XINERAMA" = xyes])
+AC_ARG_ENABLE(xinput, AS_HELP_STRING([--enable-xinput], [Build XCB XInput Extension (EXPERIMENTAL) (default: no)]), [BUILD_XINPUT=$enableval], [BUILD_XINPUT=no])
+AM_CONDITIONAL(BUILD_XINPUT, [test "x$BUILD_XINPUT" = xyes])
+AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build XCB Xprint Extension (default: yes)]), [BUILD_XPRINT=$enableval], [BUILD_XPRINT=yes])
+AM_CONDITIONAL(BUILD_XPRINT, [test "x$BUILD_XPRINT" = xyes])
+AC_ARG_ENABLE(xselinux, AS_HELP_STRING([--enable-xselinux], [Build XCB SELinux Extension (default: no)]), [BUILD_SELINUX=$enableval], [BUILD_SELINUX=no])
+AM_CONDITIONAL(BUILD_SELINUX, [test "x$BUILD_SELINUX" = xyes])
+AC_ARG_ENABLE(xtest, AS_HELP_STRING([--enable-xtest], [Build XCB XTEST Extension (default: yes)]), [BUILD_XTEST=$enableval], [BUILD_XTEST=yes])
+AM_CONDITIONAL(BUILD_XTEST, [test "x$BUILD_XTEST" = xyes])
+AC_ARG_ENABLE(xv, AS_HELP_STRING([--enable-xv], [Build XCB Xv Extension (default: yes)]), [BUILD_XV=$enableval], [BUILD_XV=yes])
+AM_CONDITIONAL(BUILD_XV, [test "x$BUILD_XV" = xyes])
+AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--enable-xvmc], [Build XCB XvMC Extension (default: yes)]), [BUILD_XVMC=$enableval], [BUILD_XVMC=yes])
+AM_CONDITIONAL(BUILD_XVMC, [test "x$BUILD_XVMC" = xyes])
+
+
AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile])
-AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xinerama.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc])
+AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xinerama.pc xcb-xinput.pc xcb-xprint.pc xcb-xselinux.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc])
AC_CONFIG_FILES([doc/xcb.doxygen])
AC_OUTPUT

363
libxcb/patches/patch-ac
View file

@ -1,13 +1,354 @@
$NetBSD: patch-ac,v 1.1 2008/03/24 21:09:00 bsadewitz Exp $
$NetBSD: patch-ac,v 1.2 2008/03/25 20:49:06 bsadewitz Exp $
--- configure.orig 2007-11-04 20:30:20.000000000 -0500
+++ configure
@@ -20302,7 +20302,7 @@ else
echo "${ECHO_T}yes" >&6; }
:
fi
-NEEDED="pthread-stubs xau >= 0.99.2"
+NEEDED="xau >= 0.99.2"
--- src/Makefile.am.orig 2006-11-24 05:42:54.000000000 -0500
+++ src/Makefile.am
@@ -1,98 +1,15 @@
lib_LTLIBRARIES = libxcb.la \
- libxcb-xlib.la \
- libxcb-composite.la \
- libxcb-damage.la \
- libxcb-dpms.la \
- libxcb-glx.la \
- libxcb-randr.la \
- libxcb-record.la \
- libxcb-render.la \
- libxcb-res.la \
- libxcb-screensaver.la \
- libxcb-shape.la \
- libxcb-shm.la \
- libxcb-sync.la \
- libxcb-xevie.la \
- libxcb-xf86dri.la \
- libxcb-xfixes.la \
- libxcb-xinerama.la \
- libxcb-xprint.la \
- libxcb-xtest.la \
- libxcb-xv.la \
- libxcb-xvmc.la
+ libxcb-xlib.la
EXTHEADERS = xproto.h \
bigreq.h \
- composite.h \
- damage.h \
- dpms.h \
- glx.h \
- randr.h \
- record.h \
- render.h \
- res.h \
- screensaver.h \
- shape.h \
- shm.h \
- sync.h \
- xc_misc.h \
- xevie.h \
- xf86dri.h \
- xfixes.h \
- xinerama.h \
- xprint.h \
- xtest.h \
- xv.h \
- xvmc.h
+ xc_misc.h
EXTSOURCES = xproto.c \
bigreq.c \
- composite.c \
- damage.c \
- dpms.c \
- glx.c \
- randr.c \
- record.c \
- render.c \
- res.c \
- screensaver.c \
- shape.c \
- shm.c \
- sync.c \
- xc_misc.c \
- xevie.c \
- xf86dri.c \
- xfixes.c \
- xinerama.c \
- xprint.c \
- xtest.c \
- xv.c \
- xvmc.c
+ xc_misc.c
EXTENSION_XML = xproto.xml \
bigreq.xml \
- composite.xml \
- damage.xml \
- dpms.xml \
- glx.xml \
- randr.xml \
- record.xml \
- render.xml \
- res.xml \
- screensaver.xml \
- shape.xml \
- shm.xml \
- sync.xml \
- xc_misc.xml \
- xevie.xml \
- xf86dri.xml \
- xfixes.xml \
- xinerama.xml \
- xprint.xml \
- xtest.xml \
- xvmc.xml \
- xv.xml
-
-xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
-noinst_HEADERS = xcbint.h
+ xc_misc.xml
AM_CFLAGS = $(CWARNFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
libxcb_la_LIBADD = $(NEEDED_LIBS) $(XDMCP_LIBS)
@@ -110,9 +27,6 @@ libxcb_la_SOURCES = \
# and age to 0.
libxcb_la_LDFLAGS = -version-info 1:0:0
-BUILT_SOURCES = $(EXTSOURCES) $(EXTHEADERS)
-CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(EXTENSION_XML)
-
XCB_LIBS = libxcb.la
libxcb_xlib_la_LDFLAGS = -version-info 0:0:0
@@ -121,85 +35,233 @@ libxcb_xlib_la_SOURCES = xcb_xlib.c
# FIXME: find a way to autogenerate this from the XML files.
+if BUILD_COMPOSITE
+lib_LTLIBRARIES += libxcb-composite.la
+EXTHEADERS += composite.h
+EXTSOURCES += composite.c
+EXTENSION_XML += composite.xml
libxcb_composite_la_LDFLAGS = -version-info 0:0:0
libxcb_composite_la_LIBADD = $(XCB_LIBS)
libxcb_composite_la_SOURCES = composite.c composite.h
+endif
+if BUILD_DAMAGE
+lib_LTLIBRARIES += libxcb-damage.la
+EXTHEADERS += damage.h
+EXTSOURCES += damage.c
+EXTENSION_XML += damage.xml
libxcb_damage_la_LDFLAGS = -version-info 0:0:0
libxcb_damage_la_LIBADD = $(XCB_LIBS)
libxcb_damage_la_SOURCES = damage.c damage.h
+endif
+if BUILD_DPMS
+lib_LTLIBRARIES += libxcb-dpms.la
+EXTHEADERS += dpms.h
+EXTSOURCES += dpms.c
+EXTENSION_XML += dpms.xml
libxcb_dpms_la_LDFLAGS = -version-info 0:0:0
libxcb_dpms_la_LIBADD = $(XCB_LIBS)
libxcb_dpms_la_SOURCES = dpms.c dpms.h
+endif
+if BUILD_GLX
+lib_LTLIBRARIES += libxcb-glx.la
+EXTHEADERS += glx.h
+EXTSOURCES += glx.c
+EXTENSION_XML += glx.xml
libxcb_glx_la_LDFLAGS = -version-info 0:0:0
libxcb_glx_la_LIBADD = $(XCB_LIBS)
libxcb_glx_la_SOURCES = glx.c glx.h
+endif
+if BUILD_RANDR
+lib_LTLIBRARIES += libxcb-randr.la
+EXTHEADERS += randr.h
+EXTSOURCES += randr.c
+EXTENSION_XML += randr.xml
libxcb_randr_la_LDFLAGS = -version-info 0:0:0
libxcb_randr_la_LIBADD = $(XCB_LIBS)
libxcb_randr_la_SOURCES = randr.c randr.h
+endif
+if BUILD_RECORD
+lib_LTLIBRARIES += libxcb-record.la
+EXTHEADERS += record.h
+EXTSOURCES += record.c
+EXTENSION_XML += record.xml
libxcb_record_la_LDFLAGS = -version-info 0:0:0
libxcb_record_la_LIBADD = $(XCB_LIBS)
libxcb_record_la_SOURCES = record.c record.h
+endif
+if BUILD_RENDER
+lib_LTLIBRARIES += libxcb-render.la
+EXTHEADERS += render.h
+EXTSOURCES += render.c
+EXTENSION_XML += render.xml
libxcb_render_la_LDFLAGS = -version-info 0:0:0
libxcb_render_la_LIBADD = $(XCB_LIBS)
libxcb_render_la_SOURCES = render.c render.h
+endif
+if BUILD_RES
+lib_LTLIBRARIES += libxcb-res.la
+EXTHEADERS += res.h
+EXTSOURCES += res.c
+EXTENSION_XML += res.xml
libxcb_res_la_LDFLAGS = -version-info 0:0:0
libxcb_res_la_LIBADD = $(XCB_LIBS)
libxcb_res_la_SOURCES = res.c res.h
+endif
+if BUILD_SCREENSAVER
+lib_LTLIBRARIES += libxcb-screensaver.la
+EXTHEADERS += screensaver.h
+EXTSOURCES += screensaver.c
+EXTENSION_XML += screensaver.xml
libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0
libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
+endif
+if BUILD_SHAPE
+lib_LTLIBRARIES += libxcb-shape.la
+EXTHEADERS += shape.h
+EXTSOURCES += shape.c
+EXTENSION_XML += shape.xml
libxcb_shape_la_LDFLAGS = -version-info 0:0:0
libxcb_shape_la_LIBADD = $(XCB_LIBS)
libxcb_shape_la_SOURCES = shape.c shape.h
+endif
+if BUILD_SHM
+lib_LTLIBRARIES += libxcb-shm.la
+EXTHEADERS += shm.h
+EXTSOURCES += shm.c
+EXTENSION_XML += shm.xml
libxcb_shm_la_LDFLAGS = -version-info 0:0:0
libxcb_shm_la_LIBADD = $(XCB_LIBS)
libxcb_shm_la_SOURCES = shm.c shm.h
+endif
+if BUILD_SYNC
+lib_LTLIBRARIES += libxcb-sync.la
+EXTHEADERS += sync.h
+EXTSOURCES += sync.c
+EXTENSION_XML += sync.xml
libxcb_sync_la_LDFLAGS = -version-info 0:0:0
libxcb_sync_la_LIBADD = $(XCB_LIBS)
libxcb_sync_la_SOURCES = sync.c sync.h
+endif
+if BUILD_XEVIE
+lib_LTLIBRARIES += libxcb-xevie.la
+EXTHEADERS += xevie.h
+EXTSOURCES += xevie.c
+EXTENSION_XML += xevie.xml
libxcb_xevie_la_LDFLAGS = -version-info 0:0:0
libxcb_xevie_la_LIBADD = $(XCB_LIBS)
libxcb_xevie_la_SOURCES = xevie.c xevie.h
+endif
+if BUILD_XF86DRI
+lib_LTLIBRARIES += libxcb-xf86dri.la
+EXTHEADERS += xf86dri.h
+EXTSOURCES += xf86dri.c
+EXTENSION_XML += xf86dri.xml
libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0
libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
+endif
+if BUILD_XFIXES
+lib_LTLIBRARIES += libxcb-xfixes.la
+EXTHEADERS += xfixes.h
+EXTSOURCES += xfixes.c
+EXTENSION_XML += xfixes.xml
libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0
libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
+endif
+
+if BUILD_XINERAMA
+lib_LTLIBRARIES += libxcb-xinerama.la
+EXTHEADERS += xinerama.h
+EXTSOURCES += xinerama.c
+EXTENSION_XML += xinerama.xml
+libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0
+libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
+libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
+endif
+if BUILD_XINPUT
+lib_LTLIBRARIES += libxcb-xinput.la
+EXTHEADERS += xinput.h
+EXTSOURCES += xinput.c
+EXTENSION_XML += xinput.xml
+libxcb_xinput_la_LDFLAGS = -version-info 0:0:0
+libxcb_xinput_la_LIBADD = $(XCB_LIBS)
+libxcb_xinput_la_SOURCES = xinput.c xinput.h
+endif
+
+if BUILD_XPRINT
+lib_LTLIBRARIES += libxcb-xprint.la
+EXTHEADERS += xprint.h
+EXTSOURCES += xprint.c
+EXTENSION_XML += xprint.xml
libxcb_xprint_la_LDFLAGS = -version-info 0:0:0
libxcb_xprint_la_LIBADD = $(XCB_LIBS)
libxcb_xprint_la_SOURCES = xprint.c xprint.h
+endif
+if BUILD_SELINUX
+lib_LTLIBRARIES += libxcb-xselinux.la
+EXTHEADERS += xselinux.h
+EXTSOURCES += xselinux.c
+EXTENSION_XML += xselinux.xml
+libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0
+libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
+libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
+endif
+
+if BUILD_XTEST
+lib_LTLIBRARIES += libxcb-xtest.la
+EXTHEADERS += xtest.h
+EXTSOURCES += xtest.c
+EXTENSION_XML += xtest.xml
libxcb_xtest_la_LDFLAGS = -version-info 0:0:0
libxcb_xtest_la_LIBADD = $(XCB_LIBS)
libxcb_xtest_la_SOURCES = xtest.c xtest.h
+endif
+if BUILD_XV
+lib_LTLIBRARIES += libxcb-xv.la
+EXTHEADERS += xv.h
+EXTSOURCES += xv.c
+EXTENSION_XML += xv.xml
libxcb_xv_la_LDFLAGS = -version-info 0:0:0
libxcb_xv_la_LIBADD = $(XCB_LIBS)
libxcb_xv_la_SOURCES = xv.c xv.h
+endif
+if BUILD_XVMC
+lib_LTLIBRARIES += libxcb-xvmc.la
+EXTHEADERS += xvmc.h
+EXTSOURCES += xvmc.c
+EXTENSION_XML += xvmc.xml
libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0
libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h
+endif
-libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0
-libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
-libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
+
+
+xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
+noinst_HEADERS = xcbint.h
+
+BUILT_SOURCES = $(EXTSOURCES) $(EXTHEADERS)
+CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(EXTENSION_XML)
$(EXTHEADERS) $(EXTSOURCES): c-client.xsl
pkg_failed=no
{ echo "$as_me:$LINENO: checking for NEEDED" >&5

23
libxcb/patches/patch-ad
View file

@ -1,12 +1,13 @@
$NetBSD: patch-ad,v 1.1 2008/03/24 21:09:00 bsadewitz Exp $
$NetBSD: patch-ad,v 1.2 2008/03/25 20:49:06 bsadewitz Exp $
--- xcb.pc.in.orig 2006-11-24 05:42:54.000000000 -0500
+++ xcb.pc.in
@@ -8,5 +8,5 @@ Description: X-protocol C Binding
Version: @PACKAGE_VERSION@
Requires.private: @NEEDED@
Libs: -L${libdir} -lxcb
-Libs.private: @LIBS@
-Cflags: -I${includedir}
+Libs.private: @LIBS@ @XTHREADLIB@
+Cflags: -I${includedir} @XTHREAD_CFLAGS@
--- src/c-client.xsl.orig 2007-11-04 20:13:32.000000000 -0500
+++ src/c-client.xsl
@@ -407,6 +407,8 @@ authorization from the authors.
<doc> * The parameter @p e supplied to this function must be NULL if</doc>
<doc> * <xsl:value-of select="xcb:xcb-prefix(@name)" />_unchecked(). is used.</doc>
<doc> * Otherwise, it stores the error if any.</doc>
+ <doc> *</doc>
+ <doc> * The returned value must be freed by the caller using free().</doc>
<doc> */</doc>
<field type="xcb_connection_t *" name="c" />
<field name="cookie">