Module Name: src
Committed By: tsutsui
Date: Sat Jun 19 18:17:56 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: md.dreamcast
src/distrib/sets/lists/xserver: md.dreamcast
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
Log Message:
Prepare entries for Xorg wsfb based server for dreamcast.
Not enabled by default yet and old xfree entries are still preserved.
XXX1: No maple keyboard keymap yet:
http://mail-index.NetBSD.org/tech-x11/2010/06/19/msg000785.html
XXX2: probably we should have some common list files for xcomp and xserver.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/xcomp/md.dreamcast
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xserver/md.dreamcast
cvs rdiff -u -r1.43 -r1.44 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.20 -r1.21 \
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/distrib/sets/lists/xcomp/md.dreamcast
diff -u src/distrib/sets/lists/xcomp/md.dreamcast:1.1 src/distrib/sets/lists/xcomp/md.dreamcast:1.2
--- src/distrib/sets/lists/xcomp/md.dreamcast:1.1 Mon Mar 15 08:03:02 2010
+++ src/distrib/sets/lists/xcomp/md.dreamcast Sat Jun 19 18:17:55 2010
@@ -1,3 +1,6 @@
-# $NetBSD: md.dreamcast,v 1.1 2010/03/15 08:03:02 mrg Exp $
-./usr/libdata/debug/usr/X11R6/bin/Xdreamcast.debug -unknown- debug
-./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug
+# $NetBSD: md.dreamcast,v 1.2 2010/06/19 18:17:55 tsutsui Exp $
+./usr/libdata/debug/usr/X11R6/bin/Xdreamcast.debug -unknown- debug,x11
+./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- debug,xorg
Index: src/distrib/sets/lists/xserver/md.dreamcast
diff -u src/distrib/sets/lists/xserver/md.dreamcast:1.9 src/distrib/sets/lists/xserver/md.dreamcast:1.10
--- src/distrib/sets/lists/xserver/md.dreamcast:1.9 Mon Feb 9 16:28:54 2009
+++ src/distrib/sets/lists/xserver/md.dreamcast Sat Jun 19 18:17:55 2010
@@ -1,6 +1,120 @@
-# $NetBSD: md.dreamcast,v 1.9 2009/02/09 16:28:54 abs Exp $
+# $NetBSD: md.dreamcast,v 1.10 2010/06/19 18:17:55 tsutsui Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/Xdreamcast -unknown- x11
./usr/X11R6/man/cat1/Xdreamcast.0 -unknown- x11,.cat
./usr/X11R6/man/html1/Xdreamcast.html -unknown- x11,html
./usr/X11R6/man/man1/Xdreamcast.1 -unknown- x11,.man
+./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- xorg
+./usr/X11R7/lib/X11/doc/README.rapidaccess -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/lib/modules/libxf8_16bpp.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/modules/libxf8_16bpp_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
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.43 src/external/mit/xorg/server/drivers/Makefile:1.44
--- src/external/mit/xorg/server/drivers/Makefile:1.43 Fri Jun 18 09:15:23 2010
+++ src/external/mit/xorg/server/drivers/Makefile Sat Jun 19 18:17:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2010/06/18 09:15:23 tsutsui Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/19 18:17:55 tsutsui Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -161,6 +161,9 @@
xf86-video-trident \
xf86-video-tseng \
+.elif ${MACHINE} == "dreamcast"
+SUBDIR+= \
+ xf86-video-wsfb
.elif ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
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.11 src/external/mit/xorg/server/xorg-server/Makefile.common:1.12
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.11 Fri Jun 18 09:15:23 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sat Jun 19 18:17:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2010/06/18 09:15:23 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.12 2010/06/19 18:17:55 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -31,9 +31,9 @@
#XSERVER_XFREE68= yes
.endif
-.if ${MACHINE} == "dreamcast"
-XSERVER_XDREAMCAST?= yes
-.endif
+#.if ${MACHINE} == "dreamcast"
+#XSERVER_XDREAMCAST?= yes
+#.endif
.if ${MACHINE} == "newsmips"
XSERVER_XNEWSMIPS?= yes
@@ -41,6 +41,7 @@
# XFree86 servers all need XFONT as well.
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+ ${MACHINE} == "dreamcast" || \
${MACHINE} == "hpcarm" || \
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" ||\
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.20 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.21
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.20 Fri Jun 18 09:15:23 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sat Jun 19 18:17:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/06/18 09:15:23 tsutsui Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/19 18:17:56 tsutsui Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -74,7 +74,8 @@
CPPFLAGS.arm_video.c= -Wno-error
.endif
-.if ${MACHINE} == "hpcsh"
+.if ${MACHINE} == "dreamcast" || \
+ ${MACHINE} == "hpcsh"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
