Module Name: src
Committed By: mrg
Date: Fri Aug 12 01:15:52 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile Makefile.Xserver
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/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c: 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/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config:
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/os: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/dri3: Makefile
src/external/mit/xorg/server/xorg-server/present: Makefile
src/external/mit/xorg/server/xorg-server/pseudoramiX: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/type1:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap:
Makefile
Log Message:
round do of reach over updates for xorg-server 1.18. again, untested,
but this should be much closer to complete for the necessary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/server/xorg-server/dri3/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile
cvs rdiff -u -r1.6 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
cvs rdiff -u -r1.11 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/type1/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.6 -r1.7 \
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/utils/cvt/Makefile
cvs rdiff -u -r1.4 -r1.5 \
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/xf86config/Makefile
cvs rdiff -u -r1.42 -r1.43 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/include/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/mi/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/present/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile
cvs rdiff -u -r1.6 -r1.7 \
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
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.22 src/external/mit/xorg/server/xorg-server/Makefile:1.23
--- src/external/mit/xorg/server/xorg-server/Makefile:1.22 Tue Dec 30 22:07:21 2014
+++ src/external/mit/xorg/server/xorg-server/Makefile Fri Aug 12 01:15:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/12/30 22:07:21 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2016/08/12 01:15:49 mrg Exp $
.include <bsd.own.mk>
@@ -13,10 +13,16 @@ SUBDIR.xfont=
SUBDIR= doc include .WAIT
SUBDIR+= glx
SUBDIR+= dix fb mi Xext miext os randr render
+SUBDIR+= present dri3 pseudoramiX
SUBDIR+= Xi xkb xkbstubs dbe record xfixes
SUBDIR+= damageext composite config .WAIT
SUBDIR+= hw
+# XXX
+.if ${HAVE_DRI3:Uno} != "no"
+SUBDIR+= dri3
+.endif
+
.PATH: ${X11SRCDIR.xorg-server}
PKGCONFIG= xorg-server
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.15 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.16
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.15 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Aug 12 01:15:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.15 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.16 2016/08/12 01:15:49 mrg Exp $
.for _SL in \
mi \
@@ -8,6 +8,8 @@
Xext \
Xext/Xextbuiltin \
dbe \
+ present \
+ pseudoramiX \
record \
render \
randr \
@@ -22,6 +24,7 @@
dix/xpstubs \
os \
dix \
+ dri3 \
config \
glx \
hw/xnest \
Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.9 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.10
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.9 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Fri Aug 12 01:15:49 2016
@@ -1,13 +1,34 @@
-# $NetBSD: Makefile.fb,v 1.9 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile.fb,v 1.10 2016/08/12 01:15:49 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS.fb= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
- fbbltone.c fbcopy.c \
- 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 \
- fbtrap.c fbutil.c fbwindow.c
+SRCS.fb= fb24_32.c \
+ fballpriv.c \
+ fbarc.c \
+ fbbits.c \
+ fbblt.c \
+ fbbltone.c \
+ fbcmap_mi.c \
+ fbcopy.c \
+ 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 \
+ 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.11 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.12
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.11 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Fri Aug 12 01:15:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.11 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.12 2016/08/12 01:15:49 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -48,6 +48,7 @@ CPPFLAGS+= \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri2 \
+ -I${X11SRCDIR.xorg-server}/present \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/src/glx \
-I${X11SRCDIR.MesaLib}/src/mesa \
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.12 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.12 Wed Jun 29 19:36:56 2016
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Fri Aug 12 01:15:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/06/29 19:36:56 christos Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/12 01:15:49 mrg Exp $
.include <bsd.own.mk>
@@ -13,8 +13,9 @@ PROG= Xvfb
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.c
+# XXX should not be needed now
+#.PATH: ${X11SRCDIR.xorg-server}/fb
+#SRCS+= fbcmap_mi.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xorg-server}/fb \
@@ -28,8 +29,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/render \
-DHAVE_DIX_CONFIG_H \
- -DNO_HW_ONLY_EXTS \
- -DNO_MODULE_EXTS \
-UGLXEXT
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
@@ -44,7 +43,6 @@ CPPFLAGS+= -UDDXTIME
CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSION} \
-UGLXEXT
CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \
- -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
-UXFree86LOADER \
-UGLXEXT
CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \
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.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.9 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Aug 12 01:15:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/12 01:15:49 mrg Exp $
.include <bsd.own.mk>
@@ -46,7 +46,7 @@ LDADD+= ${LDADD.mi}
LDADD+= ${LDADD.xfixes}
LDADD+= ${LDADD.Xext/Xextbuiltin}
LDADD+= ${LDADD.render}
-LDADD+= ${LDADD.randr}
+eDADD+= ${LDADD.randr}
LDADD+= ${LDADD.damageext}
LDADD+= ${LDADD.miext/damage}
LDADD+= ${LDADD.miext/shadow}
@@ -57,6 +57,10 @@ LDADD+= ${LDADD.os}
LDADD+= ${LDADD.glx}
LDADD+= ${LDADD.hw/xfree86/dri}
LDADD+= ${LDADD.hw/xfree86/dri2}
+# XXX
+.if ${HAVE_DRI3:Uno} != "no"
+LDADD+= ${LDADD.dri3}
+.endif
LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
@@ -118,6 +122,11 @@ DPADD+= ${DPADD.dix} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+# XXX
+.if ${HAVE_DRI3:Uno} != "no"
+DPADD+= ${DPADD.dri3}
+.endif
+
.if ${MKCRYPTO:Uno} != "no"
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
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.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.10 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Fri Aug 12 01:15:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/12 01:15:49 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -22,10 +22,8 @@ CPPFLAGS+= \
-DXFree86LOADER
SUBDIR = \
- dbe \
fb \
glx \
- record \
shadow \
wfb \
xorgxkb
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile:1.3 Sat Jul 18 08:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile Fri Aug 12 01:15:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/12 01:15:50 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
XMODULEDIRANDSTATIC= # defined
@@ -9,6 +9,6 @@ XMODULEDIRANDSTATIC= # defined
LIB= fb
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
-SRCS= ${SRCS.fb} fbmodule.c fbcmap_mi.c
+SRCS= ${SRCS.fb} fbmodule.c
.include "../../../../fb/Makefile.fb"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile:1.2 Fri Jun 12 01:59:05 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile Fri Aug 12 01:15:50 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/12 01:15:50 mrg Exp $
LIB= wfb
-SRCS= fbmodule.c fbcmap_mi.c
+SRCS= fbmodule.c
CPPFLAGS+= -DFB_ACCESS_WRAPPER \
-I${X11SRCDIR.xorg-server}/Xext \
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.12 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.12 Thu Aug 11 08:32:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile Fri Aug 12 01:15:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/11 08:32:43 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/12 01:15:50 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # define
@@ -35,9 +35,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= -DXF86DRI \
${X11FLAGS.DIX}
-CPPFLAGS.dri.c= -Wno-error
-CPPFLAGS.drimodule.c= -Wno-error # XXX xf86dristr.h
-CPPFLAGS.xf86dri.c= -Wno-error # XXX xf86dristr.h
+CPPFLAGS.dri.c= #-Wno-error
+CPPFLAGS.xf86dri.c= #-Wno-error # XXX xf86dristr.h
LIBDPLIBS= drm ${.CURDIR}/../../../../../lib/libdrm
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile:1.6 Sat Jul 18 08:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile Fri Aug 12 01:15:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/12 01:15:50 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -6,7 +6,7 @@
LIB= i2c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
-SRCS= xf86i2c.c # xf86i2cmodule.c
+SRCS= xf86i2c.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/X11 \
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.14 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.14 Thu Aug 11 08:32:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Fri Aug 12 01:15:51 2016
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2016/08/11 08:32:43 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/12 01:15:51 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
+TOP= ${X11SRCDIR.xorg-server}
+XFTOP= ${TOP}/hw/xfree86
+
LIB= loader
-LOADERDIR= ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
+LOADERDIR= ${XFTOP}/${LIB}
.PATH: ${LOADERDIR}
SRCS= loader.c loadmod.c os.c sdksyms.c
@@ -22,6 +25,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
-I${X11SRCDIR.xorg-server}/hw/xfree86/modes \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/dri \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/dri2 \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
-I${X11SRCDIR.xorg-server}/os \
@@ -47,7 +52,7 @@ CPPFLAGS.sdksyms.c= ${X11FLAGS.EXTENSION
COPTS.loadmod.c= -Wno-error
sdksyms.c: sdksyms.sh
- CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+ CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} ${XFTOP}/sdksyms.sh ${TOP} ${CFLAGS} ${CPPFLAGS}
sdksyms.d: sdksyms.c
CLEANFILES+= sdksyms.c sdksyms.dep
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.6 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.6 Thu Aug 11 08:32:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile Fri Aug 12 01:15:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/11 08:32:43 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/12 01:15:51 mrg Exp $
#XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -21,8 +21,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= ${X11FLAGS.DIX}
-CPPFLAGS.xf86BitOrder.c= -DRAMDAC_MODULE
-
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.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.7 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.7 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile Fri Aug 12 01:15:51 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/12 01:15:51 mrg Exp $
PROG= cvt
SRCS= cvt.c xf86cvt.c xprintf.c
@@ -12,6 +12,7 @@ CPPFLAGS+= ${X11FLAGS.DIX} -DHAVE_XORG_C
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/../include \
-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/modes \
-I${X11SRCDIR.xorg-server}/hw/xfree86/parser
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.4 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.4 Fri Jun 12 01:59:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile Fri Aug 12 01:15:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/12 01:15:51 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -20,6 +20,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/xorg \
-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
# XXX
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.4 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.4 Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile Fri Aug 12 01:15:51 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/12 01:15:51 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -9,7 +9,7 @@ LIB= xf86config
SRCS= DRI.c Device.c Extensions.c Files.c Flags.c Input.c Layout.c \
Module.c Monitor.c Pointer.c Screen.c Vendor.c Video.c read.c \
scan.c write.c \
- InputClass.c
+ InputClass.c OutputClass.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/include \
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.42 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.43
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.42 Thu Aug 11 08:32:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Aug 12 01:15:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2016/08/11 08:32:43 mrg Exp $
+# $NetBSD: Makefile,v 1.43 2016/08/12 01:15:51 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -142,6 +142,9 @@ SRCS.bus+= Pci.c
#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
+# All platforms get this.
+SRCS.bus+= nobus.c
+
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
SRCS.misc+= SlowBcopy.c
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.16 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.16 Thu Aug 11 08:32:44 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Fri Aug 12 01:15:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/08/11 08:32:44 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/12 01:15:51 mrg Exp $
.include <bsd.own.mk>
@@ -33,7 +33,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} \
${X11FLAGS.EXTENSION} \
${X11FLAGS.DIX} \
- -DNO_HW_ONLY_EXTS -UXFree86LOADER -UMITSHM \
+ -UXFree86LOADER -UMITSHM \
-D__XKBDEFRULES__='"xorg"'
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xnest \
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.13 src/external/mit/xorg/server/xorg-server/include/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.13 Thu Aug 11 08:32:44 2016
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Fri Aug 12 01:15:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/11 08:32:44 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/12 01:15:51 mrg Exp $
.include <bsd.own.mk>
@@ -23,23 +23,28 @@ XF86_SUBDIR= common ddc dri fbdevhw i2c
INCSDIR=${X11INCDIR}/xorg
INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.h \
bt829.h \
- callback.h closestr.h closure.h colormap.h \
+ callback.h client.h closestr.h closure.h colormap.h \
colormapst.h compiler.h compositeext.h cursor.h cursorstr.h \
damage.h damagestr.h \
- dbestruct.h dgaproc.h dix.h dixevents.h dixfont.h dixfontstr.h \
- dixgrabs.h dixstruct.h dri.h dristruct.h edid.h exa.h exevents.h \
+ dbestruct.h dgaproc.h displaymode.h \
+ dix.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 \
fbpict.h fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \
- glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \
- mi.h mibstore.h micmap.h micoord.h mifillarc.h mifpoly.h \
+ glx_extinit.h glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \
+ mi.h micmap.h micoord.h \
migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
- mispans.h mistruct.h miwideline.h mizerarc.h msp3430.h opaque.h \
- os.h picture.h picturestr.h pixmap.h pixmapstr.h property.h \
- protocol-versions.h \
+ mistruct.h mizerarc.h msp3430.h opaque.h \
+ 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 selection.h servermd.h \
- shadow.h shadowfb.h shmint.h site.h swaprep.h swapreq.h \
+ shadow.h shadowfb.h shmint.h site.h \
tda8425.h tda9850.h \
tda9885.h uda1380.h validate.h vbe.h vbeModes.h vgaHW.h \
window.h windowstr.h \
Index: src/external/mit/xorg/server/xorg-server/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/mi/Makefile:1.10 src/external/mit/xorg/server/xorg-server/mi/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/mi/Makefile:1.10 Thu Aug 11 08:32:44 2016
+++ src/external/mit/xorg/server/xorg-server/mi/Makefile Fri Aug 12 01:15:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/11 08:32:44 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/12 01:15:51 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -11,7 +11,7 @@ SRCS= miarc.c mibitblt.c micopy.c \
miexpose.c mifillarc.c mifillrct.c \
migc.c miglblt.c mioverlay.c mipointer.c mipoly.c \
mipolypnt.c mipolyrect.c \
- mipolyseg.c mipolytext.c mipolyutil.c mipushpxl.c \
+ mipolyseg.c mipolytext.c mipushpxl.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/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.11 src/external/mit/xorg/server/xorg-server/os/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.11 Thu Jul 23 08:03:25 2015
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Fri Aug 12 01:15:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/12 01:15:51 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,10 +6,11 @@
LIB= os
.PATH: ${X11SRCDIR.xorg-server}/os
-SRCS= WaitFor.c access.c auth.c connection.c io.c mitauth.c \
+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 \
xstrans.c xprintf.c log.c xdmcp.c \
- rpcauth.c backtrace.c xprintf.c xsha1.c
+ rpcauth.c xprintf.c xsha1.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.6 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.6 Thu Aug 11 08:32:44 2016
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile Fri Aug 12 01:15:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/11 08:32:44 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/12 01:15:52 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,11 +6,22 @@
LIB= randr
.PATH: ${X11SRCDIR.xorg-server}/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 rrmonitor.c rrprovider.c \
- rrproviderproperty.c
+SRCS= \
+ randr.c \
+ rrcrtc.c \
+ rrdispatch.c \
+ rrinfo.c \
+ rrmode.c \
+ rrmonitor.c \
+ rroutput.c \
+ rrpointer.c \
+ rrproperty.c \
+ rrprovider.c \
+ rrproviderproperty.c \
+ rrscreen.c \
+ rrsdispatch.c \
+ rrtransform.c \
+ rrxinerama.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
Added files:
Index: src/external/mit/xorg/server/xorg-server/dri3/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/dri3/Makefile:1.1
--- /dev/null Fri Aug 12 01:15:52 2016
+++ src/external/mit/xorg/server/xorg-server/dri3/Makefile Fri Aug 12 01:15:49 2016
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2016/08/12 01:15:49 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= dri3
+
+.PATH: ${X11SRCDIR.xorg-server}/dri3
+SRCS= dri3.c \
+ dri3_request.c \
+ dri3_screen.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/../include
+CPPFLAGS+= ${X11FLAGS.DIX}
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/present/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/present/Makefile:1.1
--- /dev/null Fri Aug 12 01:15:52 2016
+++ src/external/mit/xorg/server/xorg-server/present/Makefile Fri Aug 12 01:15:51 2016
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2016/08/12 01:15:51 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= present
+
+.PATH: ${X11SRCDIR.xorg-server}/present
+SRCS= present.c \
+ present_event.c \
+ present_fake.c \
+ present_fence.c \
+ present_notify.c \
+ present_request.c \
+ present_screen.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/../include
+CPPFLAGS+= ${X11FLAGS.DIX}
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile:1.1
--- /dev/null Fri Aug 12 01:15:52 2016
+++ src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile Fri Aug 12 01:15:51 2016
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2016/08/12 01:15:51 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= pseudoramiX
+
+.PATH: ${X11SRCDIR.xorg-server}/pseudoramiX
+SRCS= pseudoramiX.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/../include
+CPPFLAGS+= ${X11FLAGS.DIX}
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
