From 211511f150ce189681aff176c311fa8f312517e9 Mon Sep 17 00:00:00 2001 From: Soren Sandmann Pedersen Date: Tue, 11 Aug 2009 14:40:42 -0400 Subject: [PATCH] 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. --- configure.ac | 2 +- dix/main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 #include /* for unistd.h */ #include +#include #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();