[src/trunk]: src/external/mit/xorg/server/xorg-server build updates for xorg-...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/mit/xorg/server/xorg-server build updates for xorg-...
From: mrg <mrg%NetBSD.org@localhost>
Date: Mon, 31 Dec 2018 13:42:53 +0000
details:   https://anonhg.NetBSD.org/src/rev/95858fdc70d3
branches:  trunk
changeset: 447099:95858fdc70d3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Dec 31 11:14:03 2018 +0000

description:
build updates for xorg-server 1.20.3:
- moved/removed/new files
- don't define HAVE_XORG_CONFIG_H or HAVE_DIX_CONFIG_H if using
  ${X11FLAGS.DIX} -- already included.

put glxvnd into glx itself for now.

diffstat:

 external/mit/xorg/server/xorg-server/Makefile.Xserver                        |   9 ++-
 external/mit/xorg/server/xorg-server/Makefile.servermod                      |   4 +-
 external/mit/xorg/server/xorg-server/dix/Makefile                            |   4 +-
 external/mit/xorg/server/xorg-server/fb/Makefile.fb                          |   5 +-
 external/mit/xorg/server/xorg-server/glx/Makefile.glx                        |  11 +++-
 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile                 |   5 +-
 external/mit/xorg/server/xorg-server/hw/vfb/Makefile                         |  12 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/Makefile                     |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile                |   9 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile              |   7 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile             |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile     |   9 ---
 external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile              |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile              |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile            |   6 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile           |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile           |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile                 |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile               |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile          |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile           |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/xkb/Makefile                 |  17 +++++
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile              |   7 +-
 external/mit/xorg/server/xorg-server/hw/xnest/Makefile                       |   8 +-
 external/mit/xorg/server/xorg-server/include/Makefile                        |  30 ++++++---
 external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow            |   4 +-
 external/mit/xorg/server/xorg-server/os/Makefile                             |  17 +----
 external/mit/xorg/server/xorg-server/present/Makefile                        |   9 ++-
 external/mit/xorg/server/xorg-server/randr/Makefile                          |   3 +-
 30 files changed, 124 insertions(+), 101 deletions(-)

diffs (truncated from 753 to 300 lines):

diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xserver,v 1.20 2016/11/22 10:34:57 snj Exp $
+#      $NetBSD: Makefile.Xserver,v 1.21 2018/12/31 11:14:03 mrg Exp $
 
 .for _SL in \
        mi \
@@ -34,7 +34,6 @@
        hw/xfree86/dixmods/fb \
        hw/xfree86/dixmods/shadow \
        hw/xfree86/dixmods/wfb \
-       hw/xfree86/dixmods/xorgxkb \
        hw/xfree86/doc \
        hw/xfree86/dri \
        hw/xfree86/dri2 \
@@ -50,7 +49,8 @@
        hw/xfree86/vgahw \
        hw/xfree86/x86emu \
        hw/xfree86/xf86config \
-       hw/xfree86/xf86modes
+       hw/xfree86/xf86modes \
+       hw/xfree86/xkb
 
 .if !defined(LIBDIR.${_SL})
 LIBDIR.${_SL}!=        cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/${_SL} && ${PRINTOBJDIR}
@@ -66,6 +66,9 @@
 # X servers need all symbols exported
 LDFLAGS+=      -Wl,--export-dynamic
 
+LDFLAGS+=      -pthread
+CFLAGS+=       -pthread
+
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include \
                -I${X11SRCDIR.xorg-server}/Xext \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/Makefile.servermod
--- a/external/mit/xorg/server/xorg-server/Makefile.servermod   Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.servermod   Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.servermod,v 1.4 2016/01/25 18:00:26 christos Exp $
+#      $NetBSD: Makefile.servermod,v 1.5 2018/12/31 11:14:03 mrg Exp $
 
 .include <bsd.own.mk>  # For /etc/mk.conf processing
 
@@ -23,3 +23,5 @@
 .if defined(XMODULEDIR)
 CPPFLAGS+=     ${X11FLAGS.LOADABLE}
 .endif
+
+CPPFLAGS+=     ${X11FLAGS.DIX}
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/dix/Makefile
--- a/external/mit/xorg/server/xorg-server/dix/Makefile Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2016/11/17 07:58:24 snj Exp $
+#      $NetBSD: Makefile,v 1.18 2018/12/31 11:14:03 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -8,7 +8,7 @@
 
 .PATH:         ${X11SRCDIR.xorg-server}/dix
 SRCS=          atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.c \
