diff --git a/util/cf/COPYING b/util/cf/COPYING index 7f33cbfd2..db57cc5ca 100644 --- a/util/cf/COPYING +++ b/util/cf/COPYING @@ -1,12 +1,70 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Most of these files came from X11R6.6 or XFree86 4.4rc2. -Please submit updated COPYING files to the Xorg bugzilla: +X11R6.6 files are covered by this notice: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +Copyright (c) 1999,2000,2001 Compaq Computer Corporation +Copyright (c) 1999,2000,2001 Hewlett-Packard Company +Copyright (c) 1999,2000,2001 IBM Corporation +Copyright (c) 1999,2000,2001 Hummingbird Communications Ltd. +Copyright (c) 1999,2000,2001 Silicon Graphics, Inc. +Copyright (c) 1999,2000,2001 Sun Microsystems, Inc. +Copyright (c) 1999,2000,2001 The Open Group -All licensing questions regarding this software should be directed at the -Xorg mailing list: +All rights reserved. -http://lists.freedesktop.org/mailman/listinfo/xorg +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +he rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, provided that the above copyright notice(s) and this +permission notice appear in all copies of the Software and that both the +above copyright notice(s) and this permission notice appear in supporting +documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. + +X Window System is a trademark of The Open Group. + + ---------------------------------------------------------------- + +XFree86 code without an explicit copyright is covered by the following +copyright/license: + +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from the +XFree86 Project. diff --git a/util/cf/ChangeLog b/util/cf/ChangeLog index cd6fc5f59..e3bd9010f 100644 --- a/util/cf/ChangeLog +++ b/util/cf/ChangeLog @@ -1,3 +1,104 @@ +commit a724e4438e76438a9524ea7b112adc9d8e075ccb +Author: Alan Coopersmith +Date: Wed Jan 5 20:31:00 2011 -0800 + + xorg-cf-files 1.0.4 + + Signed-off-by: Alan Coopersmith + +commit 5e65933ae549ef31e81c0255bcf9548437f9b535 +Author: Alan Coopersmith +Date: Wed Jan 5 20:29:37 2011 -0800 + + config: Add missing AC_CONFIG_SRCDIR + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith + +commit db69115d0795bf12b096e38a95b1668b580c93f0 +Author: Alan Coopersmith +Date: Wed Jan 5 20:28:26 2011 -0800 + + Update xorgversion.def from 7.5 to 7.6 + + Signed-off-by: Alan Coopersmith + +commit de29e23f62d2c7deab4ace29d5897b36f5166076 +Author: Jeremy Huddleston +Date: Tue Aug 17 10:30:51 2010 -0700 + + Add support for darwin x86_64 + + Signed-off-by: Jeremy Huddleston + +commit d43a6b81c76a51a3d29376c86183955e4490ada0 +Author: Alan Coopersmith +Date: Mon Apr 26 23:40:42 2010 -0700 + + Add .gitignore + + Signed-off-by: Alan Coopersmith + +commit 6f2b44b45dafa01839960793b763509d7a72fd6b +Author: Alan Coopersmith +Date: Mon Apr 26 23:37:49 2010 -0700 + + Update README & COPYING files + + Signed-off-by: Alan Coopersmith + +commit 7331d171b0d1c5da62e9f168cf59eeb19eddec19 +Author: Alan Coopersmith +Date: Mon Apr 26 23:21:44 2010 -0700 + + Use INSTALL_CMD from xorg-macros-1.4 to make INSTALL file + + Also bump minimum autoconf version to 2.60 for consistency with other + X.Org modules + + Signed-off-by: Alan Coopersmith + +commit 245bf35aa111b0aace9d4de3e81c07f68776c9d4 +Author: Matthieu Herrb +Date: Thu Apr 22 22:43:39 2010 +0200 + + Remove libXp from XawClientLibs + + libXaw has lost Xp support some times ago. + + Signed-off-by: Matthieu Herrb + + Reviewed-by: Alan Coopersmith + +commit e042d1e888893f61deb1d3b30f89bd6196ac9169 +Author: Alan Coopersmith +Date: Thu Oct 15 16:00:33 2009 -0700 + + Use font-util 1.1 macros to set FontDir and FontEncDir in site.def + + Replaces cygwin.cf rules to manually set these paths. + + Signed-off-by: Yaakov Selkowitz + Signed-off-by: Alan Coopersmith + +commit 4b8577d83788bc7613c1e27eba9d80bd8bda9c08 +Author: Alan Coopersmith +Date: Thu Oct 15 09:57:01 2009 -0700 + + List X.Org version as 7.5 instead of 6.8.99.903 + + Signed-off-by: Alan Coopersmith + +commit 6c7e5535955e9beb15fb4e8d3e83b7e5d9298829 +Author: Yaakov Selkowitz +Date: Thu Oct 15 11:25:51 2009 -0500 + + cf: Update Cygwin rules + + Signed-off-by: Yaakov Selkowitz + commit 46ec61a400c67120584188c035378019a5f31bc5 Author: Alan Coopersmith Date: Wed Oct 14 10:40:55 2009 -0700 diff --git a/util/cf/INSTALL b/util/cf/INSTALL new file mode 100644 index 000000000..8b82ade08 --- /dev/null +++ b/util/cf/INSTALL @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/util/cf/Imake.cf b/util/cf/Imake.cf index 9b3af9cc8..7f86ee3dc 100644 --- a/util/cf/Imake.cf +++ b/util/cf/Imake.cf @@ -33,6 +33,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ # define i386DarwinArchitecture # undef __i386__ # endif +# ifdef __x86_64__ +# define x86_64DarwinArchitecture +# undef __x86_64__ +# endif #endif #if defined(clipper) || defined(__clipper__) diff --git a/util/cf/Makefile.am b/util/cf/Makefile.am index a9dd6c513..e984ca8e4 100644 --- a/util/cf/Makefile.am +++ b/util/cf/Makefile.am @@ -152,9 +152,12 @@ CLEANFILES = $(BUILT_DEFFILES) EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/util/cf/README b/util/cf/README index c4c5f59ab..e6324ab96 100644 --- a/util/cf/README +++ b/util/cf/README @@ -1,8 +1,45 @@ +The xorg-cf-files package contains the data files for the imake utility, +defining the known settings for a wide variety of platforms (many of which +have not been verified or tested in over a decade), and for many of the +libraries formerly delivered in the X.Org monolithic releases. + +The X Window System used imake extensively up through the X11R6.9 release, +for both full builds within the source tree and external software. +X has since moved to GNU autoconf and automake for its build system in +X11R7.0 and later releases, but still maintains imake for building existing +external software programs that have not yet converted. + +More information about Imake and its usage may be found in the resources +at: + http://www.snake.net/software/imake-stuff/ + http://www.kitebird.com/imake-book/ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/util/cf + + http://cgit.freedesktop.org/xorg/util/cf + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + +------------------------------------------------------------------------------ + $Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $ - - - - $XFree86: xc/config/cf/README,v 1.20 2003/04/14 20:35:50 herrb Exp $ The easiest way to write an Imakefile is to find another one that does @@ -188,7 +225,7 @@ X11.tmpl provides defaults for the following variables: BuildPlugin build xrx plug-in for web browsers BuildRECORD Build RECORD extension BuildServer build X server - BuildXAudio build Audio + BuildXAudio build Audio BuildXAServer build Audio server BuildXCSecurity Build Security Extension BuildXInputExt build X Input extension (requires ddx support, @@ -380,9 +417,9 @@ An Lib.rules file provides defaults for the following variables: PositionIndependentCFlags PIC compiler flags for C PositionIndependentCplusplusFlags PIC compiler flags for C++ - Note: PositionIndependentCplusplusFlags is only required if the + Note: PositionIndependentCplusplusFlags is only required if the C and C++ compilers use different flags to build PIC code. The - default configuration will try to use PositionIndependentCFlags + default configuration will try to use PositionIndependentCFlags for both C and C++ compiles. An Lib.tmpl file provides defaults for the following variables: @@ -517,7 +554,7 @@ SUBDIRS for an Imakefile in a directory containing and call MakeSubdirs() and DependSubdirs(). MANSUFFIX suffix used by InstallManPage* rules. May be set to $(LIBMANSUFFIX), $(FILEMANSUFFIX), or - $(MISCMANSUFFIX) in directories for libraries or data + $(MISCMANSUFFIX) in directories for libraries or data files. diff --git a/util/cf/X11.tmpl b/util/cf/X11.tmpl index e29dd9e05..3f1de8e23 100644 --- a/util/cf/X11.tmpl +++ b/util/cf/X11.tmpl @@ -45,7 +45,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ # if defined XorgVersionString # define XOrgReleaseString Release XorgVersionString # else -# define XOrgReleaseString Release 6.8 +# define XOrgReleaseString Release 7 # endif #endif @@ -1675,6 +1675,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules DOCPSDIR = DocPsDir DOCPDFDIR = DocPdfDir FONTDIR = FontDir /* font directories */ + FONTROOTDIR = FontDir /* font directories */ ENCODINGSDIR = FontEncDir /* font encodings directory */ XINITDIR = XinitDir /* xinit config files */ XDMDIR = XdmDir /* xdm config files */ diff --git a/util/cf/configure.ac b/util/cf/configure.ac index cb173e660..ab2c5acfc 100644 --- a/util/cf/configure.ac +++ b/util/cf/configure.ac @@ -1,14 +1,30 @@ -AC_PREREQ([2.57]) -AC_INIT(xorg-cf-files, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-cf-files) +dnl +dnl Process this file with autoconf to create configure. + +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xorg-cf-files], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [xorg-cf-files]) +AC_CONFIG_SRCDIR([Makefile.am]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require xorg-macros 1.4 or later: XORG_DEFAULT_OPTIONS, XORG_INSTALL m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.4) XORG_DEFAULT_OPTIONS +# Require X.Org's font util macros 1.1 or later for XORG_FONTROOTDIR +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) +XORG_FONTROOTDIR +XORG_FONTSUBDIR([ENCODINGSDIR],[encodingsdir],[encodings]) + m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) DEFAULT_XCONFDIR="${libdir}/X11/config" diff --git a/util/cf/cygwin.cf b/util/cf/cygwin.cf index 73ed8cec5..d6e6b1b0a 100644 --- a/util/cf/cygwin.cf +++ b/util/cf/cygwin.cf @@ -62,12 +62,17 @@ # define OSTeenyVersion DefaultOSTeenyVersion #endif -#ifndef ProjectRoot -# define ProjectRoot /usr/X11R6 +#ifndef XAppLoadDir +# define XAppLoadDir EtcX11Directory/app-defaults +#endif +#ifndef SystemManDirectory +# define SystemManDirectory /usr/share/man #endif #if !CrossCompiling +#ifndef HasGcc2 # define HasGcc2 YES +#endif /* HasGcc2 */ #endif /* !CrossCompiling */ #define HasGcc2ForCplusplus YES #define GccUsesGas YES @@ -98,15 +103,12 @@ */ #define Hastcl YES #define Hastk YES -#define TclLibName tcl80 -#define TkLibName tk80 +#define TclLibName tcl84 +#define TkLibName tk84 #define HasSockets YES #define GzipFontCompression YES #define HasZlib YES -#ifndef GzipLibrary -# define GzipLibrary -lz.dll -#endif /* We don't need -lm */ #define MathLibrary /**/ @@ -115,7 +117,7 @@ * /lib/libtermcap.a doesn't have tgetent, which is needed for * xc/programs/xterm/resize.exe */ -#define TermcapLibrary -lncurses.dll +#define TermcapLibrary -lncurses #define AvoidNullMakeCommand YES #define StripInstalledPrograms YES @@ -364,7 +366,6 @@ #define XWinServerDefines -DPIXPRIV \ -DXFree86Server \ -DX_BYTE_ORDER=ByteOrder \ - XvExtensionDefines \ XWinXF86ConfigDefines XWinNativeGDIDefines \ XWinPrimaryFBDefines \ XWinEmulatePseudoDefines \ @@ -406,7 +407,7 @@ # define BuildGlxExt YES /* Not enabled by default */ #endif #ifndef BuildXprintLib -# define BuildXprintLib YES /* Not enabled when Xprt disabled */ +# define BuildXprintLib NO /* Not enabled when Xprt disabled */ #endif #ifndef BuildXterm # define BuildXterm NO /* Built separately on Cygwin */ diff --git a/util/cf/cygwin.rules b/util/cf/cygwin.rules index d144755af..a2215bd71 100644 --- a/util/cf/cygwin.rules +++ b/util/cf/cygwin.rules @@ -22,11 +22,11 @@ #define SharedLibXext YES #define SharedLibXi YES #define SharedLibXtst YES -#define SharedOldX YES -#define SharedLibXp YES +#define SharedOldX NO +#define SharedLibXp NO #define SharedLibGlx YES -#define SharedLibDps YES -#define SharedLibDpsTk YES +#define SharedLibDps NO +#define SharedLibDpsTk NO #define SharedLibGlu YES #define SharedLibWindowsWM NO #ifndef SharedDataSeparation @@ -59,7 +59,7 @@ Concat3(cyg,libname,-$(shell echo rev|sed s=\\..*==).dll) #define ImportLibraryName(libname, rev) \ -Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll.a) +Concat3(lib,libname,.dll.a) #define ShortImportLibraryName(libname, rev) \ Concat3(lib,libname,.dll.a) @@ -233,8 +233,7 @@ step:: @@\ #define InstallSharedLibrary(libname,rev,dest) @@\ InstallTarget(install,ImportLibraryName(libname,rev),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\ -InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR)) @@\ -InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libname,rev),$(USRLIBDIR)) +InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR)) /* diff --git a/util/cf/cygwin.tmpl b/util/cf/cygwin.tmpl index 404b62845..a392a3478 100644 --- a/util/cf/cygwin.tmpl +++ b/util/cf/cygwin.tmpl @@ -30,10 +30,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $ #define SharedXResReqs $(LDPRELIB) $(XLIB) #define SharedXfontcacheReqs $(LDPRELIB) $(XLIB) #define SharedXineramaReqs $(LDPRELIB) $(XLIB) -/* - * We don't build Xss - * #define SharedXssReqs $(LDPRELIB) $(XLIB) - */ +#define SharedXssReqs $(LDPRELIB) $(XLIB) #define SharedXvMCReqs $(LDPRELIB) $(XLIB) #define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) #define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) @@ -54,6 +51,10 @@ XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif +#ifndef SharedXawRev +# define SharedXawRev 7.0 +#endif + #ifndef XawClientLibs # define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif diff --git a/util/cf/darwin.cf b/util/cf/darwin.cf index ef064cd6d..dd4e67345 100644 --- a/util/cf/darwin.cf +++ b/util/cf/darwin.cf @@ -230,6 +230,17 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define ByteOrder X_LITTLE_ENDIAN #endif /* i386DarwinArchitecture */ + +#ifdef x86_64DarwinArchitecture +# define DarwinMachineDefines -D__x86_64__ +# if HasGcc3 +# define OptimizedCDebugFlags -Os +# else +# define OptimizedCDebugFlags -O2 -fno-strength-reduce +# endif +# define ByteOrder X_LITTLE_ENDIAN +#endif /* x86_64DarwinArchitecture */ + #if OSMajorVersion < 7 # define DarwinLocaleDefines -DX_LOCALE #else diff --git a/util/cf/site.def.in b/util/cf/site.def.in index 998527a32..b3e5c1fe7 100644 --- a/util/cf/site.def.in +++ b/util/cf/site.def.in @@ -75,6 +75,14 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex #define ProjectRoot @prefix@ #endif +#ifndef FontDir +#define FontDir @FONTROOTDIR@ +#endif + +#ifndef FontEncDir +#define FontEncDir @ENCODINGSDIR@ +#endif + /* * On some platforms, some things may be installed outside of ProjectRoot * by default. To disable this, uncomment the following line. diff --git a/util/cf/xorgversion.def b/util/cf/xorgversion.def index 51a86f6ba..21f827bdb 100644 --- a/util/cf/xorgversion.def +++ b/util/cf/xorgversion.def @@ -1,5 +1,5 @@ -#define XORG_VERSION_MAJOR 6 -#define XORG_VERSION_MINOR 8 -#define XORG_VERSION_PATCH 99 -#define XORG_VERSION_SNAP 903 -#define XORG_DATE "03 December 2005 + cvs" +#define XORG_VERSION_MAJOR 7 +#define XORG_VERSION_MINOR 6 +#define XORG_VERSION_PATCH 0 +#define XORG_VERSION_SNAP 0 +#define XORG_DATE "20 December 2010"