Source-Changes-HG archive

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

[src/netbsd-9]: src Pull up following revision(s) (requested by tsutsui in ti...



details:   https://anonhg.NetBSD.org/src/rev/85a48b269fc1
branches:  netbsd-9
changeset: 964087:85a48b269fc1
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 27 09:05:36 2020 +0000

description:
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:

 distrib/sets/lists/xdebug/md.sun3                             |    3 +
 distrib/sets/lists/xserver/md.sun3                            |    7 +
 external/mit/xorg/server/xorg-server.old/Makefile.common      |    8 +-
 external/mit/xorg/server/xorg-server/Makefile.common          |    8 +-
 external/mit/xorg/server/xorg-server/hw/Makefile              |   12 +-
 external/mit/xorg/server/xorg-server/hw/sun/Makefile          |   15 +
 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun     |  128 ++++++++++
 external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile     |    9 +
 external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile   |    6 +
 external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile |    6 +
 10 files changed, 189 insertions(+), 13 deletions(-)

diffs (279 lines):

diff -r 0a728bb25b43 -r 85a48b269fc1 distrib/sets/lists/xdebug/md.sun3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/xdebug/md.sun3 Thu Aug 27 09:05:36 2020 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: md.sun3,v 1.4.2.2 2020/08/27 09:05:36 martin Exp $
+./usr/libdata/debug/usr/X11R7/bin/Xsun.debug   xdebug-xorg-server-debug        xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/XsunMono.debug       xdebug-xorg-server-debug        xorg,debug
diff -r 0a728bb25b43 -r 85a48b269fc1 distrib/sets/lists/xserver/md.sun3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/xserver/md.sun3        Thu Aug 27 09:05:36 2020 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: md.sun3,v 1.17.2.2 2020/08/27 09:05:37 martin 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
diff -r 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server.old/Makefile.common
--- a/external/mit/xorg/server/xorg-server.old/Makefile.common  Wed Aug 26 18:06:54 2020 +0000
+++ b/external/mit/xorg/server/xorg-server.old/Makefile.common  Thu Aug 27 09:05:36 2020 +0000
@@ -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 @@
 .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 -r 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server/Makefile.common
--- a/external/mit/xorg/server/xorg-server/Makefile.common      Wed Aug 26 18:06:54 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.common      Thu Aug 27 09:05:36 2020 +0000
@@ -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 @@
 .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 -r 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server/hw/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/Makefile  Wed Aug 26 18:06:54 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/Makefile  Thu Aug 27 09:05:36 2020 +0000
@@ -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+=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 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server/hw/sun/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile      Thu Aug 27 09:05:36 2020 +0000
@@ -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 -r 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Thu Aug 27 09:05:36 2020 +0000
@@ -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 -r 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Xsun/Makefile Thu Aug 27 09:05:36 2020 +0000
@@ -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 -r 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Xsun24/Makefile       Thu Aug 27 09:05:36 2020 +0000
@@ -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 -r 0a728bb25b43 -r 85a48b269fc1 external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/XsunMono/Makefile     Thu Aug 27 09:05:36 2020 +0000
@@ -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"



Home | Main Index | Thread Index | Old Index