From 34cc6e2c488c08d98c9278b53a89f9d54aef47ac Mon Sep 17 00:00:00 2001 From: mrg Date: Mon, 22 Aug 2016 08:58:57 +0000 Subject: [PATCH] now sunffb builds, build it for xorg-server 1.18 --- distrib/sets/lists/xdebug/md.sparc64 | 4 ++-- distrib/sets/lists/xserver/md.sparc64 | 12 ++++++------ external/mit/xorg/server/drivers/Makefile | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/distrib/sets/lists/xdebug/md.sparc64 b/distrib/sets/lists/xdebug/md.sparc64 index 7a4f4802f3b1..e87d1b53eae0 100644 --- a/distrib/sets/lists/xdebug/md.sparc64 +++ b/distrib/sets/lists/xdebug/md.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.7 2016/08/20 05:24:26 mrg Exp $ +# $NetBSD: md.sparc64,v 1.8 2016/08/22 08:58:57 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete @@ -75,7 +75,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/suncg6_drv.so.1.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sunffb_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110 +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sunffb_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sunleo_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug -unknown- xorg,debug diff --git a/distrib/sets/lists/xserver/md.sparc64 b/distrib/sets/lists/xserver/md.sparc64 index a160e1158b8f..221639e00bc1 100644 --- a/distrib/sets/lists/xserver/md.sparc64 +++ b/distrib/sets/lists/xserver/md.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.60 2016/08/20 05:24:26 mrg Exp $ x11 +# $NetBSD: md.sparc64,v 1.61 2016/08/22 08:58:57 mrg Exp $ x11 ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -45,8 +45,8 @@ ./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 -unknown- xorg ./usr/X11R7/lib/modules/drivers/suncg6_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/suncg6_drv.so.1 -unknown- xorg -./usr/X11R7/lib/modules/drivers/sunffb_drv.so -unknown- xorg,xorg_server_ver=110 -./usr/X11R7/lib/modules/drivers/sunffb_drv.so.1 -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/sunffb_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/sunffb_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/sunleo_drv.so -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/drivers/sunleo_drv.so.1 -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete @@ -179,7 +179,7 @@ ./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg ./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg ./usr/X11R7/man/cat4/suncg6.0 -unknown- .cat,xorg -./usr/X11R7/man/cat4/sunffb.0 -unknown- .cat,xorg,xorg_server_ver=110 +./usr/X11R7/man/cat4/sunffb.0 -unknown- .cat,xorg ./usr/X11R7/man/cat4/sunleo.0 -unknown- .cat,xorg,xorg_server_ver=110 ./usr/X11R7/man/cat4/void.0 -unknown- obsolete ./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg @@ -201,7 +201,7 @@ ./usr/X11R7/man/html4/r128.html -unknown- html,xorg ./usr/X11R7/man/html4/radeon.html -unknown- html,xorg ./usr/X11R7/man/html4/suncg6.html -unknown- html,xorg -./usr/X11R7/man/html4/sunffb.html -unknown- html,xorg,xorg_server_ver=110 +./usr/X11R7/man/html4/sunffb.html -unknown- html,xorg ./usr/X11R7/man/html4/sunleo.html -unknown- html,xorg,xorg_server_ver=110 ./usr/X11R7/man/html4/void.html -unknown- obsolete ./usr/X11R7/man/html4/ws.html -unknown- html,xorg @@ -223,7 +223,7 @@ ./usr/X11R7/man/man4/r128.4 -unknown- .man,xorg ./usr/X11R7/man/man4/radeon.4 -unknown- .man,xorg ./usr/X11R7/man/man4/suncg6.4 -unknown- .man,xorg -./usr/X11R7/man/man4/sunffb.4 -unknown- .man,xorg,xorg_server_ver=110 +./usr/X11R7/man/man4/sunffb.4 -unknown- .man,xorg ./usr/X11R7/man/man4/sunleo.4 -unknown- .man,xorg,xorg_server_ver=110 ./usr/X11R7/man/man4/void.4 -unknown- obsolete ./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg diff --git a/external/mit/xorg/server/drivers/Makefile b/external/mit/xorg/server/drivers/Makefile index 4b7d6f8b5bbf..c50c70611e66 100644 --- a/external/mit/xorg/server/drivers/Makefile +++ b/external/mit/xorg/server/drivers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2016/08/20 23:56:20 mrg Exp $ +# $NetBSD: Makefile,v 1.87 2016/08/22 08:58:57 mrg Exp $ # xf86-input drivers @@ -284,12 +284,12 @@ SUBDIR+= \ xf86-video-r128 \ xf86-video-radeon \ xf86-video-suncg6 \ + xf86-video-sunffb \ xf86-video-wsfb .if ${XORG_SERVER_SUBDIR} == "xorg-server.old" SUBDIR+= \ xf86-video-ag10e \ xf86-video-glint \ - xf86-video-sunffb \ xf86-video-sunleo .endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old" .if ${MACHINE} == "sparc"