Module Name: src
Committed By: tsutsui
Date: Thu Jul 21 10:20:25 UTC 2011
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
Added Files:
src/distrib/sets/lists/xcomp: md.luna68k
src/distrib/sets/lists/xserver: md.luna68k
Log Message:
Build luna68k's X.Org server using wsfb driver.
(XXX: needs more hacks to make it actually functional)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xcomp/md.luna68k
cvs rdiff -u -r0 -r1.7 src/distrib/sets/lists/xserver/md.luna68k
cvs rdiff -u -r1.58 -r1.59 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.29 -r1.30 \
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.58 src/external/mit/xorg/server/drivers/Makefile:1.59
--- src/external/mit/xorg/server/drivers/Makefile:1.58 Wed Jun 29 14:52:18 2011
+++ src/external/mit/xorg/server/drivers/Makefile Thu Jul 21 10:20:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2011/06/29 14:52:18 tsutsui Exp $
+# $NetBSD: Makefile,v 1.59 2011/07/21 10:20:25 tsutsui Exp $
# xf86-input drivers
@@ -164,6 +164,11 @@
xf86-video-wsfb
.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+.if ${MACHINE} == "luna68k"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "luna68k"
+
.if ${MACHINE} == "macppc"
SUBDIR+= \
xf86-video-ati \
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.21 src/external/mit/xorg/server/xorg-server/Makefile.common:1.22
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.21 Wed Jun 29 14:49:13 2011
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Thu Jul 21 10:20:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2011/06/29 14:49:13 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.22 2011/07/21 10:20:25 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -18,6 +18,7 @@
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" || \
${MACHINE} == "i386" || \
+ ${MACHINE} == "luna68k" || \
${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "newsmips" || \
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.29 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.30
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.29 Wed Jun 29 14:49:14 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Jul 21 10:20:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2011/06/29 14:49:14 tsutsui Exp $
+# $NetBSD: Makefile,v 1.30 2011/07/21 10:20:25 tsutsui Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -89,7 +89,8 @@
.endfor
.endif
-.if ${MACHINE} == "hp300"
+.if ${MACHINE} == "hp300" || \
+ ${MACHINE} == "luna68k"
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
Added files:
Index: src/distrib/sets/lists/xcomp/md.luna68k
diff -u /dev/null src/distrib/sets/lists/xcomp/md.luna68k:1.1
--- /dev/null Thu Jul 21 10:20:25 2011
+++ src/distrib/sets/lists/xcomp/md.luna68k Thu Jul 21 10:20:25 2011
@@ -0,0 +1,4 @@
+# $NetBSD: md.luna68k,v 1.1 2011/07/21 10:20:25 tsutsui Exp $
+./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.luna68k
diff -u /dev/null src/distrib/sets/lists/xserver/md.luna68k:1.7
--- /dev/null Thu Jul 21 10:20:25 2011
+++ src/distrib/sets/lists/xserver/md.luna68k Thu Jul 21 10:20:25 2011
@@ -0,0 +1,115 @@
+# $NetBSD: md.luna68k,v 1.7 2011/07/21 10:20:25 tsutsui 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/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
+./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
