git update 25/6/2010

6 files changed, 430 insertions, 404 deletions

diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am
index ff69db908..eebebdd75 100644
--- a/libX11/man/Makefile.am
+++ b/libX11/man/Makefile.am
@@ -196,6 +196,7 @@ libman_PRE = \
 

 filemandir = $(FILE_MAN_DIR)

 fileman_PRE = Compose.man

+FILE_MAN_DIR_SUFFIX = $(FILE_MAN_DIR:@mandir@/man%=%)

 

 # What we actually install 

 

diff --git a/libxcb/configure.ac b/libxcb/configure.ac
index c5f454bee..680199b4f 100644
--- a/libxcb/configure.ac
+++ b/libxcb/configure.ac
@@ -1,222 +1,247 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.57)
-AC_INIT([libxcb],
-        1.6,
-        [xcb@lists.freedesktop.org])
-AC_CONFIG_SRCDIR([xcb.pc.in])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
-AM_PATH_PYTHON([2.5])
-
-PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
-AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes)
-
-AC_CONFIG_HEADERS([src/config.h])
-
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
-AC_PATH_PROG(XSLTPROC, xsltproc, no)
-if test "$XSLTPROC" = "no"; then
-   AC_MSG_ERROR([XCB requires xsltproc.])
-fi
-
-HTML_CHECK_RESULT=false
-if test x"$HAVE_CHECK" = xyes; then
-	if test x"$XSLTPROC" != xno; then
-		HTML_CHECK_RESULT=true
-	fi
-fi
-AC_SUBST(HTML_CHECK_RESULT)
-
-# Checks for pkg-config packages
-PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
-NEEDED="pthread-stubs xau >= 0.99.2"
-PKG_CHECK_MODULES(NEEDED, $NEEDED)
-
-have_xdmcp="no"
-PKG_CHECK_MODULES(XDMCP, xdmcp,
-	AC_CHECK_LIB(Xdmcp, XdmcpWrap,
-		[
-		AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])
-		NEEDED="$NEEDED xdmcp"
-		have_xdmcp="yes"
-		],
-		[
-		XDMCP_CFLAGS=
-		XDMCP_LIBS=
-		], [$XDMCP_LIBS]),
-	[AC_MSG_RESULT(no)])
-
-AC_SUBST(NEEDED)
-
-# Find the xcb-proto protocol descriptions
-AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
-AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
-AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
-
-# Find the xcb-proto version
-XCBPROTO_VERSION=`$PKG_CONFIG --modversion xcb-proto`
-AC_SUBST(XCBPROTO_VERSION)
-
-# Find the xcbgen Python package
-AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR)
-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
-AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
-AC_SUBST(XCBPROTO_XCBPYTHONDIR)
-
-AC_HEADER_STDC
-AC_SEARCH_LIBS(getaddrinfo, socket)
-AC_SEARCH_LIBS(connect, socket)
-
-case $host_os in
-linux*)
-	AC_DEFINE([HAVE_ABSTRACT_SOCKETS], 1, [Define if your platform supports abstract sockets])
-	;;
-esac
-
-dnl define buffer queue size
-AC_ARG_WITH([queue-size],
-            AC_HELP_STRING([--with-queue-size=SIZE],
-            [Set the XCB buffer queue size (default is 16384)]),
-            [xcb_queue_buffer_size="$withval"],
-            [xcb_queue_buffer_size=16384])
-AC_DEFINE_UNQUOTED(XCB_QUEUE_BUFFER_SIZE, [$xcb_queue_buffer_size],
-                   [XCB buffer queue size])
-
-dnl check for the sockaddr_un.sun_len member
-AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
-		[AC_DEFINE(HAVE_SOCKADDR_SUN_LEN,1,[Have the sockaddr_un.sun_len member.])],
-		[],
-		[ #include <sys/types.h>
-		  #include <sys/un.h>
-		])
-
-xcbincludedir='${includedir}/xcb'
-AC_SUBST(xcbincludedir)
-
-if  test "x$GCC" = xyes ; then
-    CWARNFLAGS="-Wall -pedantic -Wpointer-arith \
-		-Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
-else
-    AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
-    if test "x$SUNCC" = "xyes"; then
-	CWARNFLAGS="-v"
-    fi
-fi
-AC_SUBST(CWARNFLAGS)
-
-XCB_CHECK_VISIBILITY()
-
-# htmldir is not defined prior to autoconf 2.59c, so on earlier versions
-# set an equivalent value.
-AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],
-	  ['${datadir}/doc/${PACKAGE_TARNAME}'],
-	  ['${datadir}/doc/${PACKAGE}'])
-])])
-
-XCB_CHECK_DOXYGEN()
-
-case $host_os in
-	# darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
-	darwin*) ;;
-	*)
-		AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
-	;;
-esac
-
-XCB_EXTENSION(Composite, "yes")
-XCB_EXTENSION(Damage, "yes")
-XCB_EXTENSION(DPMS, "yes")
-XCB_EXTENSION(DRI2, "yes")
-XCB_EXTENSION(GLX, "yes")
-XCB_EXTENSION(RandR, "yes")
-XCB_EXTENSION(Record, "yes")
-XCB_EXTENSION(Render, "yes")
-XCB_EXTENSION(Resource, "yes")
-XCB_EXTENSION(Screensaver, "yes")
-XCB_EXTENSION(Shape, "yes")
-XCB_EXTENSION(Shm, "yes")
-XCB_EXTENSION(Sync, "yes")
-XCB_EXTENSION(Xevie, "yes")
-XCB_EXTENSION(XFixes, "yes")
-XCB_EXTENSION(XFree86-DRI, "yes")
-XCB_EXTENSION(Xinerama, "yes")
-XCB_EXTENSION(XInput, "no")
-XCB_EXTENSION(Xprint, "yes")
-XCB_EXTENSION(SELinux, "no")
-XCB_EXTENSION(XTest, "yes")
-XCB_EXTENSION(Xv, "yes")
-XCB_EXTENSION(XvMC, "yes")
-
-AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
-if test "x$LAUNCHD" = xauto; then
-	unset LAUNCHD
-	AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
-fi
-
-if test "x$LAUNCHD" = xyes ; then
-	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
-fi
-
-AC_CONFIG_FILES([
-Makefile
-doc/Makefile
-src/Makefile
-tests/Makefile
-])
-
-AC_CONFIG_FILES([
-xcb.pc
-xcb-composite.pc
-xcb-damage.pc
-xcb-dpms.pc
-xcb-dri2.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
-
-dnl Configuration output
-
-echo ""
-echo "  Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}"
-echo ""
-echo "  Configuration"
-echo "    XDM support.........: ${have_xdmcp}"
-echo "    Build unit tests....: ${HAVE_CHECK}"
-echo "    XCB buffer size.....: ${xcb_queue_buffer_size}"
-echo ""
-echo "  Used CFLAGS:"
-echo "    CPPFLAGS............: ${CPPFLAGS}"
-echo "    CFLAGS..............: ${CFLAGS}"
-echo "    Warning CFLAGS......: ${CWARNFLAGS}"
-echo ""
-echo "  Installation:"
-echo "    Prefix..............: ${prefix}"
-echo ""
+#                                               -*- Autoconf -*-

+# Process this file with autoconf to produce a configure script.

+

+AC_PREREQ(2.57)

+AC_INIT([libxcb],

+        1.6,

+        [xcb@lists.freedesktop.org])

+AC_CONFIG_SRCDIR([xcb.pc.in])

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+

+AM_PATH_PYTHON([2.5])

+

+PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])

+AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes)

+

+AC_CONFIG_HEADERS([src/config.h])

+

+AC_PROG_LIBTOOL

+AC_PROG_CC

+

+AC_PATH_PROG(XSLTPROC, xsltproc, no)

+if test "$XSLTPROC" = "no"; then

+   AC_MSG_ERROR([XCB requires xsltproc.])

+fi

+

+HTML_CHECK_RESULT=false

+if test x"$HAVE_CHECK" = xyes; then

+	if test x"$XSLTPROC" != xno; then

+		HTML_CHECK_RESULT=true

+	fi

+fi

+AC_SUBST(HTML_CHECK_RESULT)

+

+# Checks for pkg-config packages

+PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)

+NEEDED="pthread-stubs xau >= 0.99.2"

+PKG_CHECK_MODULES(NEEDED, $NEEDED)

+

+have_xdmcp="no"

+PKG_CHECK_MODULES(XDMCP, xdmcp,

+	AC_CHECK_LIB(Xdmcp, XdmcpWrap,

+		[

+		AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])

+		NEEDED="$NEEDED xdmcp"

+		have_xdmcp="yes"

+		],

+		[

+		XDMCP_CFLAGS=

+		XDMCP_LIBS=

+		], [$XDMCP_LIBS]),

+	[AC_MSG_RESULT(no)])

