Require pixman-1 0.9.4, update pixman includes to new scheme
This commit is contained in:
parent
74feba4d77
commit
aa3c6aaaab
|
@ -617,7 +617,7 @@ XEXT_INC='-I$(top_srcdir)/Xext'
|
||||||
XEXT_LIB='$(top_builddir)/Xext/libXext.la'
|
XEXT_LIB='$(top_builddir)/Xext/libXext.la'
|
||||||
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.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.
|
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]"
|
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]"
|
||||||
|
|
2
fb/fb.h
2
fb/fb.h
|
@ -26,7 +26,7 @@
|
||||||
#define _FB_H_
|
#define _FB_H_
|
||||||
|
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
#include <pixman/pixman.h>
|
#include <pixman.h>
|
||||||
|
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "pixmap.h"
|
#include "pixmap.h"
|
||||||
|
|
|
@ -51,7 +51,7 @@ SOFTWARE.
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include <X11/Xprotostr.h>
|
#include <X11/Xprotostr.h>
|
||||||
#include "gc.h"
|
#include "gc.h"
|
||||||
#include <pixman/pixman.h>
|
#include <pixman.h>
|
||||||
|
|
||||||
typedef xPoint DDXPointRec;
|
typedef xPoint DDXPointRec;
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ Equipment Corporation.
|
||||||
#include "gc.h"
|
#include "gc.h"
|
||||||
#include "mi.h"
|
#include "mi.h"
|
||||||
#include "mispans.h"
|
#include "mispans.h"
|
||||||
#include <pixman/pixman.h>
|
#include <pixman.h>
|
||||||
|
|
||||||
#undef assert
|
#undef assert
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef _PICTURE_H_
|
#ifndef _PICTURE_H_
|
||||||
#define _PICTURE_H_
|
#define _PICTURE_H_
|
||||||
|
|
||||||
#include <pixman/pixman.h>
|
#include <pixman.h>
|
||||||
|
|
||||||
typedef struct _DirectFormat *DirectFormatPtr;
|
typedef struct _DirectFormat *DirectFormatPtr;
|
||||||
typedef struct _PictFormat *PictFormatPtr;
|
typedef struct _PictFormat *PictFormatPtr;
|
||||||
|
|
Loading…
Reference in New Issue