diff options
author | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
commit | 9b15e1cfe4c6ca9862c2865c4adbc21a758e9734 (patch) | |
tree | 13452621f70604f08fd91b1bd46ed6341dbc2ea7 /libxcb | |
parent | bd13c464f728719fceb8a4918b52727ec125ea6e (diff) | |
parent | de8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff) | |
download | vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.gz vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.bz2 vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
Conflicts:
xorg-server/Xext/xf86bigfont.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'libxcb')
-rw-r--r-- | libxcb/NEWS | 13 | ||||
-rw-r--r-- | libxcb/configure.ac | 2 | ||||
-rw-r--r-- | libxcb/src/Makefile.am | 3 | ||||
-rw-r--r-- | libxcb/xcb-proto/NEWS | 6 | ||||
-rw-r--r-- | libxcb/xcb-proto/configure.ac | 2 |
5 files changed, 23 insertions, 3 deletions
diff --git a/libxcb/NEWS b/libxcb/NEWS index 66d6253ae..533d72b87 100644 --- a/libxcb/NEWS +++ b/libxcb/NEWS @@ -1,3 +1,16 @@ +Release 1.9 (2012-10-05) +======================== + +* Always include "config.h" at the start of all C source files. +* Add AC_USE_SYSTEM_EXTENSIONS to allow use of more system functionality +* Return connection failure if display string specifies non-existent screen +* c_client: Fix parallel-make issue creating 'man' directory +* xcb_connect: launchd: Don't fall back on tcp if $DISPLAY is a path to a launchd socket +* c_client.py: generate manpages +* Allow xcb_send_request with >MAX_IOV iovecs +* Add a .gitignore for src/man/ +* Fix a multi-thread deadlock + Release 1.8.1 (2012-03-09) ========================== - Fix a busy loop on BSD and Mac OS diff --git a/libxcb/configure.ac b/libxcb/configure.ac index 3f44b534d..736438305 100644 --- a/libxcb/configure.ac +++ b/libxcb/configure.ac @@ -4,7 +4,7 @@ # Initialize Autoconf AC_PREREQ(2.57) AC_INIT([libxcb], - 1.8.1, + 1.9, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb.pc.in]) # Set common system defines for POSIX extensions, such as _GNU_SOURCE diff --git a/libxcb/src/Makefile.am b/libxcb/src/Makefile.am index fed691447..6b5a2c3c4 100644 --- a/libxcb/src/Makefile.am +++ b/libxcb/src/Makefile.am @@ -227,7 +227,8 @@ noinst_HEADERS = xcbint.h STATIC_MANS = man/xcb-examples.3 man/xcb-requests.3 BUILT_MANS = man/xcb_*.3 -man_MANS = = $(STATIC_MANS) $(BUILT_MANS) +man_MANS = $(STATIC_MANS) $(BUILT_MANS) +EXTRA_DIST = $(STATIC_MANS) BUILT_SOURCES = $(EXTSOURCES) $(BUILT_MANS) CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(BUILT_MANS) diff --git a/libxcb/xcb-proto/NEWS b/libxcb/xcb-proto/NEWS index 3e50762ab..ebe184532 100644 --- a/libxcb/xcb-proto/NEWS +++ b/libxcb/xcb-proto/NEWS @@ -1,3 +1,9 @@ +Release 1.8 (2012-10-05) +======================== +* dri2: Update to DRI2 1.4 +* XKB: Fix broken events +* xproto: add doc tags, xcbgen: handle doc tags + Release 1.7.1 (2012-03-23) ========================== * Add ge and xf86vidmode protocol descriptions diff --git a/libxcb/xcb-proto/configure.ac b/libxcb/xcb-proto/configure.ac index e20c9aa1e..ba6a90cd8 100644 --- a/libxcb/xcb-proto/configure.ac +++ b/libxcb/xcb-proto/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([XCB Proto], - 1.7.1, + 1.8, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) |