import libxcb-1.1.93, from Jeremy C. Reed and Michael Stapelberg

per pkgsrc-wip

8 files changed, 239 insertions, 0 deletions

diff --git a/x11/libxcb/DESCR b/x11/libxcb/DESCR
new file mode 100644
index 00000000000..99db029c700
--- /dev/null
+++ b/x11/libxcb/DESCR
@@ -0,0 +1,10 @@
+The libxcb package provides a replacement for the current Xlib interface.
+Some of its advantages include:
+- size: small library and lower memory footprint
+- latency hiding: batch several requests and wait for the replies later
+- direct protocol access: one-to-one mapping between interface and protocol
+- proven thread support: transparently access XCB from multiple threads
+- easy extension implementation: interfaces auto-generated from XML-XCB
+
+Xlib can also use XCB as a transport layer, allowing software to make
+requests and receive responses with both, which eases porting to XCB.
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
new file mode 100644
index 00000000000..f5bff6009c3
--- /dev/null
+++ b/x11/libxcb/Makefile
@@ -0,0 +1,87 @@
+# $NetBSD: Makefile,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+#
+
+DISTNAME=	libxcb-1.1.93
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	reed@reedmedia.net
+HOMEPAGE=	http://xcb.freedesktop.org/
+COMMENT=	X protocol C-language Binding
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+BUILD_DEPENDS+=		libxslt>=1.1.0:../../textproc/libxslt
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config automake
+
+CONFIGURE_ARGS+=	--disable-build-docs	# or needs doxygen
+CONFIGURE_ARGS+=	--disable-doxygen
+
+# Adds -Wl,-R to pkgconfig files automatically
+PKGCONFIG_OVERRIDE+=	xcb-composite.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-damage.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-dpms.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-glx.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-randr.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-record.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-render.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-res.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-screensaver.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-shape.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-shm.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-sync.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xevie.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xf86dri.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xfixes.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xinerama.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xprint.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xtest.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xv.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xvmc.pc.in
+PKGCONFIG_OVERRIDE+=	xcb.pc.in
+
+# libXdmcp is optional; adds support for XDM-AUTHORIZATION-1 in
+# addition to MIT-MAGIC-COOKIE-1.
+
+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 		# XXX Is this OK?
+.else
+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_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 "../../x11/xcb-proto/buildlink3.mk"
+.include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxcb/PLIST b/x11/libxcb/PLIST
new file mode 100644
index 00000000000..e4e9f54f573
--- /dev/null
+++ b/x11/libxcb/PLIST
@@ -0,0 +1,75 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+include/xcb/bigreq.h
+include/xcb/composite.h
+include/xcb/damage.h
+include/xcb/dpms.h
+include/xcb/glx.h
+include/xcb/randr.h
+include/xcb/record.h
+include/xcb/render.h
+include/xcb/res.h
+include/xcb/screensaver.h
+include/xcb/shape.h
+include/xcb/shm.h
+include/xcb/sync.h
+include/xcb/xc_misc.h
+include/xcb/xcb.h
+include/xcb/xcbext.h
+include/xcb/xevie.h
+include/xcb/xf86dri.h
+include/xcb/xfixes.h
+include/xcb/xinerama.h
+include/xcb/xinput.h
+include/xcb/xprint.h
+include/xcb/xproto.h
+include/xcb/xselinux.h
+include/xcb/xtest.h
+include/xcb/xv.h
+include/xcb/xvmc.h
+lib/libxcb-composite.la
+lib/libxcb-damage.la
+lib/libxcb-dpms.la
+lib/libxcb-glx.la
+lib/libxcb-randr.la
+lib/libxcb-record.la
+lib/libxcb-render.la
+lib/libxcb-res.la
+lib/libxcb-screensaver.la
+lib/libxcb-shape.la
+lib/libxcb-shm.la
+lib/libxcb-sync.la
+lib/libxcb-xevie.la
+lib/libxcb-xf86dri.la
+lib/libxcb-xfixes.la
+lib/libxcb-xinerama.la
+lib/libxcb-xprint.la
+lib/libxcb-xtest.la
+lib/libxcb-xv.la
+lib/libxcb-xvmc.la
+lib/libxcb.la
+lib/pkgconfig/xcb-composite.pc
+lib/pkgconfig/xcb-damage.pc
+lib/pkgconfig/xcb-dpms.pc
+lib/pkgconfig/xcb-glx.pc
+lib/pkgconfig/xcb-randr.pc
+lib/pkgconfig/xcb-record.pc
+lib/pkgconfig/xcb-render.pc
+lib/pkgconfig/xcb-res.pc
+lib/pkgconfig/xcb-screensaver.pc
+lib/pkgconfig/xcb-shape.pc
+lib/pkgconfig/xcb-shm.pc
+lib/pkgconfig/xcb-sync.pc
+lib/pkgconfig/xcb-xevie.pc
+lib/pkgconfig/xcb-xf86dri.pc
+lib/pkgconfig/xcb-xfixes.pc
+lib/pkgconfig/xcb-xinerama.pc
+lib/pkgconfig/xcb-xprint.pc
+lib/pkgconfig/xcb-xtest.pc
+lib/pkgconfig/xcb-xv.pc
+lib/pkgconfig/xcb-xvmc.pc
+lib/pkgconfig/xcb.pc
+share/doc/libxcb/tutorial/index.html
+share/doc/libxcb/tutorial/xcb.css
+@dirrm share/doc/libxcb/tutorial
+@dirrm share/doc/libxcb
+@dirrm include/xcb
diff --git a/x11/libxcb/buildlink3.mk b/x11/libxcb/buildlink3.mk
new file mode 100644
index 00000000000..7b8746f2dc8
--- /dev/null
+++ b/x11/libxcb/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+
+BUILDLINK_TREE+=	libxcb
+
+.if !defined(LIBXCB_BUILDLINK3_MK)
+LIBXCB_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libxcb?=	libxcb>=1.1.93
+BUILDLINK_PKGSRCDIR.libxcb?=	../../x11/libxcb
+
+.include "../../x11/xcb-proto/buildlink3.mk"
+.include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+.endif # LIBXCB_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libxcb
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
new file mode 100644
index 00000000000..a7e1b571087
--- /dev/null
+++ b/x11/libxcb/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+
+SHA1 (libxcb-1.1.93.tar.bz2) = 0b0dcf51da4a01b3584dddbe1d5c2df3edc44d15
+RMD160 (libxcb-1.1.93.tar.bz2) = 66b4c7db0091c519401a81d421f6f10e6b9a3b3b
+Size (libxcb-1.1.93.tar.bz2) = 463825 bytes
+SHA1 (patch-ab) = 77c89a95ab207a3efc8d5f983183d866c35c8e4f
+SHA1 (patch-ai) = 6c030296b818b2740c055a908eef0e8d250c2e59
+SHA1 (patch-aj) = 558465dbda40e05f9e76767ddd9d242ad1762719
diff --git a/x11/libxcb/patches/patch-ab b/x11/libxcb/patches/patch-ab
new file mode 100644
index 00000000000..30b5fd4b000
--- /dev/null
+++ b/x11/libxcb/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+
+--- configure.ac.orig	2007-11-04 18:17:11.000000000 -0500
++++ configure.ac
+@@ -33,7 +33,7 @@ AC_SUBST(HTML_CHECK_RESULT)
+ 
+ # 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)
+ 
+ have_xdmcp="no"
diff --git a/x11/libxcb/patches/patch-ai b/x11/libxcb/patches/patch-ai
new file mode 100644
index 00000000000..1706b16e083
--- /dev/null
+++ b/x11/libxcb/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+
+--- xcb.pc.in.orig	2006-11-24 05:42:54.000000000 -0500
++++ xcb.pc.in
+@@ -3,10 +3,12 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
++XTHREADLIB=@XTHREADLIB@
++
+ Name: XCB
+ 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_CPPFLAGS@
diff --git a/x11/libxcb/patches/patch-aj b/x11/libxcb/patches/patch-aj
new file mode 100644
index 00000000000..65f22708466
--- /dev/null
+++ b/x11/libxcb/patches/patch-aj
@@ -0,0 +1,11 @@
+$NetBSD: patch-aj,v 1.1.1.1 2009/04/06 10:23:59 drochner Exp $
+
+--- src/c_client.py.orig	2009-04-01 16:08:31.000000000 +0200
++++ src/c_client.py
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-from xml.etree.cElementTree import *
++from xml.etree.ElementTree import *
+ from os.path import basename
+ import getopt
+ import sys