Module Name: src
Committed By: rjs
Date: Tue Oct 13 19:43:44 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Added Files:
src/distrib/sets/lists/xdebug: md.ibmnws
src/distrib/sets/lists/xserver: md.ibmnws
Log Message:
Add Xorg server and S3 driver to ibmnws build.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xdebug/md.ibmnws
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xserver/md.ibmnws
cvs rdiff -u -r1.70 -r1.71 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.38 -r1.39 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/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.70 src/external/mit/xorg/server/drivers/Makefile:1.71
--- src/external/mit/xorg/server/drivers/Makefile:1.70 Tue Oct 13 04:33:22 2015
+++ src/external/mit/xorg/server/drivers/Makefile Tue Oct 13 19:43:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2015/10/13 04:33:22 mrg Exp $
+# $NetBSD: Makefile,v 1.71 2015/10/13 19:43:44 rjs Exp $
# xf86-input drivers
@@ -178,6 +178,11 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+.if ${MACHINE} == "ibmnws"
+SUBDIR+= \
+ xf86-video-s3
+.endif # ${MACHINE} == "ibmnws"
+
.if ${MACHINE} == "luna68k"
SUBDIR+= \
xf86-video-wsfb
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.38 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.39
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.38 Wed Sep 30 22:58:02 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Tue Oct 13 19:43:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2015/09/30 22:58:02 rjs Exp $
+# $NetBSD: Makefile,v 1.39 2015/10/13 19:43:44 rjs Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -32,7 +32,7 @@ CPPFLAGS.${_FN}+= -DUSE_I386_IOPL -DPCVT
.endfor
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || ${MACHINE} == "ibmnws"
SRCS.bsd+= ppc_video.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -114,7 +114,8 @@ SRCS.bus+= Pci.c
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc"
+ ${MACHINE} == "prep" || ${MACHINE} == "bebox" || \
+ ${MACHINE} == "ofppc" || ${MACHINE} == "ibmnws"
#SRCS.bus+= netbsdPci.c
.endif
@@ -136,7 +137,7 @@ SRCS.bus+= Pci.c
${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
${MACHINE} == "shark" || ${MACHINE} == "ofppc" || \
${MACHINE_ARCH} == "alpha" || ${MACHINE} == "prep" || \
- ${MACHINE} == "bebox"
+ ${MACHINE} == "bebox" || ${MACHINE} == "ibmnws"
#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
Added files:
Index: src/distrib/sets/lists/xdebug/md.ibmnws
diff -u /dev/null src/distrib/sets/lists/xdebug/md.ibmnws:1.1
--- /dev/null Tue Oct 13 19:43:44 2015
+++ src/distrib/sets/lists/xdebug/md.ibmnws Tue Oct 13 19:43:44 2015
@@ -0,0 +1,34 @@
+# $NetBSD: md.ibmnws,v 1.1 2015/10/13 19:43:44 rjs Exp $
+./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libint10_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libvbe_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libvgahw_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libxaa_g.a -unknown- debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- obsolete
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libglx.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libi2c.so.0.debug -unknown- xorg,debug,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.ibmnws
diff -u /dev/null src/distrib/sets/lists/xserver/md.ibmnws:1.1
--- /dev/null Tue Oct 13 19:43:44 2015
+++ src/distrib/sets/lists/xserver/md.ibmnws Tue Oct 13 19:43:44 2015
@@ -0,0 +1,113 @@
+# $NetBSD: md.ibmnws,v 1.1 2015/10/13 19:43:44 rjs 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.DRI -unknown- obsolete
+./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
+./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/s3_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- obsolete
+./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/extensions/libdbe.a -unknown- xorg,obsolete
+./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_pic.a -unknown- xorg,picinstall,obsolete
+./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/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_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg,obsolete
+./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_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg,obsolete
+./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,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg,obsolete
+./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_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg,obsolete
+./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_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libexa.a -unknown- xorg,obsolete
+./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,picinstall,obsolete
+./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_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libi2c.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libint10.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libint10.so -unknown- xorg
+./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libshadowfb.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvbe.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libvbe.so -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvbe_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvgahw.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libvgahw.so -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libxaa.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxaa_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- obsolete
+./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/s3.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
+./usr/X11R7/man/cat4/ws.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/s3.html -unknown- html,xorg
+./usr/X11R7/man/html4/vga.html -unknown- obsolete
+./usr/X11R7/man/html4/ws.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/s3.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/vga.4 -unknown- obsolete
+./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
+./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
+./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
