Module Name: src
Committed By: abs
Date: Mon May 14 08:42:04 UTC 2012
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/x11/Xserver/Xserver: Makefile
Added Files:
src/distrib/sets/lists/xserver: md.vax
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.8 src/distrib/sets/lists/xserver/md.vax
cvs rdiff -u -r1.61 -r1.62 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.18 -r1.19 src/x11/Xserver/Xserver/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.61 src/external/mit/xorg/server/drivers/Makefile:1.62
--- src/external/mit/xorg/server/drivers/Makefile:1.61 Wed Apr 4 01:23:27 2012
+++ src/external/mit/xorg/server/drivers/Makefile Mon May 14 08:42:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2012/04/04 01:23:27 bsh Exp $
+# $NetBSD: Makefile,v 1.62 2012/05/14 08:42:04 abs Exp $
# xf86-input drivers
@@ -263,6 +263,11 @@ SUBDIR+= \
.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
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.24 src/external/mit/xorg/server/xorg-server/Makefile.common:1.25
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.24 Wed Apr 4 01:23:27 2012
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Mon May 14 08:42:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2012/04/04 01:23:27 bsh Exp $
+# $NetBSD: Makefile.common,v 1.25 2012/05/14 08:42:04 abs Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -30,6 +30,7 @@
${MACHINE} == "shark" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
+ ${MACHINE} == "vax" || \
${MACHINE} == "zaurus"
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.32 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.33
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.32 Wed Apr 4 01:23:27 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon May 14 08:42:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/04/04 01:23:27 bsh Exp $
+# $NetBSD: Makefile,v 1.33 2012/05/14 08:42:04 abs Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -99,6 +99,13 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.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
Index: src/x11/Xserver/Xserver/Makefile
diff -u src/x11/Xserver/Xserver/Makefile:1.18 src/x11/Xserver/Xserver/Makefile:1.19
--- src/x11/Xserver/Xserver/Makefile:1.18 Sun Jul 30 03:25:43 2006
+++ src/x11/Xserver/Xserver/Makefile Mon May 14 08:42:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/30 03:25:43 tsutsui Exp $
+# $NetBSD: Makefile,v 1.19 2012/05/14 08:42:03 abs Exp $
.include <bsd.own.mk>
@@ -80,6 +80,10 @@ SUBDIR+= Xsun24
SUBDIR+= Xvfb
.endif
+.if ${XSERVER_XVAX} != "no"
+SUBDIR+= Xvax
+.endif
+
.include "Makefile.Xserver"
.include <bsd.subdir.mk>
Added files:
Index: src/distrib/sets/lists/xserver/md.vax
diff -u /dev/null src/distrib/sets/lists/xserver/md.vax:1.8
--- /dev/null Mon May 14 08:42:04 2012
+++ src/distrib/sets/lists/xserver/md.vax Mon May 14 08:42:04 2012
@@ -0,0 +1,110 @@
+# $NetBSD: md.vax,v 1.8 2012/05/14 08:42:04 abs 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
