xserver: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

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

New commits:
diff-tree b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0 (from parents)
Merge: 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1 6ef4ecd82670c37a354243166750d76a97959c8b
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Aug 21 14:26:34 2007 -0400

    Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/xorg/xserver

diff-tree 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1 (from 6a32a96d8df184c3ace4847beb48fdcb846d2286)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Aug 21 14:26:14 2007 -0400

    Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix
    bug 11620 (reported by Jens Stroebel.

diff --git a/configure.ac b/configure.ac
index 41cc103..ad6ae4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -623,7 +623,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 *