summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoren Sandmann Pedersen <ssp@redhat.com>2009-08-11 14:40:42 -0400
committerSoren Sandmann Pedersen <ssp@redhat.com>2009-08-11 14:40:42 -0400
commit211511f150ce189681aff176c311fa8f312517e9 (patch)
treefcff09c6998a23f797d690a3744b4e21cc9e2a96
parent93d9646c713336e03c135204c061f561d3654e23 (diff)
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.
-rw-r--r--configure.ac2
-rw-r--r--dix/main.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 69d6abb4d..5ba91aa83 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 94c252af3..f96245a4b 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();