diff options
Diffstat (limited to 'xorg.cf')
| -rw-r--r-- | xorg.cf | 76 |
1 files changed, 42 insertions, 34 deletions
@@ -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 /* */ |