Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src newsmips X server configurations.
details: https://anonhg.NetBSD.org/src/rev/0c559b6bdd29
branches: trunk
changeset: 568821:0c559b6bdd29
user: uch <uch%NetBSD.org@localhost>
date: Sun Aug 01 18:52:03 2004 +0000
description:
newsmips X server configurations.
diffstat:
distrib/sets/lists/xserver/md.newsmips | 5 ++++
x11/Xserver/Makefile.common | 8 ++++++-
x11/Xserver/Xserver/Makefile | 6 ++++-
x11/Xserver/Xserver/Makefile.Xserver | 5 ++-
x11/Xserver/Xserver/Xnewsmips/Makefile | 31 ++++++++++++++++++++++++++++++
x11/Xserver/Xserver/Xnewsmips/Xnewsmips.c | 1 +
x11/Xserver/hw/Makefile | 6 ++++-
x11/Xserver/hw/netbsd/newsmips/Makefile | 32 +++++++++++++++++++++++++++++++
x11/Xserver/xinput/Makefile | 3 +-
9 files changed, 91 insertions(+), 6 deletions(-)
diffs (190 lines):
diff -r 25a4f529ea0b -r 0c559b6bdd29 distrib/sets/lists/xserver/md.newsmips
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/xserver/md.newsmips Sun Aug 01 18:52:03 2004 +0000
@@ -0,0 +1,5 @@
+# $NetBSD: md.newsmips,v 1.1 2004/08/01 18:52:03 uch Exp $
+./usr/X11R6/bin/X
+./usr/X11R6/bin/Xnewsmips
+./usr/X11R6/man/cat1/Xnewsmips.0 -unknown- .cat
+./usr/X11R6/man/man1/Xnewsmips.1 -unknown- .man
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/Makefile.common
--- a/x11/Xserver/Makefile.common Sun Aug 01 17:07:15 2004 +0000
+++ b/x11/Xserver/Makefile.common Sun Aug 01 18:52:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/04/23 06:23:42 mhitch Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/08/01 18:52:03 uch Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -37,6 +37,10 @@
XSERVER_XDREAMCAST?= yes
.endif
+.if ${MACHINE} == "newsmips"
+XSERVER_XNEWSMIPS?= yes
+.endif
+
# XFree86 servers all need XFONT as well.
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
${MACHINE} == "macppc" || ${MACHINE} == "cats" || ${MACHINE} == "sgimips"
@@ -100,6 +104,8 @@
XSERVER_XDECNETBSD?= no
# Does this platform build the Xdreamcast server?
XSERVER_XDREAMCAST?= no
+# Does this platform build the Xnewsmips server?
+XSERVER_XNEWSMIPS?= no
# Does this platform build the Xfree68 servers?
XSERVER_XFREE68?= no
# Does this platform build XFree86 X server?
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/Xserver/Makefile
--- a/x11/Xserver/Xserver/Makefile Sun Aug 01 17:07:15 2004 +0000
+++ b/x11/Xserver/Xserver/Makefile Sun Aug 01 18:52:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/28 15:28:24 jdc Exp $
+# $NetBSD: Makefile,v 1.15 2004/08/01 18:52:03 uch Exp $
.include <bsd.own.mk>
@@ -52,6 +52,10 @@
SUBDIR+= Xmacppc
.endif
+.if ${XSERVER_XNEWSMIPS} != "no"
+SUBDIR+= Xnewsmips
+.endif
+
.if ${XSERVER_XPMAX} != "no"
SUBDIR+= Xpmax
.endif
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/Xserver/Makefile.Xserver
--- a/x11/Xserver/Xserver/Makefile.Xserver Sun Aug 01 17:07:15 2004 +0000
+++ b/x11/Xserver/Xserver/Makefile.Xserver Sun Aug 01 18:52:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.16 2004/03/28 14:30:38 jdc Exp $
+# $NetBSD: Makefile.Xserver,v 1.17 2004/08/01 18:52:03 uch Exp $
.for _SL in dix os mi printer printer/pcl printer/ps printer/raster \
Xext/ext Xext/exts GL/glx GL/GLcore xkb xinput lbx dbe \
@@ -11,7 +11,8 @@
\
hw/netbsd/macppc hw/netbsd/hpc hw/netbsd/x68k \
hw/netbsd/mac68k hw/netbsd/amiga hw/netbsd/dec \
- hw/netbsd/arm32vidc hw/netbsd/alpha hw/netbsd/dreamcast
+ hw/netbsd/arm32vidc hw/netbsd/alpha hw/netbsd/dreamcast \
+ hw/netbsd/newsmips
.if !defined(LIBDIR.${_SL})
LIBDIR.${_SL}!= cd ${NETBSDSRCDIR}/x11/Xserver/${_SL} && ${PRINTOBJDIR}
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/Xserver/Xnewsmips/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/Xserver/Xnewsmips/Makefile Sun Aug 01 18:52:03 2004 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2004/08/01 18:52:03 uch Exp $
+
+.include <bsd.own.mk>
+
+PROG= Xnewsmips
+BINMODE=4711
+
+.include "../Makefile.Xserver"
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/newsmips
+
+LDADD= ${LDADD.dix} ${LDADD.hw/netbsd/newsmips} ${LDADD.os} -lXfont \
+ -lfreetype ${LDADD.os} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.cfb} \
+ ${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/ext} \
+ ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
+ ${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
+ ${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} -lXau \
+ -lXdmcp -lz -lm
+
+DPADD= ${DPADD.dix} ${DPADD.hw/netbsd/newsmips} ${LIBXFONT} \
+ ${LIBFREETYPE} ${DPADD.os} ${DPADD.cfb} ${DPADD.cfb16} \
+ ${DPADD.xkb} ${DPADD.mfb} ${DPADD.dix/xpstubs} ${DPADD.mi} \
+ ${DPADD.Xext/ext} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
+ ${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} ${DPADD.xtrap} \
+ ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} ${DPADD.render} \
+ ${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
+
+SYMLINKS= ${X11BINDIR}/Xnewsmips ${X11BINDIR}/X
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/Xserver/Xnewsmips/Xnewsmips.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/Xserver/Xnewsmips/Xnewsmips.c Sun Aug 01 18:52:03 2004 +0000
@@ -0,0 +1,1 @@
+/* $NetBSD: Xnewsmips.c,v 1.1 2004/08/01 18:52:03 uch Exp $ */
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/hw/Makefile
--- a/x11/Xserver/hw/Makefile Sun Aug 01 17:07:15 2004 +0000
+++ b/x11/Xserver/hw/Makefile Sun Aug 01 18:52:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/07 08:30:34 rtr Exp $
+# $NetBSD: Makefile,v 1.13 2004/08/01 18:52:03 uch Exp $
.include "../Makefile.common"
@@ -44,6 +44,10 @@
SUBDIR+=netbsd/macppc
.endif
+.if ${XSERVER_XNEWSMIPS} != "no"
+SUBDIR+=netbsd/newsmips
+.endif
+
.if ${XSERVER_XSUN} != "no"
SUBDIR+=sun
.endif
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/hw/netbsd/newsmips/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/netbsd/newsmips/Makefile Sun Aug 01 18:52:03 2004 +0000
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2004/08/01 18:52:03 uch Exp $
+
+.include "../../../Makefile.serverlib"
+
+.include <bsd.own.mk>
+
+LIB= newsmips
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/newsmips
+SRCS= newsmipsInit.c newsmipsScreen.c newsmipsIo.c newsmipsKbd.c \
+ newsmipsMouse.c newsmipsFB.c newsmipsColormap.c \
+ newsmipsKeymap.c newsmipsInEx.c
+
+CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/newsmips \
+ -I${X11SRCDIR.xc}/programs/Xserver \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb32 \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/include/extensions \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+ -UXF86DRI -UXF86BIGFONT
+
+BUILDSYMLINKS= ../../../mi/miinitext.c newsmipsInEx.c
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff -r 25a4f529ea0b -r 0c559b6bdd29 x11/Xserver/xinput/Makefile
--- a/x11/Xserver/xinput/Makefile Sun Aug 01 17:07:15 2004 +0000
+++ b/x11/Xserver/xinput/Makefile Sun Aug 01 18:52:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/23 05:56:47 mhitch Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/01 18:52:03 uch Exp $
.include "../Makefile.serverlib"
@@ -27,6 +27,7 @@
${MACHINE} == "pmax" || \
${MACHINE} == "sun3" || \
${MACHINE} == "dreamcast" || \
+ ${MACHINE} == "newsmips" || \
${MACHINE} == "vax"
CPPFLAGS+= -DXINPUT
.endif
Home |
Main Index |
Thread Index |
Old Index