-               dixutils.c events.c extension.c ffs.c gc.c getevents.c \
+               dixutils.c events.c extension.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 stubmain.c \
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/fb/Makefile.fb
--- a/external/mit/xorg/server/xorg-server/fb/Makefile.fb       Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/fb/Makefile.fb       Mon Dec 31 11:14:03 2018 +0000
@@ -1,8 +1,7 @@
-#      $NetBSD: Makefile.fb,v 1.10 2016/08/12 01:15:49 mrg Exp $
+#      $NetBSD: Makefile.fb,v 1.11 2018/12/31 11:14:04 mrg Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/fb
-SRCS.fb=       fb24_32.c       \
-               fballpriv.c     \
+SRCS.fb=       fballpriv.c     \
                fbarc.c         \
                fbbits.c        \
                fbblt.c         \
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/glx/Makefile.glx
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.glx,v 1.12 2016/08/12 01:15:49 mrg Exp $
+#      $NetBSD: Makefile.glx,v 1.13 2018/12/31 11:14:04 mrg Exp $
 
 .PATH: ${X11SRCDIR.xorg-server}/glx
 .PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -36,6 +36,15 @@
         swap_interval.c \
         xfont.c
 
+# For reachover, include glxvnd into glx directly here.
+SRCS.glxvnd= \
+       vndcmds.c \
+       vndext.c \
+       vndservermapping.c \
+       vndservervendor.c
+
+SRCS.glx+= ${SRCS.glxvnd}
+
 COPTS.glxcmds.c=               -Wno-error
 COPTS.indirect_dispatch.c=     -Wno-error
 COPTS.indirect_dispatch_swap.c=        -Wno-error
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2016/08/30 08:19:43 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2018/12/31 11:14:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,9 +19,6 @@
 SRCS=  x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \
        x68kFb.c x68kGraph.c x68kText.c
 
-.PATH: ${X11SRCDIR.xorg-server}/Xext
-SRCS+= dpmsstubs.c
-
 .PATH: ${X11SRCDIR.xorg-server}/Xi
 SRCS+= stubs.c
 
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2017/05/21 15:28:40 riastradh Exp $
+#      $NetBSD: Makefile,v 1.18 2018/12/31 11:14:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@
 .PATH:         ${X11SRCDIR.xorg-server}/Xext
 .PATH:         ${X11SRCDIR.xorg-server}/Xi
 .PATH:         ${X11SRCDIR.xorg-server}/mi
-SRCS=          InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c
+SRCS=          InitInput.c InitOutput.c miinitext.c stubs.c
 
 # XXX should not be needed now
 #.PATH:                ${X11SRCDIR.xorg-server}/fb
@@ -45,8 +45,6 @@
                        -UGLXEXT
 CPPFLAGS.miinitext.c=  ${X11FLAGS.EXTENSION} \
                        -UGLXEXT
-CPPFLAGS.dpmsstubs.c=  ${X11FLAGS.EXTENSION} \
-                       -UGLXEXT
 
 COPTS.InitInput.c=     -Wno-error
 COPTS.InitOutput.c=    -Wno-error
@@ -60,11 +58,11 @@
        ${LDADD.dbe} \
        ${LDADD.record} \
        ${LDADD.randr} \
-       ${LDADD.render} \
        ${LDADD.damageext} \
        ${LDADD.miext/damage} \
        ${LDADD.miext/shadow} \
        ${LDADD.miext/sync} \
+       ${LDADD.render} \
        ${LDADD.Xi} \
        ${LDADD.xkb} \
        ${LDADD.xkbstubs} \
@@ -72,7 +70,7 @@
        ${LDADD.os} \
        ${LDADD.glx} \
        ${LDADD.present} \
-       -lXfont \
+       -lXfont2 \
        -lfreetype \
        -lXau \
        -lfontenc \
@@ -104,7 +102,7 @@
        ${DPADD.os} \
        ${DPADD.glx} \
        ${DPADD.present} \
