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

This commit is contained in:
Søren Sandmann Pedersen 2007-08-06 19:00:59 -04:00
parent 74feba4d77
commit aa3c6aaaab
5 changed files with 5 additions and 5 deletions

View File

@ -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]"

View File

@ -26,7 +26,7 @@
#define _FB_H_
#include <X11/X.h>
#include <pixman/pixman.h>
#include <pixman.h>
#include "scrnintstr.h"
#include "pixmap.h"

View File

@ -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;

View File

@ -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

View File

@ -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;