xserver: Branch 'master'

[Søren Sandmann Pedersen]

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

New commits:
diff-tree aa3c6aaaab213200591d29ddb2921adfb87ee5b4 (from 74feba4d77d74979a0ea478d666439ffc55001e5)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Mon Aug 6 19:00:59 2007 -0400

    Require pixman-1 0.9.4, update pixman includes to new scheme

diff --git a/configure.ac b/configure.ac
index 518f332..10fcbeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -617,7 +617,7 @@ XEXT_INC='-I$(top_srcdir)/Xext'
 XEXT_LIB='$(top_builddir)/Xext/libXext.la'
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
-PIXMAN="[pixman >= 0.9.2]"
+PIXMAN="[pixman-1 >= 0.9.4]"
 
 dnl Core modules for most extensions, et al.
 REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]"
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;