Module Name: src Committed By: mrg Date: Tue Aug 2 07:41:02 UTC 2011
Modified Files: src/external/mit/xorg/server/xorg-server/doc: Makefile src/external/mit/xorg/server/xorg-server/glx: Makefile.glx src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/exa: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile src/external/mit/xorg/server/xorg-server/include: Makefile src/external/mit/xorg/server/xorg-server/miext: Makefile Added Files: src/external/mit/xorg/server/xorg-server/miext/sync: Makefile Makefile.sync Log Message: build updates and fixes for xorg-server 1.10.3. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/doc/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/include/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/miext/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server/miext/sync/Makefile \ src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync 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/doc/Makefile diff -u src/external/mit/xorg/server/xorg-server/doc/Makefile:1.3 src/external/mit/xorg/server/xorg-server/doc/Makefile:1.4 --- src/external/mit/xorg/server/xorg-server/doc/Makefile:1.3 Thu Jun 11 05:43:16 2009 +++ src/external/mit/xorg/server/xorg-server/doc/Makefile Tue Aug 2 07:41:00 2011 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:16 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/02 07:41:00 mrg Exp $ .include <bsd.own.mk> .include "../dix/Makefile.common" .PATH: ${X11SRCDIR.xorg-server}/doc +.PATH: ${X11SRCDIR.xorg-server}/doc/man MAN= Xserver.1 X11EXTRAMANDEFS+= -e 's%__default_font_path__%${X11DEFAULTFONTPATH:ts,:S/,/, /g}%g' Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.8 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.9 --- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.8 Sat Jan 15 13:54:53 2011 +++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.glx,v 1.8 2011/01/15 13:54:53 jmcneill Exp $ +# $NetBSD: Makefile.glx,v 1.9 2011/08/02 07:41:01 mrg Exp $ .PATH: ${X11SRCDIR.xorg-server}/glx .PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi @@ -11,6 +11,7 @@ indirect_size_get.c \ indirect_table.c \ glapi.c \ + glapi_gentable.c \ glthread.c \ glxdri.c \ extension_string.c \ Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.10 --- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.9 Sat May 22 05:45:01 2010 +++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2011/08/02 07:41:01 mrg Exp $ .include <bsd.own.mk> @@ -7,6 +7,7 @@ PROG= Xvfb .PATH: ${X11SRCDIR.xorg-server}/hw/vfb +.PATH: ${X11SRCDIR.xorg-server}/hw/vfb/man .PATH: ${X11SRCDIR.xorg-server}/Xext .PATH: ${X11SRCDIR.xorg-server}/Xi .PATH: ${X11SRCDIR.xorg-server}/mi 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.1 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.1 Mon Mar 28 10:08:06 2011 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/03/28 10:08:06 plunky Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/02 07:41:01 mrg Exp $ .include <bsd.own.mk> @@ -114,9 +114,7 @@ SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X -# XXX -#Xorg.1: Xorg.man.pre -# cp ${.ALLSRC} ${.TARGET} +# Done in ../doc MKMAN= no FILES= xorg-server.m4 Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.6 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.5 Tue Nov 23 08:22:32 2010 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:32 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2011/08/02 07:41:01 mrg Exp $ .include <bsd.own.mk> @@ -10,6 +10,7 @@ FILESDIR= ${X11USRLIBDIR}/X11/doc MAN= Xorg.1 xorg.conf.5 +# xorg.conf.d.5? .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile:1.7 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile:1.6 Tue Oct 14 23:37:19 2008 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/exa/Makefile Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/10/14 23:37:19 cube Exp $ +# $NetBSD: Makefile,v 1.7 2011/08/02 07:41:01 mrg Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules @@ -10,6 +10,7 @@ MAN= exa.4 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/exa +.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/exa/man SRCS+= ${SRCS.exa} examodule.c .include <bsd.x11.mk> 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.5 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.5 Tue Nov 23 08:22:33 2010 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:33 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2011/08/02 07:41:01 mrg Exp $ PROG= cvt SRCS= cvt.c xf86cvt.c @@ -18,6 +18,7 @@ DPADD+= ${LIBM} .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG} +.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/man .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes .include <bsd.x11.mk> Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile:1.3 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile:1.2 Tue Oct 14 23:37:19 2008 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/02 07:41:01 mrg Exp $ .include <bsd.own.mk> @@ -12,6 +12,7 @@ DPADD+= ${LIBM} .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG} +.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/man .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.12 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.13 --- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.12 Sat May 22 05:45:02 2010 +++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Tue Aug 2 07:41:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/05/22 05:45:02 mrg Exp $ +# $NetBSD: Makefile,v 1.13 2011/08/02 07:41:01 mrg Exp $ .include <bsd.own.mk> @@ -8,6 +8,7 @@ .include "../../Makefile.servermod" .PATH: ${X11SRCDIR.xorg-server}/hw/xnest +.PATH: ${X11SRCDIR.xorg-server}/hw/xnest/man .PATH: ${X11SRCDIR.xorg-server}/Xext .PATH: ${X11SRCDIR.xorg-server}/Xi .PATH: ${X11SRCDIR.xorg-server}/mi Index: src/external/mit/xorg/server/xorg-server/include/Makefile diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.8 src/external/mit/xorg/server/xorg-server/include/Makefile:1.9 --- src/external/mit/xorg/server/xorg-server/include/Makefile:1.8 Tue Nov 23 08:22:35 2010 +++ src/external/mit/xorg/server/xorg-server/include/Makefile Tue Aug 2 07:41:01 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 07:41:01 mrg Exp $ .include <bsd.own.mk> @@ -21,8 +21,8 @@ .PATH: ${XORGSRC}/../include INCSDIR=${X11INCDIR}/xorg -INCS= BT.h IBM.h TI.h XIstubs.h bstore.h \ - bstorestr.h bt829.h \ +INCS= BT.h IBM.h TI.h XIstubs.h \ + bt829.h \ callback.h closestr.h closure.h colormap.h \ colormapst.h compiler.h cursor.h cursorstr.h damage.h damagestr.h \ dbestruct.h dgaproc.h dix.h dixevents.h dixfont.h dixfontstr.h \ @@ -30,17 +30,17 @@ eventconvert.h events.h eventstr.h list.h \ extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \ fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \ - glyphstr.h i2c_def.h input.h inputstr.h \ + glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \ mi.h mibstore.h micmap.h micoord.h mifillarc.h mifpoly.h \ migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \ mispans.h mistruct.h miwideline.h mizerarc.h msp3430.h opaque.h \ os.h picture.h picturestr.h pixmap.h pixmapstr.h property.h \ protocol-versions.h \ - propertyst.h randrstr.h region.h regionstr.h renderedge.h resource.h \ + propertyst.h randrstr.h region.h regionstr.h resource.h \ rgb.h sarea.h screenint.h scrnintstr.h selection.h servermd.h \ shadow.h shadowfb.h site.h swaprep.h swapreq.h tda8425.h tda9850.h \ tda9885.h uda1380.h validate.h vbe.h vbeModes.h vgaHW.h \ - window.h windowstr.h xaa.h xaaWrapper.h xaalocal.h xaarop.h \ + window.h windowstr.h xaa.h xaalocal.h xaarop.h \ xkbDflts.h xkb.h set.h \ xf86.h xf86Crtc.h xf86Cursor.h xf86DDC.h \ xf86Modes.h xf86Module.h \ Index: src/external/mit/xorg/server/xorg-server/miext/Makefile diff -u src/external/mit/xorg/server/xorg-server/miext/Makefile:1.2 src/external/mit/xorg/server/xorg-server/miext/Makefile:1.3 --- src/external/mit/xorg/server/xorg-server/miext/Makefile:1.2 Sat Aug 2 06:37:57 2008 +++ src/external/mit/xorg/server/xorg-server/miext/Makefile Tue Aug 2 07:41:02 2011 @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.2 2008/08/02 06:37:57 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/02 07:41:02 mrg Exp $ -SUBDIR= damage shadow cw # rootless +SUBDIR= damage shadow cw sync # rootless .include <bsd.subdir.mk> Added files: Index: src/external/mit/xorg/server/xorg-server/miext/sync/Makefile diff -u /dev/null src/external/mit/xorg/server/xorg-server/miext/sync/Makefile:1.1 --- /dev/null Tue Aug 2 07:41:02 2011 +++ src/external/mit/xorg/server/xorg-server/miext/sync/Makefile Tue Aug 2 07:41:02 2011 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.1 2011/08/02 07:41:02 mrg Exp $ + +LIBISPRIVATE= yes + +.include "../../Makefile.serverlib" + +LIB= sync +SRCS= ${SRCS.sync} + +.include "Makefile.sync" Index: src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync diff -u /dev/null src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync:1.1 --- /dev/null Tue Aug 2 07:41:02 2011 +++ src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync Tue Aug 2 07:41:02 2011 @@ -0,0 +1,15 @@ +# $NetBSD: Makefile.sync,v 1.1 2011/08/02 07:41:02 mrg Exp $ + +.PATH: ${X11SRCDIR.xorg-server}/miext/sync +SRCS.sync= misync.c + +CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} \ + ${X11FLAGS.DIX} ${X11INCS.DIX} + +CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \ + -I${DESTDIR}${X11INCDIR}/pixman-1 \ + -I${DESTDIR}${X11INCDIR}/xorg + +.include <bsd.x11.mk> +LIBDIR= ${XMODULEDIR} +.include <bsd.lib.mk>