-       ${LIBXFONT} \
+       ${LIBXFONT2} \
        ${LIBFREETYPE} \
        ${LIBXAU} \
        ${LIBFONTENC} \
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile  Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile  Mon Dec 31 11:14:03 2018 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.36 2016/11/22 10:34:57 snj Exp $
+#      $NetBSD: Makefile,v 1.37 2018/12/31 11:14:04 mrg Exp $
 
 SUBDIR=                common ddc dixmods doc dri dri2 i2c loader \
                xf86modes exa \
                xorgos ramdac shadowfb vbe vgahw \
-               x86emu xf86config \
+               x86emu xf86config xkb \
                drivers
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "powerpc"
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2017/05/21 15:28:40 riastradh Exp $
+#      $NetBSD: Makefile,v 1.16 2018/12/31 11:14:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -46,6 +46,7 @@
 LDADD+=        ${LDADD.hw/xfree86/ramdac}
 LDADD+=        ${LDADD.hw/xfree86/ddc}
 LDADD+=        ${LDADD.hw/xfree86/i2c}
+LDADD+=        ${LDADD.hw/xfree86/xkb}
 LDADD+=        ${LDADD.composite}
 LDADD+=        ${LDADD.mi}
 LDADD+=        ${LDADD.xfixes}
@@ -68,8 +69,7 @@
 LDADD+=        ${LDADD.dri3}
 .endif
 LDADD+=        ${LDADD.hw/xfree86/dixmods/fb}
-LDADD+=        ${LDADD.hw/xfree86/dixmods/xorgxkb}
-LDADD+=        -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
+LDADD+=        -lpixman-1 -lXfont2 -lfreetype -lXau -lfontenc -lXdmcp
 LDADD+=        -lpciaccess -ldrm
 LDADD+=        -Wl,--no-whole-archive
 
@@ -128,8 +128,9 @@
        ${DPADD.hw/xfree86/ramdac} \
        ${DPADD.hw/xfree86/ddc} \
        ${DPADD.hw/xfree86/i2c} \
+       ${DPADD.hw/xfree86/xkb} \
        ${LIBCWRAPPER} \
-       ${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
+       ${LIBXFONT2} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
        ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
        ${LIBGL} ${LIBXV} ${LIBXSHMFENCE}
 
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.32 2018/02/02 01:02:41 mrg Exp $
+#      $NetBSD: Makefile,v 1.33 2018/12/31 11:14:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -71,9 +71,8 @@
                ${X11FLAGS.DIX} \
                -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
                -D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
-               -D__VENDORDWEBSUPPORT__='"http://wiki.X.Org";' \
-               -DXVENDORNAME='"The X.Org Foundation"' \
-               -DHAVE_XORG_CONFIG_H
+               -D__VENDORDWEBSUPPORT__='"http://wiki.x.org";' \
+               -DXVENDORNAME='"The X.Org Foundation"'
 
 .if ${MACHINE_ARCH} == "i386"
 CPPFLAGS+=     -DPCCONS_SUPPORT -DPCVT_SUPPORT
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2016/10/08 20:08:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2018/12/31 11:14:04 mrg Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -25,8 +25,7 @@
        fb \
        glx \
        shadow \
-       wfb \
-       xorgxkb
+       wfb
 
 COPTS.miinitext.c=     -Wno-error      # XXX xf86bigfstr.h
 
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile  Mon Dec 31 02:45:55 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#      $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $
-
-LIB=   xorgxkb
-
-SRCS=  xkbVT.c xkbPrivate.c xkbKillSrv.c
-
-CPPFLAGS=      -I${X11SRCDIR.xorg-server}/Xext
-
-.include "../Makefile.dixmod"
diff -r 5d70712686e5 -r 95858fdc70d3 external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile      Mon Dec 31 02:45:55 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile      Mon Dec 31 11:14:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2016/09/26 22:37:32 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2018/12/31 11:14:04 mrg Exp $
 
 DRIVER=                xf86-video-modesetting
Prev by Date: [xsrc/trunk]: xsrc/external/mit various updates for xorg-server 1.20. some o...
Next by Date: [src/trunk]: src/share/mk updates for xorg-server 1.20. don't define stuff h...
Previous by Thread: [xsrc/trunk]: xsrc/external/mit various updates for xorg-server 1.20. some o...
Next by Thread: [src/trunk]: src/share/mk updates for xorg-server 1.20. don't define stuff h...
Indexes:
Home | Main Index | Thread Index | Old Index