From aa3c6aaaab213200591d29ddb2921adfb87ee5b4 Mon Sep 17 00:00:00 2001
From: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon, 6 Aug 2007 19:00:59 -0400
Subject: Require pixman-1 0.9.4, update pixman includes to new scheme

---
 include/miscstruct.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/miscstruct.h')

diff --git a/include/miscstruct.h b/include/miscstruct.h
index 4f5b1d516..d240f1b28 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;
 
-- 
cgit v1.2.3


From feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed, 22 Aug 2007 16:54:29 +0100
Subject: Fix <pixman.h> include to <pixman/pixman.h>

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

(limited to 'include/miscstruct.h')

diff --git a/fb/fb.h b/fb/fb.h
index df430b8fd..27b49f681 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -26,7 +26,7 @@
 #define _FB_H_
 
 #include <X11/X.h>
-#include <pixman.h>
+#include <pixman/pixman.h>
 
 #include "scrnintstr.h"
 #include "pixmap.h"
diff --git a/include/miscstruct.h b/include/miscstruct.h
index d240f1b28..4f5b1d516 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.h>
+#include <pixman/pixman.h>
 
 typedef xPoint DDXPointRec;
 
diff --git a/mi/miregion.c b/mi/miregion.c
index 45768a34f..28d38a254 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.h>
+#include <pixman/pixman.h>
 
 #undef assert
 #ifdef DEBUG
diff --git a/render/picture.h b/render/picture.h
index 563a81b43..1719587a5 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -25,7 +25,7 @@
 #ifndef _PICTURE_H_
 #define _PICTURE_H_
 
-#include <pixman.h>
+#include <pixman/pixman.h>
 
 typedef struct _DirectFormat	*DirectFormatPtr;
 typedef struct _PictFormat	*PictFormatPtr;
-- 
cgit v1.2.3


From d0dc9698ae4324d44ed4c0482d6858d0b73bff33 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 22 Aug 2007 09:00:45 -0700
Subject: 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.
---
 fb/fb.h              | 2 +-
 include/miscstruct.h | 2 +-
 mi/miregion.c        | 2 +-
 render/picture.h     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/miscstruct.h')

diff --git a/fb/fb.h b/fb/fb.h
index 27b49f681..df430b8fd 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 4f5b1d516..d240f1b28 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 28d38a254..45768a34f 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 1719587a5..563a81b43 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;
-- 
cgit v1.2.3