xserver: Branch 'master'

[Søren Sandmann Pedersen]

 configure.ac |    2 +-
 dix/main.c   |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 211511f150ce189681aff176c311fa8f312517e9
Author: Soren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Aug 11 14:40:42 2009 -0400

    Disable the out-of-bounds workaround in pixman.
    
    This workaround was necessary for older X servers, but now fb should
    be using correct coordinates.
    
    Also bump pixman requirement to 0.15.20.

diff --git a/configure.ac b/configure.ac
index 69d6abb..5ba91aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,7 +709,7 @@ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 dnl Core modules for most extensions, et al.
 REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.15] [kbproto >= 1.0.3]"
-REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.14]"
+REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
 dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
diff --git a/dix/main.c b/dix/main.c
index 94c252a..f96245a 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -82,6 +82,7 @@ Equipment Corporation.
 #include <X11/X.h>
 #include <X11/Xos.h>   /* for unistd.h  */
 #include <X11/Xproto.h>
+#include <pixman.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
@@ -138,6 +139,8 @@ int main(int argc, char *argv[], char *envp[])
 
     InitRegions();
 
+    pixman_disable_out_of_bounds_workaround();
+
     CheckUserParameters(argc, argv, envp);
 
     CheckUserAuthorization();