Module Name: src
Committed By: riz
Date: Mon Mar 7 18:50:49 UTC 2011
Modified Files:
src/external/mit/xorg/server/xorg-server/damageext [netbsd-5]: Makefile
src/external/mit/xorg/server/xorg-server/dbe [netbsd-5]: Makefile.dbe
src/external/mit/xorg/server/xorg-server/exa [netbsd-5]: Makefile.exa
src/external/mit/xorg/server/xorg-server/glx [netbsd-5]: Makefile.glx
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1558):
external/mit/xorg/server/xorg-server/glx/Makefile.glx: revision 1.8
external/mit/xorg/server/xorg-server/damageext/Makefile: revision 1.3
external/mit/xorg/server/xorg-server/dbe/Makefile.dbe: revision 1.6
external/mit/xorg/server/xorg-server/exa/Makefile.exa: revision 1.5
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.1.8.1 -r1.1.8.2 \
src/external/mit/xorg/server/xorg-server/damageext/Makefile
cvs rdiff -u -r1.4.8.1 -r1.4.8.2 \
src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 \
src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
cvs rdiff -u -r1.3.2.3 -r1.3.2.4 \
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.1.8.1 src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.1.8.2
--- src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.1.8.1 Thu Sep 17 04:24:37 2009
+++ src/external/mit/xorg/server/xorg-server/damageext/Makefile Mon Mar 7 18:50:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.8.1 2009/09/17 04:24:37 snj Exp $
+# $NetBSD: Makefile,v 1.1.8.2 2011/03/07 18:50:48 riz 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.4.8.1 src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.4.8.2
--- src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.4.8.1 Thu Sep 17 04:24:38 2009
+++ src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe Mon Mar 7 18:50:49 2011
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.dbe,v 1.4.8.1 2009/09/17 04:24:38 snj Exp $
+# $NetBSD: Makefile.dbe,v 1.4.8.2 2011/03/07 18:50:49 riz 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.2.8.1 src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.2.8.2
--- src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.2.8.1 Thu Sep 17 04:24:38 2009
+++ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa Mon Mar 7 18:50:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.exa,v 1.2.8.1 2009/09/17 04:24:38 snj Exp $
+# $NetBSD: Makefile.exa,v 1.2.8.2 2011/03/07 18:50:49 riz Exp $
.PATH: ${X11SRCDIR.xorg-server}/exa
@@ -13,7 +13,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.3.2.3 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.4
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.3 Sat Oct 10 19:53:24 2009
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Mon Mar 7 18:50:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.3.2.3 2009/10/10 19:53:24 sborrill Exp $
+# $NetBSD: Makefile.glx,v 1.3.2.4 2011/03/07 18:50:48 riz Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -59,7 +59,8 @@
CPPFLAGS+= \
-DGLXEXT \
-DGLX_USE_MESA \
- ${X11FLAGS.DIX}
+ -I${X11SRCDIR.xorg-server}/../include \
+ ${X11FLAGS.DIX} ${X11INCS.DIX}
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
