Subject: XFree86 2.1 and new stuff
To: None <current-users@sun-lamp.cs.berkeley.edu>
From: Matthieu Herrb <matthieu@laas.fr>
List: current-users
Date: 04/08/1994 09:20:49
Some good news:
1. I made a new binary distribution on XFree86-2.1. Available from:
ftp.laas.fr:/pub/NetBSD/XFree86-2.1.
WARNING: the shared libraries version numbers are now 3.0.
2. Here are the patches I needed to build it with the 4 April's
binaries (They mostly come from Mark Weaver).
*** mit/config/imake.c.orig Sat Jan 15 13:57:38 1994
--- mit/config/imake.c Thu Apr 7 20:32:36 1994
***************
*** 742,748 ****
#if defined(SYSV) || defined(AMOEBA) || defined(_MINIX)
freopen(tmpfname, "w+", tmpfd);
#else /* !SYSV */
! ftruncate(fileno(tmpfd), 0);
#endif /* !SYSV */
initialized = TRUE;
fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
--- 742,748 ----
#if defined(SYSV) || defined(AMOEBA) || defined(_MINIX)
freopen(tmpfname, "w+", tmpfd);
#else /* !SYSV */
! ftruncate(fileno(tmpfd), (off_t)0);
#endif /* !SYSV */
initialized = TRUE;
fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
*** mit/server/ddx/x386/os-support/bsd/bsd_video.c.orig Sat Jan 15 13:57:26 1994
--- mit/server/ddx/x386/os-support/bsd/bsd_video.c Thu Apr 7 20:35:33 1994
***************
*** 33,38 ****
--- 33,42 ----
#include "x386Priv.h"
#include "xf86_OSlib.h"
+ #if defined(__NetBSD__) && !defined(MAP_FILE)
+ #define MAP_FILE 0
+ #endif
+
/***************************************************************************/
/* Video Memory Mapping section */
/***************************************************************************/
*** mit/config/bsdLib.tmpl.orig Thu Apr 7 20:53:09 1994
--- mit/config/bsdLib.tmpl Thu Apr 7 20:56:27 1994
***************
*** 2,10 ****
XCOMM $XConsortium: sunLib.tmpl,v 1.14.1.2 92/11/11 09:52.02 rws Exp $
/*
! * SunOS shared library template
*/
#ifndef SharedXlibRev
#define SharedXlibRev 2.0
#endif
--- 2,11 ----
XCOMM $XConsortium: sunLib.tmpl,v 1.14.1.2 92/11/11 09:52.02 rws Exp $
/*
! * Free/NetBSD shared library template
*/
+ #ifndef __NetBSD__
#ifndef SharedXlibRev
#define SharedXlibRev 2.0
#endif
***************
*** 32,37 ****
--- 33,67 ----
#ifndef SharedPexRev
#define SharedPexRev 2.0
#endif
+ #else /* __NetBSD__ */
+ #ifndef SharedXlibRev
+ #define SharedXlibRev 3.0
+ #endif
+ #ifndef SharedOldXRev
+ #define SharedOldXRev 3.0
+ #endif
+ #ifndef SharedXtRev
+ #define SharedXtRev 3.0
+ #endif
+ #ifndef SharedXawRev
+ #define SharedXawRev 3.0
+ #endif
+ #ifndef SharedXmuRev
+ #define SharedXmuRev 3.0
+ #endif
+ #ifndef SharedXextRev
+ #define SharedXextRev 3.0
+ #endif
+ #ifndef SharedXinputRev
+ #define SharedXinputRev 3.0
+ #endif
+ #ifndef SharedXTrapRev
+ #define SharedXTrapRev 3.0
+ #endif
+ #ifndef SharedPexRev
+ #define SharedPexRev 3.0
+ #endif
+ #endif /* __NetBSD__ */
SHLIBLDFLAGS = SharedLibraryLoadFlags
PICFLAGS = PositionIndependentCFlags
*** mit/server/ddx/x386/SuperProbe/OS_386BSD.c.orig Fri Apr 8 08:28:16 1994
--- mit/server/ddx/x386/SuperProbe/OS_386BSD.c Fri Apr 8 07:40:20 1994
***************
*** 48,53 ****
--- 48,56 ----
# undef CONSOLE_X_MODE_OFF
# define CONSOLE_X_MODE_OFF _IO('t',122)
#endif
+ #if defined(__NetBSD__) && !defined(MAP_FILE)
+ #define MAP_FILE 0
+ #endif
static int CONS_fd = -1;
static int BIOS_fd = -1;
Matthieu
------------------------------------------------------------------------------