Update to 1.8.1:

1.8.1:
Arnaud Fontaine (1):
      Add xkb_internals and xkb_issues to EXTRA_DIST.

Jeremy Huddleston (2):
      Revert "Fix include order with Xdmcp on WIN32"
      darwin: Use read(2) rather than recv(2)

Jon TURNEY (2):
      Fix build of xcb_auth.c with XDMCP on WIN32
      Update use of error_connection under WIN32 to _xcb_conn_ret_error()

Julien Cristau (1):
      Fallback to TCP if no protocol is specified and the UNIX connection fails

Julien Danjou (2):
      Bump xcb-proto requirement
      Release libxcb 1.8.1

Uli Schlachter (1):
      Fix a busy loop on BSD and Mac OS

1.8:
Aaron Plattner (1):
      xcb_disconnect: call shutdown() to force a disconnect

Alan Coopersmith (5):
      Use special path to sockets when running under Solaris Trusted Extensions
      Remove unused DECnet code
      Add #include <sys/socket.h> to xcb_conn.c
      Make launchd code in xcb_util.c match surrounding code indent levels
      If protocol is "unix", use a Unix domain socket, not TCP

Arvind Umrao (1):
      Added more error states and removed global error_connection

Carlos Garnacho (1):
      Handle XGE events with the "send event" flag

Christoph Reimann (14):
      added xcb_sumof() with restriction to uint8_t
      xkb: updated configure.ac/Makefile.am
      new and still preliminary functions for switch; feautures include     - API compatibility with valueparam     - r
      xkb: added pkg config file
      added generating code for _serialize() in case of variable sized structs (largely untested)
      preliminary handling of further special cases in unserialize     first attempts to unify serialize and unserializ
      partial rewrite of serialize helper functions completed;     _serialize() & _unserialize() have been tested for s
      bug fixes for all kinds of 'special cases'
      attempt to fix special case: variable fields followed by fixed size fields
      renamed most _unserialize() functions to _sizeof() and fixed _unserialize() for the special case of intermixed va
      special case 'intermixed variable and fixed size fields': fixed reply side, needs testing
      added accessors for special cases     major bugfixes include: rewrite of prefix related functions, merge of seria
      small fix in the xkb pkg file
      small fix to get rid of some compiler warnings     also added very basic documentation for xkb

David Coles (1):
      Add support for building with Python 3

James Jones (1):
      Insert, not append explicit xcbgen dir python path

Jamey Sharp (15):
      xcb_request_check: Sync even if an event was read for this sequence.
      _xcb_conn_wait: Shut down the connection on unexpected poll() events.
      xcb_send_request: Send all requests using a common internal send_request.
      xcb_request_check: Hold the I/O lock while deciding to sync.
      xcb_discard_reply: Simplify by re-using poll_for_reply helper.
      xcb_in: Use 64-bit sequence numbers internally everywhere.
      Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb/libxcb
      Include XKB in ./configure's summary output.
      Enable AM_SILENT_RULES on automake 1.11 or newer.
      Factor reader_list management out of wait_for_reply.
      Dequeue readers that can't receive any new responses.
      Introduce xcb_wait_for_event_until, for consuming responses in wire-order.
      Delete the old c-client.xsl.
      Revert "Introduce xcb_wait_for_event_until, for consuming responses in wire-order."
      Keep ALIGNOF definition out of the public namespace.

Jeetu Golani (8):
      Win32 code for xcb-1.5
      windefs.h is now called xcb_windefs.h - changed all includes to reflect that.Replaced one instance ofWIN32 with _
      changes in xcb_windefs.h - the flag  _XCB_WINDEFS_H replaces WINDEFS_H
      restablished inclusion of fcntl.h and netinet/tcp.h in xcb_util.c -- without these the code no longer compiled on
      xcb_in.c #ifndef _WIN32 inside of #if USE_POLL redundant and removed
      Set errno=0 in read_block. On Win32 there is no errno and this makes the     do..while loop execute only once. Al
      Replaced read() in read_block and _xcb_in_read() with recv for all     platforms. MSG_WAITALL is undefined in Min
      Don't validate FD_SETSIZE on Win32

Jeremy Huddleston (1):
      darwin: Don't use poll() when expected to run on darwin10 and prior

Jon TURNEY (1):
      Fix WIN32 compilation after commit 163c47bdc0d32785d831e4c93fea9ab7e023446b

Josh Triplett (1):
      Allow disconnecting connections that are in error state.

Julien Danjou (1):
      Release libxcb 1.8

Keith Packard (1):
      Make xcb_take_socket keep flushing until idle

Markus Duft (1):
      Support pre-IPv6 systems (without getaddrinfo)

Michael Stapelberg (1):
      Drop AI_ADDRCONFIG when resolving TCP addresses

Nick Bowler (1):
      xcb_auth: Fix memory leak in _xcb_get_auth_info.

