[src/trunk]: src/external/mit/xorg/server/xorg-server first merge of xorg-ser...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08667e63757c
branches:  trunk
changeset: 347043:08667e63757c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Aug 11 08:32:42 2016 +0000

description:
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

diffstat:

 external/mit/xorg/server/xorg-server/Makefile.Xserver                   |   5 +--
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xext                 |   3 +-
 external/mit/xorg/server/xorg-server/Xi/Makefile                        |   3 +-
 external/mit/xorg/server/xorg-server/config/Makefile                    |   3 +-
 external/mit/xorg/server/xorg-server/dix/Makefile                       |   9 ++---
 external/mit/xorg/server/xorg-server/exa/Makefile.exa                   |   3 +-
 external/mit/xorg/server/xorg-server/fb/Makefile.fb                     |   4 +-
 external/mit/xorg/server/xorg-server/glx/Makefile.glx                   |   8 ++---
 external/mit/xorg/server/xorg-server/hw/xfree86/Makefile                |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile           |   6 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile         |   9 +++--
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile        |   3 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile    |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile            |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile           |   3 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile           |   3 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile         |   6 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile         |   5 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile            |   5 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile         |   5 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile         |   5 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile      |   4 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile      |   5 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile         |   4 +-
 external/mit/xorg/server/xorg-server/hw/xnest/Makefile                  |   4 +--
 external/mit/xorg/server/xorg-server/include/Makefile                   |   8 ++--
 external/mit/xorg/server/xorg-server/mi/Makefile                        |  10 +++---
 external/mit/xorg/server/xorg-server/miext/Makefile                     |   4 +-
 external/mit/xorg/server/xorg-server/miext/cw/Makefile                  |  10 ------
 external/mit/xorg/server/xorg-server/miext/cw/Makefile.cw               |  15 ----------
 external/mit/xorg/server/xorg-server/miext/damage/Makefile.damage       |   5 +--
 external/mit/xorg/server/xorg-server/miext/rootless/Makefile.rootless   |   3 +-
 external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow       |   4 +-
 external/mit/xorg/server/xorg-server/miext/sync/Makefile.sync           |   4 +-
 external/mit/xorg/server/xorg-server/randr/Makefile                     |   5 ++-
 external/mit/xorg/server/xorg-server/xkb/Makefile                       |   6 +--
 external/mit/xorg/server/xorg-server/xkbstubs/Makefile                  |   3 +-
 38 files changed, 71 insertions(+), 127 deletions(-)

diffs (truncated from 790 to 300 lines):

diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Thu Aug 11 08:32:42 2016 +0000
@@ -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 \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext   Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext   Thu Aug 11 08:32:42 2016 +0000
@@ -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}/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
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/Xi/Makefile
--- a/external/mit/xorg/server/xorg-server/Xi/Makefile  Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Xi/Makefile  Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
                setfocus.c setmmap.c setmode.c ungrdev.c ungrdevb.c \
                ungrdevk.c \
                xiallowev.c \
+               xibarriers.c \
                xichangecursor.c \
                xichangehierarchy.c \
                xigetclientpointer.c \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/config/Makefile
--- a/external/mit/xorg/server/xorg-server/config/Makefile      Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/config/Makefile      Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
 .PATH:         ${X11SRCDIR.xorg-server}/config
 
 SRCS=          config.c
+SRCS+=         wscons.c
 
 CPPFLAGS+=     ${X11FLAGS.DIX}
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/dix/Makefile
--- a/external/mit/xorg/server/xorg-server/dix/Makefile Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
                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 @@
 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
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/exa/Makefile.exa
--- a/external/mit/xorg/server/xorg-server/exa/Makefile.exa     Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/exa/Makefile.exa     Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
                -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 \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/fb/Makefile.fb
--- a/external/mit/xorg/server/xorg-server/fb/Makefile.fb       Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/fb/Makefile.fb       Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
                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
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/glx/Makefile.glx
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Thu Aug 11 08:32:42 2016 +0000
@@ -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 \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile  Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile  Thu Aug 11 08:32:42 2016 +0000
@@ -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 
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
 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.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.damageext} \
        ${DPADD.miext/damage} \
        ${DPADD.miext/shadow} \
-       ${DPADD.miext/cw} \
        ${DPADD.miext/sync} \
        ${DPADD.Xi} \
        ${DPADD.xkb} \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Thu Aug 11 08:32:42 2016 +0000
@@ -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.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 @@
        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 @@
                -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 \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
 
 SUBDIR = \
        dbe \
-       extmod \
        fb \
        glx \
        record \
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile      Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile      Thu Aug 11 08:32:42 2016 +0000
@@ -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 @@
 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}
diff -r 14b349c109d2 -r 08667e63757c external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile   Thu Aug 11 02:42:28 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile   Thu Aug 11 08:32:42 2016 +0000
@@ -1,4 +1,4 @@