From 11419c187043888c7fd2e3a84e69c5a71b0e6bf6 Mon Sep 17 00:00:00 2001 From: uwe Date: Mon, 3 Apr 2006 11:15:17 +0000 Subject: [PATCH] Build XFree86 server on netwinder with a minimal set of generic drivers (XFree doesn't have a driver for CyberPro cards). --- distrib/sets/lists/xcomp/md.netwinder | 3 + distrib/sets/lists/xserver/md.netwinder | 190 ++++++++++++++++++++++++ x11/Xserver/Makefile.common | 5 +- x11/Xserver/hw/xfree86/drivers/Makefile | 6 +- x11/Xserver/hw/xfree86/xf86_os/Makefile | 15 +- 5 files changed, 213 insertions(+), 6 deletions(-) create mode 100644 distrib/sets/lists/xcomp/md.netwinder create mode 100644 distrib/sets/lists/xserver/md.netwinder diff --git a/distrib/sets/lists/xcomp/md.netwinder b/distrib/sets/lists/xcomp/md.netwinder new file mode 100644 index 000000000000..94ce318e3095 --- /dev/null +++ b/distrib/sets/lists/xcomp/md.netwinder @@ -0,0 +1,3 @@ +# $NetBSD: md.netwinder,v 1.1 2006/04/03 11:15:17 uwe Exp $ +./usr/X11R6/include/xf86Optrec.h +./usr/X11R6/include/xf86Parser.h diff --git a/distrib/sets/lists/xserver/md.netwinder b/distrib/sets/lists/xserver/md.netwinder new file mode 100644 index 000000000000..f74accb961ba --- /dev/null +++ b/distrib/sets/lists/xserver/md.netwinder @@ -0,0 +1,190 @@ +# $NetBSD: md.netwinder,v 1.3 2006/04/03 11:15:17 uwe Exp $ +./usr/X11R6/bin/X +./usr/X11R6/bin/XFree86 +./usr/X11R6/bin/gtf +./usr/X11R6/bin/kbd_mode +./usr/X11R6/bin/mmapr +./usr/X11R6/bin/mmapw +./usr/X11R6/bin/pcitweak +./usr/X11R6/bin/scanpci +./usr/X11R6/bin/xf86cfg +./usr/X11R6/bin/xf86config +./usr/X11R6/include/X11/bitmaps/card.xbm +./usr/X11R6/include/X11/bitmaps/down.xbm +./usr/X11R6/include/X11/bitmaps/keyboard.xbm +./usr/X11R6/include/X11/bitmaps/left.xbm +./usr/X11R6/include/X11/bitmaps/monitor.xbm +./usr/X11R6/include/X11/bitmaps/mouse.xbm +./usr/X11R6/include/X11/bitmaps/narrower.xbm +./usr/X11R6/include/X11/bitmaps/right.xbm +./usr/X11R6/include/X11/bitmaps/shorter.xbm +./usr/X11R6/include/X11/bitmaps/taller.xbm +./usr/X11R6/include/X11/bitmaps/up.xbm +./usr/X11R6/include/X11/bitmaps/wider.xbm +./usr/X11R6/include/X11/pixmaps/card.xpm +./usr/X11R6/include/X11/pixmaps/computer.xpm +./usr/X11R6/include/X11/pixmaps/keyboard.xpm +./usr/X11R6/include/X11/pixmaps/monitor.xpm +./usr/X11R6/include/X11/pixmaps/mouse.xpm +./usr/X11R6/lib/X11/Cards +./usr/X11R6/lib/X11/Options +./usr/X11R6/lib/X11/XF86Config.98 +./usr/X11R6/lib/X11/XF86Config.eg +./usr/X11R6/lib/X11/app-defaults/XF86Cfg +./usr/X11R6/lib/X11/doc/BUILD +./usr/X11R6/lib/X11/doc/BugReport +./usr/X11R6/lib/X11/doc/DESIGN +./usr/X11R6/lib/X11/doc/Install +./usr/X11R6/lib/X11/doc/LICENSE +./usr/X11R6/lib/X11/doc/README +./usr/X11R6/lib/X11/doc/README.DECtga +./usr/X11R6/lib/X11/doc/README.DRI +./usr/X11R6/lib/X11/doc/README.DRIcomp +./usr/X11R6/lib/X11/doc/README.I128 +./usr/X11R6/lib/X11/doc/README.SiS +./usr/X11R6/lib/X11/doc/README.XKB-Config +./usr/X11R6/lib/X11/doc/README.XKB-Enhancing +./usr/X11R6/lib/X11/doc/README.apm +./usr/X11R6/lib/X11/doc/README.ati +./usr/X11R6/lib/X11/doc/README.chips +./usr/X11R6/lib/X11/doc/README.cyrix +./usr/X11R6/lib/X11/doc/README.dps +./usr/X11R6/lib/X11/doc/README.fonts +./usr/X11R6/lib/X11/doc/README.i740 +./usr/X11R6/lib/X11/doc/README.i810 +./usr/X11R6/lib/X11/doc/README.mouse +./usr/X11R6/lib/X11/doc/README.newport +./usr/X11R6/lib/X11/doc/README.r128 +./usr/X11R6/lib/X11/doc/README.rapidaccess +./usr/X11R6/lib/X11/doc/README.rendition +./usr/X11R6/lib/X11/doc/README.s3virge +./usr/X11R6/lib/X11/doc/RELNOTES +./usr/X11R6/lib/X11/doc/Versions +./usr/X11R6/lib/X11/doc/VideoBoard98 +./usr/X11R6/lib/X11/etc/xmodmap.std +./usr/X11R6/lib/libxf86config.a +./usr/X11R6/lib/modules/drivers/dummy_drv.o +./usr/X11R6/lib/modules/drivers/fbdev_drv.o +./usr/X11R6/lib/modules/drivers/vesa_drv.o +./usr/X11R6/lib/modules/drivers/vga_drv.o +./usr/X11R6/lib/modules/drivers/wsfb_drv.o +./usr/X11R6/lib/modules/extensions/libGLcore.a +./usr/X11R6/lib/modules/extensions/libdbe.a +./usr/X11R6/lib/modules/extensions/libextmod.a +./usr/X11R6/lib/modules/extensions/libglx.a +./usr/X11R6/lib/modules/extensions/librecord.a +./usr/X11R6/lib/modules/extensions/libxtrap.a +./usr/X11R6/lib/modules/fonts/libbitmap.a +./usr/X11R6/lib/modules/fonts/libfreetype.a +./usr/X11R6/lib/modules/fonts/libspeedo.a +./usr/X11R6/lib/modules/fonts/libtype1.a +./usr/X11R6/lib/modules/fonts/libxtt.a +./usr/X11R6/lib/modules/input/acecad_drv.o +./usr/X11R6/lib/modules/input/calcomp_drv.o +./usr/X11R6/lib/modules/input/citron_drv.o +./usr/X11R6/lib/modules/input/digitaledge_drv.o +./usr/X11R6/lib/modules/input/dmc_drv.o +./usr/X11R6/lib/modules/input/dynapro_drv.o +./usr/X11R6/lib/modules/input/elographics_drv.o +./usr/X11R6/lib/modules/input/fpit_drv.o +./usr/X11R6/lib/modules/input/hyperpen_drv.o +./usr/X11R6/lib/modules/input/js_x_drv.o +./usr/X11R6/lib/modules/input/kbd_drv.o +./usr/X11R6/lib/modules/input/magellan_drv.o +./usr/X11R6/lib/modules/input/microtouch_drv.o +./usr/X11R6/lib/modules/input/mouse_drv.o +./usr/X11R6/lib/modules/input/mutouch_drv.o +./usr/X11R6/lib/modules/input/palmax_drv.o +./usr/X11R6/lib/modules/input/penmount_drv.o +./usr/X11R6/lib/modules/input/spaceorb_drv.o +./usr/X11R6/lib/modules/input/summa_drv.o +./usr/X11R6/lib/modules/input/tek4957_drv.o +./usr/X11R6/lib/modules/input/usbtablet_drv.o +./usr/X11R6/lib/modules/input/void_drv.o +./usr/X11R6/lib/modules/input/wacom_drv.o +./usr/X11R6/lib/modules/libcfb.a +./usr/X11R6/lib/modules/libcfb16.a +./usr/X11R6/lib/modules/libcfb24.a +./usr/X11R6/lib/modules/libcfb32.a +./usr/X11R6/lib/modules/libddc.a +./usr/X11R6/lib/modules/libfb.a +./usr/X11R6/lib/modules/libi2c.a +./usr/X11R6/lib/modules/libint10.a +./usr/X11R6/lib/modules/liblayer.a +./usr/X11R6/lib/modules/libmfb.a +./usr/X11R6/lib/modules/libpcidata.a +./usr/X11R6/lib/modules/librac.a +./usr/X11R6/lib/modules/libramdac.a +./usr/X11R6/lib/modules/libscanpci.a +./usr/X11R6/lib/modules/libshadow.a +./usr/X11R6/lib/modules/libshadowfb.a +./usr/X11R6/lib/modules/libvbe.a +./usr/X11R6/lib/modules/libvgahw.a +./usr/X11R6/lib/modules/libxaa.a +./usr/X11R6/lib/modules/libxf1bpp.a +./usr/X11R6/lib/modules/libxf24_32bpp.a +./usr/X11R6/lib/modules/libxf4bpp.a +./usr/X11R6/lib/modules/libxf8_16bpp.a +./usr/X11R6/lib/modules/libxf8_32bpp.a +./usr/X11R6/man/cat1/XFree86.0 -unknown- .cat +./usr/X11R6/man/cat1/gtf.0 -unknown- .cat +./usr/X11R6/man/cat1/kbd_mode.0 -unknown- .cat +./usr/X11R6/man/cat1/pcitweak.0 -unknown- .cat +./usr/X11R6/man/cat1/scanpci.0 -unknown- .cat +./usr/X11R6/man/cat1/xf86cfg.0 -unknown- .cat +./usr/X11R6/man/cat1/xf86config.0 -unknown- .cat +./usr/X11R6/man/cat4/acecad.0 -unknown- .cat +./usr/X11R6/man/cat4/citron.0 -unknown- .cat +./usr/X11R6/man/cat4/dmc.0 -unknown- .cat +./usr/X11R6/man/cat4/dynapro.0 -unknown- .cat +./usr/X11R6/man/cat4/elographics.0 -unknown- .cat +./usr/X11R6/man/cat4/fbdev.0 -unknown- .cat +./usr/X11R6/man/cat4/fbdevhw.0 -unknown- .cat +./usr/X11R6/man/cat4/fpit.0 -unknown- .cat +./usr/X11R6/man/cat4/js_x.0 -unknown- .cat +./usr/X11R6/man/cat4/kbd.0 -unknown- .cat +./usr/X11R6/man/cat4/keyboard.0 -unknown- .cat +./usr/X11R6/man/cat4/microtouch.0 -unknown- .cat +./usr/X11R6/man/cat4/mouse.0 -unknown- .cat +./usr/X11R6/man/cat4/mutouch.0 -unknown- .cat +./usr/X11R6/man/cat4/palmax.0 -unknown- .cat +./usr/X11R6/man/cat4/penmount.0 -unknown- .cat +./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat +./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat +./usr/X11R6/man/cat4/vesa.0 -unknown- .cat +./usr/X11R6/man/cat4/vga.0 -unknown- .cat +./usr/X11R6/man/cat4/void.0 -unknown- .cat +./usr/X11R6/man/cat4/wacom.0 -unknown- .cat +./usr/X11R6/man/cat4/wsfb.0 -unknown- .cat +./usr/X11R6/man/cat5/XF86Config.0 -unknown- .cat +./usr/X11R6/man/man1/XFree86.1 -unknown- .man +./usr/X11R6/man/man1/gtf.1 -unknown- .man +./usr/X11R6/man/man1/kbd_mode.1 -unknown- .man +./usr/X11R6/man/man1/pcitweak.1 -unknown- .man +./usr/X11R6/man/man1/scanpci.1 -unknown- .man +./usr/X11R6/man/man1/xf86cfg.1 -unknown- .man +./usr/X11R6/man/man1/xf86config.1 -unknown- .man +./usr/X11R6/man/man4/acecad.4 -unknown- .man +./usr/X11R6/man/man4/citron.4 -unknown- .man +./usr/X11R6/man/man4/dmc.4 -unknown- .man +./usr/X11R6/man/man4/dynapro.4 -unknown- .man +./usr/X11R6/man/man4/elographics.4 -unknown- .man +./usr/X11R6/man/man4/fbdev.4 -unknown- .man +./usr/X11R6/man/man4/fbdevhw.4 -unknown- .man +./usr/X11R6/man/man4/fpit.4 -unknown- .man +./usr/X11R6/man/man4/js_x.4 -unknown- .man +./usr/X11R6/man/man4/kbd.4 -unknown- .man +./usr/X11R6/man/man4/keyboard.4 -unknown- .man +./usr/X11R6/man/man4/microtouch.4 -unknown- .man +./usr/X11R6/man/man4/mouse.4 -unknown- .man +./usr/X11R6/man/man4/mutouch.4 -unknown- .man +./usr/X11R6/man/man4/palmax.4 -unknown- .man +./usr/X11R6/man/man4/penmount.4 -unknown- .man +./usr/X11R6/man/man4/tek4957.4 -unknown- .man +./usr/X11R6/man/man4/usbtablet.4 -unknown- .man +./usr/X11R6/man/man4/vesa.4 -unknown- .man +./usr/X11R6/man/man4/vga.4 -unknown- .man +./usr/X11R6/man/man4/void.4 -unknown- .man +./usr/X11R6/man/man4/wacom.4 -unknown- .man +./usr/X11R6/man/man4/wsfb.4 -unknown- .man +./usr/X11R6/man/man5/XF86Config.5 -unknown- .man diff --git a/x11/Xserver/Makefile.common b/x11/Xserver/Makefile.common index a3ce73993eb4..ac10d392b821 100644 --- a/x11/Xserver/Makefile.common +++ b/x11/Xserver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2005/12/29 15:52:20 tsutsui Exp $ +# $NetBSD: Makefile.common,v 1.31 2006/04/03 11:15:17 uwe Exp $ # These define parts of the Xserver tree that are to be # conditionally compiled for different platforms. See @@ -48,7 +48,8 @@ XSERVER_XNEWSMIPS?= yes .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \ ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \ ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \ - ${MACHINE} == "sparc" + ${MACHINE} == "sparc" || \ + ${MACHINE} == "netwinder" XSERVER_NEEDS_XFONT= yes XSERVER_NEEDS_MIEXT= yes XSERVER_XFREE86= yes diff --git a/x11/Xserver/hw/xfree86/drivers/Makefile b/x11/Xserver/hw/xfree86/drivers/Makefile index b1254b9653a3..764bc3d48de6 100644 --- a/x11/Xserver/hw/xfree86/drivers/Makefile +++ b/x11/Xserver/hw/xfree86/drivers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/10/01 22:51:31 macallan Exp $ +# $NetBSD: Makefile,v 1.14 2006/04/03 11:15:17 uwe Exp $ SUBDIR= ati atimisc chips fbdev glint imstt mga nv r128 radeon \ s3 s3virge savage sis tdfx trident wsfb @@ -16,6 +16,10 @@ SUBDIR+= apm ark cirrus cyrix dummy i128 nsc \ rendition siliconmotion tga tseng vesa .endif +.if ${MACHINE} == "netwinder" +SUBDIR= dummy fbdev vesa vga wsfb +.endif + .if ${MACHINE} == "sgimips" SUBDIR= newport .endif diff --git a/x11/Xserver/hw/xfree86/xf86_os/Makefile b/x11/Xserver/hw/xfree86/xf86_os/Makefile index 067fd7cfc5d2..f8f51317260c 100644 --- a/x11/Xserver/hw/xfree86/xf86_os/Makefile +++ b/x11/Xserver/hw/xfree86/xf86_os/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/01 22:51:31 macallan Exp $ +# $NetBSD: Makefile,v 1.13 2006/04/03 11:15:17 uwe Exp $ .include "../../../Makefile.serverlib" @@ -59,6 +59,13 @@ CPPFLAGS.${_FN}= -DPCVT_SUPPORT -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_ .endfor .endif +.if ${MACHINE} == "netwinder" +SRCS.bsd+= arm_video.c bsdResource.c pm_noop.c agp_noop.c ioperm_noop.c +.for _FN in ${SRCS.bsd} +CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC +.endfor +.endif + .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus SRCS.bus= Pci.c @@ -68,7 +75,8 @@ SRCS.bus+= ix86Pci.c .if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \ ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \ - ${MACHINE} == "sparc" + ${MACHINE} == "sparc" || \ + ${MACHINE} == "netwinder" SRCS.bus+= netbsdPci.c .endif @@ -85,7 +93,8 @@ CPPFLAGS.SlowBcopy.S= -DUSE_GAS .if ${MACHINE} == "amd64" || ${MACHINE} == "macppc" || \ ${MACHINE} == "cats" || ${MACHINE} == "sgimips" || \ - ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" + ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \ + ${MACHINE} == "netwinder" SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c .endif