Module Name: src
Committed By: nonaka
Date: Sun Dec 13 05:04:37 UTC 2009
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/share/mk: bsd.x11.mk
Added Files:
src/distrib/sets/lists/xserver: md.zaurus
Log Message:
The support of X for zaurus is added.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xserver/md.zaurus
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.80 -r1.81 src/share/mk/bsd.x11.mk
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.37 src/external/mit/xorg/server/drivers/Makefile:1.38
--- src/external/mit/xorg/server/drivers/Makefile:1.37 Fri Dec 11 22:37:39 2009
+++ src/external/mit/xorg/server/drivers/Makefile Sun Dec 13 05:04:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2009/12/11 22:37:39 snj Exp $
+# $NetBSD: Makefile,v 1.38 2009/12/13 05:04:36 nonaka Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -166,6 +166,9 @@
# replace with xf86-video-openchrome
# xf86-video-via
+.elif ${MACHINE} == "zaurus"
+SUBDIR+= \
+ xf86-video-wsfb
.endif
# broken with xorg-server 1.6
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.9 src/external/mit/xorg/server/xorg-server/Makefile.common:1.10
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.9 Mon Feb 16 12:41:11 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sun Dec 13 05:04:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2009/02/16 12:41:11 abs Exp $
+# $NetBSD: Makefile.common,v 1.10 2009/12/13 05:04:36 nonaka Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -44,7 +44,8 @@
${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE} == "sparc64" || \
- ${MACHINE} == "sparc" || ${MACHINE} == "alpha"
+ ${MACHINE} == "sparc" || ${MACHINE} == "alpha" || \
+ ${MACHINE} == "zaurus"
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
.endif
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.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.18 Thu Aug 27 04:34:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Dec 13 05:04:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/08/27 04:34:13 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/13 05:04:36 nonaka Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -63,7 +63,8 @@
.if ${MACHINE} == "cats" || \
${MACHINE} == "shark" || \
- ${MACHINE} == "netwinder"
+ ${MACHINE} == "netwinder" || \
+ ${MACHINE} == "zaurus"
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
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.80 src/share/mk/bsd.x11.mk:1.81
--- src/share/mk/bsd.x11.mk:1.80 Wed Nov 11 16:35:45 2009
+++ src/share/mk/bsd.x11.mk Sun Dec 13 05:04:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.80 2009/11/11 16:35:45 tron Exp $
+# $NetBSD: bsd.x11.mk,v 1.81 2009/12/13 05:04:37 nonaka Exp $
.include <bsd.init.mk>
@@ -116,7 +116,8 @@
${MACHINE} == "sgimips" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || \
- ${MACHINE} == "shark"
+ ${MACHINE} == "shark" || \
+ ${MACHINE} == "zaurus"
# LOADABLE
X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \
-fno-merge-constants
Added files:
Index: src/distrib/sets/lists/xserver/md.zaurus
diff -u /dev/null src/distrib/sets/lists/xserver/md.zaurus:1.1
--- /dev/null Sun Dec 13 05:04:37 2009
+++ src/distrib/sets/lists/xserver/md.zaurus Sun Dec 13 05:04:36 2009
@@ -0,0 +1,119 @@
+./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/void_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_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/void.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/void.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/void.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