+

+AC_SUBST(NEEDED)

+

+# Find the xcb-proto protocol descriptions

+AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)

+XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`

+AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)

+AC_SUBST(XCBPROTO_XCBINCLUDEDIR)

+

+# Find the xcb-proto version

+XCBPROTO_VERSION=`$PKG_CONFIG --modversion xcb-proto`

+AC_SUBST(XCBPROTO_VERSION)

+

+# Find the xcbgen Python package

+AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR)

+XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`

+AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)

+AC_SUBST(XCBPROTO_XCBPYTHONDIR)

+

+AC_HEADER_STDC

+AC_SEARCH_LIBS(getaddrinfo, socket)

+AC_SEARCH_LIBS(connect, socket)

+

+case $host_os in

+linux*)

+	AC_DEFINE([HAVE_ABSTRACT_SOCKETS], 1, [Define if your platform supports abstract sockets])

+	;;

+esac

+

+dnl define buffer queue size

+AC_ARG_WITH([queue-size],

+            AC_HELP_STRING([--with-queue-size=SIZE],

+            [Set the XCB buffer queue size (default is 16384)]),

+            [xcb_queue_buffer_size="$withval"],

+            [xcb_queue_buffer_size=16384])

+AC_DEFINE_UNQUOTED(XCB_QUEUE_BUFFER_SIZE, [$xcb_queue_buffer_size],

+                   [XCB buffer queue size])

+

+dnl check for the sockaddr_un.sun_len member

+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],

+		[AC_DEFINE(HAVE_SOCKADDR_SUN_LEN,1,[Have the sockaddr_un.sun_len member.])],

+		[],

+		[ #include <sys/types.h>

+		  #include <sys/un.h>

+		])

+

+xcbincludedir='${includedir}/xcb'

+AC_SUBST(xcbincludedir)

+

+if  test "x$GCC" = xyes ; then

+    CWARNFLAGS="-Wall -pedantic -Wpointer-arith \

+		-Wstrict-prototypes -Wmissing-declarations -Wnested-externs"

+else

+    AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])

+    if test "x$SUNCC" = "xyes"; then

+	CWARNFLAGS="-v"

+    fi

+fi

+AC_SUBST(CWARNFLAGS)

+

+XCB_CHECK_VISIBILITY()

+

+# htmldir is not defined prior to autoconf 2.59c, so on earlier versions

+# set an equivalent value.

+AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],

+	  ['${datadir}/doc/${PACKAGE_TARNAME}'],

+	  ['${datadir}/doc/${PACKAGE}'])

+])])

+

+XCB_CHECK_DOXYGEN()

+

+case $host_os in

+	# darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)

+	darwin*) ;;

+	*)

+		AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )

+	;;

+esac

+

+XCB_EXTENSION(Composite, "yes")

+XCB_EXTENSION(Damage, "yes")

+XCB_EXTENSION(DPMS, "yes")

+XCB_EXTENSION(DRI2, "yes")

+XCB_EXTENSION(GLX, "yes")

+XCB_EXTENSION(RandR, "yes")

+XCB_EXTENSION(Record, "yes")

+XCB_EXTENSION(Render, "yes")

+XCB_EXTENSION(Resource, "yes")

+XCB_EXTENSION(Screensaver, "yes")

+XCB_EXTENSION(Shape, "yes")

+XCB_EXTENSION(Shm, "yes")

+XCB_EXTENSION(Sync, "yes")

