Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by abs in ticket...
details: https://anonhg.NetBSD.org/src/rev/96fed762c188
branches: netbsd-6
changeset: 774180:96fed762c188
user: riz <riz%NetBSD.org@localhost>
date: Mon Jun 11 20:53:39 2012 +0000
description:
Pull up following revision(s) (requested by abs in ticket #300):
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile: revision 1.33
x11/Xserver/Xserver/Makefile: revision 1.19
x11/Xserver/Makefile.common: revision 1.36
external/mit/xorg/server/xorg-server/Makefile.common: revision 1.25
distrib/sets/lists/xserver/md.vax: revision 1.8
external/mit/xorg/server/drivers/Makefile: revision 1.62
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h: revision 1.9
Add vax to the list of non inb() users
Enable wsfb X server on vax. Likely to be keyboard and mouse issues, but
with three additional lines of an ioctl() case in the kernel 'startx' will
display the traditional three xterms
Missed defining XSERVER_XVAX
diffstat:
distrib/sets/lists/xserver/md.vax | 110 ++++++++++
external/mit/xorg/server/drivers/Makefile | 7 +-
external/mit/xorg/server/xorg-server/Makefile.common | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile | 9 +-
x11/Xserver/Makefile.common | 8 +-
x11/Xserver/Xserver/Makefile | 6 +-
6 files changed, 138 insertions(+), 5 deletions(-)
diffs (221 lines):
diff -r fbc584853362 -r 96fed762c188 distrib/sets/lists/xserver/md.vax
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/xserver/md.vax Mon Jun 11 20:53:39 2012 +0000
@@ -0,0 +1,110 @@
+# $NetBSD: md.vax,v 1.8.2.2 2012/06/11 20:53:40 riz Exp $
+./usr/X11R7/bin/X -unknown- xorg
+./usr/X11R7/bin/Xorg -unknown- xorg
+./usr/X11R7/bin/cvt -unknown- xorg
+./usr/X11R7/bin/gtf -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libexa_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libfb.a -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvbe_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libvbe_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libvgahw_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxaa_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libxaa_pic.a -unknown- xorg
+./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
+./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
+./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
+./usr/X11R7/man/html1/gtf.html -unknown- html,xorg
+./usr/X11R7/man/html4/exa.html -unknown- html,xorg
+./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
+./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
+./usr/X11R7/man/html4/ws.html -unknown- html,xorg
+./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
+./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
+./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg
+./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
+./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
+./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
diff -r fbc584853362 -r 96fed762c188 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Mon Jun 11 20:44:43 2012 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Mon Jun 11 20:53:39 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2011/08/30 04:22:56 macallan Exp $
+# $NetBSD: Makefile,v 1.60.4.1 2012/06/11 20:53:40 riz Exp $
# xf86-input drivers
@@ -258,6 +258,11 @@
.endif # ${MACHINE} == "sparc"
.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
+.if ${MACHINE} == "vax"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "vax"
+
.if ${MACHINE} == "zaurus"
SUBDIR+= \
xf86-video-wsfb
diff -r fbc584853362 -r 96fed762c188 external/mit/xorg/server/xorg-server/Makefile.common
--- a/external/mit/xorg/server/xorg-server/Makefile.common Mon Jun 11 20:44:43 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.common Mon Jun 11 20:53:39 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2011/08/30 04:22:56 macallan Exp $
+# $NetBSD: Makefile.common,v 1.23.4.1 2012/06/11 20:53:40 riz Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -29,6 +29,7 @@
${MACHINE} == "shark" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
+ ${MACHINE} == "vax" || \
${MACHINE} == "zaurus"
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
diff -r fbc584853362 -r 96fed762c188 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Jun 11 20:44:43 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Jun 11 20:53:39 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2011/08/30 04:22:56 macallan Exp $
+# $NetBSD: Makefile,v 1.31.4.1 2012/06/11 20:53:39 riz Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -98,6 +98,13 @@
.endfor
.endif
+.if ${MACHINE} == "vax"
+SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
# some platforms will probably need ioperm_noop.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus
diff -r fbc584853362 -r 96fed762c188 x11/Xserver/Makefile.common
--- a/x11/Xserver/Makefile.common Mon Jun 11 20:44:43 2012 +0000
+++ b/x11/Xserver/Makefile.common Mon Jun 11 20:53:39 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2009/02/08 00:50:07 abs Exp $
+# $NetBSD: Makefile.common,v 1.35.10.1 2012/06/11 20:53:39 riz Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -79,6 +79,10 @@
XSERVER_XSUN24= yes
.endif
+.if ${MACHINE} == "vax"
+XSERVER_XVAX= yes
+.endif
+
# Does this server need Xfont/fontbase libraries?
XSERVER_NEEDS_XFONT?= no
@@ -127,3 +131,5 @@
XSERVER_XSUN24?= no
# Does this platform build Xvfb X server?
XSERVER_XVFB?= yes
+# Does this platform build Xvax X server?
+XSERVER_XVAX?= no
diff -r fbc584853362 -r 96fed762c188 x11/Xserver/Xserver/Makefile
--- a/x11/Xserver/Xserver/Makefile Mon Jun 11 20:44:43 2012 +0000
+++ b/x11/Xserver/Xserver/Makefile Mon Jun 11 20:53:39 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/30 03:25:43 tsutsui Exp $
+# $NetBSD: Makefile,v 1.18.42.1 2012/06/11 20:53:39 riz Exp $
.include <bsd.own.mk>
@@ -80,6 +80,10 @@
SUBDIR+= Xvfb
.endif
+.if ${XSERVER_XVAX} != "no"
+SUBDIR+= Xvax
+.endif
+
.include "Makefile.Xserver"
.include <bsd.subdir.mk>
Home |
Main Index |
Thread Index |
Old Index