Module Name: src
Committed By: jmcneill
Date: Sat Jan 15 13:54:53 UTC 2011
Modified Files:
src/external/mit/xorg/server/xorg-server/damageext: Makefile
src/external/mit/xorg/server/xorg-server/dbe: Makefile.dbe
src/external/mit/xorg/server/xorg-server/exa: Makefile.exa
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
Log Message:
Ensure that HAVE_DIX_CONFIG_H is defined for damageext, dbe, exa, and glx
builds. Fixes recent trouble with the Composite extension, and should fix
some problems with the DAMAGE extension and who knows what else.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/damageext/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
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/damageext/Makefile
diff -u src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.2 src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.2 Sat Aug 22 02:40:26 2009
+++ src/external/mit/xorg/server/xorg-server/damageext/Makefile Sat Jan 15 13:54:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/08/22 02:40:26 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/01/15 13:54:52 jmcneill Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -15,7 +15,8 @@
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${X11SRCDIR.xorg-server}/../include
+ -I${X11SRCDIR.xorg-server}/../include \
+ ${X11FLAGS.DIX} ${X11INCS.DIX}
COPTS.damageext.c+= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
diff -u src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.5 src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.6
--- src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.5 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe Sat Jan 15 13:54:53 2011
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.dbe,v 1.5 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile.dbe,v 1.6 2011/01/15 13:54:53 jmcneill Exp $
.PATH: ${X11SRCDIR.xorg-server}/dbe
SRCS.dbe= dbe.c midbe.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/Xext \
- -I${DESTDIR}${X11INCDIR}/pixman-1
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include \
+ ${X11FLAGS.DIX} ${X11INCS.DIX}
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
Index: src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
diff -u src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.4 src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.5
--- src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.4 Tue Nov 23 08:22:30 2010
+++ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa Sat Jan 15 13:54:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.exa,v 1.4 2010/11/23 08:22:30 mrg Exp $
+# $NetBSD: Makefile.exa,v 1.5 2011/01/15 13:54:53 jmcneill Exp $
.PATH: ${X11SRCDIR.xorg-server}/exa
@@ -23,7 +23,8 @@
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${X11SRCDIR.xorg-server}/../include
+ -I${X11SRCDIR.xorg-server}/../include \
+ ${X11FLAGS.DIX} ${X11INCS.DIX}
.if !defined(XMODULEDIR)
.include <bsd.x11.mk>
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.7 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.8
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.7 Tue Nov 23 08:22:30 2010
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Sat Jan 15 13:54:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.7 2010/11/23 08:22:30 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.8 2011/01/15 13:54:53 jmcneill Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -60,7 +60,8 @@
CPPFLAGS+= \
-DGLXEXT \
-DGLX_USE_MESA \
- ${X11FLAGS.DIX}
+ -I${X11SRCDIR.xorg-server}/../include \
+ ${X11FLAGS.DIX} ${X11INCS.DIX}
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