+XCB_EXTENSION(Xevie, "yes")

+XCB_EXTENSION(XFixes, "yes")

+XCB_EXTENSION(XFree86-DRI, "yes")

+XCB_EXTENSION(Xinerama, "yes")

+XCB_EXTENSION(XInput, "no")

+XCB_EXTENSION(Xprint, "yes")

+XCB_EXTENSION(SELinux, "no")

+XCB_EXTENSION(XTest, "yes")

+XCB_EXTENSION(Xv, "yes")

+XCB_EXTENSION(XvMC, "yes")

+

+AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])

+if test "x$LAUNCHD" = xauto; then

+	unset LAUNCHD

+	AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])

+fi

+

+if test "x$LAUNCHD" = xyes ; then

+	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])

+fi

+

+AC_CONFIG_FILES([

+Makefile

+doc/Makefile

+src/Makefile

+tests/Makefile

+])

+

+AC_CONFIG_FILES([

+xcb.pc

+xcb-composite.pc

+xcb-damage.pc

+xcb-dpms.pc

+xcb-dri2.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

+

+dnl Configuration output

+

+echo ""

+echo "  Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}"

+echo ""

+echo "  Configuration"

+echo "    XDM support.........: ${have_xdmcp}"

+echo "    Build unit tests....: ${HAVE_CHECK}"

+echo "    XCB buffer size.....: ${xcb_queue_buffer_size}"

+echo ""

+echo "  X11 extensions"

+echo "    Composite...........: ${BUILD_COMPOSITE}"

+echo "    Damage..............: ${BUILD_DAMAGE}"

+echo "    Dpms................: ${BUILD_DPMS}"

+echo "    Dri2................: ${BUILD_DRI2}"

+echo "    Glx.................: ${BUILD_GLX}"

+echo "    Randr...............: ${BUILD_RANDR}"

+echo "    Record..............: ${BUILD_RECORD}"

+echo "    Render..............: ${BUILD_RENDER}"

+echo "    Resource............: ${BUILD_RESOURCE}"

+echo "    Screensaver.........: ${BUILD_SCREENSAVER}"

+echo "    selinux.............: ${BUILD_SELINUX}"

+echo "    Shape...............: ${BUILD_SHAPE}"

+echo "    Shm.................: ${BUILD_SHM}"

+echo "    Sync................: ${BUILD_SYNC}"

+echo "    Xevie...............: ${BUILD_XEVIE}"

+echo "    Xfixes..............: ${BUILD_XFIXES}"

+echo "    Xfree86-dri.........: ${BUILD_XFREE86_DRI}"

+echo "    xinerama............: ${BUILD_XINERAMA}"

+echo "    xinput..............: ${BUILD_XINPUT}"

+echo "    xprint..............: ${BUILD_XPRINT}"

+echo "    xtest...............: ${BUILD_XTEST}"

+echo "    xv..................: ${BUILD_XV}"

+echo "    xvmc................: ${BUILD_XVMC}"

+echo ""

+echo "  Used CFLAGS:"

+echo "    CPPFLAGS............: ${CPPFLAGS}"

+echo "    CFLAGS..............: ${CFLAGS}"

+echo "    Warning CFLAGS......: ${CWARNFLAGS}"

+echo ""

+echo "  Installation:"

+echo "    Prefix..............: ${prefix}"

+echo ""

diff --git a/libxcb/xcb-proto/src/xf86dri.xml b/libxcb/xcb-proto/src/xf86dri.xml
index 981c9682f..003728dd8 100644
--- a/libxcb/xcb-proto/src/xf86dri.xml
+++ b/libxcb/xcb-proto/src/xf86dri.xml
@@ -1,167 +1,172 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2005 Jeremy Kolb.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person ob/Sintaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the authors or their
-institutions shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from the authors.
--->
-
-<xcb header="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri"
-    major-version="4" minor-version="1">
-
-    <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
-
-    <!-- Types -->
-
-    <struct name="DrmClipRect">
-	<field type="INT16" name="x1" />
-	<field type="INT16" name="y1" />
-	<field type="INT16" name="x2" />
-	<field type="INT16" name="x3" />
-    </struct>
-	
-    <!-- Requests -->
-    <request name="QueryVersion" opcode="0">
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD16" name="dri_major_version" />
-	    <field type="CARD16" name="dri_minor_version" />
-	    <field type="CARD32" name="dri_minor_patch" />
-	</reply>
-    </request>
-
-    <request name="QueryDirectRenderingCapable" opcode="1">
-	<field type="CARD32" name="screen" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="BOOL" name="is_capable" />
-	</reply>
-    </request>
-
-    <request name="OpenConnection" opcode="2">
-	<field type="CARD32" name="screen" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD32" name="sarea_handle_low" />
-	    <field type="CARD32" name="sarea_handle_high" />
-	    <field type="CARD32" name="bus_id_len" />
-	    <pad bytes="12" />
-	    <list type="char" name="bus_id">
-		<fieldref>bus_id_len</fieldref>
-	    </list>
-	</reply>
-    </request>
-
-    <request name="CloseConnection" opcode="3">
-	<field type="CARD32" name="screen" />
-    </request>
-
-    <request name="GetClientDriverName" opcode="4">
-	<field type="CARD32" name="screen" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD32" name="client_driver_major_version" />
-	    <field type="CARD32" name="client_driver_minor_version" />
-	    <field type="CARD32" name="client_driver_patch_version" />
-	    <field type="CARD32" name="client_driver_name_len" />
-	    <pad bytes="8" />
-	    <list type="char" name="client_driver_name">
-		<fieldref>client_driver_name_len</fieldref>
-	    </list>
-	</reply>
-    </request>
-
-    <request name="CreateContext" opcode="5">
-	<field type="CARD32" name="screen" />
-	<field type="CARD32" name="visual" />
-	<field type="CARD32" name="context" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD32" name="hw_context" />
-	</reply>
-    </request>
-
-    <request name="DestroyContext" opcode="6">
-	<field type="CARD32" name="screen" />
-	<field type="CARD32" name="context" />
-    </request>
-
-    <request name="CreateDrawable" opcode="7">
-	<field type="CARD32" name="screen" />
-	<field type="CARD32" name="drawable" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD32" name="hw_drawable_handle" />
-	</reply>
-    </request>
-
-    <request name="DestroyDrawable" opcode="8">
-	<field type="CARD32" name="screen" />
-	<field type="CARD32" name="drawable" />
-    </request>
-
-    <request name="GetDrawableInfo" opcode="9">
-	<field type="CARD32" name="screen" />
-	<field type="CARD32" name="drawable" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD32" name="drawable_table_index" />
-	    <field type="CARD32" name="drawable_table_stamp" />
-	    <field type="INT16" name="drawable_origin_X" />
-	    <field type="INT16" name="drawable_origin_Y" />
-	    <field type="INT16" name="drawable_size_W" />
-	    <field type="INT16" name="drawable_size_H" />
-	    <field type="CARD32" name="num_clip_rects" />
-	    <pad bytes="4" />
-	    <list type="DrmClipRect" name="clip_rects">
-		<fieldref>num_clip_rects</fieldref>
-	    </list>
-	</reply>
-    </request>
-
-    <request name="GetDeviceInfo" opcode="10">
-	<field type="CARD32" name="screen" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD32" name="framebuffer_handle_low" />
-	    <field type="CARD32" name="framebuffer_handle_high" />
-	    <field type="CARD32" name="framebuffer_origin_offset" />
-	    <field type="CARD32" name="framebuffer_size" />
-	    <field type="CARD32" name="framebuffer_stride" />
-	    <field type="CARD32" name="device_private_size" />
-	    <list type="CARD32" name="device_private">
-		<fieldref>device_private_size</fieldref>
-	    </list>
-	</reply>
-    </request>
-
-    <!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->
-    <request name="AuthConnection" opcode="11">
-	<field type="CARD32" name="screen" />
-	<field type="CARD32" name="magic" />
-	<reply>
-	    <pad bytes="1" />
-	    <field type="CARD32" name="authenticated" />
-	</reply>
-    </request>	    
-</xcb>
+<?xml version="1.0" encoding="utf-8"?>

+<!--

+Copyright (C) 2005 Jeremy Kolb.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person ob/Sintaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all

+copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the names of the authors or their

+institutions shall not be used in advertising or otherwise to promote the

+sale, use or other dealings in this Software without prior written

+authorization from the authors.

+-->

+

+<xcb header="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri"

+    major-version="4" minor-version="1">

+

+    <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->

+

+    <!-- Types -->

+

+    <struct name="DrmClipRect">

+	<field type="INT16" name="x1" />

+	<field type="INT16" name="y1" />

+	<field type="INT16" name="x2" />

+	<field type="INT16" name="x3" />

+    </struct>

+	

+    <!-- Requests -->

+    <request name="QueryVersion" opcode="0">

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD16" name="dri_major_version" />

+	    <field type="CARD16" name="dri_minor_version" />

+	    <field type="CARD32" name="dri_minor_patch" />

+	</reply>

+    </request>

+

+    <request name="QueryDirectRenderingCapable" opcode="1">

+	<field type="CARD32" name="screen" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="BOOL" name="is_capable" />

+	</reply>

+    </request>

+

+    <request name="OpenConnection" opcode="2">

+	<field type="CARD32" name="screen" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD32" name="sarea_handle_low" />

+	    <field type="CARD32" name="sarea_handle_high" />

+	    <field type="CARD32" name="bus_id_len" />

+	    <pad bytes="12" />

+	    <list type="char" name="bus_id">

+		<fieldref>bus_id_len</fieldref>

+	    </list>

+	</reply>

+    </request>

+

+    <request name="CloseConnection" opcode="3">

+	<field type="CARD32" name="screen" />

+    </request>

+

+    <request name="GetClientDriverName" opcode="4">

+	<field type="CARD32" name="screen" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD32" name="client_driver_major_version" />

+	    <field type="CARD32" name="client_driver_minor_version" />

+	    <field type="CARD32" name="client_driver_patch_version" />

+	    <field type="CARD32" name="client_driver_name_len" />

+	    <pad bytes="8" />

+	    <list type="char" name="client_driver_name">

+		<fieldref>client_driver_name_len</fieldref>

+	    </list>

+	</reply>

+    </request>

+

+    <request name="CreateContext" opcode="5">

+	<field type="CARD32" name="screen" />

+	<field type="CARD32" name="visual" />

+	<field type="CARD32" name="context" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD32" name="hw_context" />

+	</reply>

+    </request>

+

+    <request name="DestroyContext" opcode="6">

+	<field type="CARD32" name="screen" />

+	<field type="CARD32" name="context" />

+    </request>

+

+    <request name="CreateDrawable" opcode="7">

+	<field type="CARD32" name="screen" />

+	<field type="CARD32" name="drawable" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD32" name="hw_drawable_handle" />

+	</reply>

+    </request>

+

+    <request name="DestroyDrawable" opcode="8">

+	<field type="CARD32" name="screen" />

+	<field type="CARD32" name="drawable" />

+    </request>

+

+    <request name="GetDrawableInfo" opcode="9">

+	<field type="CARD32" name="screen" />

+	<field type="CARD32" name="drawable" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD32" name="drawable_table_index" />

+	    <field type="CARD32" name="drawable_table_stamp" />

+	    <field type="INT16" name="drawable_origin_X" />

+	    <field type="INT16" name="drawable_origin_Y" />

+	    <field type="INT16" name="drawable_size_W" />

+	    <field type="INT16" name="drawable_size_H" />

+	    <field type="CARD32" name="num_clip_rects" />

+	    <field type="INT16" name="back_x" />

+	    <field type="INT16" name="back_y" />

+	    <field type="CARD32" name="num_back_clip_rects" />

+	    <list type="DrmClipRect" name="clip_rects">

+		<fieldref>num_clip_rects</fieldref>

+	    </list>

+	    <list type="DrmClipRect" name="back_clip_rects">

+		<fieldref>num_back_clip_rects</fieldref>

+	    </list>

+	</reply>

+    </request>

+

+    <request name="GetDeviceInfo" opcode="10">

+	<field type="CARD32" name="screen" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD32" name="framebuffer_handle_low" />

+	    <field type="CARD32" name="framebuffer_handle_high" />

+	    <field type="CARD32" name="framebuffer_origin_offset" />

+	    <field type="CARD32" name="framebuffer_size" />

+	    <field type="CARD32" name="framebuffer_stride" />

+	    <field type="CARD32" name="device_private_size" />

+	    <list type="CARD32" name="device_private">

+		<fieldref>device_private_size</fieldref>

+	    </list>

+	</reply>

+    </request>

+

+    <!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->

+    <request name="AuthConnection" opcode="11">

+	<field type="CARD32" name="screen" />

+	<field type="CARD32" name="magic" />

+	<reply>

+	    <pad bytes="1" />

+	    <field type="CARD32" name="authenticated" />

+	</reply>

+    </request>	    

+</xcb>

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 2b611b8ed..21ad15e4c 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -794,9 +794,6 @@ APPLEWMPROTO="applewmproto >= 1.4"
 

 dnl Core modules for most extensions, et al.

 SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.0.99.3] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

-REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"

-REQUIRED_LIBS="xfont xau"

-

 # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc

 AC_SUBST(SDK_REQUIRED_MODULES)

 

@@ -807,6 +804,7 @@ LIBDRI="dri >= 7.8.0"
 LIBDRM="libdrm >= 2.3.0"

 LIBGL="gl >= 7.1.0"

 LIBXEXT="xext >= 1.0.99.4"

+LIBXFONT="xfont >= 1.4.2"

 LIBXI="xi >= 1.2.99.1"

 LIBXTST="xtst >= 1.0.99.2"

 LIBPCIACCESS="pciaccess >= 0.8.0"

@@ -819,7 +817,9 @@ LIBPIXMAN="pixman-1 >= 0.15.20"
 dnl Pixman is always required, but we separate it out so we can link

 dnl specific modules against it

 PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)

-REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN"

+REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"

+

+REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"

 

 if test "x$CONFIG_UDEV" = xyes &&

  { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then

@@ -1515,7 +1515,7 @@ fi
 

 dnl Xnest DDX

 

-PKG_CHECK_MODULES(XNESTMODULES, [xfont $LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])

+PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])

 AC_MSG_CHECKING([whether to build Xnest DDX])

 if test "x$XNEST" = xauto; then

 	XNEST="$have_xnest"

@@ -1867,7 +1867,7 @@ if test "x$XWIN" = xyes; then
 	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])

 	AC_CHECK_TOOL(WINDRES, windres)

 

-	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])

+	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau])

 

 	if test "x$WINDOWSWM" = xauto; then

 		PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])

@@ -1956,7 +1956,7 @@ AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
 dnl DMX DDX

 PKG_CHECK_MODULES(

 	[DMXMODULES],

-	[xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],

+	[xmuu $LIBXEXT x11 xrender xfixes $LIBXI $DMXPROTO xau $XDMCP_MODULES],

 	[PKG_CHECK_MODULES(

 		[XDMXCONFIG_DEP],

 		[xaw7 xmu xt xpm x11],

@@ -2061,7 +2061,7 @@ if test "$KDRIVE" = yes; then
        AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])

     fi

 

-    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp"

+    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"

     if test "x$XV" = xyes; then

         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"

     fi

diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index 496e075d9..1c9da1e26 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1924,9 +1924,7 @@ InitFonts (void)
 {

     patternCache = MakeFontPatternCache();

 

-    BuiltinRegisterFpeFunctions();

-    FontFileRegisterFpeFunctions();

-    fs_register_fpe_functions();

+    register_fpe_functions();

 }

 

 int

diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h
index 4e23da845..7ed29cfba 100644
--- a/xorg-server/include/dixfont.h
+++ b/xorg-server/include/dixfont.h
@@ -141,10 +141,7 @@ extern _X_EXPORT void InitGlyphCaching(void);
 

 extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);

 

-/*

- * libXfont/src/builtins/builtin.h

- */

-extern _X_EXPORT void BuiltinRegisterFpeFunctions(void);

+extern _X_EXPORT void register_fpe_functions(void);

 

 /*

  * libXfont stubs.