diff options
| -rw-r--r-- | OpenBSDLib.tmpl | 20 | ||||
| -rw-r--r-- | X11.tmpl | 17 | ||||
| -rw-r--r-- | cygwin.cf | 3 | ||||
| -rw-r--r-- | darwin.cf | 3 | ||||
| -rw-r--r-- | xorg.cf | 10 | ||||
| -rw-r--r-- | xorgsite.def | 4 | ||||
| -rw-r--r-- | xorgversion.def | 6 |
7 files changed, 39 insertions, 24 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 @@ -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 @@ -687,6 +687,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 +1256,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 +1274,8 @@ FCHOWN_DEFINES = -DHAS_FCHOWN XF86BigfontExtensionDefines DPMSDefines \ LowMemDefines XprintDefines XineramaDefines \ SitePervasiveExtensionDefines RenderDefines RandRDefines \ - XfixesDefines XDamageDefines CompositeDefines XevieDefines Lg3dDefines + XfixesDefines XDamageDefines CompositeDefines XevieDefines RootlessDefines \ + Lg3dDefines #endif #ifndef SiteExtensionDefines #define SiteExtensionDefines /**/ @@ -6,7 +6,7 @@ # define CygxVersionMinor 8 #endif #ifndef CygxVersionPatch -# define CygxVersionPatch 0 +# define CygxVersionPatch 1 #endif #ifndef CygxVersionSnap # define CygxVersionSnap 0 @@ -329,6 +329,7 @@ # define XWinMultiWindowDefines #endif /* BuildXWinMultiWindow */ #if BuildXWinMultiWindowExtWM +# define BuildRootless YES # define XWinMultiWindowExtWMDefines -DXWIN_MULTIWINDOWEXTWM #else /* BuildXWinMultiWindowExtWM */ # define XWinMultiWindowExtWMDefines @@ -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 */ @@ -1,4 +1,4 @@ -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.3 2004/12/15 03:26:32 gisburn Exp $ /* * This configuration file contains all of the configuration * information for the Xorg based X Servers. @@ -11,13 +11,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) && \ 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..d4cc3ce --- /dev/null +++ b/xorgversion.def @@ -0,0 +1,6 @@ +#define XORG_VERSION_MAJOR 6 +#define XORG_VERSION_MINOR 8 +#define XORG_VERSION_PATCH 1 +#define XORG_VERSION_SNAP 901 + +#define XORG_DATE "16 December 2004" |