Module Name: src
Committed By: mrg
Date: Sun Aug 14 03:43:05 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libxshmfence: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
Makefile.serverlib
src/external/mit/xorg/server/xorg-server/Xext: Makefile
src/external/mit/xorg/server/xorg-server/composite: Makefile
src/external/mit/xorg/server/xorg-server/dbe: Makefile
src/external/mit/xorg/server/xorg-server/dix: Makefile
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/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: 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/os: Makefile
src/external/mit/xorg/server/xorg-server/xfixes: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xext
Makefile.Xextbuiltin Makefile.Xextmodule
src/external/mit/xorg/server/xorg-server/Xext/Xextbuiltin: Makefile
src/external/mit/xorg/server/xorg-server/Xext/Xextmodule: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/rac: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp: Makefile
Log Message:
various updates:
- port pkgsrc libxshmfence patches
- Xextbuiltin/module is no longer a thing, make it normal
- always need xorg-config.h/xorg-server.h for server components now
- add present, damage, render, Xi, dri, pixman, extension where needed
- fix various CPPFLAGS issues
- deal with moved sdksyms.sh
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxshmfence/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile
cvs rdiff -u -r1.12 -r0 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
cvs rdiff -u -r1.7 -r0 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
cvs rdiff -u -r1.9 -r0 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/Xext/Xextbuiltin/Makefile
cvs rdiff -u -r1.7 -r0 \
src/external/mit/xorg/server/xorg-server/Xext/Xextmodule/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/composite/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/dbe/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.5 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/rac/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci/Makefile
cvs rdiff -u -r1.8 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile
cvs rdiff -u -r1.43 -r1.44 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/xfixes/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/lib/libxshmfence/Makefile
diff -u src/external/mit/xorg/lib/libxshmfence/Makefile:1.1 src/external/mit/xorg/lib/libxshmfence/Makefile:1.2
--- src/external/mit/xorg/lib/libxshmfence/Makefile:1.1 Sun Aug 14 00:02:19 2016
+++ src/external/mit/xorg/lib/libxshmfence/Makefile Sun Aug 14 03:43:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/14 00:02:19 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/14 03:43:03 mrg Exp $
.include <bsd.own.mk>
@@ -6,21 +6,18 @@ LIB= xshmfence
XSHMFENCEDIR= ${X11SRCDIR.${LIB}}
.PATH: ${XSHMFENCEDIR}/src
-SRCS= xshmfence_pthread.c xshmfence_alloc.c
+SRCS= xshmfence_alloc.c xshmfence_semaphore.c
INCS= xshmfence.h
INCSDIR=${X11INCDIR}/X11
-#CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-CPPFLAGS+= -DHAVE_PTHREAD
CPPFLAGS+= -DSHMDIR=\"/var/shm\"
+CPPFLAGS+= -DHAVE_SEMAPHORE
# XXX
-CPPFLAGS+= -D_PTHREAD_PSHARED
+CPPFLAGS+= -DLIBXSHM_PAGESIZE=4096
NOMAN= # defined
-#LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic
-
PKGDIST= ${LIB}
.include <bsd.x11.mk>
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.16 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.17
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.16 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Sun Aug 14 03:43:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.16 2016/08/12 01:15:49 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.17 2016/08/14 03:43:03 mrg Exp $
.for _SL in \
mi \
@@ -6,7 +6,6 @@
fb \
xfixes \
Xext \
- Xext/Xextbuiltin \
dbe \
present \
pseudoramiX \
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.9 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.10
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.9 Mon Jan 25 18:00:26 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Sun Aug 14 03:43:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.9 2016/01/25 18:00:26 christos Exp $
+# $NetBSD: Makefile.serverlib,v 1.10 2016/08/14 03:43:03 mrg Exp $
.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
@@ -21,6 +21,9 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include \
+ -DHAVE_XORG_CONFIG_H -D_HAVE_DIX_CONFIG_H
+
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.5 src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.5 Sat Aug 9 06:48:17 2008
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile Sun Aug 14 03:43:03 2016
@@ -1,16 +1,53 @@
-# $NetBSD: Makefile,v 1.5 2008/08/09 06:48:17 rtr Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/14 03:43:03 mrg Exp $
LIBISPRIVATE= yes
LIB= Xext
.include "../Makefile.serverlib"
-.include "Makefile.Xextbuiltin"
-.include "Makefile.Xextmodule"
+SRCS= bigreq.c geext.c shape.c sleepuntil.c \
+ sync.c xcmisc.c xtest.c
+SRCS+= shm.c
+SRCS+= xvmain.c xvdisp.c xvmc.c
+SRCS+= hashtable.c xres.c
+SRCS+= saver.c
+SRCS+= panoramiX.c panoramiXprocs.c panoramiXSwap.c
+SRCS+= xace.c
+SRCS+= security.c
+SRCS+= xf86bigfont.c
+SRCS+= dpms.c
+# XXX not really
+SRCS+= vidmode.c
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xext
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/Xi
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/xfixes
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/miext/sync
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/composite
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/damageext
+CPPFLAGS+= -DHAVE_DIX_CONFIG_H
+
+.if 0
+COPTS.panoramiX.c+= -Wno-error
+COPTS.panoramiXprocs.c+= -Wno-error
+COPTS.saver.c+= -Wno-error
+COPTS.security.c+= -Wno-error
+COPTS.shape.c+= -Wno-error
+COPTS.shm.c+= -Wno-error
+COPTS.sync.c+= -Wno-error
+COPTS.xf86bigfont.c+= -Wno-error
+COPTS.xres.c= -Wno-error
+COPTS.xvdisp.c+= -Wno-error
+COPTS.xvmain.c+= -Wno-error
+COPTS.xvmc.c+= -Wno-error
+COPTS.bigreq.c+= -Wno-error # XXX bigreqstr.h
+COPTS.xcmisc.c+= -Wno-error # XXX xcmiscstr.h
+.endif
-SRCS= ${SRCS.Xextbuiltin} ${SRCS.Xextmodule}
+.PATH: ${X11SRCDIR.xorg-server}/Xext
-SUBDIR= Xextbuiltin Xextmodule
-
-.include <bsd.subdir.mk>
-.include "Makefile.Xext"
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/composite/Makefile
diff -u src/external/mit/xorg/server/xorg-server/composite/Makefile:1.5 src/external/mit/xorg/server/xorg-server/composite/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/composite/Makefile:1.5 Fri Nov 6 21:32:22 2015
+++ src/external/mit/xorg/server/xorg-server/composite/Makefile Sun Aug 14 03:43:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/11/06 21:32:22 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/14 03:43:03 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -18,6 +18,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/xfixes \
-I${X11SRCDIR.xorg-server}/damageext \
-I${X11SRCDIR.xorg-server}/miext/damage \
+ -I${X11SRCDIR.xorg-server}/present \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
Index: src/external/mit/xorg/server/xorg-server/dbe/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dbe/Makefile:1.3 src/external/mit/xorg/server/xorg-server/dbe/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/dbe/Makefile:1.3 Sat Aug 22 02:40:27 2009
+++ src/external/mit/xorg/server/xorg-server/dbe/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:27 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/14 03:43:04 mrg Exp $
LIBISPRIVATE= yes
@@ -7,6 +7,6 @@ LIBISPRIVATE= yes
LIB= dbe
SRCS= ${SRCS.dbe}
-COPTS.dbe.c= -Wno-error
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/present
.include "Makefile.dbe"
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.14 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.14 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -22,8 +22,10 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/mi
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION}
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX}
+.if 0
CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\" \
-DRGB_DB=\"${X11LIBDIR}/rgb\"
+.endif
# XXX make user variables
CPPFLAGS.dispatch.c= -DVENDOR_NAME="\"The Xorg Foundation\""
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.14 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
.include <bsd.own.mk>
@@ -72,6 +72,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.composite} \
${LDADD.os} \
${LDADD.glx} \
+ ${LDADD.present} \
-lXfont \
-lfreetype \
-lXau \
@@ -103,6 +104,7 @@ DPADD+= ${DPADD.dix} \
${DPADD.composite} \
${DPADD.os} \
${DPADD.glx} \
+ ${DPADD.present} \
${LIBXFONT} \
${LIBFREETYPE} \
${LIBXAU} \
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.11 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.11 Fri Aug 12 20:45:05 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/08/12 20:45:05 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/14 03:43:04 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,7 @@ BINMODE= 4711
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86
SRCS= xorg-wrapper.c
+SRCS= dummy.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xorg-server}/fb \
@@ -17,6 +18,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${X11SRCDIR.xorg-server}/os \
-I${X11SRCDIR.xorg-server}/Xext \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/render \
@@ -31,6 +33,8 @@ LDADD+= -Wl,--whole-archive
LDADD+= ${LDADD.dix}
LDADD+= ${LDADD.hw/xfree86/init}
LDADD+= ${LDADD.config}
+LDADD+= ${LDADD.dbe}
+LDADD+= ${LDADD.record}
LDADD+= ${LDADD.hw/xfree86/loader}
LDADD+= ${LDADD.hw/xfree86/common}
LDADD+= ${LDADD.hw/xfree86/xorgos}
@@ -44,7 +48,7 @@ LDADD+= ${LDADD.hw/xfree86/i2c}
LDADD+= ${LDADD.composite}
LDADD+= ${LDADD.mi}
LDADD+= ${LDADD.xfixes}
-LDADD+= ${LDADD.Xext/Xextbuiltin}
+LDADD+= ${LDADD.Xext}
LDADD+= ${LDADD.render}
LDADD+= ${LDADD.randr}
LDADD+= ${LDADD.damageext}
@@ -55,6 +59,7 @@ LDADD+= ${LDADD.Xi}
LDADD+= ${LDADD.xkb}
LDADD+= ${LDADD.os}
LDADD+= ${LDADD.glx}
+LDADD+= ${LDADD.present}
LDADD+= ${LDADD.hw/xfree86/dri}
LDADD+= ${LDADD.hw/xfree86/dri2}
# XXX
@@ -78,14 +83,14 @@ LDADD+= -lalpha
DPADD+= ${LIBALPHA}
.endif
+LDADD+= -lm -lGL -lXv -lxshmfence
+
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
# Needed by current xf86-video-intel for SNA.
LDADD+= -lpthread
DPADD+= ${LIBPTHREAD}
.endif
-LDADD+= -lm
-
DPADD+= ${DPADD.dix} \
${DPADD.fb} \
${DPADD.mi} \
@@ -105,6 +110,7 @@ DPADD+= ${DPADD.dix} \
${DPADD.composite} \
${DPADD.os} \
${DPADD.glx} \
+ ${DPADD.present} \
${DPADD.hw/xfree86/dri} \
${DPADD.hw/xfree86/dri2} \
${DPADD.hw/xfree86/dixmods/fb} \
@@ -120,7 +126,8 @@ DPADD+= ${DPADD.dix} \
${DPADD.hw/xfree86/i2c} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
+ ${LIBGL} ${LIBXV} ${LIBXSHMFENCE}
# XXX
.if ${HAVE_DRI3:Uno} != "no"
@@ -142,6 +149,10 @@ FILESDIR= ${X11ROOTDIR}/share/aclocal
.PATH: ${X11SRCDIR.xorg-server}
+dummy.c:
+ echo > dummy.c
+CLEANFILES=+ dummy.c
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
.include <bsd.files.mk>
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.22 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.23
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.22 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2016/08/14 03:43:04 mrg Exp $
.include <bsd.own.mk>
@@ -114,8 +114,7 @@ CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/
-DXORG_RELEASE='"Release 1.4.2"' \
-DBUILDERADDR='"[email protected]"' \
-DOSVENDOR='" The NetBSD Foundation, Inc."'
-CPPFLAGS.xf86Globals.c= -DDEFAULT_LOGPREFIX='"/var/log/Xorg."' \
- -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"'
+CPPFLAGS.xf86Globals.c= -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"'
CPPFLAGS.xf86Configure.c= -DXF86CONFIGFILE='"xorg.conf"'
CPPFLAGS.xf86Config.c= -DDRIVERS='"${DRIVERS}"' \
-DIDRIVERS='"${IDRIVERS}"' \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.6 Sat Jul 18 08:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile Sun Aug 14 03:43:04 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/14 03:43:04 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -14,6 +14,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
+ -I${X11SRCDIR.xorg-server}/render \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
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.11 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.11 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/08/12 01:15:49 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/14 03:43:04 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -14,6 +14,7 @@ CPPFLAGS+= \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/loader
CPPFLAGS+= \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.6 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile Sun Aug 14 03:43:04 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/doc
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/doc/man
+.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/man
FILES= README.modes
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.9 Thu Aug 11 08:32:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/11 08:32:43 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/14 03:43:04 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
XMODULEDIRANDSTATIC= # defined
@@ -26,6 +26,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/parser \
-I${X11SRCDIR.xorg-server}/ramdac \
-I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
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.15 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.15 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Sun Aug 14 03:43:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/14 03:43:04 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -33,11 +33,17 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/xfixes \
+ -I${X11SRCDIR.xorg-server}/Xi \
+ -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/../include \
-I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${DESTDIR}${X11INCDIR}/xorg
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} -DDLOPEN_SUPPORT -DHAS_SHM \
+ -DHAVE_XORG_CONFIG_H -DHAVE_DIX_CONFIG_H \
-DIN_LOADER \
${x11FLAGS.DIX}
@@ -51,8 +57,11 @@ CPPFLAGS.sdksyms.c= ${X11FLAGS.EXTENSION
#COPTS.sdksyms.c= -Wno-error
COPTS.loadmod.c= -Wno-error
-sdksyms.c: sdksyms.sh
- CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} ${XFTOP}/sdksyms.sh ${TOP} ${CFLAGS} ${CPPFLAGS}
+SDKSYMS_CFLAGS=${CFLAGS} ${CPPFLAGS}
+# Ugh, pid_t in the header trips the script.
+SDKSYMS_CFLAGS+= -Dpid_t=unsigned
+sdksyms.c: ${XFTOP}/sdksyms.sh
+ CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} ${XFTOP}/sdksyms.sh ${TOP} ${SDKSYMS_CFLAGS}
sdksyms.d: sdksyms.c
CLEANFILES+= sdksyms.c sdksyms.dep
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.43 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.44
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.43 Fri Aug 12 01:15:51 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Aug 14 03:43:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/08/12 01:15:51 mrg Exp $
+# $NetBSD: Makefile,v 1.44 2016/08/14 03:43:05 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -161,6 +161,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc \
-I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
+ -I${X11SRCDIR.xorg-server}/render \
+ -I${X11SRCDIR.xorg-server}/present \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.18 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Sun Aug 14 03:43:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2016/08/14 03:43:05 mrg Exp $
.include <bsd.own.mk>
@@ -25,6 +25,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/os \
+ -I${X11SRCDIR.xorg-server}/present \
-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
@@ -69,6 +70,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.composite} \
${LDADD.os} \
${LDADD.glx} \
+ ${LDADD.present} \
-lXfont -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
-lXdmcp -lfreetype -lm
@@ -92,6 +94,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.composite} \
${DPADD.os} \
${DPADD.glx} \
+ ${DPADD.present} \
${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.13 src/external/mit/xorg/server/xorg-server/os/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.13 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Sun Aug 14 03:43:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/14 03:43:05 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -9,7 +9,7 @@ LIB= 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 \
- xstrans.c xprintf.c log.c xdmcp.c \
+ xstrans.c xprintf.c log.c xdmcp.c busfault.c \
rpcauth.c xsha1.c \
reallocarray.c
@@ -19,7 +19,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/render \
- -I${X11SRCDIR.xorg-server}/lbx \
+ -I${X11SRCDIR.xorg-server}/present \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX} \
@@ -29,10 +29,15 @@ CPPFLAGS+= ${X11FLAGS.DIX} \
${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
.include "../Makefile.common"
Index: src/external/mit/xorg/server/xorg-server/xfixes/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.4 src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.4 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/xfixes/Makefile Sun Aug 14 03:43:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/14 03:43:05 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -18,6 +18,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/Xi \
-I${X11SRCDIR.xorg-server}/xfixes \
-I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/present \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
