summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--OpenBSDLib.tmpl20
-rw-r--r--X11.tmpl22
-rw-r--r--cygwin.cf11
-rw-r--r--darwin.cf3
-rw-r--r--sun.cf5
-rw-r--r--xorg.cf76
-rw-r--r--xorgsite.def4
-rw-r--r--xorgversion.def6
8 files changed, 92 insertions, 55 deletions
diff --git a/OpenBSDLib.tmpl b/OpenBSDLib.tmpl
index 3b59c5a..d92d8f0 100644
--- a/OpenBSDLib.tmpl
+++ b/OpenBSDLib.tmpl
@@ -175,7 +175,7 @@ XCOMM
# elif OSMajorVersion > 3 || OSMajorVersion == 3 && OSMinorVersion >= 6
# ifndef SharedX11Rev
-# define SharedX11Rev 8.0
+# define SharedX11Rev 8.1
# endif
# ifndef SharedXThrStubRev
# define SharedXThrStubRev 8.0
@@ -225,22 +225,22 @@ XCOMM
# endif
# endif
# ifndef SharedGlxRev
-# define SharedGlxRev 3.0
+# define SharedGlxRev 3.1
# endif
# ifndef SharedOSMesaRev
-# define SharedOSMesaRev 5.0
+# define SharedOSMesaRev 6.0
# endif
# ifndef SharedGLwRev
# define SharedGLwRev 3.0
# endif
# ifndef SharedXrenderRev
-# define SharedXrenderRev 3.0
+# define SharedXrenderRev 3.1
# endif
# ifndef SharedXrandrRev
# define SharedXrandrRev 4.0
# endif
# ifndef SharedXcursorRev
-# define SharedXcursorRev 2.0
+# define SharedXcursorRev 2.2
# endif
# ifndef SharedXfontcacheRev
# define SharedXfontcacheRev 3.0
@@ -273,7 +273,7 @@ XCOMM
# define SharedXawRev 9.0
# endif
# ifndef SharedXaw6Rev
-# define SharedXaw6Rev 8.0
+# define SharedXaw6Rev 8.1
# endif
# ifndef SharedXiRev
# define SharedXiRev 8.0
@@ -294,7 +294,7 @@ XCOMM
# define SharedFSRev 8.0
# endif
# ifndef SharedFontRev
-# define SharedFontRev 3.0
+# define SharedFontRev 4.0
# endif
# ifndef SharedFontEncRev
# define SharedFontEncRev 3.0
@@ -303,16 +303,16 @@ XCOMM
# define SharedXpmRev 6.0
# endif
# ifndef SharedFreetype2Rev
-# define SharedFreetype2Rev 12.0
+# define SharedFreetype2Rev 13.0
# endif
# ifndef SharedExpatRev
# define SharedExpatRev 5.0
# endif
# ifndef SharedXft1Rev
-# define SharedXft1Rev 2.0
+# define SharedXft1Rev 3.0
# endif
# ifndef SharedXftRev
-# define SharedXftRev 4.0
+# define SharedXftRev 5.0
# endif
# ifndef SharedFontconfigRev
# define SharedFontconfigRev 2.0
diff --git a/X11.tmpl b/X11.tmpl
index cef5a40..80f2622 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,6 +1,6 @@
XCOMM ----------------------------------------------------------------------
XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.35 2004/09/03 16:18:18 kem Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.35.4.1 2004/09/16 23:37:20 deronj Exp $
XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
@@ -473,7 +473,10 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
#define BuildCup YES
#endif
#ifndef HasPlugin
-#define HasPlugin NO
+/* Browser plugins are shared libraries - only build them if the OS
+ * supports shared libs.
+ */
+#define HasPlugin HasSharedLibraries
#endif
#ifndef BuildPlugin
#define BuildPlugin HasPlugin
@@ -687,6 +690,10 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
#define BuildLg3dLibrary !BuildServersOnly
#endif
+#ifndef BuildRootless
+#define BuildRootless NO
+#endif
+
#ifndef BuildXterm
#define BuildXterm BuildClients
#endif
@@ -1252,6 +1259,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
+#ifndef RootlessDefines
+#if BuildRootless
+#define RootlessDefines -DROOTLESS
+#else
+#define RootlessDefines /**/
+#endif
+#endif
+
#ifndef SitePervasiveExtensionDefines
#define SitePervasiveExtensionDefines /**/
#endif
@@ -1262,7 +1277,8 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
XF86BigfontExtensionDefines DPMSDefines \
LowMemDefines XprintDefines XineramaDefines \
SitePervasiveExtensionDefines RenderDefines RandRDefines \
- XfixesDefines XDamageDefines CompositeDefines XevieDefines Lg3dDefines
+ XfixesDefines XDamageDefines CompositeDefines XevieDefines Lg3dDefines \
+ RootlessDefines
#endif
#ifndef SiteExtensionDefines
#define SiteExtensionDefines /**/
diff --git a/cygwin.cf b/cygwin.cf
index 9361f83..5f07028 100644
--- a/cygwin.cf
+++ b/cygwin.cf
@@ -1,15 +1,17 @@
/* Cygwin/X vendor strings and version */
+#include "xorgversion.def"
+
#ifndef CygxVersionMajor
-# define CygxVersionMajor 6
+# define CygxVersionMajor XORG_VERSION_MAJOR
#endif
#ifndef CygxVersionMinor
-# define CygxVersionMinor 8
+# define CygxVersionMinor XORG_VERSION_MINOR
#endif
#ifndef CygxVersionPatch
-# define CygxVersionPatch 0
+# define CygxVersionPatch XORG_VERSION_PATCH
#endif
#ifndef CygxVersionSnap
-# define CygxVersionSnap 0
+# define CygxVersionSnap XORG_VERSION_SNAP
#endif
#ifndef CygxVersionServer
# define CygxVersionServer 0
@@ -329,6 +331,7 @@
# define XWinMultiWindowDefines
#endif /* BuildXWinMultiWindow */
#if BuildXWinMultiWindowExtWM
+# define BuildRootless YES
# define XWinMultiWindowExtWMDefines -DXWIN_MULTIWINDOWEXTWM
#else /* BuildXWinMultiWindowExtWM */
# define XWinMultiWindowExtWMDefines
diff --git a/darwin.cf b/darwin.cf
index 0a8d963..94e5b6a 100644
--- a/darwin.cf
+++ b/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/darwin.cf,v 1.3 2004/07/30 18:22:06 torrey Exp $
+XCOMM $XdotOrg: xc/config/cf/darwin.cf,v 1.4.2.1 2004/12/15 04:53:05 gisburn Exp $
XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.50 2004/01/20 23:54:50 torrey Exp $
/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
@@ -133,6 +133,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define GlxExtraDefines -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL GlxArchDefines
# endif
+# define BuildRootless YES
#define BuildAppleWMLibrary YES
#endif /* DarwinQuartzSupport */
diff --git a/sun.cf b/sun.cf
index c7aa726..cef0560 100644
--- a/sun.cf
+++ b/sun.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.8 2004/08/15 00:58:42 krh Exp $
+XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.9.2.1 2005/01/13 01:18:47 gisburn Exp $
XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
@@ -240,6 +240,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
# endif
# endif
#else
+# if HasSunC
+# define CompilerServerExtraDefines $(XF86SRC)/os-support/sunos/sparcv8plus.il
+# endif
# define HasPlugin YES
#endif
diff --git a/xorg.cf b/xorg.cf
index 6b5484f..0f423a6 100644
--- a/xorg.cf
+++ b/xorg.cf
@@ -1,4 +1,5 @@
-XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.27 2004/09/03 22:00:10 kem Exp $
+XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.27.2.6 2005/01/24 03:11:42 gisburn Exp $
+
/*
* This configuration file contains all of the configuration
* information for the Xorg based X Servers.
@@ -11,13 +12,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
/* Get and set version information. */
#include "date.def"
-
-#define XORG_VERSION_MAJOR 6
-#define XORG_VERSION_MINOR 8
-#define XORG_VERSION_PATCH 0
-#define XORG_VERSION_SNAP 0
-
-#define XORG_DATE "8 September 2004"
+#include "xorgversion.def"
#if !defined(XorgVersionString) && \
defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \
@@ -421,14 +416,17 @@ RELEASE_VERSION = ReleaseVersion
# ifndef DriDrivers
# ifndef ia64Architecture
-# define i386DRIDrivers i810 i915
+# define i386DRIDrivers i810 i915 sis tdfx
# else
+ /*
+ * The tdfx driver needs Glide, which is not available for IA64.
+ * SiS is 64-bit unclean as of this writing.
+ */
# define i386DRIDrivers /**/
# endif
-# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 \
- sis tdfx
+# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200
# endif
-#endif
+#endif /* i386Architecture || ia64Architecture */
#if defined(AMD64Architecture)
/* vgahw module */
@@ -447,15 +445,17 @@ RELEASE_VERSION = ReleaseVersion
# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
neomagic tdfx savage cirrus tseng trident \
chips apm i128 ati ark cyrix siliconmotion \
- vga dummy vesa \
+ vga dummy vesa i810 \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-/* The tdfx driver needs Glide, which is not available for AMD64. SiS is 64-bit
- * unclean as of this writing.
+/*
+ * The tdfx driver needs Glide, which is not available for AMD64.
+ * SiS is 64-bit unclean as of this writing.
*/
-# define DriDrivers gamma mga r128 radeon r200
-
+# ifndef DriDrivers
+# define DriDrivers i915 gamma mga r128 radeon r200
+# endif
#endif /*AMD64Arcitecture*/
/* SPARC and UltraSPARC drivers */
@@ -540,7 +540,7 @@ RELEASE_VERSION = ReleaseVersion
DevelDrivers \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-#endif
+#endif /* OpenBSDArchitecture && Sparc64Architecture */
/* MIPS drivers */
@@ -564,7 +564,7 @@ RELEASE_VERSION = ReleaseVersion
DevelDrivers newport \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-#endif
+#endif /* MipsArchitecture */
/*
* DEC Alpha drivers
@@ -589,11 +589,14 @@ RELEASE_VERSION = ReleaseVersion
savage nv cirrus DevelDrivers siliconmotion \
vga XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-/* SiS is 64-bit unclean as of this writing. */
+/*
+ * Glide is available for Alpha, therefore build tdfx DRM module.
+ * SiS is 64-bit unclean as of this writing.
+ */
# ifndef DriDrivers
# define DriDrivers gamma tdfx mga r128 radeon r200
# endif
-#endif
+#endif /* AlphaArchitecture */
/*
* Motorola 68k and PowerPC drivers
@@ -623,10 +626,11 @@ RELEASE_VERSION = ReleaseVersion
DevelDrivers vga \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
+/* The tdfx driver needs Glide, which is not available for PPC. */
# ifndef DriDrivers
-# define DriDrivers gamma tdfx mga r128 radeon r200
+# define DriDrivers gamma mga r128 radeon r200
# endif
-#endif
+#endif /* PpcArchitecture || Mc68020Architecture */
/*
* Intel StrongARM and Hewlett-Packard PA-RISC
@@ -672,10 +676,6 @@ RELEASE_VERSION = ReleaseVersion
# ifndef XorgServer
# define XorgServer YES
# endif
-/* Amiga framebuffer module */
-# ifndef XF86AFB
-# define XF86AFB NO
-# endif
/* 1bpp module */
# ifndef XF1Bpp
# define XF1Bpp NO
@@ -700,10 +700,6 @@ RELEASE_VERSION = ReleaseVersion
# ifndef XFShadowFB
# define XFShadowFB YES
# endif
-/* vgahw module */
-# ifndef XF86VgaHw
-# define XF86VgaHw NO
-# endif
/* fbdevhw module */
# ifndef XF86FBDevHw
# define XF86FBDevHw YES
@@ -728,11 +724,23 @@ RELEASE_VERSION = ReleaseVersion
# ifndef XF86RAC
# define XF86RAC YES
# endif
-
/* int10 module */
# ifndef XF86Int10
# define XF86Int10 YES
# endif
+/* vbe module */
+# ifndef XF86VBE
+# define XF86VBE YES
+# endif
+
+/* vgahw module */
+# ifndef XF86VgaHw
+# define XF86VgaHw NO
+# endif
+/* Amiga framebuffer module */
+# ifndef XF86AFB
+# define XF86AFB NO
+# endif
# ifndef DevelDrivers
# if XFree86Devel
@@ -756,7 +764,7 @@ RELEASE_VERSION = ReleaseVersion
# ifndef DriDrivers
# define DriDrivers gamma r128
# endif
-#endif
+#endif /* Ppc64Architecture */
/*
* For Mips/Arc platforms, the default is to build all modules which
@@ -1550,7 +1558,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
# endif
#endif
-#if (GccMajorVersion == 3) && (GccMinorVersion >= 1)
+#if ((GccMajorVersion == 3) && (GccMinorVersion >= 1)) || (GccMajorVersion > 3)
# define GccAliasingArgs -fno-strict-aliasing
#else
# define GccAliasingArgs /* */
diff --git a/xorgsite.def b/xorgsite.def
index f4e1121..69bb2ce 100644
--- a/xorgsite.def
+++ b/xorgsite.def
@@ -24,7 +24,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
* The host.def file will never be patched.
*
* The distributed version of this file MUST contain no uncommented
- * definitions. Default definitions belong in xfree86.cf, or <vendor>.cf
+ * definitions. Default definitions belong in xorg.cf, or <vendor>.cf
* files.
*/
/******************************************************************************/
@@ -71,7 +71,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
/*
* Set the default server (ie the one that gets the sym-link to "X")
*
-#define ServerToInstall XFree86
+#define ServerToInstall Xorg
*/
/*
diff --git a/xorgversion.def b/xorgversion.def
new file mode 100644
index 0000000..1c183a3
--- /dev/null
+++ b/xorgversion.def
@@ -0,0 +1,6 @@
+#define XORG_VERSION_MAJOR 6
+#define XORG_VERSION_MINOR 8
+#define XORG_VERSION_PATCH 2
+#define XORG_VERSION_SNAP 0
+
+#define XORG_DATE "9 February 2005"