Peter Harris (10):
      Merge branch 'master' of git://github.com/topcat/xcb-win32
      Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/libxcb
      Add xkb.* to gitignore
      Don't emit out-of-module sizeof definitions
      Fix memory leak in _sizeof implemented with _unserialize
      Make *_unserialize safe to use on buffers in-place
      Clean up a couple of warnings in xprint
      Fix _unserialize of reply headers
      Merge branch 'master' of git://anongit.freedesktop.org/~peterh/libxcb
      Don't try to sizeof(void)

Rami Ylimäki (3):
      Prevent reply waiters from being blocked.
      Prevent theoretical double free and leak on get_peer_sock_name.
      Introduce a variant of xcb_poll_for_event for examining event queue.

Ryan Pavlik (2):
      Fix include order with Xdmcp on WIN32
      Use WSAStartup()/WSACleanup() on WIN32

Uli Schlachter (3):
      xcb_take_socket: Document sequence wrap requirements
      Compute alignment correctly
      Fix a dead-lock due to xcb_poll_for_reply

Vincent Torri (1):
      fix Windows build and installation

4 files changed, 15 insertions, 14 deletions

diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 02193c547e3..6fe1f3fe380 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/04/08 19:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/06/03 17:29:41 wiz Exp $
 #
 
-DISTNAME=	libxcb-1.7
+DISTNAME=	libxcb-1.8.1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ COMMENT=	X protocol C-language Binding
 LICENSE=	mit # with no-advertising clause
 
 BUILD_DEPENDS+=		libxslt>=1.1.0:../../textproc/libxslt
-BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.6nb2:../../x11/py-xcbgen
+BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.7:../../x11/py-xcbgen
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -82,7 +82,7 @@ post-extract:
 #.include "../../devel/gperf/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/application.mk"
-BUILDLINK_API_DEPENDS.xcb-proto?=	xcb-proto>=1.6
+BUILDLINK_API_DEPENDS.xcb-proto?=	xcb-proto>=1.7
 .include "../../x11/xcb-proto/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
diff --git a/x11/libxcb/PLIST b/x11/libxcb/PLIST
index 74b9ead6642..cff6e8d5dca 100644
--- a/x11/libxcb/PLIST
+++ b/x11/libxcb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/15 12:24:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/06/03 17:29:41 wiz Exp $
 include/xcb/bigreq.h
 include/xcb/composite.h
 include/xcb/damage.h
@@ -21,6 +21,7 @@ include/xcb/xf86dri.h
 include/xcb/xfixes.h
 include/xcb/xinerama.h
 include/xcb/xinput.h
+include/xcb/xkb.h
 include/xcb/xprint.h
 include/xcb/xproto.h
 include/xcb/xselinux.h
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index b59846d06ca..33e5258321c 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2011/06/15 11:15:35 obache Exp $
+$NetBSD: distinfo,v 1.9 2012/06/03 17:29:41 wiz Exp $
 
-SHA1 (libxcb-1.7.tar.bz2) = 7540f0587907bce421914f0ddb813810cb2f36f8
-RMD160 (libxcb-1.7.tar.bz2) = f6748b9751e339c2669a6b9322b421abbbff7afb
-Size (libxcb-1.7.tar.bz2) = 318619 bytes
+SHA1 (libxcb-1.8.1.tar.bz2) = 98199b6054750a06cddd4e77baa4354af547ce6f
+RMD160 (libxcb-1.8.1.tar.bz2) = 19496c65b1e86d469a2fda6ea5037b4cadc4d681
+Size (libxcb-1.8.1.tar.bz2) = 375955 bytes
 SHA1 (patch-aa) = f099c6a56e965950e38cd451595a8c897fd824d1
-SHA1 (patch-ab) = 5c3600ef18cbe53a766c020d3dd6db5880a1921c
+SHA1 (patch-ab) = 5b4ec005b76dd10730edb6acb9f6b9dd48ef9b2e
 SHA1 (patch-ai) = 637affb3aa2f7d40e0aada4dadab8c695ea74b6f
diff --git a/x11/libxcb/patches/patch-ab b/x11/libxcb/patches/patch-ab
index 5e42ed8ef19..b283b3737b9 100644
--- a/x11/libxcb/patches/patch-ab
+++ b/x11/libxcb/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2010/05/02 11:56:21 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2012/06/03 17:29:41 wiz Exp $
 
---- configure.ac.orig	2010-04-09 14:55:28.000000000 +0000
+--- configure.ac.orig	2012-03-09 14:38:38.000000000 +0000
 +++ configure.ac
-@@ -33,7 +33,7 @@ AC_SUBST(HTML_CHECK_RESULT)
+@@ -35,7 +35,7 @@ AC_SUBST(HTML_CHECK_RESULT)
  
  # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)