[src/trunk]: src/external/mit/xorg/server fix driver list for sgimips, make X...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a6640a120fd0
branches:  trunk
changeset: 368493:a6640a120fd0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 19:12:39 2022 +0000

description:
fix driver list for sgimips, make Xsun and Xvfb build.

diffstat:

 external/mit/xorg/server/drivers/Makefile                    |  9 ++++-----
 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile |  3 ++-
 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun    |  3 ++-
 external/mit/xorg/server/xorg-server/hw/vfb/Makefile         |  5 +++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diffs (83 lines):

diff -r 163159629894 -r a6640a120fd0 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Fri Jul 15 18:58:09 2022 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Fri Jul 15 19:12:39 2022 +0000
@@ -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 @@
        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 @@
 .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"
 
diff -r 163159629894 -r a6640a120fd0 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Fri Jul 15 18:58:09 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Fri Jul 15 19:12:39 2022 +0000
@@ -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 @@
                -UXF86DRI -UXF86BIGFONT
 
 CPPFLAGS+=     -UHAVE_XORG_CONFIG_H
+CPPFLAGS+=     -D_OPENBSD_SOURCE
 
 CPPFLAGS.x68kConfig.c=  -DX11_LIBDIR=\"${X11ETCDIR}\"
 
diff -r 163159629894 -r a6640a120fd0 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
--- a/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Fri Jul 15 18:58:09 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Fri Jul 15 19:12:39 2022 +0000
@@ -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 @@
 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)
diff -r 163159629894 -r a6640a120fd0 external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Fri Jul 15 18:58:09 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Fri Jul 15 19:12:39 2022 +0000
@@ -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 @@
                -UGLXEXT
 
 CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
-               -DHAS_SHM -DHAS_MMAP -UXFree86LOADER
+               -DHAS_SHM -DHAS_MMAP -UXFree86LOADER \
+               -D_OPENBSD_SOURCE
 
 .include "../../Makefile.common"