Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/server/xorg-server.old/hw Add build glue f...



details:   https://anonhg.NetBSD.org/src/rev/d14177498d85
branches:  trunk
changeset: 974083:d14177498d85
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Jul 22 19:26:37 2020 +0000

description:
Add build glue files for Xorg-Server-1.10'fied monolithic Xsun servers.

Not enabled and just for reference.

diffstat:

 external/mit/xorg/server/xorg-server.old/hw/Makefile              |   12 +-
 external/mit/xorg/server/xorg-server.old/hw/sun/Makefile          |   15 +
 external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun     |  134 ++++++++++
 external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile     |    9 +
 external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile   |    6 +
 external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/Makefile |    6 +
 6 files changed, 177 insertions(+), 5 deletions(-)

diffs (223 lines):

diff -r a0c142418066 -r d14177498d85 external/mit/xorg/server/xorg-server.old/hw/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/Makefile      Wed Jul 22 19:05:14 2020 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/Makefile      Wed Jul 22 19:26:37 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $
 
 .include "../Makefile.common"
 
@@ -11,6 +11,12 @@
 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/newsmips
 .endif
 
-.if ${XSERVER_XSUN} != "no"
-SUBDIR+=sun
-.endif
-
 .if ${XSERVER_XVFB} != "no"
 SUBDIR+=vfb
 .endif
diff -r a0c142418066 -r d14177498d85 external/mit/xorg/server/xorg-server.old/hw/sun/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile  Wed Jul 22 19:26:37 2020 +0000
@@ -0,0 +1,15 @@
+#      $NetBSD: Makefile,v 1.1 2020/07/22 19:26:37 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>
diff -r a0c142418066 -r d14177498d85 external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun     Wed Jul 22 19:26:37 2020 +0000
@@ -0,0 +1,134 @@
+#      $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 19:26:37 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}/Xext
+SRCS+= dpmsstubs.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} \
+       -lXfont \
+       -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} \
+       ${LIBXFONT} \
+       ${LIBPIXMAN-1} \
+       ${LIBXEXT} \
+       ${LIBX11} \
+       ${LIBZ} \
+       ${LIBM}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r a0c142418066 -r d14177498d85 external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile     Wed Jul 22 19:26:37 2020 +0000
@@ -0,0 +1,9 @@
+#       $NetBSD: Makefile,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+
+PROG=  Xsun
+
+.if ${MACHINE} == "sun3"
+SYMLINKS=      ${X11BINDIR}/Xsun ${X11BINDIR}/X
+.endif
+
+.include "../Makefile.Xsun"
diff -r a0c142418066 -r d14177498d85 external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile   Wed Jul 22 19:26:37 2020 +0000
@@ -0,0 +1,6 @@
+#       $NetBSD: Makefile,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+
+PROG=  Xsun24
+NOMAN=
+
+.include "../Makefile.Xsun"
diff -r a0c142418066 -r d14177498d85 external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/Makefile Wed Jul 22 19:26:37 2020 +0000
@@ -0,0 +1,6 @@
+#       $NetBSD: Makefile,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+
+PROG=  XsunMono
+NOMAN=
+
+.include "../Makefile.Xsun"



Home | Main Index | Thread Index | Old Index