Module Name: src
Committed By: mrg
Date: Mon Dec 31 11:14:06 UTC 2018
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
Makefile.servermod
src/external/mit/xorg/server/xorg-server/dix: Makefile
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/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
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/drivers/modesetting:
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/shadowfb: 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/xfree86/vbe: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: 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/miext/shadow: Makefile.shadow
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/server/xorg-server/present: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb:
Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.36 -r1.37 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb/Makefile
cvs rdiff -u -r1.46 -r1.47 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/include/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/present/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/randr/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.20 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.21
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.20 Tue Nov 22 10:34:57 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Mon Dec 31 11:14:03 2018
@@ -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 @@ DPADD.XORG_CORE= ${DPADD.dix} ${DPADD.co
# 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 \
Index: src/external/mit/xorg/server/xorg-server/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.4 src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.5
--- src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.4 Mon Jan 25 18:00:26 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod Mon Dec 31 11:14:03 2018
@@ -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 @@ moduleinstall::
.if defined(XMODULEDIR)
CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
+
+CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.17 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.17 Thu Nov 17 07:58:24 2016
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Mon Dec 31 11:14:03 2018
@@ -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 @@ LIB= dix
.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 \
Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.10 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.11
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.10 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Mon Dec 31 11:14:04 2018
@@ -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 \
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.12 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.13
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.12 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Mon Dec 31 11:14:04 2018
@@ -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 @@ SRCS.glx= \
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
Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.3 Tue Aug 30 08:19:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Mon Dec 31 11:14:04 2018
@@ -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 @@ WARNS?= 2
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
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.17 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.17 Sun May 21 15:28:40 2017
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Mon Dec 31 11:14:04 2018
@@ -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 @@ PROG= Xvfb
.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 @@ CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSI
-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+= ${LDADD.dix} \
${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+= ${LDADD.dix} \
${LDADD.os} \
${LDADD.glx} \
${LDADD.present} \
- -lXfont \
+ -lXfont2 \
-lfreetype \
-lXau \
-lfontenc \
@@ -104,7 +102,7 @@ DPADD+= ${DPADD.dix} \
${DPADD.os} \
${DPADD.glx} \
${DPADD.present} \
- ${LIBXFONT} \
+ ${LIBXFONT2} \
${LIBFREETYPE} \
${LIBXAU} \
${LIBFONTENC} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.36 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.37
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.36 Tue Nov 22 10:34:57 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Mon Dec 31 11:14:04 2018
@@ -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"
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.15 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.15 Sun May 21 15:28:40 2017
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Mon Dec 31 11:14:04 2018
@@ -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/xf86modes}
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.hw/xfree86/dri2}
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+= \
${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}
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.32 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.33
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.32 Fri Feb 2 01:02:41 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Mon Dec 31 11:14:04 2018
@@ -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 @@ CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FL
${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
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.14 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.14 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Mon Dec 31 11:14:04 2018
@@ -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 @@ SUBDIR = \
fb \
glx \
shadow \
- wfb \
- xorgxkb
+ wfb
COPTS.miinitext.c= -Wno-error # XXX xf86bigfstr.h
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile:1.1 Mon Sep 26 22:37:32 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile Mon Dec 31 11:14:04 2018
@@ -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
DRIVER_NAME= modesetting_drv
@@ -7,8 +7,8 @@ SRCS= dri2.c \
driver.c \
drmmode_display.c \
dumb_bo.c \
+ pageflip.c \
present.c \
- sh3224.c \
vblank.c
MAN= modesetting.4
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.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.16 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Mon Dec 31 11:14:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2018/12/31 11:14:04 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -10,7 +10,7 @@ LIB= loader
LOADERDIR= ${XFTOP}/${LIB}
.PATH: ${LOADERDIR}
-SRCS= loader.c loadmod.c os.c sdksyms.c
+SRCS= loader.c loadmod.c sdksyms.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
#SRCS+= SparcMulDiv.S
@@ -43,7 +43,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} -DDLOPEN_SUPPORT -DHAS_SHM \
- -DHAVE_XORG_CONFIG_H -DHAVE_DIX_CONFIG_H \
-DIN_LOADER \
${x11FLAGS.DIX}
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.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.7 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/31 11:14:05 mrg Exp $
#XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -9,7 +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
+ xf86CursorRD.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/shadowfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.5 Tue Aug 16 18:20:38 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/16 18:20:38 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 11:14:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -7,7 +7,7 @@ XMODULEDIR= ${X11USRLIBDIR}/modules
LIB= shadowfb
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
-SRCS= sfbmodule.c shadow.c
+SRCS= sfbmodule.c shadowfb.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/mi \
@@ -20,7 +20,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/render \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
- -DHAVE_XORG_CONFIG_H \
+ ${X11FLAGS.DIX} \
-I${X11SRCDIR.xorg-server}/../include
.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.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile:1.8 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2018/12/31 11:14:05 mrg Exp $
PROG= cvt
SRCS= cvt.c xf86cvt.c xprintf.c
@@ -6,7 +6,7 @@ MAN= cvt.1
.include "../Makefile.utils"
-CPPFLAGS+= ${X11FLAGS.DIX} -DHAVE_XORG_CONFIG_H \
+CPPFLAGS+= ${X11FLAGS.DIX} \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
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.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile:1.3 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile Mon Dec 31 11:14:05 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 11:14:05 mrg Exp $
.include <bsd.own.mk>
PROG= gtf
MAN= gtf.1
-CPPFLAGS+= -DHAVE_XORG_CONFIG_H \
+CPPFLAGS+= ${X11FLAGS.DIX} \
-I${X11SRCDIR.xorg-server}/../include
LDADD+= -lm
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile:1.5 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 11:14:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -21,7 +21,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/int10
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
+ -I${X11SRCDIR.xorg-server}/../include
# XXX
COPTS.vbe.c= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile:1.4 Fri Jun 12 01:59:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/31 11:14:05 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -23,7 +23,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
+ -I${X11SRCDIR.xorg-server}/../include
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile:1.5 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 11:14:05 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -23,6 +23,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= ${X11FLAGS.DIX}
CPPFLAGS+= -DPROJECTROOT='"${X11ROOTDIR}"'
+CPPFLAGS+= -DDATADIR='"${X11ROOTDIR}/share"'
+
CWARNFLAGS.clang+= -Wno-format
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.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.6 Thu Aug 11 08:32:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/11 08:32:43 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2018/12/31 11:14:05 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -35,8 +35,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/../include
-CPPFLAGS+= ${X11FLAGS.DIX} \
- -DHAVE_XORG_CONFIG_H
+CPPFLAGS+= ${X11FLAGS.DIX}
# XXX
CPPFLAGS.xf86RandR12.c= -Wno-error
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.46 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.47
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.46 Sat Nov 10 01:38:02 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Dec 31 11:14:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/11/10 01:38:02 macallan Exp $
+# $NetBSD: Makefile,v 1.47 2018/12/31 11:14:05 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -43,7 +43,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT
.endif
.if ${MACHINE_ARCH} == "alpha"
-SRCS.bsd+= alpha_video.c bsd_ev56.c pm_noop.c agp_noop.c
+SRCS.bsd+= alpha_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_ALPHA_PIO
.endfor
@@ -160,7 +160,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/Xext \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared \
+ -I${X11SRCDIR.xorg-server}/../include
.if ${X11DRI} != "no"
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.20 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.21
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.20 Sun May 21 15:28:40 2017
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Mon Dec 31 11:14:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/05/21 15:28:40 riastradh Exp $
+# $NetBSD: Makefile,v 1.21 2018/12/31 11:14:06 mrg Exp $
.include <bsd.own.mk>
@@ -16,7 +16,7 @@ PROG= Xnest
SRCS= Args.c Color.c Cursor.c Display.c Events.c Font.c \
GC.c GCOps.c Handlers.c Init.c Keyboard.c \
Pixmap.c Pointer.c Screen.c Visual.c Window.c \
- dpmsstubs.c stubs.c miinitext.c \
+ stubs.c miinitext.c \
fbcmap_mi.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xnest \
@@ -59,11 +59,11 @@ LDADD+= ${LDADD.dix} \
${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} \
@@ -71,7 +71,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.os} \
${LDADD.glx} \
${LDADD.present} \
- -lXfont -lXext -lfontenc \
+ -lXfont2 -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
-lXdmcp -lfreetype -lm
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.18 src/external/mit/xorg/server/xorg-server/include/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.18 Fri Aug 19 22:33:34 2016
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Mon Dec 31 11:14:06 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2016/08/19 22:33:34 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2018/12/31 11:14:06 mrg Exp $
.include <bsd.own.mk>
XORGSRC= ${X11SRCDIR.xorg-server}
-XORGINC_SUBDIR= Xext composite dbe dri3 exa fb glamor include mi \
+XORGINC_SUBDIR= Xext composite dbe dri3 exa fb glamor glx include mi \
miext/damage miext/shadow miext/sync \
present randr render xkb record
XF86_SUBDIR= common ddc dri fbdevhw i2c int10 modes \
@@ -27,14 +27,17 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
colormapst.h compiler.h compositeext.h cursor.h cursorstr.h \
damage.h damagestr.h \
dbestruct.h dgaproc.h displaymode.h \
- dix.h dixevents.h dixfont.h dixfontstr.h \
+ dix.h dixaccess.h dixevents.h dixfont.h dixfontstr.h \
dixgrabs.h dixstruct.h dri.h dristruct.h \
dri3.h \
edid.h exa.h exevents.h \
- eventconvert.h events.h eventstr.h list.h \
- extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \
+ eventconvert.h events.h eventstr.h \
+ extension.h extinit.h extnsionst.h \
+ fb.h fbdevhw.h fboverlay.h \
fbpict.h fbrop.h fourcc.h gc.h gcstruct.h geext.h glamor.h globals.h \
- glx_extinit.h glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \
+ glyphstr.h glx_extinit.h glxvndabi.h \
+ i2c_def.h input.h inputstr.h inpututils.h \
+ list.h \
mi.h micmap.h micoord.h \
migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
mistruct.h mizerarc.h opaque.h \
@@ -42,17 +45,21 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
nonsdk_extinit.h optionstr.h \
os.h picture.h picturestr.h pixmap.h pixmapstr.h \
present.h presentext.h \
- property.h protocol-versions.h \
- propertyst.h randrstr.h region.h regionstr.h resource.h \
- rgb.h sarea.h screenint.h scrnintstr.h \
+ privates.h \
+ property.h propertyst.h protocol-versions.h ptrveloc.h \
+ randrstr.h region.h regionstr.h registry.h resource.h rgb.h \
+ sarea.h screenint.h scrnintstr.h \
securitysrv.h selection.h servermd.h \
shadow.h shadowfb.h shmint.h site.h \
validate.h vbe.h vbeModes.h vgaHW.h \
+ version-config.h \
+ vndserver.h \
window.h windowstr.h \
xaarop.h \
xkbDflts.h xkb.h set.h \
xf86.h xf86platformBus.h \
xf86Crtc.h xf86Cursor.h xf86DDC.h \
+ xf86MatchDrivers.h \
xf86Modes.h xf86Module.h xf86Optionstr.h xf86Opt.h xf86Optrec.h \
xf86Parser.h xf86Pci.h xf86PciInfo.h \
xf86Priv.h xf86Privstr.h xf86RamDac.h xf86RandR12.h \
@@ -60,10 +67,11 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
xf86_OSproc.h xf86cmap.h xf86fbman.h \
xf86i2c.h xf86int10.h xf86sbusBus.h xf86str.h xf86xv.h \
xkbstr.h xkbrules.h xserver-properties.h \
- dixaccess.h privates.h ptrveloc.h registry.h xkbfile.h \
+ xkbfile.h \
xf86xvmc.h xf86xvpriv.h xisb.h xorg-server.h xorgVersion.h xvdix.h \
xvmcext.h hotplug.h xkbsrv.h dri2.h rrtransform.h \
- xsha1.h version-config.h
+ xsha1.h \
+ xserver_poll.h \
.include <bsd.x11.mk>
.include <bsd.prog.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.4 src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow:1.5
--- src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow:1.4 Thu Aug 11 08:32:44 2016
+++ src/external/mit/xorg/server/xorg-server/miext/shadow/Makefile.shadow Mon Dec 31 11:14:06 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.shadow,v 1.4 2016/08/11 08:32:44 mrg Exp $
+# $NetBSD: Makefile.shadow,v 1.5 2018/12/31 11:14:06 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/miext/shadow
-SRCS.shadow+= shadow.c shalloc.c shpacked.c shplanar8.c shplanar.c \
+SRCS.shadow+= shadow.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 \
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.15 src/external/mit/xorg/server/xorg-server/os/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.15 Wed Mar 8 07:45:11 2017
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Mon Dec 31 11:14:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/03/08 07:45:11 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2018/12/31 11:14:06 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -7,8 +7,8 @@ LIB= os
.PATH: ${X11SRCDIR.xorg-server}/os
SRCS= WaitFor.c access.c auth.c backtrace.c client.c connection.c \
- io.c mitauth.c \
- oscolor.c osinit.c utils.c xdmauth.c \
+ inputthread.c io.c mitauth.c \
+ oscolor.c ospoll.c osinit.c utils.c xdmauth.c \
xstrans.c xprintf.c log.c xdmcp.c busfault.c \
rpcauth.c xsha1.c \
reallocarray.c \
@@ -29,16 +29,7 @@ CPPFLAGS+= ${X11FLAGS.DIX} \
-DHASXDMAUTH \
${X11FLAGS.OS_DEFINES} \
-DUSE_RGB_TXT \
- -UDDXTIME \
- -DHAVE_XORG_CONFIG_H
-
-.if 0
- -DHAVE_SHA1_IN_LIBC \
- -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
- -DHAVE_STRCASESTR \
- -DHAVE_REALLOCARRAY \
- -DMONOTONIC_CLOCK
-.endif
+ -UDDXTIME
.include "../Makefile.common"
Index: src/external/mit/xorg/server/xorg-server/present/Makefile
diff -u src/external/mit/xorg/server/xorg-server/present/Makefile:1.2 src/external/mit/xorg/server/xorg-server/present/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/present/Makefile:1.2 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/present/Makefile Mon Dec 31 11:14:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/12/31 11:14:06 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -8,11 +8,16 @@ LIB= present
.PATH: ${X11SRCDIR.xorg-server}/present
SRCS= present.c \
present_event.c \
+ present_execute.c \
present_fake.c \
present_fence.c \
present_notify.c \
present_request.c \
- present_screen.c
+ present_scmd.c \
+ present_screen.c \
+ present_vblank.c \
+ present_wnmd.c
+
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.8 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.8 Mon Aug 15 22:01:16 2016
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile Mon Dec 31 11:14:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/15 22:01:16 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2018/12/31 11:14:06 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -11,6 +11,7 @@ SRCS= \
rrcrtc.c \
rrdispatch.c \
rrinfo.c \
+ rrlease.c \
rrmode.c \
rrmonitor.c \
rroutput.c \
Added files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb/Makefile:1.1
--- /dev/null Mon Dec 31 11:14:06 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb/Makefile Mon Dec 31 11:14:05 2018
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2018/12/31 11:14:05 mrg Exp $
+
+.include "../../../Makefile.serverlib"
+.include "../../../Makefile.servermod"
+
+LIB= xkb
+
+.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
+SRCS= xkbVT.c xkbPrivate.c xkbKillSrv.c
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xext \
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
