Module Name: src Committed By: bsh Date: Wed Apr 4 01:23:27 UTC 2012
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/xserver: md.evbarm Log Message: enable X11 build for evbarm. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xserver/md.evbarm cvs rdiff -u -r1.60 -r1.61 src/external/mit/xorg/server/drivers/Makefile cvs rdiff -u -r1.23 -r1.24 \ src/external/mit/xorg/server/xorg-server/Makefile.common cvs rdiff -u -r1.31 -r1.32 \ 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.60 src/external/mit/xorg/server/drivers/Makefile:1.61 --- src/external/mit/xorg/server/drivers/Makefile:1.60 Tue Aug 30 04:22:56 2011 +++ src/external/mit/xorg/server/drivers/Makefile Wed Apr 4 01:23:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2011/08/30 04:22:56 macallan Exp $ +# $NetBSD: Makefile,v 1.61 2012/04/04 01:23:27 bsh Exp $ # xf86-input drivers @@ -147,6 +147,11 @@ SUBDIR+= \ xf86-video-wsfb .endif # ${MACHINE} == "dreamcast" +.if ${MACHINE} == "evbarm" +SUBDIR+= \ + xf86-video-wsfb +.endif # ${MACHINE} == "evbarm" + .if ${MACHINE} == "evbmips" SUBDIR+= \ xf86-video-siliconmotion \ Index: src/external/mit/xorg/server/xorg-server/Makefile.common diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.23 src/external/mit/xorg/server/xorg-server/Makefile.common:1.24 --- src/external/mit/xorg/server/xorg-server/Makefile.common:1.23 Tue Aug 30 04:22:56 2011 +++ src/external/mit/xorg/server/xorg-server/Makefile.common Wed Apr 4 01:23:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2011/08/30 04:22:56 macallan Exp $ +# $NetBSD: Makefile.common,v 1.24 2012/04/04 01:23:27 bsh Exp $ # These define parts of the Xserver tree that are to be # conditionally compiled for different platforms. See @@ -13,6 +13,7 @@ ${MACHINE} == "cats" || \ ${MACHINE} == "dreamcast" || \ ${MACHINE} == "ews4800mips" || \ + ${MACHINE} == "evbarm" || \ ${MACHINE} == "evbmips" || \ ${MACHINE} == "hp300" || \ ${MACHINE} == "hpcarm" || \ 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.31 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.32 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31 Tue Aug 30 04:22:56 2011 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Wed Apr 4 01:23:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2011/08/30 04:22:56 macallan Exp $ +# $NetBSD: Makefile,v 1.32 2012/04/04 01:23:27 bsh Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -69,6 +69,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES .endif .if ${MACHINE} == "cats" || \ + ${MACHINE} == "evbarm" || \ ${MACHINE} == "hpcarm" || \ ${MACHINE} == "shark" || \ ${MACHINE} == "netwinder" || \ Added files: Index: src/distrib/sets/lists/xserver/md.evbarm diff -u /dev/null src/distrib/sets/lists/xserver/md.evbarm:1.1 --- /dev/null Wed Apr 4 01:23:27 2012 +++ src/distrib/sets/lists/xserver/md.evbarm Wed Apr 4 01:23:26 2012 @@ -0,0 +1,122 @@ +# $NetBSD: md.evbarm,v 1.1 2012/04/04 01:23:26 bsh 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/void_drv.so -unknown- obsolete +./usr/X11R7/lib/modules/drivers/void_drv.so.1 -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/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- 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_g.a -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/void.0 -unknown- obsolete +./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- obsolete +./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- obsolete +./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