>Number:         25112
>Category:       xsrc
>Synopsis:       xfree86.cf update from CVS XFree86 for amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 09 13:10:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Nicolas Joly
>Release:        NetBSD 2.0C (-current 20040409)
>Organization:
	Insitut Pasteur
>Environment:
System: NetBSD lanfeust.sis.pasteur.fr 2.0C NetBSD 2.0C (LANFEUST) #0: Fri Apr 9 10:21:40 CEST 2004 njoly@lanfeust.sis.pasteur.fr:/local/src/NetBSD/obj/amd64/sys/arch/amd64/compile/LANFEUST amd64
Architecture: x86_64
Machine: amd64
>Description:
There was a local hack (XF86AFB define) in NetBSD.cf to make the static
X server compile/work on amd64.
The fix was since applied, by Matthieu Herrb, in the CVS version of XFree86,
in file xfree86.cf (rev 3.469).

CVSROOT:        /home/x-cvs
Module name:    xc
Changes by:     herrb@public.xfree86.org.       04/03/21 03:09:06
Log message:
  Static X servers using the vesa driver also need AFB.
Modified files:
      xc/config/cf/: xfree86.cf
  Revision      Changes    Path
  3.469         +4 -1      xc/config/cf/xfree86.cf

>How-To-Repeat:
n/a
>Fix:

Index: xfree/xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvsroot/xsrc/xfree/xc/config/cf/NetBSD.cf,v
retrieving revision 1.66
diff -u -r1.66 NetBSD.cf
--- xfree/xc/config/cf/NetBSD.cf	28 Mar 2004 15:02:03 -0000	1.66
+++ xfree/xc/config/cf/NetBSD.cf	9 Apr 2004 12:36:48 -0000
@@ -445,7 +445,6 @@
 
 #if defined(AMD64Architecture)
 # define HasMTRRBuiltin       YES
-# define XF86AFB              YES
 #endif
 
 /*
Index: xfree/xc/config/cf/xfree86.cf
===================================================================
RCS file: /cvsroot/xsrc/xfree/xc/config/cf/xfree86.cf,v
retrieving revision 1.12
diff -u -r1.12 xfree86.cf
--- xfree/xc/config/cf/xfree86.cf	5 Mar 2004 16:32:44 -0000	1.12
+++ xfree/xc/config/cf/xfree86.cf	9 Apr 2004 12:36:49 -0000
@@ -403,6 +403,9 @@
 # ifndef XF86Server
 #  define XF86Server		YES
 # endif
+# ifndef XF86AFB
+#  define XF86AFB		!DoLoadableServer
+# endif
 /* 1bpp module */
 # ifndef XF1Bpp
 #  define XF1Bpp		YES
>Release-Note:
>Audit-Trail:
>Unformatted: