xserver: Branch 'master' - 3 commits

[Eric Anholt]

 configure.ac         |    2 +-
 exa/exa.c            |    2 +-
 fb/fb.h              |    2 +-
 fb/fbpict.c          |    1 -
 include/miscstruct.h |    2 +-
 mi/miregion.c        |    2 +-
 render/picture.h     |    2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

New commits:
diff-tree 57f7f2a5327a2d967a726bb4706e4f6b2f4b2cea (from d0dc9698ae4324d44ed4c0482d6858d0b73bff33)
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 22 09:02:03 2007 -0700

    Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"
    
    The corresponding pixman code hasn't been pushed, so revert until the code is
    ready.
    
    This reverts commit 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1.

diff --git a/configure.ac b/configure.ac
index fae439c..f0ede75 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.5]"
+PIXMAN="[pixman-1 >= 0.9.4]"
 PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
 AC_SUBST(PIXMAN_CFLAGS)
 
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 85b5171..8a146dd 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -397,7 +397,6 @@ 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 *
diff-tree d0dc9698ae4324d44ed4c0482d6858d0b73bff33 (from bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98)
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 22 09:00:45 2007 -0700

    Revert "Fix <pixman.h> include to <pixman/pixman.h>"
    
    The pixman headers have been located under pixman-1/ instead of pixman/ since
    around 2007-08-06, and pixman-1.pc has the updated include paths to account
    for this.
    
    This reverts commit feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68.

diff --git a/fb/fb.h b/fb/fb.h
index 27b49f6..df430b8 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -26,7 +26,7 @@
 #define _FB_H_
 
 #include <X11/X.h>
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 #include "scrnintstr.h"
 #include "pixmap.h"
diff --git a/include/miscstruct.h b/include/miscstruct.h
index 4f5b1d5..d240f1b 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -51,7 +51,7 @@ SOFTWARE.
 #include "misc.h"
 #include <X11/Xprotostr.h>
 #include "gc.h"
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 typedef xPoint DDXPointRec;
 
diff --git a/mi/miregion.c b/mi/miregion.c
index 28d38a2..45768a3 100644
--- a/mi/miregion.c
+++ b/mi/miregion.c
@@ -85,7 +85,7 @@ Equipment Corporation.
 #include "gc.h"
 #include "mi.h"
 #include "mispans.h"
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 #undef assert
 #ifdef DEBUG
diff --git a/render/picture.h b/render/picture.h
index 1719587..563a81b 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -25,7 +25,7 @@
 #ifndef _PICTURE_H_
 #define _PICTURE_H_
 
-#include <pixman/pixman.h>
+#include <pixman.h>
 
 typedef struct _DirectFormat	*DirectFormatPtr;
 typedef struct _PictFormat	*PictFormatPtr;
diff-tree bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98 (from feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 17 12:14:16 2007 -0700

    Fix overly-restrictive integer overflow check in EXA pixmap creation.
    
    The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
    created, due to treating a pitch value as a width.

diff --git a/exa/exa.c b/exa/exa.c
index aa42b92..b2faf2f 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -253,7 +253,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w
 				     pExaScr->info->pixmapPitchAlign);
     pExaPixmap->fb_size = pExaPixmap->fb_pitch * h;
 
-    if (pExaPixmap->fb_pitch > 32767) {
+    if (pExaPixmap->fb_pitch > 131071) {
 	fbDestroyPixmap(pPixmap);
 	return NULL;
     }