Module Name: src
Committed By: mrg
Date: Tue Aug 2 09:11:39 UTC 2011
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xext
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/mi: Makefile
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
src/external/mit/xorg/server/xorg-server/render: Makefile
Log Message:
various updates for xorg-server 1.10.3.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/server/xorg-server/mi/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/randr/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/render/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.11 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.12
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.11 Fri Sep 25 06:04:30 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Aug 2 09:11:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.11 2009/09/25 06:04:30 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.12 2011/08/02 09:11:37 mrg Exp $
.for _SL in \
mi \
@@ -15,6 +15,7 @@
miext/damage \
miext/shadow \
miext/cw \
+ miext/sync \
Xi \
xkb \
xkbstubs \
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.10 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.11
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.10 Tue Nov 23 08:22:29 2010
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext Tue Aug 2 09:11:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xext,v 1.10 2010/11/23 08:22:29 mrg Exp $
+# $NetBSD: Makefile.Xext,v 1.11 2011/08/02 09:11:37 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/Xext
@@ -8,6 +8,10 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xi
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/xfixes
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/miext/sync
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/composite
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/damageext
CPPFLAGS+= -DHAVE_DIX_CONFIG_H
COPTS.panoramiX.c+= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.7 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.8
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.7 Sat May 22 02:40:40 2010
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Tue Aug 2 09:11:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fb,v 1.7 2010/05/22 02:40:40 mrg Exp $
+# $NetBSD: Makefile.fb,v 1.8 2011/08/02 09:11:37 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS.fb= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
@@ -11,10 +11,7 @@
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
- -I${DESTDIR}${X11INCDIR}/pixman-1 \
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= -DHAVE_DIX_CONFIG_H
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.10 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Tue Aug 2 09:11:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2011/08/02 09:11:38 mrg Exp $
.include <bsd.own.mk>
@@ -66,6 +66,7 @@
${LDADD.damageext} \
${LDADD.miext/damage} \
${LDADD.miext/shadow} \
+ ${LDADD.miext/sync} \
${LDADD.Xi} \
${LDADD.xkb} \
${LDADD.xkbstubs} \
@@ -83,13 +84,34 @@
-lm \
-lcrypto
-DPADD+= ${DPADD.dix} ${DPADD.fb} ${DPADD.mi} ${DPADD.xfixes} \
- ${DPADD.Xext} ${DPADD.config} ${DPADD.dbe} \
- ${DPADD.record} ${DPADD.render} ${DPADD.randr} ${DPADD.damageext} \
- ${DPADD.miext/damage} ${DPADD.miext/shadow} ${DPADD.Xi} \
- ${DPADD.xkb} ${DPADD.composite} ${DPADD.os} ${DPADD.glx} \
- ${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} \
+DPADD+= ${DPADD.dix} \
+ ${DPADD.fb} \
+ ${DPADD.mi} \
+ ${DPADD.xfixes} \
+ ${DPADD.Xext} \
+ ${DPADD.config} \
+ ${DPADD.dbe} \
+ ${DPADD.record} \
+ ${DPADD.render} \
+ ${DPADD.randr} \
+ ${DPADD.damageext} \
+ ${DPADD.miext/damage} \
+ ${DPADD.miext/shadow} \
+ ${DPADD.miext/sync} \
+ ${DPADD.Xi} \
+ ${DPADD.xkb} \
+ ${DPADD.xkbstubs} \
+ ${DPADD.composite} \
+ ${DPADD.os} \
+ ${DPADD.glx} \
+ ${LIBXFONT} \
+ ${LIBFREETYPE} \
+ ${LIBXAU} \
+ ${LIBFONTENC} \
+ ${LIBPIXMAN1} \
+ ${LIBXDMCP} \
+ ${LIBZ} \
+ ${LIBM} \
${LIBCRYPTO}
.if ${MACHINE_ARCH} == "i386"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.32 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.33
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.32 Mon Mar 28 10:08:06 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Tue Aug 2 09:11:38 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2011/03/28 10:08:06 plunky Exp $
+# $NetBSD: Makefile,v 1.33 2011/08/02 09:11:38 mrg Exp $
SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
- x86emu xaa xf86config xf8_16bpp
+ x86emu xaa xf86config
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "powerpc"
SUBDIR+= int10
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.2 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Aug 2 09:11:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/02 09:11:38 mrg Exp $
.include <bsd.own.mk>
@@ -52,6 +52,7 @@
LDADD+= ${LDADD.miext/damage}
LDADD+= ${LDADD.miext/shadow}
LDADD+= ${LDADD.miext/cw}
+LDADD+= ${LDADD.miext/sync}
LDADD+= ${LDADD.Xi}
LDADD+= ${LDADD.xkb}
LDADD+= ${LDADD.os}
@@ -91,6 +92,7 @@
${DPADD.miext/damage} \
${DPADD.miext/shadow} \
${DPADD.miext/cw} \
+ ${DPADD.miext/sync} \
${DPADD.Xi} \
${DPADD.xkb} \
${DPADD.composite} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.9 Sun Dec 5 15:57:40 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Tue Aug 2 09:11:38 2011
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2010/12/05 15:57:40 adam Exp $
+# $NetBSD: Makefile,v 1.10 2011/08/02 09:11:38 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
LIB= loader
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
+LOADERDIR= ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
+.PATH: ${LOADERDIR}
-SRCS= loader.c loadext.c loadmod.c dlloader.c os.c sdksyms.c
+SRCS= loader.c loadext.c loadmod.c os.c sdksyms.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
#SRCS+= SparcMulDiv.S
@@ -17,6 +18,7 @@
-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
-I${X11SRCDIR.xorg-server}/hw/xfree86/vbe \
-I${X11SRCDIR.xorg-server}/miext/cw \
+ -I${X11SRCDIR.xorg-server}/miext/sync \
-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
@@ -48,3 +50,8 @@
.include <bsd.x11.mk>
.include <bsd.lib.mk>
+
+sdksyms.c: sdksyms.sh
+ CPP='$(CPP)' AWK='$(AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+sdksyms.d: sdksyms.c
+CLEANFILES+= sdksyms.c
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.6 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile Tue Aug 2 09:11:38 2011
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/02 09:11:38 mrg Exp $
PROG= cvt
-SRCS= cvt.c xf86cvt.c
+SRCS= cvt.c xf86cvt.c xprintf.c
MAN= cvt.1
.include "../Makefile.utils"
@@ -20,6 +20,7 @@
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/man
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes
+.PATH: ${X11SRCDIR.xorg-server}/os
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.6 Tue Nov 23 08:22:34 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile Tue Aug 2 09:11:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/23 08:22:34 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/02 09:11:38 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -12,7 +12,7 @@
SRCS= xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \
xaaCpyPlane.c xaaFillRect.c xaaTEText.c xaaNonTEText.c \
- xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c xaaWrapper.c \
+ xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c \
xaaRect.c xaaLineMisc.c xaaBitOrder.c \
xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.13 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.13 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Tue Aug 2 09:11:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2011/08/02 09:11:38 mrg Exp $
.include <bsd.own.mk>
@@ -62,6 +62,7 @@
${LDADD.miext/damage} \
${LDADD.cw/cw} \
${LDADD.miext/shadow} \
+ ${LDADD.miext/sync} \
${LDADD.Xi} \
${LDADD.xkb} \
${LDADD.xkbstubs} \
@@ -86,6 +87,7 @@
${DPADD.miext/damage} \
${DPADD.cw/cw} \
${DPADD.miext/shadow} \
+ ${DPADD.miext/sync} \
${DPADD.Xi} \
${DPADD.xkb} \
${DPADD.composite} \
Index: src/external/mit/xorg/server/xorg-server/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/mi/Makefile:1.8 src/external/mit/xorg/server/xorg-server/mi/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/mi/Makefile:1.8 Tue Nov 23 08:22:35 2010
+++ src/external/mit/xorg/server/xorg-server/mi/Makefile Tue Aug 2 09:11:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,7 +6,7 @@
LIB= mi
.PATH: ${X11SRCDIR.xorg-server}/mi
-SRCS= miarc.c mibitblt.c mibstore.c micopy.c \
+SRCS= miarc.c mibitblt.c micopy.c \
micmap.c micursor.c midash.c midispcur.c mieq.c \
miexpose.c mifillarc.c mifillrct.c mifpolycon.c \
migc.c miglblt.c mioverlay.c mipointer.c mipoly.c \
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.8 src/external/mit/xorg/server/xorg-server/os/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.8 Tue Nov 23 08:22:35 2010
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Tue Aug 2 09:11:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -9,7 +9,7 @@
SRCS= WaitFor.c access.c auth.c connection.c io.c mitauth.c \
oscolor.c osinit.c utils.c xdmauth.c \
xstrans.c xprintf.c log.c xdmcp.c \
- rpcauth.c backtrace.c xsha1.c
+ rpcauth.c backtrace.c xprintf.c xsha1.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.4 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.4 Sat Aug 22 02:40:28 2009
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile Tue Aug 2 09:11:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/22 02:40:28 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/02 09:11:39 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,7 +6,7 @@
LIB= randr
.PATH: ${X11SRCDIR.xorg-server}/randr
-SRCS= mirandr.c randr.c randrstr.h rrcrtc.c rrdispatch.c \
+SRCS= randr.c randrstr.h rrcrtc.c rrdispatch.c \
rrinfo.c rrmode.c rroutput.c rrpointer.c rrproperty.c \
rrscreen.c rrsdispatch.c rrtransform.c
SRCS+= rrxinerama.c
Index: src/external/mit/xorg/server/xorg-server/render/Makefile
diff -u src/external/mit/xorg/server/xorg-server/render/Makefile:1.3 src/external/mit/xorg/server/xorg-server/render/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/render/Makefile:1.3 Sat Aug 22 02:40:28 2009
+++ src/external/mit/xorg/server/xorg-server/render/Makefile Tue Aug 2 09:11:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:28 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/02 09:11:39 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -7,7 +7,7 @@
.PATH: ${X11SRCDIR.xorg-server}/render
SRCS= animcur.c filter.c glyph.c matrix.c miindex.c mipict.c \
- mirect.c mitrap.c mitri.c picture.c render.c renderedge.c
+ mirect.c mitrap.c mitri.c picture.c render.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
