Module Name: src
Committed By: mrg
Date: Thu Aug 11 08:32:45 UTC 2016
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/Xi: Makefile
src/external/mit/xorg/server/xorg-server/config: Makefile
src/external/mit/xorg/server/xorg-server/dix: Makefile
src/external/mit/xorg/server/xorg-server/exa: Makefile.exa
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
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/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: 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/mi: Makefile
src/external/mit/xorg/server/xorg-server/miext: Makefile
src/external/mit/xorg/server/xorg-server/miext/damage: Makefile.damage
src/external/mit/xorg/server/xorg-server/miext/rootless:
Makefile.rootless
src/external/mit/xorg/server/xorg-server/miext/shadow: Makefile.shadow
src/external/mit/xorg/server/xorg-server/miext/sync: Makefile.sync
src/external/mit/xorg/server/xorg-server/randr: Makefile
src/external/mit/xorg/server/xorg-server/xkb: Makefile
src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/miext/cw: Makefile Makefile.cw
Log Message:
first merge of xorg-server 1.18.4 reach over. not tested, and
missing at these new subdirs, some which may not be needed:
dri2
glamor
hw/xfree86/drivers/modesetting
hw/xfree86/parser
present
pseudoramiX
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/config/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile
cvs rdiff -u -r1.41 -r1.42 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/include/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/mi/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/miext/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/miext/cw/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/xorg-server/miext/cw/Makefile.cw
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/miext/damage/Makefile.damage
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/miext/rootless/Makefile.rootless
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/randr/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/xkbstubs/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.14 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.15
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.14 Fri Jun 10 03:37:34 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.14 2016/06/10 03:37:34 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.15 2016/08/11 08:32:42 mrg Exp $
.for _SL in \
mi \
@@ -14,7 +14,6 @@
damageext \
miext/damage \
miext/shadow \
- miext/cw \
miext/sync \
Xi \
xkb \
@@ -30,7 +29,6 @@
hw/xfree86/ddc \
hw/xfree86/dixmods \
hw/xfree86/dixmods/dbe \
- hw/xfree86/dixmods/extmod \
hw/xfree86/dixmods/fb \
hw/xfree86/dixmods/freetype \
hw/xfree86/dixmods/record \
@@ -56,7 +54,6 @@
hw/xfree86/vbe \
hw/xfree86/vgahw \
hw/xfree86/x86emu \
- hw/xfree86/xaa \
hw/xfree86/xf8_16bpp \
hw/xfree86/xf8_32bpp \
hw/xfree86/xf86config \
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.11 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.12
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.11 Tue Aug 2 09:11:37 2011
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xext,v 1.11 2011/08/02 09:11:37 mrg Exp $
+# $NetBSD: Makefile.Xext,v 1.12 2016/08/11 08:32:42 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/Xext
@@ -6,7 +6,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xext
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1
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
Index: src/external/mit/xorg/server/xorg-server/Xi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4 Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/11 08:32:42 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -16,6 +16,7 @@ SRCS= allowev.c chgdctl.c chgfctl.c chg
setfocus.c setmmap.c setmode.c ungrdev.c ungrdevb.c \
ungrdevk.c \
xiallowev.c \
+ xibarriers.c \
xichangecursor.c \
xichangehierarchy.c \
xigetclientpointer.c \
Index: src/external/mit/xorg/server/xorg-server/config/Makefile
diff -u src/external/mit/xorg/server/xorg-server/config/Makefile:1.1 src/external/mit/xorg/server/xorg-server/config/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/config/Makefile:1.1 Sat Aug 2 21:44:14 2008
+++ src/external/mit/xorg/server/xorg-server/config/Makefile Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/02 21:44:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/11 08:32:42 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -7,6 +7,7 @@ LIB= config
.PATH: ${X11SRCDIR.xorg-server}/config
SRCS= config.c
+SRCS+= wscons.c
CPPFLAGS+= ${X11FLAGS.DIX}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.12 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.12 Thu Mar 22 23:46:28 2012
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/03/22 23:46:28 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/11 08:32:42 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -11,9 +11,9 @@ SRCS= atom.c colormap.c cursor.c device
dixutils.c events.c extension.c ffs.c gc.c getevents.c \
globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c \
privates.c property.c resource.c swaprep.c swapreq.c \
- tables.c window.c \
- deprecated.c enterleave.c ptrveloc.c registry.c selection.c \
- eventconvert.c inpututils.c region.c
+ tables.c window.c stubmain.c \
+ enterleave.c ptrveloc.c registry.c selection.c \
+ eventconvert.c inpututils.c region.c touch.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1
@@ -36,7 +36,6 @@ FILESDIR= ${X11ROOTDIR}/lib/xorg
COPTS.dixutils.c= -Wno-error
COPTS.colormap.c= -Wno-error
COPTS.cursor.c= -Wno-error
-COPTS.deprecated.c= -Wno-error
COPTS.dispatch.c= -Wno-error
COPTS.dixfonts.c= -Wno-error
COPTS.events.c= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
diff -u src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.5 src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.6
--- src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.5 Sat Jan 15 13:54:53 2011
+++ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.exa,v 1.5 2011/01/15 13:54:53 jmcneill Exp $
+# $NetBSD: Makefile.exa,v 1.6 2016/08/11 08:32:42 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/exa
@@ -19,7 +19,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/exa \
-I${X11SRCDIR.xorg-server}/fb \
- -I${X11SRCDIR.xorg-server}/miext/cw \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.8 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.9
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.8 Tue Aug 2 09:11:37 2011
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fb,v 1.8 2011/08/02 09:11:37 mrg Exp $
+# $NetBSD: Makefile.fb,v 1.9 2016/08/11 08:32:42 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS.fb= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
@@ -6,7 +6,7 @@ SRCS.fb= fb24_32.c fballpriv.c fbarc.c f
fbfill.c fbfillrect.c fbfillsp.c fbgc.c fbgetsp.c \
fbglyph.c fbimage.c fbline.c fboverlay.c \
fbpict.c fbpixmap.c fbpoint.c fbpush.c fbscreen.c \
- fbseg.c fbsetsp.c fbsolid.c fbstipple.c fbtile.c \
+ fbseg.c fbsetsp.c fbsolid.c \
fbtrap.c fbutil.c fbwindow.c
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.10 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.11
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.10 Wed Oct 3 21:50:14 2012
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Thu Aug 11 08:32:42 2016
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile.glx,v 1.10 2012/10/03 21:50:14 gsutre Exp $
+# $NetBSD: Makefile.glx,v 1.11 2016/08/11 08:32:42 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
.PATH: ${X11SRCDIR.MesaLib}/src/glx
SRCS.glx= \
+ clientinfo.c \
+ createcontext.c \
indirect_dispatch.c \
indirect_dispatch_swap.c \
indirect_reqsize.c \
indirect_size_get.c \
indirect_table.c \
- glapi.c \
- glapi_gentable.c \
- glthread.c \
- glxdri.c \
glxdri2.c \
extension_string.c \
indirect_util.c \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.33 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.34
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.33 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Thu Aug 11 08:32:42 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2016/08/11 08:32:42 mrg Exp $
SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
- x86emu xaa xf86config
+ x86emu 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.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.8 Wed Jun 29 19:36:56 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/29 19:36:56 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/11 08:32:42 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ PROG= Xorg
BINMODE= 4711
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86
-SRCS= xorg.c libxorg.c
+SRCS= xorg-wrapper.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xorg-server}/fb \
@@ -50,7 +50,6 @@ LDADD+= ${LDADD.randr}
LDADD+= ${LDADD.damageext}
LDADD+= ${LDADD.miext/damage}
LDADD+= ${LDADD.miext/shadow}
-LDADD+= ${LDADD.miext/cw}
LDADD+= ${LDADD.miext/sync}
LDADD+= ${LDADD.Xi}
LDADD+= ${LDADD.xkb}
@@ -96,7 +95,6 @@ DPADD+= ${DPADD.dix} \
${DPADD.damageext} \
${DPADD.miext/damage} \
${DPADD.miext/shadow} \
- ${DPADD.miext/cw} \
${DPADD.miext/sync} \
${DPADD.Xi} \
${DPADD.xkb} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.21 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.22
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.21 Thu Jan 16 01:15:33 2014
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/01/16 01:15:33 christos Exp $
+# $NetBSD: Makefile,v 1.22 2016/08/11 08:32:42 mrg Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@ SRCS.xv= xf86xv.c xf86xvmc.c
SRCS.bus= xf86pciBus.c xf86fbBus.c xf86noBus.c
SRCS.randr= xf86RandR.c
-SRCS= xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
+SRCS= xf86Configure.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c \
xf86Events.c xf86Globals.c xf86AutoConfig.c \
xf86Option.c \
@@ -21,7 +21,9 @@ SRCS= xf86Configure.c xf86ShowOpts.c xf8
xf86Mode.c xorgHelper.c \
${SRCS.xv} ${SRCS.bus} ${SRCS.randr} \
xf86DefModeSet.c \
- xf86VGAarbiter.c
+ xf86VGAarbiter.c \
+ xf86Extensions.c \
+ xf86platformBus.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
SRCS.bus+= xf86sbusBus.c
@@ -62,7 +64,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
-I${X11SRCDIR.xorg-server}/hw/xfree86/modes \
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
-I${X11SRCDIR.xorg-server}/hw/xfree86 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.9 Sat May 22 05:45:01 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Thu Aug 11 08:32:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/11 08:32:42 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -23,7 +23,6 @@ CPPFLAGS+= \
SUBDIR = \
dbe \
- extmod \
fb \
glx \
record \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile:1.5 Tue Nov 23 08:22:31 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:31 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -8,7 +8,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules/
LIB= dbe
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
-SRCS= ${SRCS.dbe} dbemodule.c
+SRCS= ${SRCS.dbe}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= -DHAVE_XORG_CONFIG_H ${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile:1.2 Sun Aug 10 06:43:29 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/10 06:43:29 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -8,7 +8,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules/
LIB= record
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
-SRCS= ${SRCS.record} recordmod.c
+SRCS= ${SRCS.record}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.11 Sat Jul 18 08:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # define
@@ -9,7 +9,7 @@ XMODULEDIRANDSTATIC= # define
LIB= dri
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
-SRCS= dri.c drimodule.c xf86dri.c
+SRCS= dri.c xf86dri.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/include \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.8 Sat Jul 18 08:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # defined
@@ -14,6 +14,7 @@ SRCS= dri2.c dri2ext.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/dri2/pci_ids \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
-I${X11SRCDIR.xorg-server}/xfixes \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.9 Thu Jan 16 01:15:33 2014
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/01/16 01:15:33 christos Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/11 08:32:43 mrg Exp $
.include <bsd.own.mk>
@@ -24,7 +24,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
-I${X11SRCDIR.xorg-server}/hw/xfree86 \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
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.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.13 Sun Mar 23 20:39:40 2014
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/03/23 20:39:40 tron Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/11 08:32:43 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -7,7 +7,7 @@ LIB= loader
LOADERDIR= ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
.PATH: ${LOADERDIR}
-SRCS= loader.c loadext.c loadmod.c os.c sdksyms.c
+SRCS= loader.c loadmod.c os.c sdksyms.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
#SRCS+= SparcMulDiv.S
@@ -15,9 +15,7 @@ SRCS= loader.c loadext.c loadmod.c os.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
- -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 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.5 Tue Nov 23 08:22:33 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/11/23 08:22:33 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/11 08:32:43 mrg Exp $
#XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -9,8 +9,7 @@ LIB= ramdac
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
SRCS= xf86RamDac.c xf86RamDacCmap.c \
- xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \
- xf86BitOrder.c
+ xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/Xext \
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.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile:1.7 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -43,9 +43,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${X11SRCDIR.xorg-server}/render \
-I${X11SRCDIR.xorg-server}/../include
-# XXX to find files lokoing for "../../../../hw/something"
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
-
CPPFLAGS+= ${X11FLAGS.DIX}
.if 0
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -67,9 +67,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/mf
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-# XXX for ../../../../ files
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
-
COPTS.mfbclip.c= -Wno-error
COPTS.mfbfont.c= -Wno-error
COPTS.mfbmisc.c= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -63,9 +63,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= -DXF86VGA16
-# XXX for ../../../../ files
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
-
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.5 Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/11 08:32:43 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -11,7 +11,6 @@ SRCS=\
xf86Cursors.c \
xf86cvt.c \
xf86gtf.c \
- xf86DisplayIDModes.c \
xf86EdidModes.c \
xf86Modes.c \
xf86RandR12.c \
@@ -29,7 +28,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ramdac \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/xfixes \
-I${DESTDIR}${X11INCDIR}/X11 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/11 08:32:43 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -37,9 +37,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/Xext
-# XXX for ../../../../ files
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
-
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.41 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.42
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.41 Sun Feb 28 15:15:42 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Aug 11 08:32:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2016/02/28 15:15:42 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2016/08/11 08:32:43 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -150,7 +150,7 @@ SRCS.misc+= SlowBcopy.c
# IODelay.c CIODelay.c \
# SlowBcopy.c CSlowBcopy.c
-SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc} xorgos.c
+SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.15 Wed Jun 29 19:36:56 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/06/29 19:36:56 christos Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/11 08:32:44 mrg Exp $
.include <bsd.own.mk>
@@ -60,7 +60,6 @@ LDADD+= ${LDADD.dix} \
${LDADD.render} \
${LDADD.damageext} \
${LDADD.miext/damage} \
- ${LDADD.cw/cw} \
${LDADD.miext/shadow} \
${LDADD.miext/sync} \
${LDADD.Xi} \
@@ -85,7 +84,6 @@ DPADD+= ${LDADD.dix} \
${DPADD.randr} \
${DPADD.damageext} \
${DPADD.miext/damage} \
- ${DPADD.cw/cw} \
${DPADD.miext/shadow} \
${DPADD.miext/sync} \
${DPADD.Xi} \
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.12 src/external/mit/xorg/server/xorg-server/include/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.12 Wed Nov 5 14:30:00 2014
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/11/05 14:30:00 prlw1 Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/11 08:32:44 mrg Exp $
.include <bsd.own.mk>
@@ -6,9 +6,9 @@ XORGSRC= ${X11SRCDIR.xorg-server}
XORGINC_SUBDIR= Xext composite dbe exa fb include mi \
miext/damage miext/shadow randr render xkb record
-XF86_SUBDIR= common ddc dixmods/extmod dri fbdevhw i2c int10 modes \
+XF86_SUBDIR= common ddc dri fbdevhw i2c int10 modes \
os-support os-support/bus parser rac ramdac shadowfb \
- vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2
+ vbe vgahw xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2
.for _dir in ${XORGINC_SUBDIR}
.PATH: ${XORGSRC}/${_dir}
@@ -42,7 +42,7 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
shadow.h shadowfb.h shmint.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 xaalocal.h xaarop.h \
+ window.h windowstr.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/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/mi/Makefile:1.9 src/external/mit/xorg/server/xorg-server/mi/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/mi/Makefile:1.9 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/mi/Makefile Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/11 08:32:44 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -7,12 +7,12 @@ LIB= mi
.PATH: ${X11SRCDIR.xorg-server}/mi
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 \
+ micmap.c midash.c midispcur.c mieq.c \
+ miexpose.c mifillarc.c mifillrct.c \
migc.c miglblt.c mioverlay.c mipointer.c mipoly.c \
- mipolycon.c mipolygen.c mipolypnt.c mipolyrect.c \
+ mipolypnt.c mipolyrect.c \
mipolyseg.c mipolytext.c mipolyutil.c mipushpxl.c \
- miscrinit.c mispans.c misprite.c \
+ miscrinit.c misprite.c \
mivaltree.c miwideline.c miwindow.c mizerarc.c \
mizerclip.c mizerline.c
Index: src/external/mit/xorg/server/xorg-server/miext/Makefile
diff -u src/external/mit/xorg/server/xorg-server/miext/Makefile:1.3 src/external/mit/xorg/server/xorg-server/miext/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/miext/Makefile:1.3 Tue Aug 2 07:41:02 2011
+++ src/external/mit/xorg/server/xorg-server/miext/Makefile Thu Aug 11 08:32:44 2016
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2011/08/02 07:41:02 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/11 08:32:44 mrg Exp $
-SUBDIR= damage shadow cw sync # rootless
+SUBDIR= damage shadow sync # rootless
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server/miext/damage/Makefile.damage
diff -u src/external/mit/xorg/server/xorg-server/miext/damage/Makefile.damage:1.3 src/external/mit/xorg/server/xorg-server/miext/damage/Makefile.damage:1.4
--- src/external/mit/xorg/server/xorg-server/miext/damage/Makefile.damage:1.3 Sun Aug 24 13:40:13 2008
+++ src/external/mit/xorg/server/xorg-server/miext/damage/Makefile.damage Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.damage,v 1.3 2008/08/24 13:40:13 rtr Exp $
+# $NetBSD: Makefile.damage,v 1.4 2016/08/11 08:32:44 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/miext/damage
SRCS.damage= damage.c
@@ -7,8 +7,7 @@ CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSIO
${X11FLAGS.DIX} ${X11INCS.DIX}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${DESTDIR}${X11INCDIR}/xorg \
- -I${X11SRCDIR.xorg-server}/miext/cw
+ -I${DESTDIR}${X11INCDIR}/xorg
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
Index: src/external/mit/xorg/server/xorg-server/miext/rootless/Makefile.rootless
diff -u src/external/mit/xorg/server/xorg-server/miext/rootless/Makefile.rootless:1.2 src/external/mit/xorg/server/xorg-server/miext/rootless/Makefile.rootless:1.3
--- src/external/mit/xorg/server/xorg-server/miext/rootless/Makefile.rootless:1.2 Sun Aug 24 13:40:13 2008
+++ src/external/mit/xorg/server/xorg-server/miext/rootless/Makefile.rootless Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rootless,v 1.2 2008/08/24 13:40:13 rtr Exp $
+# $NetBSD: Makefile.rootless,v 1.3 2016/08/11 08:32:44 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/miext/rootless
SRCS.rootless+= rootlessCommon.c rootlessGC.c rootlessScreen.c \
@@ -8,7 +8,6 @@ CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSIO
${X11FLAGS.DIX} ${X11INCS.DIX}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
- -I${X11SRCDIR.xorg-server}/miext/cw \
-I${DESTDIR}${X11INCDIR}/pixman-1
.include <bsd.x11.mk>
Index: src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow
diff -u src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow:1.3 src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow:1.4
--- src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow:1.3 Sun Aug 24 13:37:33 2008
+++ src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow Thu Aug 11 08:32:44 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.shadow,v 1.3 2008/08/24 13:37:33 rtr Exp $
+# $NetBSD: Makefile.shadow,v 1.4 2016/08/11 08:32:44 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/miext/shadow
SRCS.shadow+= shadow.c shalloc.c shpacked.c shplanar8.c shplanar.c \
+ shafb4.c shafb8.c shiplan2p4.c shiplan2p8.c \
shrot16pack_180.c shrot16pack_270.c shrot16pack_270YX.c \
shrot16pack_90.c shrot16pack_90YX.c shrot16pack.c \
shrot32pack_180.c shrot32pack_270.c shrot32pack_90.c \
@@ -12,7 +13,6 @@ CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSIO
${X11FLAGS.DIX} ${X11INCS.DIX}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
- -I${X11SRCDIR.xorg-server}/miext/cw \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
Index: src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync
diff -u src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync:1.1 src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync:1.2
--- src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync:1.1 Tue Aug 2 07:41:02 2011
+++ src/external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync Thu Aug 11 08:32:44 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.sync,v 1.1 2011/08/02 07:41:02 mrg Exp $
+# $NetBSD: Makefile.sync,v 1.2 2016/08/11 08:32:44 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/miext/sync
-SRCS.sync= misync.c
+SRCS.sync= misync.c misyncfd.c misyncshm.c
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} \
${X11FLAGS.DIX} ${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.5 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.5 Tue Aug 2 09:11:39 2011
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/02 09:11:39 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/11 08:32:44 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB= randr
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
+SRCS+= rrxinerama.c rrmonitor.c rrprovider.c \
+ rrproviderproperty.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.8 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.8 Tue Nov 23 08:22:35 2010
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/23 08:22:35 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/11 08:32:44 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -9,8 +9,7 @@ LIB= xkb
.PATH: ${X11SRCDIR.X11}/src
.PATH: ${X11SRCDIR.xkbfile}/src
DDXSRCS= ddxBeep.c ddxCtrls.c \
- ddxLEDs.c ddxLoad.c \
- ddxList.c
+ ddxLEDs.c ddxLoad.c
DIXSRCS= xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \
xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c
XKBFILESRCS= maprules.c xkmread.c xkbtext.c xkbfmisc.c \
@@ -24,7 +23,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
- -I${X11SRCDIR.xorg-server}/Xext/extmod \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/${LIB} \
Index: src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.1 src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.1 Mon Dec 22 01:04:27 2008
+++ src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile Thu Aug 11 08:32:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/12/22 01:04:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/11 08:32:44 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -15,7 +15,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
- -I${X11SRCDIR.xorg-server}/Xext/extmod \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
