Module Name: src
Committed By: mrg
Date: Fri Jul 15 04:18:56 UTC 2022
Modified Files:
src/external/mit/xorg/server/drivers: Makefile Makefile.xf86-driver
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
Makefile.serverlib Makefile.servermod
src/external/mit/xorg/server/xorg-server/config: Makefile
src/external/mit/xorg/server/xorg-server/dix: 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/int10: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: 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/include: Makefile
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/xfixes: Makefile
Log Message:
various updates to build with xorg-server 21.1.3.
- the s3, tga, and trident drivers use old functionality and are disabled
- dixmods/fb is removed, main fb has all these now (we retain our revert
of an upstream change here.)
- adjust source lists as necessary
- remove vbe module, now part of int10
- use -lxcvt
- misc clean up
- ramdac loses IBM, BT and TI support (this is one of the problems for
the disabled drivers, but also some structures in RamDac.h are gone
entirely, not copied anywhere.)
- old apm code is gone, all bsd uses pm_noop. now
this probably require a clean build in at least xorg-server and the
drivers, and perhaps the DESTDIR as well. will update src/UPDATING with
details when they are fully known.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/config/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.40 -r1.41 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.34 -r1.35 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
cvs rdiff -u -r1.8 -r1.9 \
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/xf86modes/Makefile
cvs rdiff -u -r1.50 -r1.51 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/include/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/present/Makefile
cvs rdiff -u -r1.5 -r1.6 \
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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.105 src/external/mit/xorg/server/drivers/Makefile:1.106
--- src/external/mit/xorg/server/drivers/Makefile:1.105 Tue Jul 12 02:42:40 2022
+++ src/external/mit/xorg/server/drivers/Makefile Fri Jul 15 04:18:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2022/07/12 02:42:40 mrg Exp $
+# $NetBSD: Makefile,v 1.106 2022/07/15 04:18:54 mrg Exp $
.include <bsd.own.mk>
@@ -42,14 +42,11 @@ SUBDIR+= \
xf86-video-r128 \
xf86-video-radeon \
xf86-video-radeon-kms \
- xf86-video-s3 \
xf86-video-s3virge \
xf86-video-savage \
xf86-video-siliconmotion \
xf86-video-sis \
xf86-video-tdfx \
- xf86-video-tga \
- xf86-video-trident \
xf86-video-tseng \
xf86-video-vboxvideo \
xf86-video-vmware \
@@ -60,6 +57,11 @@ SUBDIR+= \
# xf86-video-imstt
# xf86-video-rendition
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+# xf86-video-tga
+# xf86-video-trident
+
# needs porting for xorg-server 1.18
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
@@ -120,14 +122,19 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "amiga"
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
.if ${MACHINE} == "bebox"
SUBDIR+= \
xf86-video-cirrus \
xf86-video-mga \
- xf86-video-s3 \
xf86-video-s3virge
.endif # ${MACHINE} == "bebox"
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+# xf86-video-tga
+# xf86-video-trident
.if ${MACHINE} == "cats"
SUBDIR+= \
xf86-video-ast \
@@ -140,13 +147,10 @@ SUBDIR+= \
xf86-video-neomagic \
xf86-video-nv \
xf86-video-radeon \
- xf86-video-s3 \
xf86-video-s3virge \
xf86-video-savage \
xf86-video-siliconmotion \
xf86-video-tdfx \
- xf86-video-tga \
- xf86-video-trident \
xf86-video-tseng \
xf86-video-vesa \
xf86-video-wsfb
@@ -209,8 +213,9 @@ SUBDIR+= \
.endif # ${MACHINE} == "hppa"
.if ${MACHINE} == "ibmnws"
-SUBDIR+= \
- xf86-video-s3
+# needs porting for xorg-server 21.1.3
+#SUBDIR+= \
+# xf86-video-s3
.endif # ${MACHINE} == "ibmnws"
.if ${MACHINE} == "iyonix"
@@ -229,11 +234,12 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "mac68k"
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
.if ${MACHINE} == "macppc"
SUBDIR+= \
xf86-video-ati \
xf86-video-chips \
- xf86-video-glint \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -268,19 +274,21 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "ofppc"
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
.if ${MACHINE} == "prep"
SUBDIR+= \
xf86-video-cirrus \
- xf86-video-mga \
- xf86-video-s3
+ xf86-video-mga
.endif # ${MACHINE} == "prep"
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
+# xf86-video-s3
.if ${MACHINE} == "sgimips"
SUBDIR+= \
xf86-video-cirrus \
- xf86-video-glint \
xf86-video-mga \
- xf86-video-s3 \
xf86-video-wsfb
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
@@ -296,11 +304,12 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "shark"
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
.if ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64"
SUBDIR+= \
xf86-video-ati \
- xf86-video-glint \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-r128 \
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.32 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.33
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.32 Wed Dec 15 16:27:10 2021
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Fri Jul 15 04:18:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.32 2021/12/15 16:27:10 christos Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.33 2022/07/15 04:18:54 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -47,6 +47,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DHAVE_XAA_H
+.else
+CPPFLAGS+= -D_OPENBSD_SOURCE
.endif
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.23 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.24
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.23 Mon Nov 1 10:05:19 2021
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Jul 15 04:18:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.23 2021/11/01 10:05:19 nia Exp $
+# $NetBSD: Makefile.Xserver,v 1.24 2022/07/15 04:18:54 mrg Exp $
.for _SL in \
mi \
@@ -31,7 +31,6 @@
hw/xfree86/common \
hw/xfree86/ddc \
hw/xfree86/dixmods \
- hw/xfree86/dixmods/fb \
hw/xfree86/dixmods/shadow \
hw/xfree86/dixmods/wfb \
hw/xfree86/doc \
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.15 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.16
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.15 Tue Nov 16 09:25:52 2021
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 15 04:18:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.15 2021/11/16 09:25:52 nia Exp $
+# $NetBSD: Makefile.serverlib,v 1.16 2022/07/15 04:18:54 mrg Exp $
NOFULLRELRO= yes
@@ -22,7 +22,7 @@ X_BYTE_ORDER=X_BIG_ENDIAN
X_BYTE_ORDER=0
.endif
-CPPFLAGS+= ${X11FLAGS.SERVER}
+CPPFLAGS+= ${X11FLAGS.SERVER} -D_OPENBSD_SOURCE
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
.if ${HAVE_XORG_GLAMOR} != "no"
Index: src/external/mit/xorg/server/xorg-server/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.8 src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.9
--- src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.8 Tue Nov 16 09:25:52 2021
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod Fri Jul 15 04:18:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.8 2021/11/16 09:25:52 nia Exp $
+# $NetBSD: Makefile.servermod,v 1.9 2022/07/15 04:18:54 mrg Exp $
NOFULLRELRO= yes
@@ -28,7 +28,7 @@ moduleinstall::
CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
-CPPFLAGS+= ${X11FLAGS.DIX}
+CPPFLAGS+= ${X11FLAGS.DIX} -D_OPENBSD_SOURCE
# IOPortBase is particularly annoying to fix
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server/config/Makefile
diff -u src/external/mit/xorg/server/xorg-server/config/Makefile:1.3 src/external/mit/xorg/server/xorg-server/config/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/config/Makefile:1.3 Sun Dec 5 22:59:32 2021
+++ src/external/mit/xorg/server/xorg-server/config/Makefile Fri Jul 15 04:18:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/05 22:59:32 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/07/15 04:18:54 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -19,5 +19,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
CPPFLAGS+= -DCONFIG_WSCONS
+CPPFLAGS+= -Wno-error=deprecated-declarations
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.18 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.18 Mon Dec 31 11:14:03 2018
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Fri Jul 15 04:18:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/12/31 11:14:03 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2022/07/15 04:18:54 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 gc.c getevents.c \
+ dixutils.c events.c extension.c gc.c getevents.c gestures.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 \
@@ -25,10 +25,8 @@ CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX
CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\"
# XXX make user variables
-CPPFLAGS.dispatch.c= -DVENDOR_NAME="\"The Xorg Foundation\""
CPPFLAGS.main.c= -DVENDOR_STRING="\"The Xorg Group\"" \
-DVENDOR_RELEASE=${XORG_VERSION_CURRENT} \
- -DVENDOR_NAME="\"The Xorg Foundation\""
FILES= protocol.txt
FILESDIR= ${X11ROOTDIR}/lib/xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.40 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.41
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.40 Sun Mar 7 10:42:27 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Fri Jul 15 04:18:55 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2021/03/07 10:42:27 rin Exp $
+# $NetBSD: Makefile,v 1.41 2022/07/15 04:18:55 mrg Exp $
.include <bsd.own.mk>
SUBDIR= common ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
- xorgos ramdac shadowfb vbe vgahw \
+ xorgos ramdac shadowfb vgahw \
x86emu xf86config xkb \
drivers
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.21 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.22
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.21 Tue Nov 16 09:25:52 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/11/16 09:25:52 nia Exp $
+# $NetBSD: Makefile,v 1.22 2022/07/15 04:18:55 mrg Exp $
USE_FORT?= yes # network server *and* setuid
@@ -32,6 +32,7 @@ LDFLAGS+= -rdynamic
LDADD+= -Wl,--whole-archive
LDADD+= ${LDADD.dix}
+LDADD+= ${LDADD.fb}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
@@ -66,9 +67,8 @@ LDADD+= ${LDADD.present}
LDADD+= ${LDADD.hw/xfree86/dri}
LDADD+= ${LDADD.hw/xfree86/dri2}
LDADD+= ${LDADD.dri3}
-LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= -lpixman-1 -lXfont2 -lfreetype -lXau -lfontenc -lXdmcp
-LDADD+= -lpciaccess -ldrm
+LDADD+= -lpciaccess -ldrm -lxcvt
LDADD+= -Wl,--no-whole-archive
.if ${MACHINE_ARCH} == "i386"
@@ -117,7 +117,6 @@ DPADD+= \
${DPADD.hw/xfree86/dri} \
${DPADD.hw/xfree86/dri2} \
${DPADD.dri3} \
- ${DPADD.hw/xfree86/dixmods/fb} \
${DPADD.hw/xfree86/fb} \
${DPADD.hw/xfree86/common} \
${DPADD.hw/xfree86/loader} \
@@ -131,7 +130,7 @@ DPADD+= \
${LIBCWRAPPER} \
${LIBXFONT2} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
- ${LIBGL} ${LIBXV} ${LIBXSHMFENCE}
+ ${LIBGL} ${LIBXV} ${LIBXSHMFENCE} ${LIBXCVT}
.if ${HAVE_XORG_GLAMOR} != "no"
DPADD+= \
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.34 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.35
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.34 Sun Dec 5 22:59:32 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/12/05 22:59:32 nia Exp $
+# $NetBSD: Makefile,v 1.35 2022/07/15 04:18:55 mrg Exp $
.include <bsd.own.mk>
@@ -97,9 +97,7 @@ IDRIVERS= mouse keyboard acecad calcomp
mutouch penmount spaceorb summa wacom void \
magellan hyperpen jamstudio fpit palmax
-CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfre...@xfree86.org"'
-CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
- -DBUILDERADDR='"x...@xorg.org"' \
+CPPFLAGS.xf86Init.c+= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
-DOSVENDOR='"The NetBSD Foundation, Inc."' \
-DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"' \
-DDEFAULT_LIBRARY_PATH='"${X11USRLIBDIR}"'
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.15 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.15 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2022/07/15 04:18:55 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -22,7 +22,6 @@ CPPFLAGS+= \
-I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
SUBDIR = \
- fb \
glx \
shadow \
wfb
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.10 Mon Dec 31 21:38:53 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/12/31 21:38:53 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2022/07/15 04:18:55 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -9,7 +9,7 @@ LIB= int10
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/int10
SRCS= x86emu.c generic.c xf86x86emu.c xf86int10.c helper_mem.c \
- helper_exec.c xf86int10module.c
+ helper_exec.c xf86int10module.c vbe.c vbeModes.c
CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \
-D_X86EMU
@@ -28,6 +28,10 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/modes \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/parser \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
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.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile:1.8 Mon Dec 31 11:14:05 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/12/31 11:14:05 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2022/07/15 04:18:55 mrg Exp $
#XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -8,8 +8,7 @@
LIB= ramdac
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
-SRCS= xf86RamDac.c xf86RamDacCmap.c \
- xf86CursorRD.c xf86HWCurs.c IBM.c BT.c TI.c
+SRCS= xf86CursorRD.c xf86HWCurs.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-I${X11SRCDIR.xorg-server}/Xext \
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.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.7 Mon Dec 31 11:14:05 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/12/31 11:14:05 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2022/07/15 04:18:55 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -9,7 +9,6 @@ LIB= xf86modes
SRCS=\
xf86Crtc.c \
xf86Cursors.c \
- xf86cvt.c \
xf86gtf.c \
xf86EdidModes.c \
xf86Modes.c \
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.50 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.51
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.50 Mon Dec 6 17:51:59 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2021/12/06 17:51:59 abs Exp $
+# $NetBSD: Makefile,v 1.51 2022/07/15 04:18:55 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -10,16 +10,10 @@ LIB= xorgos
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared
SRCS.bsd= \
bsd_VTsw.c bsd_bell.c bsd_init.c bsd_pci.c \
- kmod_noop.c \
+ kmod_noop.c pm_noop.c \
posix_tty.c sigio.c vidmem.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/linux
-.if ${MACHINE_ARCH} == "x86_64"
-SRCS.bsd+= pm_noop.c
-.endif
-.if ${MACHINE_ARCH} == "i386"
-SRCS.bsd+= bsd_apm.c
-.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS.bsd+= i386_video.c lnx_agp.c
.for _FN in ${SRCS.bsd}
@@ -36,7 +30,7 @@ CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCON
.endif
.if ${MACHINE_CPU} == "powerpc" || ${MACHINE} == "hppa"
-SRCS.bsd+= ppc_video.c pm_noop.c
+SRCS.bsd+= ppc_video.c
. if ${MACHINE} != "evbppc"
SRCS.bsd+= lnx_agp.c
. else
@@ -48,14 +42,14 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT
.endif
.if ${MACHINE_ARCH} == "alpha"
-SRCS.bsd+= alpha_video.c pm_noop.c agp_noop.c
+SRCS.bsd+= alpha_video.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_ALPHA_PIO
.endfor
.endif
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c agp_noop.c
SRCS.bus+= netbsdSbus.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -67,7 +61,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT
${MACHINE} == "newsmips" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "evbmips"
-SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@@ -80,7 +74,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT
${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "zaurus"
-SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@@ -92,7 +86,7 @@ CPPFLAGS.ppc_video.c += -DPCI_MAGIC_IO_R
.if ${MACHINE} == "dreamcast" || \
${MACHINE} == "hpcsh"
-SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@@ -102,7 +96,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
${MACHINE} == "hp300" || \
${MACHINE} == "luna68k" || \
${MACHINE} == "mac68k"
-SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@@ -110,7 +104,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.if ${MACHINE} == "pmax" || \
${MACHINE} == "vax"
-SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.19 src/external/mit/xorg/server/xorg-server/include/Makefile:1.20
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.19 Mon Dec 31 11:14:06 2018
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Fri Jul 15 04:18:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/12/31 11:14:06 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2022/07/15 04:18:55 mrg Exp $
.include <bsd.own.mk>
@@ -22,7 +22,7 @@ XF86_SUBDIR= common ddc dri fbdevhw i2c
.PATH: ${XORGSRC}/../include
INCSDIR=${X11INCDIR}/xorg
-INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.h \
+INCS= XIstubs.h Xprintf.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 \
@@ -50,7 +50,7 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
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 \
+ shadow.h shadowfb.h shmint.h \
validate.h vbe.h vbeModes.h vgaHW.h \
version-config.h \
vndserver.h \
@@ -62,7 +62,7 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
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 \
+ xf86Priv.h xf86Privstr.h xf86RandR12.h \
xf86Xinput.h xf86_OSlib.h \
xf86_OSproc.h xf86cmap.h xf86fbman.h \
xf86i2c.h xf86int10.h xf86sbusBus.h xf86str.h xf86xv.h \
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.17 src/external/mit/xorg/server/xorg-server/os/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.17 Tue Jan 22 12:45:25 2019
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Fri Jul 15 04:18:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/01/22 12:45:25 tron Exp $
+# $NetBSD: Makefile,v 1.18 2022/07/15 04:18:56 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -21,6 +21,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/render \
-I${X11SRCDIR.xorg-server}/present \
+ -I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/randr \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX} \
Index: src/external/mit/xorg/server/xorg-server/present/Makefile
diff -u src/external/mit/xorg/server/xorg-server/present/Makefile:1.3 src/external/mit/xorg/server/xorg-server/present/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/present/Makefile:1.3 Mon Dec 31 11:14:06 2018
+++ src/external/mit/xorg/server/xorg-server/present/Makefile Fri Jul 15 04:18:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/12/31 11:14:06 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2022/07/15 04:18:56 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -15,8 +15,7 @@ SRCS= present.c \
present_request.c \
present_scmd.c \
present_screen.c \
- present_vblank.c \
- present_wnmd.c
+ present_vblank.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
Index: src/external/mit/xorg/server/xorg-server/xfixes/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.5 src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.5 Sun Aug 14 03:43:05 2016
+++ src/external/mit/xorg/server/xorg-server/xfixes/Makefile Fri Jul 15 04:18:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/14 03:43:05 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2022/07/15 04:18:56 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,7 +6,7 @@
LIB= xfixes
.PATH: ${X11SRCDIR.xorg-server}/xfixes
-SRCS= cursor.c region.c saveset.c select.c xfixes.c
+SRCS= cursor.c disconnect.c region.c saveset.c select.c xfixes.c
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION} ${X11FLAGS.DIX}
