Subject: Re: HEADS UP: XFree86 4.2.1 imported
To: None <current-users@netbsd.org>
From: Wolfgang Rupprecht <wolfgang+gnus20020906T210259@wsrcc.com>
List: current-users
Date: 09/06/2002 21:06:32
uwe@ptc.spbu.ru (Valeriy E. Ushakov) writes:
> On Fri, Sep 06, 2002 at 07:09:27 -0700, Wolfgang Rupprecht wrote:
> > Is this release meant to work on netbsd-current/sparc ? The xfree86
> > folks mention that it now has sun framebuffer support, but I guess
> > they mean sun framebuffer support iff compiled up under solaris or
> > some such.
> You cannot compile XFree on NetBSD/sparc yet.
Ok, my poor ss5 finally finished the compile. The trivial path-name
changes produce a working Xsun. Folks with suns might want to ditch
the old Xfree 3.x and try 4.x.
-wolfgang
cvs server: Diffing .
Index: constype.c
===================================================================
RCS file: /cvsroot/xsrc/xfree/xc/programs/Xserver/hw/sun/constype.c,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 constype.c
--- constype.c 2002/01/19 15:05:52 1.1.1.4
+++ constype.c 2002/09/06 23:11:15
@@ -84,7 +84,11 @@
#ifndef CSRG_BASED
#include <sun/fbio.h>
#else
-#include <machine/fbio.h>
+# ifdef __NetBSD__
+# include <dev/sun/fbio.h> /* -wsr */
+# else
+# include <machine/fbio.h>
+# endif
#endif
#endif
Index: sun.h
===================================================================
RCS file: /cvsroot/xsrc/xfree/xc/programs/Xserver/hw/sun/sun.h,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 sun.h
--- sun.h 2002/01/19 15:05:53 1.1.1.4
+++ sun.h 2002/09/06 23:11:17
@@ -99,7 +99,7 @@
extern int setrlimit();
extern int getpagesize();
# else
-# if defined(CSRG_BASED) && !defined(__bsdi__)
+# if defined(CSRG_BASED) && !defined(__bsdi__) && !defined(__NetBSD__)
# include <machine/fbio.h>
# include <machine/kbd.h>
# include <machine/kbio.h>
@@ -110,6 +110,12 @@
# include </sys/sparc/dev/kbd.h>
# include </sys/sparc/dev/kbio.h>
# include </sys/sparc/dev/vuid_event.h>
+# endif
+# ifdef __NetBSD__
+# include <dev/sun/fbio.h>
+# include <sparc/kbd.h>
+# include <dev/sun/kbio.h> /* also <sparc/kbio.h> -wsr */
+# include <dev/sun/vuid_event.h> /* also <sparc/vud_event.h> -wsr */
# endif
# endif
#endif
--
Wolfgang Rupprecht <wolfgang+gnus@dailyplanet.wsrcc.com>
http://www.wsrcc.com/wolfgang/
Hackers don't spread viruses. Microsoft spreads viruses.