summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-08-27 09:05:36 +0000
committermartin <martin@NetBSD.org>2020-08-27 09:05:36 +0000
commit01dc2672a6937acaf5dd926f993ebfbc04f0cd4f (patch)
treed455dd6bd37f3ac802ff03a764d5b7e07fcccf99 /external
parentc5c18f202a5c5b649ce1e0e9453215586df3eb9c (diff)
Pull up following revision(s) (requested by tsutsui in ticket #1061):
distrib/sets/lists/xdebug/md.sun3: revision 1.4 distrib/sets/lists/xserver/md.sun3: revision 1.16 external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile: revision 1.1 external/mit/xorg/server/xorg-server/hw/Makefile: revision 1.6 external/mit/xorg/server/xorg-server/hw/sun/Makefile: revision 1.1 external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile: revision 1.1 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun: revision 1.1 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun: revision 1.2 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun: revision 1.3 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun: revision 1.4 external/mit/xorg/server/xorg-server/Makefile.common: revision 1.28 external/mit/xorg/server/xorg-server.old/Makefile.common: revision 1.3 external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile: revision 1.1 Add build glue for Xorg-Server-1.20'fied monolithic Xsun servers. Don't build Xsun servers for sparc and sparc64. Not tested, and maybe not worth for wscons'fied ports. Add .debug binaries for Xsun servers. Note daily build.sh on releng.netbsd.org has MKDEBUG=yes so local test builds should also include it. fix build: - add .../xorg subdir to the path - add dbe and present extensions, both wanted via linkage .. but maybe these shouldn't be built? they're not in sets. Explicitly disable dbe, record, and present DIX extentions. Specify default /var/log/Xsun.%s.log path definitions.
Diffstat (limited to 'external')
-rw-r--r--external/mit/xorg/server/xorg-server.old/Makefile.common8
-rw-r--r--external/mit/xorg/server/xorg-server/Makefile.common8
-rw-r--r--external/mit/xorg/server/xorg-server/hw/Makefile12
-rw-r--r--external/mit/xorg/server/xorg-server/hw/sun/Makefile15
-rw-r--r--external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun128
-rw-r--r--external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile9
-rw-r--r--external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile6
-rw-r--r--external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile6
8 files changed, 179 insertions, 13 deletions
diff --git a/external/mit/xorg/server/xorg-server.old/Makefile.common b/external/mit/xorg/server/xorg-server.old/Makefile.common
index 1a628106593..c0de2e67daf 100644
--- a/external/mit/xorg/server/xorg-server.old/Makefile.common
+++ b/external/mit/xorg/server/xorg-server.old/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2016/08/19 03:59:31 mrg Exp $
+# $NetBSD: Makefile.common,v 1.2.16.1 2020/08/27 09:05:37 martin Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -42,9 +42,9 @@ XSERVER_XPMAX= no # XXX should be yes but may be obsoleted
.endif
.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN= yes
-XSERVER_XSUNMONO= yes
-XSERVER_XSUN24= yes
+#XSERVER_XSUN= yes
+#XSERVER_XSUNMONO= yes
+#XSERVER_XSUN24= yes
.endif
.if ${MACHINE} == "sun3"
diff --git a/external/mit/xorg/server/xorg-server/Makefile.common b/external/mit/xorg/server/xorg-server/Makefile.common
index 3f900d5d4fc..fc1d3f5247b 100644
--- a/external/mit/xorg/server/xorg-server/Makefile.common
+++ b/external/mit/xorg/server/xorg-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2016/08/19 03:59:30 mrg Exp $
+# $NetBSD: Makefile.common,v 1.27.16.1 2020/08/27 09:05:37 martin Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -43,9 +43,9 @@ XSERVER_XPMAX= no # XXX should be yes but may be obsoleted
.endif
.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN= yes
-XSERVER_XSUNMONO= yes
-XSERVER_XSUN24= yes
+#XSERVER_XSUN= yes
+#XSERVER_XSUNMONO= yes
+#XSERVER_XSUN24= yes
.endif
.if ${MACHINE} == "sun3"
diff --git a/external/mit/xorg/server/xorg-server/hw/Makefile b/external/mit/xorg/server/xorg-server/hw/Makefile
index 0ccbbce7881..a9cc1323f46 100644
--- a/external/mit/xorg/server/xorg-server/hw/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/03/01 19:45:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5.28.1 2020/08/27 09:05:37 martin 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
diff --git a/external/mit/xorg/server/xorg-server/hw/sun/Makefile b/external/mit/xorg/server/xorg-server/hw/sun/Makefile
new file mode 100644
index 00000000000..fca15546f55
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1.2.2 2020/08/27 09:05:37 martin 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 --git a/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
new file mode 100644
index 00000000000..4b01b240980
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
@@ -0,0 +1,128 @@
+# $NetBSD: Makefile.Xsun,v 1.5.2.2 2020/08/27 09:05:37 martin 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+= -DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\"
+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+= -UDBE -UXRECORD -UPRESENT
+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.render} \
+ ${LDADD.os} \
+ ${LDADD.xfixes} \
+ ${LDADD.damageext} \
+ ${LDADD.miext/damage} \
+ ${LDADD.miext/sync} \
+ ${LDADD.Xi} \
+ -lXfont2 \
+ -lpixman-1 \
+ -lX11 \
+ -lz \
+ -lm
+
+DPADD+= ${LDADD.dix} \
+ ${DPADD.fb} \
+ ${DPADD.mi} \
+ ${DPADD.xkb} \
+ ${DPADD.randr} \
+ ${DPADD.Xext} \
+ ${DPADD.composite} \
+ ${DPADD.render} \
+ ${DPADD.os} \
+ ${DPADD.xfixes} \
+ ${DPADD.damageext} \
+ ${DPADD.miext/damage} \
+ ${DPADD.miext/sync} \
+ ${DPADD.Xi} \
+ ${LIBXFONT2} \
+ ${LIBPIXMAN-1} \
+ ${LIBX11} \
+ ${LIBZ} \
+ ${LIBM}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff --git a/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile b/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile
new file mode 100644
index 00000000000..add8c03750e
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1.2.2 2020/08/27 09:05:37 martin Exp $
+
+PROG= Xsun
+
+.if ${MACHINE} == "sun3"
+SYMLINKS= ${X11BINDIR}/Xsun ${X11BINDIR}/X
+.endif
+
+.include "../Makefile.Xsun"
diff --git a/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile b/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile
new file mode 100644
index 00000000000..fe59cf783a1
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1.2.2 2020/08/27 09:05:37 martin Exp $
+
+PROG= Xsun24
+NOMAN=
+
+.include "../Makefile.Xsun"
diff --git a/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile b/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile
new file mode 100644
index 00000000000..342415ed4dc
--- /dev/null
+++ b/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1.2.2 2020/08/27 09:05:37 martin Exp $
+
+PROG= XsunMono
+NOMAN=
+
+.include "../Makefile.Xsun"