xserver: Branch 'master'

[Søren Sandmann Pedersen]

 configure.ac |    2 +-
 fb/fbpict.c  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 943dd6ad99670c283a6869ea6c5f751acbd73134 (from 13949f997289068354e83bc83e50d97b8232efb1)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Thu Aug 23 12:15:03 2007 -0400

    Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now.
    
    This reverts commit 57f7f2a5327a2d967a726bb4706e4f6b2f4b2cea.

diff --git a/configure.ac b/configure.ac
index f0ede75..fae439c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -624,7 +624,7 @@ XEXT_INC='-I$(top_srcdir)/Xext'
 XEXT_LIB='$(top_builddir)/Xext/libXext.la'
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
-PIXMAN="[pixman-1 >= 0.9.4]"
+PIXMAN="[pixman-1 >= 0.9.5]"
 PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
 AC_SUBST(PIXMAN_CFLAGS)
 
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 8a146dd..85b5171 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -397,6 +397,7 @@ set_image_properties (pixman_image_t *im
     }
     
     pixman_image_set_filter (image, filter, (pixman_fixed_t *)pict->filter_params, pict->filter_nparams);
+    pixman_image_set_source_clipping (image, TRUE);
 }
 
 pixman_image_t *