Module Name: src
Committed By: mrg
Date: Fri Jul 15 19:12:39 UTC 2022
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
Log Message:
fix driver list for sgimips, make Xsun and Xvfb build.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/hw/vfb/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.107 src/external/mit/xorg/server/drivers/Makefile:1.108
--- src/external/mit/xorg/server/drivers/Makefile:1.107 Fri Jul 15 04:53:05 2022
+++ src/external/mit/xorg/server/drivers/Makefile Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2022/07/15 04:53:05 mrg Exp $
+# $NetBSD: Makefile,v 1.108 2022/07/15 19:12:39 mrg Exp $
.include <bsd.own.mk>
@@ -275,9 +275,6 @@ SUBDIR+= \
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 \
@@ -286,7 +283,9 @@ SUBDIR+= \
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-crime \
- xf86-video-newport
+ xf86-video-glint \
+ xf86-video-newport \
+ xf86-video-s3
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "sgimips"
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.12 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.12 Sat Aug 21 15:57:00 2021
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/08/21 15:57:00 tsutsui Exp $
+# $NetBSD: Makefile,v 1.13 2022/07/15 19:12:39 mrg Exp $
.include <bsd.own.mk>
@@ -33,6 +33,7 @@ CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE
-UXF86DRI -UXF86BIGFONT
CPPFLAGS+= -UHAVE_XORG_CONFIG_H
+CPPFLAGS+= -D_OPENBSD_SOURCE
CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.6 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.7
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.6 Sat Aug 21 15:57:00 2021
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.6 2021/08/21 15:57:00 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.7 2022/07/15 19:12:39 mrg Exp $
.include <bsd.own.mk>
@@ -15,6 +15,7 @@ WARNS?= 2
BUILDSYMLINKS=
CPPFLAGS+= -DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\"
CPPFLAGS+= -DINCLUDE_CG2_HEADER
+CPPFLAGS+= -D_OPENBSD_SOURCE -D_XTYPEDEF_POINTER=1
#CPPFLAGS+= -DLOWMEMFTPT
# for Xsun (8bpp)
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.21 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.22
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.21 Thu Aug 19 11:03:04 2021
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Fri Jul 15 19:12:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/08/19 11:03:04 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2022/07/15 19:12:39 mrg Exp $
.include <bsd.own.mk>
@@ -28,7 +28,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-UGLXEXT
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
- -DHAS_SHM -DHAS_MMAP -UXFree86LOADER
+ -DHAS_SHM -DHAS_MMAP -UXFree86LOADER \
+ -D_OPENBSD_SOURCE
.include "../../Makefile.common"
