Module Name: src
Committed By: tsutsui
Date: Wed Jul 22 20:54:08 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw: Makefile
Added Files:
src/distrib/sets/lists/xserver: md.sun3
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile Makefile.Xsun
src/external/mit/xorg/server/xorg-server/hw/sun/Xsun: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun/Xsun24: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun/XsunMono: Makefile
Log Message:
Add build glue for Xorg-Server-1.20'fied monolithic Xsun servers.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.16 src/distrib/sets/lists/xserver/md.sun3
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/server/xorg-server/hw/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/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/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/Makefile:1.5 Sat Mar 1 19:45:29 2014
+++ src/external/mit/xorg/server/xorg-server/hw/Makefile Wed Jul 22 20:54:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/03/01 19:45:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.6 2020/07/22 20:54:07 tsutsui Exp $
.include "../Makefile.common"
@@ -11,6 +11,12 @@ SUBDIR+= xfree86
SUBDIR+=netbsd/x68k
.endif
+.if ${XSERVER_XSUN} != "no" || \
+ ${XSERVER_XSUNMONO} != "no" || \
+ ${XSERVER_XSUN24} != "no"
+SUBDIR+=sun
+.endif
+
.if 0
.if ${XSERVER_XALPHANETBSD} != "no"
SUBDIR+=netbsd/alpha
@@ -52,10 +58,6 @@ SUBDIR+=netbsd/macppc
SUBDIR+=netbsd/newsmips
.endif
-.if ${XSERVER_XSUN} != "no"
-SUBDIR+=sun
-.endif
-
.if ${XSERVER_XVFB} != "no"
SUBDIR+=vfb
.endif
Added files:
Index: src/distrib/sets/lists/xserver/md.sun3
diff -u /dev/null src/distrib/sets/lists/xserver/md.sun3:1.16
--- /dev/null Wed Jul 22 20:54:08 2020
+++ src/distrib/sets/lists/xserver/md.sun3 Wed Jul 22 20:54:07 2020
@@ -0,0 +1,7 @@
+# $NetBSD: md.sun3,v 1.16 2020/07/22 20:54:07 tsutsui Exp $
+./usr/X11R7/bin/X -unknown- xorg
+./usr/X11R7/bin/Xsun -unknown- xorg
+./usr/X11R7/bin/XsunMono -unknown- xorg
+./usr/X11R7/man/cat1/Xsun.0 -unknown- .cat,xorg
+./usr/X11R7/man/html1/Xsun.html -unknown- html,xorg
+./usr/X11R7/man/man1/Xsun.1 -unknown- .man,xorg
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/sun/Makefile:1.1
--- /dev/null Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile Wed Jul 22 20:54:08 2020
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+
+.include "../../Makefile.common"
+
+SUBDIR= Xsun
+
+.if ${XSERVER_XSUNMONO} != "no"
+SUBDIR+= XsunMono
+.endif
+
+.if ${XSERVER_XSUN24} != "no"
+SUBDIR+= Xsun24
+.endif
+
+.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1
--- /dev/null Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Wed Jul 22 20:54:08 2020
@@ -0,0 +1,131 @@
+# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+
+.include <bsd.own.mk>
+
+PROG?= Xsun
+BINMODE= 4711
+
+.include "../../../Makefile.serverlib"
+.include "../../../Makefile.servermod"
+
+WARNS?= 2
+
+.PATH: ${X11SRCDIR.xorg-server}/hw/sun
+
+BUILDSYMLINKS=
+CPPFLAGS+= -DINCLUDE_CG2_HEADER
+#CPPFLAGS+= -DLOWMEMFTPT
+
+# for Xsun (8bpp)
+.if ${PROG} == "Xsun"
+SRCS= sunInit.c
+SRCS+= sunCfb.c
+# XXX not yet
+#SRCS+= sunGX.c sunCursor.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+.endif
+
+# for XsunMono (1bpp)
+.if ${PROG} == "XsunMono"
+BUILDSYMLINKS+= sunInit.c sunInitMono.c
+SRCS= sunInitMono.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInExMono.c
+SRCS+= sunInExMono.c
+
+CPPFLAGS.sunInitMono.c= -DSUNMAXDEPTH=1
+CPPFLAGS.sunInExMono.c= -URENDER
+.endif
+
+# for Xsun24 (24bpp)
+.if ${PROG} == "Xsun24"
+BUILDSYMLINKS+= sunInit.c sunInitMulti.c
+SRCS+= sunInitMulti.c
+SRCS+= sunCfb.c
+SRCS+= sunCfb24.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+
+CPPFLAGS.sunInitMulti.c= -DSUNMAXDEPTH=32
+.endif
+
+# for XsunMulti (XXX: incomplete?)
+.if 0
+SRCS+= sunMultiDepth.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+.endif
+
+# common sources
+SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyMap.c sunMouse.c
+
+.PATH: ${X11SRCDIR.xorg-server}/Xi
+SRCS+= stubs.c
+
+.PATH: ${X11SRCDIR.xorg-server}/fb
+SRCS+= fbcmap_mi.c
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \
+ ${X11INCS.DIX}
+
+CPPFLAGS+= -UHAVE_XORG_CONFIG_H
+
+CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+ -UXF86DRI -UXF86BIGFONT
+
+.include "../../../Makefile.Xserver"
+
+LDADD+= ${LDADD.dix} \
+ ${LDADD.fb} \
+ ${LDADD.mi} \
+ ${LDADD.xkb} \
+ ${LDADD.xkbstubs} \
+ ${LDADD.randr} \
+ ${LDADD.Xext} \
+ ${LDADD.composite} \
+ ${LDADD.record} \
+ ${LDADD.render} \
+ ${LDADD.os} \
+ ${LDADD.xfixes} \
+ ${LDADD.damageext} \
+ ${LDADD.miext/damage} \
+ ${LDADD.miext/sync} \
+ ${LDADD.Xi} \
+ -lXfont2 \
+ -lpixman-1 \
+ -lXext \
+ -lX11 \
+ -lz \
+ -lm
+
+DPADD+= ${LDADD.dix} \
+ ${DPADD.fb} \
+ ${DPADD.mi} \
+ ${DPADD.xkb} \
+ ${DPADD.randr} \
+ ${DPADD.Xext} \
+ ${DPADD.composite} \
+ ${DPADD.record} \
+ ${DPADD.render} \
+ ${DPADD.os} \
+ ${DPADD.xfixes} \
+ ${DPADD.damageext} \
+ ${DPADD.miext/damage} \
+ ${DPADD.miext/sync} \
+ ${DPADD.Xi} \
+ ${LIBXFONT2} \
+ ${LIBPIXMAN-1} \
+ ${LIBXEXT} \
+ ${LIBX11} \
+ ${LIBZ} \
+ ${LIBM}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile:1.1
--- /dev/null Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile Wed Jul 22 20:54:08 2020
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+
+PROG= Xsun
+
+.if ${MACHINE} == "sun3"
+SYMLINKS= ${X11BINDIR}/Xsun ${X11BINDIR}/X
+.endif
+
+.include "../Makefile.Xsun"
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile:1.1
--- /dev/null Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile Wed Jul 22 20:54:08 2020
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+
+PROG= Xsun24
+NOMAN=
+
+.include "../Makefile.Xsun"
Index: src/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile:1.1
--- /dev/null Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile Wed Jul 22 20:54:08 2020
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+
+PROG= XsunMono
+NOMAN=
+
+.include "../Makefile.Xsun"
