[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/doc BUILD,
1.1.4.5.2.1, 1.1.4.5.2.1.4.1 DESIGN, 1.1.4.2.2.1,
1.1.4.2.2.1.4.1 Imakefile, 1.1.4.4.2.1.4.1,
1.1.4.4.2.1.4.2 Install, 1.1.4.4.2.1, 1.1.4.4.2.1.4.1 LICENSE,
1.1.4.4, 1.1.4.4.8.1 OS2.Notes, 1.1.4.2.6.1,
1.1.4.2.6.1.4.1 README, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 README.DECtga, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 README.DRI, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.DRIcomp, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.Darwin, 1.1.4.4.2.1,
1.1.4.4.2.1.4.1 README.I128, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.LynxOS, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 README.NetBSD, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 README.OpenBSD, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 README.SCO, 1.1.4.3.4.1,
1.1.4.3.4.1.4.1 README.SiS, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 README.Solaris, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.XKB-Config, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.XKB-Enhancing, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.apm, 1.1.4.2.6.1,
1.1.4.2.6.1.4.1 README.ati, 1.1.4.2.6.1,
1.1.4.2.6.1.4.1 README.chips, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 README.cyrix, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.dps, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.fonts, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 README.i740, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.i810, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.mouse, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 README.newport, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.r128, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.rendition, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 README.s3virge, 1.1.4.4.2.1,
1.1.4.4.2.1.4.1 RELNOTES, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 Versions, 1.1.4.2.2.1,
1.1.4.2.2.1.4.1 README.isc, 1.1.4.2.6.1, NONE
Keith Packard
xorg-commit at pdx.freedesktop.org
Sun Mar 28 22:11:52 PST 2004
- Previous message: [xorg-commit-diffs] xc CHANGELOG-RELEASE-1-TM,1.1.2.33,1.1.2.34
- Next message: [xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/doc/sgml
BUILD.sgml, 1.1.4.3.4.1, 1.1.4.3.4.1.4.1 DECtga.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 DESIGN.sgml, 1.1.4.2.2.1,
1.1.4.2.2.1.4.1 Darwin.sgml, 1.1.4.1.4.2,
1.1.4.1.4.2.4.1 I128.sgml, 1.1.10.1, 1.1.10.1.4.1 Imakefile,
1.1.4.4.2.1, 1.1.4.4.2.1.4.1 Install.sgml, 1.1.10.1,
1.1.10.1.4.1 LICENSE.sgml, 1.1.4.4, 1.1.4.4.8.1 LynxOS.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 NetBSD.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 OS2Notes.sgml, 1.1.10.1,
1.1.10.1.4.1 OpenBSD.sgml, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 README.sgml, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 RELNOTES.sgml, 1.1.4.4.2.2,
1.1.4.4.2.2.4.1 SCO.sgml, 1.1.4.2.4.2,
1.1.4.2.4.2.4.1 SiS.sgml, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 Solaris.sgml, 1.1.10.1,
1.1.10.1.4.1 Status.sgml, 1.1.4.2.4.2,
1.1.4.2.4.2.4.1 Versions.sgml, 1.1.10.1,
1.1.10.1.4.1 XKB-Config.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 XKB-Enhancing.sgml, 1.1.10.1,
1.1.10.1.4.1 apm.sgml, 1.1.4.2.6.1, 1.1.4.2.6.1.4.1 ati.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 chips.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 cyrix.sgml, 1.1.10.1, 1.1.10.1.4.1 defs.ent,
1.1.4.4.2.1, 1.1.4.4.2.1.4.1 dps.sgml, 1.1.10.1,
1.1.10.1.4.1 fonts.sgml, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 i740.sgml, 1.1.10.1, 1.1.10.1.4.1 i810.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 mouse.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 newport.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 r128.sgml, 1.1.10.1,
1.1.10.1.4.1 rendition.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 s3virge.sgml, 1.1.10.1, 1.1.10.1.4.1 DRI.sgml,
1.1.10.1, NONE DRIcomp.sgml, 1.1.4.1.6.1, NONE isc.sgml,
1.1.4.1.6.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: keithp
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc
In directory pdx:/tmp/cvs-serv10045/programs/Xserver/hw/xfree86/doc
Modified Files:
Tag: XORG-RELEASE-1-TM
BUILD DESIGN Imakefile Install LICENSE OS2.Notes README
README.DECtga README.DRI README.DRIcomp README.Darwin
README.I128 README.LynxOS README.NetBSD README.OpenBSD
README.SCO README.SiS README.Solaris README.XKB-Config
README.XKB-Enhancing README.apm README.ati README.chips
README.cyrix README.dps README.fonts README.i740 README.i810
README.mouse README.newport README.r128 README.rendition
README.s3virge RELNOTES Versions
Removed Files:
Tag: XORG-RELEASE-1-TM
README.isc
Log Message:
43. Updates to SGML and SGML-generated documentation
(Jim Gettys, with minor hacks by Keith Packard)
Index: BUILD
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/BUILD,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/BUILD 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/BUILD 29 Mar 2004 06:11:44 -0000 1.1.4.5.2.1.4.1
@@ -1,86 +1,87 @@
- Building XFree86 from a Source Distribution
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.13
+2003/12/05 15:51:44 dawes Exp $
- David Dawes, Matthieu Herrb
+ Building the X Window System from a Source Distribution
- 23 February 2004
+ David Dawes, Matthieu Herrb, Jim Gettys
+
+ 25 March 2004
Abstract
- This document describes how to build XFree86 from the source dis-
- tribution and is designed to be used in conjunction with the oper-
- ating system (OS) specific README files.
+ This document describes how to build the X Window System from the
+ Xorg monolithic source distribution and is designed to be used in
+ conjunction with the operating system (OS) specific README files.
NOTE: Refer to the appropriate OS-specific README file before
- attempting to build XFree86. These files often contain additional
- information that you need to successfully build for your OS.
+ attempting to build the X distribution. These files often contain
+ additional information that you need to successfully build for your
+ OS.
-We highly recommend using gcc to build XFree86, but XFree86 also generally
-builds with the native compiler for each OS platform;
+We highly recommend using gcc to build the X distribution, but X also gener-
+ally builds with the native compiler for each OS platform;
-1. How to get the XFree86 4.4.0 source
+1. How to get the X11R6.7.0 distribution source
-The recommended way of getting the XFree86 4.4.0 source is to obtain it
-directly from the XFree86 CVS repository. There are several ways of doing
-that, and they are described at our CVS web page
-<URL:http://www.xfree86.org/cvs/> The CVS tag for this release is
-"xf-4_4_0". The tag for the maintenance branch for this release is
-"xf-4_4-branch".
+The recommended way of getting the X11R6.7.0 source is to obtain it directly
+from the X.Org CVS repository. There are several ways of doing that, and
+they are described at our CVS web page <URL:http://www.freedesktop.org/Soft-
+ware/xorg> The CVS tag for this release is "xo-6.7_0". The tag for the
+maintenance branch for this release is "xo-6.7-branch".
-Another method of getting the XFree86 4.4.0 source is to either download the
-4.4.0 source tarballs from the XFree86 ftp site. The procedure for this is
-as follows:
+Another method of getting the X11R6.7.0 source is to either download the
+6.7.0 source tarballs from the X.org ftp site. The procedure for this is as
+follows:
- o The XFree86 4.4.0 source is contained in the files:
+ o The X11R6.7.0 source is contained in the files:
- XFree86-4.4.0-src-1.tgz
+ xorg-6.7.0-1.tar.gz
- XFree86-4.4.0-src-2.tgz
+ xorg-6.7.0-2.tar.gz
- XFree86-4.4.0-src-3.tgz
+ xorg-6.7.0-3.tar.gz
- XFree86-4.4.0-src-4.tgz
+ xorg-6.7.0-4.tar.gz
- XFree86-4.4.0-src-5.tgz
+ xorg-6.7.0-5.tar.gz
- XFree86-4.4.0-src-6.tgz
+ xorg-6.7.0-6.tar.gz
- XFree86-4.4.0-src-7.tgz
+ xorg-6.7.0-7.tar.gz
- These can be found at ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/
- and similar locations on XFree86 mirror sites. XFree86-4.4.0-src-4.tgz
- and XFree86-4.4.0-src-5.tgz contains the fonts. XFree86-4.4.0-src-6.tgz
- contains the documentation source. XFree86-4.4.0-src-7.tgz contains the
- hardcopy documentation. XFree86-4.4.0-src-1.tgz,
- XFree86-4.4.0-src-2.tgz and XFree86-4.4.0-src-3.tgz contains everything
- else. If you don't need the docs or fonts you can get by with only
- XFree86-4.4.0-src-1.tgz, XFree86-4.4.0-src-2.tgz and
- XFree86-4.4.0-src-3.tgz.
+ These can be found at ftp://ftp.x.org/pub/R6.7.0/tars/ and similar loca-
+ tions on Xorg mirror sites. xorg-6.7.0-4.tgz and xorg-6.7.0-5.tar.gz
+ contains the fonts. xorg-6.7.0-6.tar.gz contains the documentation
+ source. xorg-6.7.0-7.tar.gz contains the hardcopy documentation.
+ xorg-6.7.0-1.tar.gz, xorg-6.7.0-2.tar.gz and xorg-6.7.0-3.tar.gz con-
+ tains everything else. If you don't need the docs or fonts you can get
+ by with only xorg-6.7.0-1.tar.gz, xorg-6.7.0-2.tar.gz and
+ xorg-6.7.0-3.tar.gz.
o Extract each of these files by running the following from a directory on
a filesystem containing enough space (the full source requires around
305MB, and a similar amount is required in addition to this for the com-
piled binaries):
- gzip -d < XFree86-4.4.0-src-1.tgz | tar vxf -
+ gzip -d < xorg-6.7.0-1.tar.gz | tar vxf -
- gzip -d < XFree86-4.4.0-src-2.tgz | tar vxf -
+ gzip -d < xorg-6.7.0-2.tar.gz | tar vxf -
- gzip -d < XFree86-4.4.0-src-3.tgz | tar vxf -
+ gzip -d < xorg-6.7.0-3.tar.gz | tar vxf -
- gzip -d < XFree86-4.4.0-src-4.tgz | tar vxf -
+ gzip -d < xorg-6.7.0-4.tar.gz | tar vxf -
- gzip -d < XFree86-4.4.0-src-5.tgz | tar vxf -
+ gzip -d < xorg-6.7.0-5.tar.gz | tar vxf -
- gzip -d < XFree86-4.4.0-src-6.tgz | tar vxf -
+ gzip -d < xorg-6.7.0-6.tar.gz | tar vxf -
- gzip -d < XFree86-4.4.0-src-7.tgz | tar vxf -
+ gzip -d < xorg-6.7.0-7.tar.gz | tar vxf -
-Alternatively, if you already have a pristine copy of the XFree86 4.3.0
-source, you can download patches from
-ftp://ftp.xfree86.org/pub/XFree86/4.4.0/patches/ that will allow you to con-
-vert it to 4.4.0. Information about which patch files to download and how to
-apply them can be found in the "How to get XFree86" section of the README for
-this release.
+Alternatively, if you already have a pristine copy of the X11R6.7.0 6.6.0
+source, you can download patches from ftp://ftp.x.org/pub/R6.7.0/fixes/ that
+will allow you to convert it to 6.7.0. Information about which patch files
+to download and how to apply them can be found in the "How to get X11R6.7.0"
+section of the README for this release.
All methods will produce one main source directory called xc.
@@ -91,7 +92,7 @@
If you do want to make configuration changes, it is recommended that you
start by going to the xc/config/cf directory, and copying the file
-xf86site.def to host.def. Then read through the host.def file (which is
+xorgsite.def to host.def. Then read through the host.def file (which is
heavily commented), and set your configuration parameters. Usually you can
find the default settings by checking the .cf file(s) relevant to your OS.
@@ -99,25 +100,25 @@
easy to create build problems by changing the default configuration. Check
the configuration parameters specified in the xc/config/cf/README.
-If you are using just the XFree86-4.4.0-src-1.tgz, XFree86-4.4.0-src-2.tgz
-and XFree86-4.4.0-src-3.tgz parts of the source dist, you will need to define
-BuildFonts to NO.
+If you are using just the xorg-6.7.0-1.tar.gz, xorg-6.7.0-2.tar.gz and
+xorg-6.7.0-3.tar.gz parts of the source dist, you will need to define Build-
+Fonts to NO.
3. Using a shadow directory of symbolic links for the build
A recommended practice is to use a shadow directory of symbolic links to do
-the build of XFree86 as this allows you to keep the source directory unmodi-
-fied during the build. It has the following benefits:
+the build of X11R6.7.0 as this allows you to keep the source directory unmod-
+ified during the build. It has the following benefits:
o When you are using CVS to maintain your source tree, the update process
is not disturbed by foreign files not under CVS's control.
- o It is possible to build XFree86 for several different Operating System
+ o It is possible to build X11R6.7.0 for several different Operating System
or architectures from the same sources, shared by read-only NFS mounts.
- o It is possible to build XFree86 with different configuration options, by
- putting a real copy of the host.def file in each build tree and by cus-
- tomizing it separately in each build tree.
+ o It is possible to build X11R6.7.0 with different configuration options,
+ by putting a real copy of the host.def file in each build tree and by
+ customizing it separately in each build tree.
To make a shadow directory of symbolic links, use the following steps:
@@ -138,7 +139,7 @@
See the lndir(1) manual page for details.
If lndir is not already installed on your system, you can build it manually
-from the XFree86 sources by running the following commands:
+from the X11R6.7.0 sources by running the following commands:
cd xc/config/util
@@ -161,9 +162,9 @@
addressed the OS-specific details, go your build directory (either the xc
directory or the shadow tree created before) and run "make World" with the
BOOTSTRAPCFLAGS set as described in the OS-specific README (if necessary, but
-most systems supported by XFree86 don't need BOOTSTRAPCFLAGS). It is advis-
-able to redirect stdout and stderr to World.Log so that you can track down
-problems that might occur during the build.
+most systems supported by X11R6.7.0 don't need BOOTSTRAPCFLAGS). It is
+advisable to redirect stdout and stderr to World.Log so that you can track
+down problems that might occur during the build.
With Bourne-like shells (Bash, the Korn shell, zsh, etc.) use a command like:
@@ -228,7 +229,7 @@
6. Other useful make targets
There are some other useful targets defined in the top level Makefile of
-XFree86:
+X11R6.7.0:
o Everything after a make World, make Everything does everything a make
World does, except the cleaning of the tree. It is a way to quickly
@@ -244,11 +245,11 @@
make depend
make
- to rebuild the XFree86.
+ to rebuild the X11R6.7.0.
o distclean does a full cleaning of the source tree, removing all gener-
ated files. After a make distclean, make World is the only option to
- rebuild XFree86.
+ rebuild X11R6.7.0.
o includes generates all generated header files and in-tree symbolic links
needed by the build. These files are removed by a make clean.
@@ -260,9 +261,7 @@
o VerifyOS displays the detected operating system version. If the numbers
shown do not match your system, you probably need to set them manually
- in host.def and report the problem to <XFree86 at XFree86.org>.
-
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.14 dawes Exp $
+ in host.def and report the problem to <Xorg at Xorg.org>.
+ $XdotOrg$
-$XFree86: $
Index: DESIGN
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/DESIGN,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.1.4.1
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.1.4.1
--- a/DESIGN 4 Mar 2004 17:47:34 -0000 1.1.4.2.2.1
+++ b/DESIGN 29 Mar 2004 06:11:44 -0000 1.1.4.2.2.1.4.1
@@ -1,6 +1,7 @@
XFree86 server 4.x Design (DRAFT)
The XFree86 Project, Inc
+ Updates for X11R6.7.0 by Jim Gettys
19 December 2003
@@ -47,9 +48,9 @@
Unless we find major deficiencies in the DIX layer, we should avoid making
changes there.
-2. The XF86Config File
+2. The xorg.conf File
-The XF86Config file format is similar to the old format, with the following
+The xorg.conf file format is similar to the old format, with the following
changes:
2.1 Device section
@@ -242,7 +243,7 @@
that it knows how to drive.
PreInit
- Process information from the XF86Config file, determine the full
+ Process information from the xorg.conf file, determine the full
characteristics of the hardware, and determine if a valid config-
uration is present.
@@ -337,11 +338,11 @@
screenInfo.screen[] entry for each screen present. Here is what InitOutput()
does:
-5.1 Parse the XF86Config file
+5.1 Parse the xorg.conf file
This is done at the start of the first server generation only.
-The XF86Config file is read in full, and the resulting information stored in
+The xorg.conf file is read in full, and the resulting information stored in
data structures. None of the parsed information is processed at this point.
The parser data structures are opaque to the video drivers and to most of the
common layer code.
@@ -469,7 +470,7 @@
PROBE_DETECT is used if "-configure" or "-probe" command
line arguments are given and indicates to the Probe()
function that it should not configure the bus entities
- and that no XF86Config information is available.
+ and that no xorg.conf information is available.
The probe must find the active device sections that match
the driver by calling xf86MatchDevice(). The number of
@@ -609,7 +610,7 @@
This is done at the start of the first server generation only.
After the Probe phase is finished, there will be some number of ScrnInfoRecs.
-These are then matched with the active Screen sections in the XF86Config, and
+These are then matched with the active Screen sections in the xorg.conf, and
those not having an active Screen section are deleted. If the number of
remaining screens is 0, InitOutput() sets screenInfo.numScreens to 0 and
returns.
@@ -1061,11 +1062,11 @@
mode field, unless it wants to modify the mode timings reported to the user
by xf86PrintModes().
-The function is called once for every mode in the XF86Config Monitor section
+The function is called once for every mode in the xorg.conf Monitor section
assigned to the screen, with flags set to MODECHECK_INITIAL. It is subse-
-quently called for every mode in the XF86Config Display subsection assigned
-to the screen, with flags set to MODECHECK_FINAL. In the second case, the
-mode will have successfully passed all other tests. In addition, the ScrnIn-
+quently called for every mode in the xorg.conf Display subsection assigned to
+the screen, with flags set to MODECHECK_FINAL. In the second case, the mode
+will have successfully passed all other tests. In addition, the ScrnIn-
foRec's virtualX, virtualY and displayWidth fields will have been set as if
the mode to be validated were to be the last mode accepted.
@@ -1503,7 +1504,7 @@
and allocates screens and adds the resources to screens.
Two helper functions are provided for matching device sections in the
-XF86Config file to the devices:
+xorg.conf file to the devices:
int xf86MatchPciInstances(const char *driverName, int vendorID,
@@ -2879,12 +2880,12 @@
void FillRect (pScrn, x, y, w, h, color)
- This optional function should fill a rectangle w × h
+ This optional function should fill a rectangle w h
located at (x,y) in the given color.
void BlitRect (pScrn, srcx, srcy, w, h, dstx, dsty)
- This optional function should copy an area w × h located
+ This optional function should copy an area w h located
at (srcx,srcy) to location (dstx,dsty). This function
will need to handle copy directions as appropriate.
@@ -4467,7 +4468,7 @@
Allow missing horizontal sync and/or
vertical refresh ranges in the
- XF86Config Monitor section
+ xorg.conf Monitor section
LOOKUP_OPTIONAL_TOLERANCES should only be spec-
ified when the driver can ensure all modes it
@@ -4495,7 +4496,7 @@
monitor
- Pointer to the applicable XF86Config monitor
+ Pointer to the applicable xorg.conf monitor
section
fdFormat
@@ -5735,7 +5736,7 @@
20.3.5 AvailableOptions
Define the AvailableOptions() function. The purpose of this is to return the
-available driver options back to the -configure option, so that an XF86Config
+available driver options back to the -configure option, so that an xorg.conf
file can be built and the user can see which options are available for them
to use.
@@ -6366,7 +6367,5 @@
ZZZFreeRec(xf86Screens[scrnIndex]);
}
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.54 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.53 dawes Exp $
-$XFree86: $
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/Imakefile,v
retrieving revision 1.1.4.4.2.1.4.1
retrieving revision 1.1.4.4.2.1.4.2
diff -u -d -r1.1.4.4.2.1.4.1 -r1.1.4.4.2.1.4.2
--- a/Imakefile 17 Mar 2004 20:18:14 -0000 1.1.4.4.2.1.4.1
+++ b/Imakefile 29 Mar 2004 06:11:44 -0000 1.1.4.4.2.1.4.2
@@ -29,7 +29,6 @@
#if !BuildLinuxDocText
OSREADMES = \
ReadmeFile(Darwin) \
- ReadmeFile(isc) \
ReadmeFile(LynxOS) \
ReadmeFile(NetBSD) \
ReadmeFile(OpenBSD) \
@@ -58,8 +57,6 @@
OTHERDOCS = \
ReadmeFile(fonts) \
ReadmeFile(mouse) \
- ReadmeFile(DRI) \
- ReadmeFile(DRIcomp) \
ReadmeFile(dps) \
ReadmeFile(XKB-Config) \
ReadmeFile(XKB-Enhancing)
Index: Install
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/Install,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.1.4.1
diff -u -d -r1.1.4.4.2.1 -r1.1.4.4.2.1.4.1
--- a/Install 4 Mar 2004 17:47:34 -0000 1.1.4.4.2.1
+++ b/Install 29 Mar 2004 06:11:45 -0000 1.1.4.4.2.1.4.1
@@ -1,386 +1,32 @@
- Installation Details for XFree86[tm] 4.4.0
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v
+1.17 2003/02/24 17:09:16 dawes Exp $
- The XFree86 Project, Inc
+ Installation Details for X11R6.7[tm] 6.7.0
+
+ The X.org Foundation
23 February 2004
Abstract
- How to install XFree86.
+ How to install the X.Org Foundation's X Window System release ver-
+ sion X11R6.7.0.
1. Introduction
-This document contains information about installing the XFree86 binaries pro-
-vided by The XFree86 Project.
-
-The XFree86 binaries that we provide for UNIX-like OS's (Linux, the BSDs,
-Solaris, etc) are packaged in a platform-independent gzipped tar format (aka
-"tarballs" identified by the .tgz suffix). Along with the binaries we pro-
-vide a customized version of the GNU tar utility called "extract" and an
-installation script. We recommend that these be used to install the bina-
-ries. (The source for this customized version of GNU tar can be found in the
-XFree86 CVS repository's "utils" module, and from our ftp site
-<URL:ftp://ftp.xfree86.org/pub/XFree86/misc/utils-1.1.2.tgz>.)
-
-2. Downloading the XFree86 4.4.0 binaries
-
-We provide XFree86 4.4.0 binaries for a range of operating systems at our ftp
-site <URL:ftp://ftp.xfree86.org/pub/XFree86/4.4.0/binaries/> and our web site
-<URL:http://ftp.xfree86.org/pub/XFree86/4.4.0/binaries/>. Often during
-releases our site is heavily loaded. Instead of downloading directly from us
-we recommend that instead you use one of our mirror sites.
-
-Our binaries are organized by sub-directories which correspond to each of the
-OS/platforms for which we provide binaries. First go to the sub-directory
-that represents your OS platform. In some cases (e.g., Linux) there may be a
-number of choices depending on the architecture or libc version your platform
-uses. In all case we recommend that you first download the Xinstall.sh
-script, and run it as in the following example to find out which binary dis-
-tribution you should download.
-
- sh Xinstall.sh -check
-
-The output of this utility tells you which is the correct set of binaries for
-you to download. If you are careful with this step you will save yourself a
-lot time and trouble from NOT downloading an incompatible distribution.
-
-NOTES:
-
- o The Xinstall.sh script must be downloaded in binary mode, otherwise it
- will not run correctly. If you get lots of "command not found" mes-
- sages when you try to run it, then it is most likely because the script
- was not downloaded in binary mode. Some web browsers will not do this
- for files of that name, so we also have a copy of it called "Xin-
- stall.bin", and most browsers should download that correctly. When
- downloading it under this name, select "save as" on your browser, and
- save the file under the name "Xinstall.sh".
-
- o The Xinstall.sh script requires some system commands and utilities to
- function correctly. While most systems will have these, some Linux
- installations may not. If the script fails because of some missing sys-
- tem command, you need to install it before you can continue. If you do
- not know how to do this, then we recommend that you obtain this version
- of XFree86 from your Operating System distributor.
-
- o Always use the version of the Xinstall.sh script that is provided with
- the release. Older versions of the script may not install newer
- releases correctly.
-
- o If the binary distribution reported by the Xinstall.sh script is not
- present on the XFree86 site, then there are two possibilities: first is
- that it has not uploaded yet. This is likeliest possibility if you are
- looking shortly after the release date. The second possibility is that
- your target will not be be available at for this release. This is like-
- liest possibility if you are looking about two weeks after the release
- date. Check here <URL:http://www.xfree86.org/4.4.0/UPDATES.html> for
- information about updates to our binary distributions, and here
- <URL:http://www.xfree86.org/4.4.0/ERRATA.html> for errata related to
- this release.
-
-Assuming that you have run the Xinstall.sh script and found the binary dis-
-tribution suitable for your system, download the necessary files. The twelve
-(12) mandatory files for all installations are listed below. The installer
-script will complain if you do not have all four (4) files in the same direc-
-tory.
-
- 1. Xinstall.sh The installer script
- 2. extract The utility for extracting tarballs
- 3. Xbin.tgz X clients/utilities and run-time libraries
- 4. Xlib.tgz Some data files required at run-time
- 5. Xman.tgz Manual pages
- 6. Xdoc.tgz XFree86 documentation
- 7. Xfnts.tgz Base set of fonts
- 8. Xfenc.tgz Base set of font encoding data
- 9. Xetc.tgz Run-time configuration files
- 10. Xvar.tgz Run-time data
- 11. Xxserv.tgz XFree86 X server
- 12. Xmod.tgz XFree86 X server modules
-
-NOTES:
-
- o Some web browsers have a problem downloading the extract utility cor-
- rectly. If you encounter this problem, download the version called
- extract.exe. (NOTE: This is not a MS-DOS/Windows executable.)
-
- o Some distributions do not require the Xvar.tgz tarball. If it is
- present in the binaries sub-directory for your platform, then it is
- required.
-
- o The Darwin/Mac OS X distribution do not have or require the Xmod.tgz
- tarball.
-
- o Some distributions may have additional mandatory tarballs. While rare,
- the installer script will tell you if any are missing.
-
-The following eleven (11) tarballs are optional. You should download the
-ones you want to install.
-
- 1. Xdrm.tgz Source for DRM kernel modules
- 2. Xfsrv.tgz Font server
- 3. Xnest.tgz Nested X server
- 4. Xprog.tgz X header files, config files and compile-time libs
- 5. Xprt.tgz X Print server
- 6. Xvfb.tgz Virtual framebuffer X server
- 7. Xf100.tgz 100dpi fonts
- 8. Xfcyr.tgz Cyrillic fonts
- 9. Xfscl.tgz Scalable fonts (Speedo, Type1 and TrueType)
- 10. Xhtml.tgz HTML version of the documentation
- 11. Xps.tgz PostScript version of the documentation
- 12. Xpdf.tgz PDF version of the documentation
- 13. Xjdoc.tgz Documentation in Japanese
-
-NOTES:
-
- o Some distributions may have some additional optional tarballs.
-
-If you miss some and want to install them later, go to the Manual Installa-
-tion (section 4., page 1) section.
-
-3. Installing XFree86 4.4.0 using the Xinstall.sh script
-
-We strongly recommend that our XFree86 4.4.0 binaries be installed using the
-Xinstall.sh script we provide. There are a lot of steps in the manual
-installation process, and those steps can vary according to the platform and
-hardware setup. There is a description of the manual installation process
-for the most common cases below (section 4., page 1).
-
-You must login as the super user (root) to run the installer script and place
-all of the downloaded files into a single directory. Use the cd command to
-change to the chosen directory and run the installer script as follows:
-
- sh Xinstall.sh
-
-Answer the prompts as they come up. If you are missing something that is
-required, the installer may tell you to install it before trying again. If
-the problem is that you did not download all of mandatory files aforemen-
-tioned, then the installer will tell you which ones are missing and ask you
-to download them before proceeding.
-
-3.1 Questions the installer may ask
-
-The installer asks some questions that may not have obvious answers. The
-information here should help you answer them. In most cases, apart from the
-first question, the default answers should be OK.
-
-If you run the installer from within an X session (the installer checks if
-$DISPLAY is set), you will be warned that doing so is not a good idea.
-Unless you have a good reason for knowing that this will not be a problem,
-you should exit your X session, including stopping xdm or equivalent if it is
-running, before continuing. If you ignore this warning and run into prob-
-lems, well, you were warned!
-
-If you have an existing X installation, you will be warned that proceeding
-with this installation will overwrite it. Only those things that are part of
-our standard distribution will be overwritten. Other X applications that you
-may have installed will not be removed. Some configuration files may be
-overwritten though, but the installer should prompt you before doing so. As
-the opening greeting says, it is strongly recommended that you backup any
-existing installation before proceeding. If you want your old applications
-to still be there after you've installed, do not do the "backup" by simply
-renaming your old /usr/X11R6 directory. It is better to make a copy of it,
-and then install over the top of the original one. If you run into problems
-and want to revert to the old installation, you can then delete the overwrit-
-ten one and copy the saved version back.
-
-During the first part of the installation over an existing version, the
-script may remove some old files or directories that would get in the way of
-the new installation. It will list which files/directories have been
-removed. If none are listed, then none were removed.
-
-The next step when installing over an existing version is to check for exist-
-ing configuration files. As of XFree86 version 3.9.18, the run-time configu-
-ration files are installed by default under /etc/X11 instead of under
-/usr/X11R6/lib/X11. The installer will move the existing ones for you and
-create the necessary symbolic links. If you do not want to have these con-
-figuration files under /etc/X11, then you should answer "no" when asked about
-it. Answering "no" here also means that the new configuration files will be
-installed in the old /usr/X11R6/lib/X11 location.
-
-Note: for the rare systems that do not have symbolic links, this question
-will not be asked. The default answer is "yes" because that is best for most
-situations. It is our new default. It makes it easier to share the
-/usr/X11R6 directory between multiple hosts, and allows it to be mounted
-read-only. If you do not need these features, then you can safely answer
-"no" if you do not want them moved.
-
-When installing over an existing version, you will be prompted before each
-set of configuration files is installed. If you haven't made any Customisa-
-tions to your existing configuration files, then you can safely answer "yes"
-for each of these. If you have made customisations, you can try answering
-"no". If you run into problems later, you may need to manually merge your
-customisations into the the new version of the configuration files. The con-
-figuration files can all be found in the Xetc.tgz tarball. See the section
-below (section 4., page 1) about manual installation for information about
-extracting them separately.
-
-After the configuration files have been dealt with, the other mandatory com-
-ponents of the binary distribution will be installed. This should proceed
-without any user intervention.
-
-If you downloaded any of the optional components, the installer will ask you
-about each one before it is installed. The default answer is "yes". If
-there are any that you've since decided that you do not want to install,
-answer "no" when prompted.
-
-After that is done, the main part of the installation is complete. The next
-steps are to tidy up some aspects of the installation. The first of these is
-to run "ldconfig" on systems that require it, so that the newly installed
-shared libraries are accessible. Then the fonts.dir files in some directo-
-ries are updated so that the fonts can be accessed correctly. Next, the
-installer checks to see if your system has a termcap file or terminfo files.
-If it finds the former, it tells you how you may update the entries in that
-file. If it finds the latter, it asks you if you want it to update them for
-you.
-
-You may be asked if you want to create links for the GL libraries and header
-files. The OpenGL standard on some platforms (Linux in particular) says that
-these should be installed in the standard system locations (/usr/lib and
-/usr/include), so the installer offers to create the appropriate links. If
-you're running Linux, you should probably answer yes. For other platforms it
-is your choice. If you already have another version of libGL in /usr/lib,
-answering "yes" will remove it and replace it with a link to the version we
-supply. The installer will show you a listing of any existing versions
-before asking if they should be replaced.
-
-Finally, the installer asks you if you want a link created for the rstart
-utility. On most modern systems the link isn't essential, so the default
-answer is "no". Answer "yes" if you know that you need it. If you find
-later that you need it, you can create it easily by running:
-
- rm -f /usr/bin/rstartd
- ln -s /usr/X11R6/bin/rstartd /usr/bin/rstartd
-
-3.2 After the installation is complete
-
-The next step is to configure the X server. That is covered in detail in an
-as-yet unwritten document :-(. In the meantime, there are three ways to cre-
-ate a basic X server configuration file for XFree86 4.4.0. One is to run the
-xf86config utility. Another is to run the xf86cfg utility. The third option
-is to use the new -configure X server option:
-
- XFree86 -configure
-
-Note that if you are running Darwin/Mac OS X, there is no step 3 :-). You
-should skip this step, as configuration is not required or possible. The X
-server configuration file is not used on Darwin/Mac OS X.
-
-The X server config file (XF86Config) format has changed compared to 3.3.x.
-Also, its default location is now /etc/X11. Finally, there is now only one X
-server for driving video hardware, and it is called "XFree86". Once you're
-satisfied with the operation of the new X server, you can safely remove the
-old XF86_* and/or XF98_* X server binaries from /usr/X11R6/bin.
-
-After the X server configuration is done, it may be advisable to reboot,
-especially if you run xdm (or equivalent) or the font server (xfs).
-
-4. Installing XFree86 4.4.0 manually
-
-This section contains information about manually installing the XFree86 4.4.0
-binary distributions. You should only use this method if you know what
-you're doing. The information here covers some common cases, but not every
-possible case. It also may not be complete or up to date. Use at your own
-risk.
-
-Put all of the downloaded files into a single directory (choose some tempo-
-rary location with enough space). Become the super user (root). All of the
-following commands should be run as root, and they should be run from the
-directory that has all of the downloaded files. The "extract" utility should
-be used to unpack the tarballs. This is a customised version of GNU tar that
-has the gzip code built-in, and which has a different usage when run under
-the name "extract". One important thing that extract does that most versions
-of tar do not do by default is that it unlinks existing files before writing
-new ones. This is important when installing over an existing version of X.
-If you choose to use some other utility to extract the tarballs, you're on
-your own.
-
-4.1 A new installation
-
-The simplest case is when there is no existing X installation. The installa-
-tion procedure for this case is as follows:
-
- chmod +x extract
- mkdir /usr/X11R6
- mkdir /etc/X11
- ./extract -C /usr/X11R6 X[a-df-uw-z]*.tgz
- ./extract -C /usr/X11R6 Xvfb.tgz # If you are installing Xvfb
- ./extract -C /etc/X11 Xetc.tgz
- ./extract -C /var Xvar.tgz
- ln -s /etc/X11/app-defaults /usr/X11R6/lib/X11
- ln -s /etc/X11/fs /usr/X11R6/lib/X11
- ln -s /etc/X11/lbxproxy /usr/X11R6/lib/X11
- ln -s /etc/X11/proxymngr /usr/X11R6/lib/X11
- ln -s /etc/X11/rstart /usr/X11R6/lib/X11
- ln -s /etc/X11/twm /usr/X11R6/lib/X11
- ln -s /etc/X11/xdm /usr/X11R6/lib/X11
- ln -s /etc/X11/xinit /usr/X11R6/lib/X11
- ln -s /etc/X11/xsm /usr/X11R6/lib/X11
- ln -s /etc/X11/xserver /usr/X11R6/lib/X11
- chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK
- /sbin/ldconfig /usr/X11R6/lib # For Linux
- /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD
- /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
-
-4.2 Installing over an old installation
-
-If you have an existing installation of X, you should make a backup copy of
-it before installing the new version over the top of it.
-
-Before doing anything else, make sure the extract command is executable, and
-also link it to the name "gnu-tar" so that it can be used as a regular tar
-command:
-
- chmod +x extract
- rm -f gnu-tar
- ln extract gnu-tar
-
-The first part of the procedure is to move the old run-time config files from
-/usr/X11R6/lib/X11 to /etc/X11. Create /etc/X11 if it doesn't already exist.
-For each of the following sub-directories (app-defaults, fs, lbxproxy, prox-
-ymngr, rstart, twm, xdm, xinit, xsm, xserver) that you want to move, check
-that there is a sub-directory of this name in /usr/X11R6/lib/X11. Create a
-sub-directory of the same name under /etc/X11, then copy the files over by
-running:
-
- ./gnu-tar -C /usr/X11R6/lib/X11/subdir -c -f - . | \
- ./gnu-tar -C /etc/X11/subdir -v -x -p -U -f -
-
-For each subdirectory that is moved, remove the one under /usr/X11R6/lib/X11
-and create a symbolic link to the new location:
-
- rm -fr /usr/X11R6/lib/X11/subdir
- ln -s /etc/X11/subdir /usr/X11R6/lib/X11
-
-For those subdirectories that didn't already exist under /usr/X11R6/lib/X11,
-create one under /etc/X11 and create the symbolic link to it:
-
- mkdir /etc/X11/subdir
- ln -s /etc/X11/subdir /usr/X11R6/lib/X11
-
-Once that is done, extract the config files from the Xetc.tgz tarball into a
-temporary directory:
-
- mkdir tmpdir
- ./extract -C tmpdir Xetc.tgz
-
-and then copy each sub-directory over to the installed location:
-
- ./gnu-tar -C tmpdir/subdir -c -f - . | \
- ./gnu-tar -C /usr/X11R6/lib/X11/subdir -v -x -p -U -f -
-
-If you have customised any config files in your old installation, you may
-want to omit those sub-directories, or copy selected files over by hand.
-
-Once that's done, the main part of the installation can be done:
+At this time, the X.org Foundation is not making binary releases; this will
+likely change in the not-distant future as our tinderbox system reaches its
+full potential.
- ./extract -C /usr/X11R6 `pwd`/X[a-df-uw-z]*.tgz
- ./extract -C /usr/X11R6 Xvfb.tgz # If you are installing Xvfb
- ./extract -C /var Xvar.tgz
- chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK
- /sbin/ldconfig /usr/X11R6/lib # For Linux
- /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD
- /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
+However, people are already packaging the distribution for release in many of
+the common distributions (e.g. RedHat Fedora, SuSE Linux, Debian), and you
+may wish to work with those distributors on their packaged binaries.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.18 dawes Exp $
+In the meanwhile, we recommend building X from source and doing install on
+top of your running X installation *after* having carefully backed up
+/usr/X11R6 to allow restoration in case of some unanticipated problems. See
+the file INSTALL.TXT in the root of the source distribution for build and
+install details.
+ $Xorg$
-$XFree86: $
Index: LICENSE
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/LICENSE,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.4.8.1
diff -u -d -r1.1.4.4 -r1.1.4.4.8.1
--- a/LICENSE 26 Feb 2004 19:27:23 -0000 1.1.4.4
+++ b/LICENSE 29 Mar 2004 06:11:45 -0000 1.1.4.4.8.1
@@ -1,10 +1,21 @@
Licenses
- The XFree86 Project
+ The Xorg Foundation
- February 2003
+ March 2004
-1. XFree86 License
+1. Introduction
+
+The X.org Foundation X Window System distribution is a compilation of code
+and documentation from many sources. This document is intended primarily as
+a guide to the licenses used in the distribution: you must check each file
+and/or package for precise redistribution terms. None-the-less, this summary
+may be useful to many users. No software incorporating the XFree86 1.1
+license has been incorporated.
+
+This document is based on the compilation from XFree86.
+
+2. XFree86 License
XFree86 code without an explicit copyright is covered by the following copy-
right/license:
@@ -33,14 +44,14 @@
ings in this Software without prior written authorization from the XFree86
Project.
-2. Other Licenses
+3. Other Licenses
Portions of code are covered by the following licenses/copyrights. See indi-
vidual files for the copyright dates.
-2.1 X/MIT Copyrights
+3.1 X/MIT Copyrights
-2.1.1 X Consortium
+3.1.1 X Consortium
Copyright (C) <date> X Consortium
@@ -67,7 +78,7 @@
X Window System is a trademark of X Consortium, Inc.
-2.1.2 The Open Group
+3.1.2 The Open Group
Copyright <date> The Open Group
@@ -90,9 +101,11 @@
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
-2.2 Berkeley-based copyrights:
+3.2 Berkeley-based copyrights:
-2.2.1 General
+o
+
+3.2.1 General
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
@@ -118,7 +131,7 @@
ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
-2.2.2 UCB/LBL
+3.2.2 UCB/LBL
Copyright (c) 1993 The Regents of the University of California. All rights
reserved.
@@ -161,7 +174,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-2.2.3 The NetBSD Foundation, Inc.
+3.2.3 The NetBSD Foundation, Inc.
Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved.
@@ -198,7 +211,7 @@
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM-
AGE.
-2.2.4 Theodore Ts'o.
+3.2.4 Theodore Ts'o.
Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights
reserved.
@@ -228,7 +241,7 @@
ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-2.2.5 Theo de Raadt and Damien Miller
+3.2.5 Theo de Raadt and Damien Miller
Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c)
2001-2002 Damien Miller. All rights reserved.
@@ -254,7 +267,7 @@
ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
-2.2.6 Todd C. Miller
+3.2.6 Todd C. Miller
Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
@@ -270,7 +283,7 @@
TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-2.3 NVIDIA Corp
+3.3 NVIDIA Corp
Copyright (c) 1996 NVIDIA, Corp. All rights reserved.
@@ -297,7 +310,7 @@
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-2.4 GLX Public License
+3.4 GLX Public License
GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
@@ -493,7 +506,7 @@
portions of the Subject Software created by Silicon Graphics, Inc. are Copy-
right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-2.5 CID Font Code Public License
+3.5 CID Font Code Public License
CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
@@ -687,7 +700,59 @@
solely in object code form, Recipient may replace the words "this file" with
"this software" in both the first and second sentences.]
-2.6 Bigelow & Holmes Inc and URW++ GmbH Luxi font license
+3.6 Bitstream Vera Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as long as
+"Bitstream" or "Vera" are not in the names), and full redistribution (so long
+as they are not *sold* by themselves). They can be be bundled, redistributed
+and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated documentation
+files (the "Font Software"), to reproduce and distribute the Font Software,
+including without limitation the rights to use, copy, merge, publish, dis-
+tribute, and/or sell copies of the Font Software, and to permit persons to
+whom the Font Software is furnished to do so, subject to the following condi-
+tions:
+
+The above copyright and trademark notices and this permission notice shall be
+included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and addi-
+tional glyphs or characters may be added to the Fonts, only if the fonts are
+renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream Vera"
+names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA-
+TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
+ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
+INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
+WARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation,
+and Bitstream Inc., shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Font Software without prior written
+authorization from the Gnome Foundation or Bitstream Inc., respectively. For
+further information, contact: fonts at gnome dot org.
+
+3.7 Bigelow & Holmes Inc and URW++ GmbH Luxi font license
Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction
code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis-
@@ -727,7 +792,5 @@
info at urwpp.de or design at bigelowandholmes.com
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.16 herrb Exp $
-
+ $Xorg$
-$XFree86$
Index: OS2.Notes
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/OS2.Notes,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.4.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.4.1
--- a/OS2.Notes 4 Mar 2004 17:47:34 -0000 1.1.4.2.6.1
+++ b/OS2.Notes 29 Mar 2004 06:11:45 -0000 1.1.4.2.6.1.4.1
@@ -1,33 +1,27 @@
- Notes on Rebuilding XFree86/OS2 from Scratch
+ Notes on Rebuilding X11R6.7.0/OS2 from Scratch
Holger Veit
+ Document updated for X.Org's X11R6.7.0 by Jim Gettys
Last modified March 8th, 2000
1. Preface
-X11 and XFree86 were initially developed on Unix-based systems. Usually Unix
-systems provide a rich number of tools and utilities to get certain things
-done. Under OS/2, these tools are not installed, but ports are available
-which are sometimes functionally equivalent to Unix utilities with the same
-name, but also differ sometimes in a subtle way. This guide will give you
-hints if you intend to rebuild the system from scratch under OS/2.
+X11 was initially developed on Unix-based systems. Usually Unix systems pro-
+vide a rich number of tools and utilities to get certain things done. Under
+OS/2, these tools are not installed, but ports are available which are some-
+times functionally equivalent to Unix utilities with the same name, but also
+differ sometimes in a subtle way. This guide will give you hints if you
+intend to rebuild the system from scratch under OS/2.
Please also read README.OS2 for end-user information, and set at least the
environment variables described there.
-At the current time, the most recent version available is XFree86-4.0. This
-is a full and unrestricted version which comes with complete source code. 4.0
-is a highly experimental release, so many features that might have worked in
-earlier versions, may now no longer work, or work differently. Be aware that
-for OS/2, XFree86-4.0 is considered to be alpha software.
-
-If you want to join the XFree86 developer team, e.g. to add support for cer-
-tain hardware, please send a request to <BOD at XFree86.org>. Please think
-about such a step carefully before, though, since much work is involved.
-Please use the XFree86-4.0 source code as a test example how to compile the
-system. The ability to manage that is a basic requirement for becoming a
-developer.
+At the current time, the most recent version available is X11R6.7.0 This is a
+full and unrestricted version which comes with complete source code. 4.0 is a
+highly experimental release, so many features that might have worked in ear-
+lier versions, may now no longer work, or work differently. Be aware that
+for OS/2, X11R6.7.0 is considered to be alpha software.
2. Tools required
@@ -76,9 +70,9 @@
critical is only EMX/gcc and GNU make. Note that the second GCC implementa-
tion which might still be available from some archives is NOT compatible.
-Furthermore, you need the XFree86 sources. These are available from the com-
-mon XFree86 repositories. Look into a directory which is often named
-/pub/XFree86/4.0/source.
+Furthermore, you need the X11R6.7.0 sources. These are available from the
+common X.org repositories. Look into a directory which is often named
+/pub/R6.7.0.
3. Compiling and Installing
@@ -105,7 +99,7 @@
but non-fatal message "gzip: stdout Broken pipe". Ignore it.
4. After that, is is likely necessary to apply some patches, either from
- the XConsortium or from the XFree86 project. Before you do this, enter
+ the X.Org Foundation. Before you do this, enter
chmod -R a+rw \x11\xc
@@ -148,19 +142,20 @@
find \x11 -name *.orig -print -exec rm {} ;
- 7. Go to the xc/config/cf directory and edit the xf86site.def file to
+ 7. Go to the xc/config/cf directory and edit the xorgsite.def file to
match your requirements (you probably don't want to compile all X
servers). Certain changes must be set to the following values:
o Disable if not already done any PC98 server; PC98 (Japanese
- XFree86) does not work yet. Porters from Japan are welcome!
+ X11R6.7.0) does not work yet. Porters from Japan are welcome!
o #define WacomSupport NO #define ElographicsSupport
NO Both options are not yet supported.
o Tcl* and Tk* don't need to be set explicitly. Reasonable defaults
are in the other config files, provided you have a complete
- XFree86/OS2 binary tree with the tcl/tk runtime support installed.
+ X11R6.7.0/OS2 binary tree with the tcl/tk runtime support
+ installed.
o #define BuildDynamicLoading NO This does not work.
@@ -173,14 +168,14 @@
9. Set the environment variable X11ROOT to something different than it is;
otherwise the installation process will overwrite your original
- XFree86/OS2 installation. If you have not set this variable, go back to
- the prefix section of this document: you have forgotten something.
+ X11R6.7.0/OS2 installation. If you have not set this variable, go back
+ to the prefix section of this document: you have forgotten something.
10. Copy the file xc/pro-
grams/Xserver/hw/xfree86/etc/bindist/OS2/host.def.os2 to the location
xc/config/cf/host.def. Use this file to do any specific modifications
- to imake variables, rather than editing the file xfree86.cf,
- imake.tmpl, or os2.cf directly.
+ to imake variables, rather than editing the file xorg.cf, imake.tmpl,
+ or os2.cf directly.
11. Copy the file xc/config/util/buildos2.cmd into the xc directory. If
this is a second or later attempt, you might need to copy the saved
@@ -208,21 +203,13 @@
lation. This is no problem and has no effect on the rest of the
system.
- 2. The imake.exe which is installed in \XFree86\bin is usually
+ 2. The imake.exe which is installed in \X11R6.7.0\bin is usually
defective. The one which was built initially and installed in
the root directory of the drive where you have the source tree is
- okay. So simply copy this \imake.exe to the \XFree86\bin direc-
+ okay. So simply copy this \imake.exe to the \X11R6.7.0\bin direc-
tory manually. Some day this might be fixed.
- 3. XF86Setup is not ported yet and won't work with the tcl/tk port
- available for XFree86/OS2. My idea was to replace this by some
- native installation tool, which I didn't find the time to do yet.
- Feel free to spend a bit of time to play with XF86Setup if you
- like.
-
Well, you see, this was quite easy :-)
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2Notes.sgml,v 1.2 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2Notes.sgml,v 1.1 dawes Exp $
-$XFree86: $
Index: README
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/README 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/README 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,43 +1,62 @@
- README for XFree86[tm] 4.4.0
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v
+3.140 2004/02/24 03:41:40 dawes Exp $
- The XFree86 Project, Inc
+ README for X11R6.7.0
- 23 February 2004
+ The X.org Foundation
+
+ 25 March 2004
Abstract
- XFree86 is an Open Source version of the X Window System that sup-
- ports many UNIX(R) and UNIX-like operating systems (such as Linux,
- FreeBSD, NetBSD, OpenBSD and Solaris x86) on Intel and other plat-
- forms. This version is compatible with X11R6.6.
+ X11R6.7.0 is an Open Source version of the X Window System that
+ supports many UNIX(R) and UNIX-like operating systems (such as
+ Linux, FreeBSD, NetBSD, OpenBSD and Solaris x86) on Intel and other
+ platforms. This version is compatible with X11R6.6, and is based
+ on the XFree86 4.4.0RC2 code base, which, in turn was based on the
+ X consortium sample implementation.
-1. What is XFree86 4.4.0?
+1. What is X11R6.7.0?
-XFree86 4.4.0 is the seventh full release in the XFree86 4.x series.
+X11R6.7.0 is the seventh full release in the X11R6.7 series.
-XFree86 4.x is the current XFree86 release series. The first release in this
-series was in early 2000. The core of XFree86 4.x is a modular X server.
-The 4.4.0 version is a new release that includes additional hardware support,
-functional enhancements and bug fixes. Specific release enhancements can be
-viewed in the Release Notes.
+X11R6.7 is the current X.org Foundation release series, based on the XFree86
+4.x code base. The first release in the XFree86 4.x series was in early
+2000. The core of X11R6.7 is a modular X server. The 6.7.0 version is a new
+release that includes additional hardware support, functional enhancements
+and bug fixes. Specific release enhancements can be viewed in the Release
+Notes.
-Most modern PC video hardware is supported in XFree86 4.4.0, and most PC
-video hardware that isn't supported explicitly can be used with the "vesa"
-driver. The Releaes Notes has a table showing the drivers provided with
-XFree86 4.4.0, and links to related documentation.
+Most modern PC video hardware is supported in X11R6.7.0, and most PC video
+hardware that isn't supported explicitly can be used with the "vesa" driver.
+The Release Notes has a table showing the drivers provided with X11R6.7.0,
+and links to related documentation.
+
+The X.org Foundation X releases are produced by the X.org Foundation. X.Org
+Foundation formed Delaware corporation organized to operate as a scientific
+charity under IRS code 501(c)(3) to chartered to develop and execute effec-
+tive strategies which provide world-wide stewardship of the X Window System
+technology and standards. Membership of the X.Org Foundation is free to all
+participants. Applications for Membership are now being accepted, and active
+participants in the further development of the X Window Technology are
+invited to complete a membership application. X11R6.7.0 codebase is based on
+the codebase found in XFree86[tm] 4.4RC2, which in turn was based from the
+original X Window System implementation. This release is dedicated to the
+greater X community, developers and users alike.
XFree86[tm] is produced by The XFree86 Project, Inc through the work of a
group of volunteer independent developers. The XFree86 Project is a non-com-
mercial organisation and XFree86 would not exist without the invaluable
-development contributions of volunteers from around the world. This release
-is dedicated to the greater XFree86 community, developers and users alike.
+development contributions of volunteers from around the world. The XFree86
+Project is a non-commercial organisation and XFree86 would not exist without
+the invaluable development contributions of volunteers from around the world.
2. Licensing
-XFree86 source code is covered by many licenses. All of these licenses have
-in common the fact that they do not impose significant conditions on the mod-
-ification or redistribution or either source code or binaries beyond requir-
-ing one or more of the following:
+X Window System source code is covered by many licenses. All of these
+licenses have in common the fact that they do not impose significant condi-
+tions on the modification or redistribution or either source code or binaries
+beyond requiring one or more of the following:
1. Copyright and/or license notices are left intact.
@@ -51,146 +70,113 @@
nition, and most are consistent with the Free Software Foundation's Free
Software Definition.
-Copyright and Licensing information for XFree86, including the reproduction
-of copyright and/or license notices and attributions required by some of the
+Copyright and Licensing information for X, including the reproduction of
+copyright and/or license notices and attributions required by some of the
licenses for binary distributions, can be found in the License Document. If
you find any omissions in that document, please contact us with details at
-<bod at XFree86.org>.
+<xf_board at x.org>. While the current licenses are all open source licenses,
+the X.org Foundation is attempting, with time, to bring as much as possible
+of the code's licenses in the distribution into compliance with the Debian
+Free Software Guidelines.
3. Pointers to additional information
-The documentation for this release can be found online at the XFree86 web
-site <URL:http://www.xfree86.org/4.4.0/>. Documentation for the latest
-release version can always be found here <URL:http://www.xfree86.org/cur-
-rent/>, and documentation for the latest pre-release snapshot can be found
-here <URL:http://www.xfree86.org/snapshot/>. Checking those last two links
-is a good way of finding out the latest available versions of XFree86.
-
-Information about binary distributions and the attendant installation
-instructions can be found in the Installation Document.
+The documentation for this release can be found online at the X.org web site
+<URL:http://wiki.x.org/>. Information about binary distributions and the
+attendant installation instructions can be found in the Installation Docu-
+ment.
-The XFree86 version numbering system (including historical information) can
-be found in the Versions Document.
+The X11 version numbering system (including historical information) can be
+found in the Versions Document.
-Additional information may be available at the XFree86 web site
-<URL:http://www.xfree86.org/>, and pointers to other information are avail-
-able at the XFree86 support page <URL:http://www.xfree86.org/support.html>.
+Additional information may be available at the X.org Foundation Wiki
+<URL:http://wiki.x.org/>.
4. The Public Mailing Lists
-Current information about the XFree86 public mailing lists can be found at
-our web site <URL:http://www.xfree86.org/lists.html>.
-
-4.1 CVS Commit
-
-For those who want to see what has been committed recently to our CVS reposi-
-tory this is the list that will show you those updates. This list is updated
-dynamically every time the repository is updated after the the commit hap-
-pens.
-
-4.2 Devel
-
-This list is available for discussions about XFree86 development and for fol-
-lowing up well-defined bug reports. Many experienced XFree86 developers are
-present on this list.
-
-4.3 XFree86
-
-This list is available for any discussions and questions related to XFree86.
-Support related questions should be sent here. Many experienced XFree86
-developers monitor this list.
-
-4.4 Forum
-
-This list is available for high level discussions about XFree86 and related
-technologies, their future, and for inter-project communication.
+Current information about the X.org Foundation public mailing lists is avail-
+able on the X.org mailing list page <URL:http://www.x.org/XOrg_Founda-
+tion_Join_OpenLists.html> and related desktop technology mailing lists can be
+found on Freedesktop.org's mailing list page <URL:http://freedesk-
+top.org/mailman/listinfo>.
-5. Contributing to XFree86
+5. Contributing to the X.org Foundation's X efforts.
If you have any new work or enhancements/bug fixes for existing work, please
-submit them to <patch at XFree86.org> or to our bug tracking system
-<URL:http://bugs.xfree86.org/>. This will ensure that they are included in
-future releases. New works should be discussed on our <devel at XFree86.org>
-list prior to submission.
-
-Current information about the XFree86 development process can be found at our
-web site <URL:http://www.xfree86.org/developer.html>.
+<xorg at freedestop.org> or to our bug tracking system
+<URL:http://bugzilla.freedesktop.org/> using the xorg compoent. This will
+ensure that they are included in future releases.
-6. How to get XFree86 4.4.0
+6. How to get X11R6.7.0
-XFree86 4.4.0 can be found at the XFree86 ftp server
-<URL:ftp://ftp.xfree86.org/pub/XFree86/4.4.0/>, and at mirrors of this
-server. Information about obtaining and installing binary distributions of
-this release can be found in the Installation Document. Information about
-obtaining the release in source form is given below.
+X11R6.7.0 can be found from the X.org Foundation wiki at
+<URL:http://wiki.x.org>, and at mirrors of this server. Information about
+obtaining and installing binary distributions of this release can be found in
+the Installation Document. Information about obtaining the release in source
+form is given below.
-The source for version 4.4.0 is split into seven tarballs:
+The source for version 6.7.0 is split into seven tarballs:
- XFree86-4.4.0-src-1.tgz
- XFree86-4.4.0-src-2.tgz
- XFree86-4.4.0-src-3.tgz
- XFree86-4.4.0-src-4.tgz
- XFree86-4.4.0-src-5.tgz
- XFree86-4.4.0-src-6.tgz
- XFree86-4.4.0-src-7.tgz
+ xorg-6.7.0-1.tgz
+ xorg-6.7.0-2.tgz
+ xorg-6.7.0-3.tgz
+ xorg-6.7.0-4.tgz
+ xorg-6.7.0-5.tgz
+ xorg-6.7.0-6.tgz
+ xorg-6.7.0-7.tgz
The first three contain everything except the fonts and general X11 documen-
-tation. Those three are sufficient for building XFree86 if you already have
-a set of fonts. The fourth and fifth contain the fonts. The sixth contains
-the source for the general X11 documentation. The seventh contains the gen-
-eral X11 documentation in hardcopy format.
+tation. Those three are sufficient for building X11R6.7.0 if you already
+have a set of fonts. The fourth and fifth contain the fonts. The sixth con-
+tains the source for the general X11 documentation. The seventh contains the
+general X11 documentation in hardcopy format.
-A source patch relative to version 4.3.0 is also available. Because of its
+A source patch relative to version 6.6.0 is also available. Because of its
size, it is split into four parts. The patch files are:
- XFree86-4.3.0-4.4.0.diff1.gz
- XFree86-4.3.0-4.4.0.diff2.gz
- XFree86-4.3.0-4.4.0.diff3.gz
- XFree86-4.3.0-4.4.0.diff4.gz
+ X11R6.7.0-6.6.0-6.7.0.diff1.gz
+ X11R6.7.0-6.6.0-6.7.0.diff2.gz
+ X11R6.7.0-6.6.0-6.7.0.diff3.gz
+ X11R6.7.0-6.6.0-6.7.0.diff4.gz
There is also a tarball and a cleanup script that handle files that have com-
ponents that can't be included in a diff. These are:
- XFree86-4.3.0-4.4.0-diff0.tgz
- XFree86-4.3.0-4.4.0-cleanup.sh
+ X11R6.7.0-6.6.0-6.7.0-diff0.tgz
+ X11R6.7.0-6.6.0-6.7.0-cleanup.sh
-These patches should be applied to a clean 4.3.0 source tree, working from
+These patches should be applied to a clean 6.6.0 source tree, working from
the directory containing the xc/ directory. The patches should be applied by
running:
- gzip -d < XFree86-4.3.0-4.4.0.diff1.gz | patch -p0 -E
- gzip -d < XFree86-4.3.0-4.4.0.diff2.gz | patch -p0 -E
- gzip -d < XFree86-4.3.0-4.4.0.diff3.gz | patch -p0 -E
- gzip -d < XFree86-4.3.0-4.4.0.diff4.gz | patch -p0 -E
+ gzip -d < X11R6.7.0-6.6.0-6.7.0.diff1.gz | patch -p0 -E
+ gzip -d < X11R6.7.0-6.6.0-6.7.0.diff2.gz | patch -p0 -E
+ gzip -d < X11R6.7.0-6.6.0-6.7.0.diff3.gz | patch -p0 -E
+ gzip -d < X11R6.7.0-6.6.0-6.7.0.diff4.gz | patch -p0 -E
- sh XFree86-4.3.0-4.4.0-cleanup.sh
- gzip -d < XFree86-4.3.0-4.4.0-diff0.tgz | tar vxf -
+ sh X11R6.7.0-6.6.0-6.7.0-cleanup.sh
+ gzip -d < X11R6.7.0-6.6.0-6.7.0-diff0.tgz | tar vxf -
-To format the XFree86 documentation use the latest version of our doctools
-package available from the XFree86 CVS repository's "doctools" module, and
-from our ftp site <URL:ftp://ftp.xfree86.org/pub/XFree86/misc/doc-
-tools-1.3.2.tgz>.
+To format the X11R6.7.0 documentation use the latest version of our doctools
+package available from the Xorg CVS repository's "doctools" module.
-The XFree86 source code for this and all releases/snapshots as well as devel-
-opment versions can also be accessed via the XFree86 CVS repository. Infor-
-mation about accessing this can be found at the CVS page
-<URL:http://www.xfree86.org/cvs/> on our web site. It's also possible to
-browse the XFree86 CVS repository at our CVSWeb server
-<URL:http://cvsweb.xfree86.org/>. The CVS tag for this version is
-"xf-4_4_0". The CVS tag for the stable branch for this release is
-"xf-4_4-branch". To check out the latest development version, don't specify
+The X source code for this and all releases/snapshots as well as development
+versions can also be accessed via the Freedesktop.org CVS repository. It's
+also possible to browse the freedesktop CVS repository.
+url="http://cvs.freedesktop.org/">. The CVS tag for this version is
+"xo-6.7_0". The CVS tag for the stable branch for this release is
+"xo-6.7-branch". To check out the latest development version, don't specify
any tag.
7. Reporting Bugs
-Bugs should be reported to <XFree86 at XFree86.org>. Before reporting bugs,
-please check the XFree86 server log file, which can be found at
-/var/log/XFree86.0.log on most platforms. If you can't resolve the problem
-yourself, send the entire log file with your bug report but not the operating
-system core dump. Do not edit the log file as our developers use it to
-reproduce and debug your problem.
-
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.141 dawes Exp $
+Bugs should be reported to bug tracking system <URL:http://bugzilla.freedesk-
+top.org/> using the xorg compoent. Before reporting bugs, please check the
+server log file, which can be found at /var/log/Xorg.0.log on most platforms.
+If you can't resolve the problem yourself, send the entire log file with your
+bug report but not the operating system core dump. Do not edit the log file
+as our developers use it to reproduce and debug your problem. Please attach
+it to your bug report.
+ $Id:$.
-$XFree86: $
Index: README.DECtga
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.DECtga,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/README.DECtga 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/README.DECtga 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,13 +1,17 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.8
+1999/07/19 13:36:20 dawes Exp $
+
Information for DEC 21030 Users (aka TGA)
The XFree86 Project, Inc.
+ Updates for X11R6.7.0 by Jim Gettys
- March 5th, 2000
+ March 25th, 2004
1. DEC 21030
- o The DEC 21030 is supported by XFree86 4.4.0. The driver is now par-
- tially accelerated. The built-in graphics on the Multia is supported in
+ o The DEC 21030 is supported by X11R6.7.0. The driver is now partially
+ accelerated. The built-in graphics on the Multia is supported in
8-plane mode, and PCI cards with 8 or 16 MB framebuffers are supported
in 24-plane mode. TGA2 (aka PowerStorm 3D30/4D20) cards are not cur-
rently supported.
@@ -62,7 +66,5 @@
o Tim Rowley, <tor at cs.brown.edu>
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.9 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.DRI
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.DRI,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.DRI 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.DRI 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -8,7 +8,7 @@
1.1 Copyright
-Copyright © 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
+Copyright 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
Permission is granted to make and distribute verbatim copies of this document
provided the copyright notice and this permission notice are preserved on all
@@ -1251,7 +1251,5 @@
o In the future there may be IHV and Linux vendor support resources for
the DRI.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.29 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.28 dawes Exp $
-$XFree86: $
Index: README.DRIcomp
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.DRIcomp 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.DRIcomp 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -8,7 +8,7 @@
1.1 Copyright
-Copyright © 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
+Copyright 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
Permission is granted to make and distribute verbatim copies of this document
provided the copyright notice and this permission notice are preserved on all
@@ -551,7 +551,5 @@
ated direct rendering. Please read the DRI User Guide for information about
trouble shooting and how to use the DRI-enabled X server for 3D applications.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.20 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.19 dawes Exp $
-$XFree86: $
Index: README.Darwin
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.Darwin,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.1.4.1
diff -u -d -r1.1.4.4.2.1 -r1.1.4.4.2.1.4.1
--- a/README.Darwin 4 Mar 2004 17:47:34 -0000 1.1.4.4.2.1
+++ b/README.Darwin 29 Mar 2004 06:11:45 -0000 1.1.4.4.2.1.4.1
@@ -1,4 +1,7 @@
- XFree86 on Darwin and Mac OS X
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.9
+2001/12/13 07:09:05 torrey Exp $
+
+ X.org X on Darwin and Mac OS X
Torrey T. Lyons
@@ -6,24 +9,23 @@
1. Introduction
-XFree86, a freely redistributable open-source implementation of the X Window
+Xorg, a freely redistributable open-source implementation of the X Window
System, has been ported to Darwin and Mac OS X. This document is a collection
-of information for anyone running XFree86 on Apple's next generation operat-
-ing system.
+of information for anyone running Xorg's X server on Apple's next generation
+operating system.
-Most of the current work on XFree86 for Darwin and Mac OS X is centered
-around the XonX project at SourceForge. If you are interested in up-to-date
-status, want to report a bug, or are interested in working on XFree86 for
-Darwin, stop by the XonX project.
+Most of the current work on X for Darwin and Mac OS X is centered around the
+XonX project at SourceForge. If you are interested in up-to-date status, want
+to report a bug, or are interested in working on Xorg for Darwin, stop by the
+XonX project.
2. Hardware Support and Configuration
-The X window server for Darwin and Mac OS X provided by the XFree86 Project,
-Inc. is called XDarwin. XDarwin can run in three different modes. On Mac
-OS X, XDarwin runs in parallel with Aqua in full screen or rootless modes.
-These modes are called Quartz modes, named after the Quartz 2D compositing
-engine used by Aqua. XDarwin can also be run from the Darwin console in IOKit
-mode.
+The X window server for Darwin and Mac OS X provided by the X.Org Foundation.
+is called XDarwin. XDarwin can run in three different modes. On Mac OS X,
+XDarwin runs in parallel with Aqua in full screen or rootless modes. These
+modes are called Quartz modes, named after the Quartz 2D compositing engine
+used by Aqua. XDarwin can also be run from the Darwin console in IOKit mode.
In full screen Quartz mode, when the X Window System is active, it takes over
the entire screen. You can switch back to the Mac OS X desktop by holding
@@ -38,18 +40,18 @@
other windows. The X11 root window is not displayed in rootless mode as Aqua
handles the desktop background.
-From the console, the Darwin port of XFree86 uses the IOKit for device driver
-loading and discovery, rather than the XFree86 module loader. Because of
-this, the XFree86 configuration file is not used on Darwin or Mac OS X sys-
-tems. The descriptions found elsewhere of devices supported by XFree86 for
-other operating systems also do not apply.
+From the console, the Darwin port of X11R6.7.0 uses the IOKit for device
+driver loading and discovery, rather than the X11R6.7.0 module loader.
+Because of this, the X11R6.7.0 configuration file is not used on Darwin or
+Mac OS X systems. The descriptions found elsewhere of devices supported by
+X11R6.7.0 for other operating systems also do not apply.
-XFree86 for Darwin or Mac OS X will work with any video card that you have an
-IOKit driver for. If you are running Mac OS X, this typically means any card
-that has been shipped by Apple. If a card works for you with the Mac OS X
-GUI, it will work on the same machine with XFree86. If you have a pure Darwin
-installation, you may need to download additional third-party drivers from
-Apple's Darwin site. IOKit drivers are typically installed in /Sys-
+X11R6.7.0 for Darwin or Mac OS X will work with any video card that you have
+an IOKit driver for. If you are running Mac OS X, this typically means any
+card that has been shipped by Apple. If a card works for you with the Mac
+OS X GUI, it will work on the same machine with X11R6.7.0. If you have a pure
+Darwin installation, you may need to download additional third-party drivers
+from Apple's Darwin site. IOKit drivers are typically installed in /Sys-
tem/Library/Extensions/ or /Library/Extensions/.
Multi-button and scroll wheel mouse support works well with all USB mice that
@@ -58,20 +60,13 @@
3. Getting Started
-Following are instructions for building and running your own copy of XFree86.
-The procedure for getting your X server up and running on Darwin and Mac OS X
-are very similar. Where there are differences I have noted them below. Note
-that to build XFree86 for yourself on Mac OS X, you need to install the
-Developers' Tools.
+Following are instructions for building and running your own copy of
+X11R6.7.0. The procedure for getting your X server up and running on Darwin
+and Mac OS X are very similar. Where there are differences I have noted them
+below. Note that to build X11R6.7.0 for yourself on Mac OS X, you need to
+install the Developers' Tools.
-If you don't feel the need to live on the cutting edge, you can save some
-time and effort by using the precompiled binaries available on the XFree86
-FTP server at <URL:ftp://ftp.xfree86.org/pub/XFree86/4.4.0/binaries/>. Fol-
-low the instructions in the Install document to install it. This will create
-three new directory trees, /usr/X11R6, /etc/X11 and /etc/fonts. On Mac OS X
-the Xquartz.tgz tarball is required in addition to the other tarballs
-required on other platforms. With Mac OS X Quartz support, the XDarwin appli-
-cation will be installed in /Applications.
+/Applications.
If you get the precompiled binaries you can skip ahead to the section on run-
ning the X Window System (section 4., page 1) On the other hand, if you want
@@ -79,14 +74,15 @@
3.1 Get the Code
-The first thing you need to do is to get the source code from the XFree86
-project.
+The first thing you need to do is to get the source code from the X.Org Foun-
+dation project.
o Setup CVS: Both Darwin and Mac OS X include CVS (Concurrent Versions
System), which is an easy way to download and keep up to date with open
- source code released by XFree86 and others. You do have to setup CVS
- properly, however, to tell it where to look. Follow the XFree86 instruc-
- tions on how to do this either via ssh or via the cvs pserver.
+ source code released by the X.Org Foundation and others. You do have to
+ setup CVS properly, however, to tell it where to look. Follow the X.Org
+ CVS instructions on how to do this either via ssh or via the cvs
+ pserver.
o Now make a directory in some convenient place which will serve as your
top level directory for you open source development efforts. I am going
@@ -100,10 +96,10 @@
Wait for all the files to complete downloading.
-3.2 Build XFree86
+3.2 Build X11R6.7.0
-Once you have everything ready it is easy to build and install XFree86. From
-the command line:
+Once you have everything ready it is easy to build and install X11R6.7.0.
+From the command line:
cd sandbox/xc
make World >& world.log
@@ -133,21 +129,21 @@
specified in the preferences.) The way to set the path depends on the shell
you are using. This is described in the man page documentation for the shell.
-In addition you may also want to add the man pages from XFree86 to the list
+In addition you may also want to add the man pages from X11R6.7.0 to the list
of pages to be searched when you are looking for documentation. The X11 man
pages are located in /usr/X11R6/man and the MANPATH environment variable con-
tains the list of directories to search.
4.2 Starting the X Server
-On Mac OS X, you can run XFree86 from the Darwin text console or in parallel
-with Aqua. To get to the text console in Mac OS X you need to logout and type
-``>console'' as the user name. This will shutdown Core Graphics and bring up
-the console login prompt. Login again as your user. From the text console
-you can start the X Window System by typing ``exec startx''.
+On Mac OS X, you can run X11R6.7.0 from the Darwin text console or in paral-
+lel with Aqua. To get to the text console in Mac OS X you need to logout and
+type ``>console'' as the user name. This will shutdown Core Graphics and
+bring up the console login prompt. Login again as your user. From the text
+console you can start the X Window System by typing ``exec startx''.
-When you are ready to quit XFree86 type ``exit'' in the main terminal window
-or quit with the window manager if you have one running. Unfortunately in
+When you are ready to quit X11R6.7.0 type ``exit'' in the main terminal win-
+dow or quit with the window manager if you have one running. Unfortunately in
IOKit mode, the X server does not shutdown correctly and if you did not start
with ``exec startx'', you will get an apparently frozen screen with only a
spinning beachball cursor on it. Nothing you type shows up on the screen, but
@@ -156,12 +152,12 @@
at the text console login prompt. With Mac OS X, Core Graphics will restart
and you should be given a login window.
-To start XFree86 in Quartz mode you can launch the XDarwin application in the
-/Applications folder, or from the command line type ``startx -- -quartz''. By
-default this will give you a mode picker to choose between full screen or
-rootless mode. You can change the default to always use a particular mode in
-the preferences, or you can specify the ``-fullscreen'' or ``-rootless''
-options on the command line instead of ``-quartz''.
+To start X11R6.7.0 in Quartz mode you can launch the XDarwin application in
+the /Applications folder, or from the command line type ``startx --
+-quartz''. By default this will give you a mode picker to choose between full
+screen or rootless mode. You can change the default to always use a particu-
+lar mode in the preferences, or you can specify the ``-fullscreen'' or
+``-rootless'' options on the command line instead of ``-quartz''.
4.3 Double-clickable X11 Executables
@@ -189,10 +185,10 @@
The X Window System is very customizable and you will certainly want to
change some things. There is a lot you can do to control how your windows
look, how the windows are moved, resized, etc. You will likely want to get a
-fancier window manager than twm, which is included with XFree86. The .xinitrc
-file in your home directory controls what programs are run when you start the
-X Window System. You can find a sample .xinitrc file in /etc/X11/xinit/xini-
-trc.
+fancier window manager than twm, which is included with X11R6.7.0. The .xini-
+trc file in your home directory controls what programs are run when you start
+the X Window System. You can find a sample .xinitrc file in
+/etc/X11/xinit/xinitrc.
There are many window managers that have been ported to Darwin. The following
pages contain collections of window managers and other X window system
@@ -208,7 +204,5 @@
Good luck!
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.10 torrey Exp $
-
+ $XdotOrg$
-$XFree86: $
Index: README.I128
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.I128,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.I128 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.I128 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -1,8 +1,9 @@
Information for Number Nine I128 Users
The XFree86 Project Inc.
+ Updated for X.org's X11R6.7.0 by Jim Gettys
- 3 November 2000
+ 25 March 2004
1. Supported hardware
@@ -36,8 +37,8 @@
3. Configuration:
The I128 driver should auto-detect all supported hardware so you needn't have
-anything other than the Identifier in the Section "Device" of the XF86Config
-file. When running the XF86Setup or xf86config programs one merely needs to
+anything other than the Identifier in the Section "Device" of the xorg.conf
+file. When running the xorgcfg or xorgconfig programs one merely needs to
select an I128 card so that the correct server will be used. One need not
and should not specify a RAMDAC, clockchip or allow the setup program to
probe for clocks. The driver will auto-detect the amount of video ram
@@ -97,7 +98,5 @@
o Galen Brooks, <galen at interlabs.com>
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v 1.6 robin Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v 1.5 dawes Exp $
-$XFree86: $
Index: README.LynxOS
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.LynxOS,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/README.LynxOS 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/README.LynxOS 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,81 +1,59 @@
- README for XFree86 4.4.0 on LynxOS
+ README for X11R6.7.0 on LynxOS
Thomas Mueller
25 February 2000
-1. What and Where is XFree86?
+1. What and Where is X11R6.7.0?
-XFree86 is a port of X11R6.4 that supports several versions of Intel-based
-Unix. It is derived from X386 1.2, which was the X server distributed with
-X11R5. This release consists of many new features and performance improve-
-ments as well as many bug fixes.
+X11R6.7.0 is a port of X11R6.4 that supports several versions of Intel-based
+Unix. It is derived from XFree86 4.4 rc2 which was derived from X386 1.2,
+which was the X server distributed with X11R5. This release consists of many
+new features and performance improvements as well as many bug fixes.
See the Copyright Notice.
-The sources for XFree86 4.4.0 are available by anonymous ftp from:
-
-ftp://ftp.XFree86.org/pub/XFree86/4.4.0
-
-Binaries of XFree86 for LynxOS x86 are available from:
-
-ftp://ftp.XFree86.org/pub/XFree86/4.4.0/binaries/LynxOS
-
-A list of mirror sites is provided by ftp://ftp.XFree86.org/pub/XFree86/MIR-
-RORS
-
-The binaries on the FTP site were built on the latest released LynxOS version
-at the time XFree86 4.4.0 was released. In this case it is `LynxOS x86
-3.0.1'. Because of changes made to the object format they don't run on LynxOS
-versions earlier than 3.0.0.
-
-Building of this XFree86 version has never been tested on LynxOS versions
-earlier than 2.5.1.
+Building of this X11R6.7.0 version has never been tested on LynxOS.
This release contains preliminary build support for `LynxOS 3.1.0'. Since
this OS release was not available long enough for serious testing `LynxOS
-3.1.0' support has to be considered to be in `alpha state'. Initial tests
-were performed on LynxOS x86 only!
-
-XFree86 4.4.0 supports LynxOS on the x86 and on the PowerPC platform. X
-servers are currently available only on the x86 platform. The X server may
-work with some PowerPC platforms supported by LynxOS though this has not
-(yet) been thoroughly tested.
+3.1.0' support has to be considered to be in `alpha state'.
-If you need binaries for other platforms than the one on the XFree86 FTP
-server or if you have comments or suggestions about this document contact me
-(<tmueller at sysgo.de>).
+X11R6.7.0 supports LynxOS on the x86 and on the PowerPC platform. X servers
+are currently available only on the x86 platform. The X server may work with
+some PowerPC platforms supported by LynxOS though this has not (yet) been
+thoroughly tested.
-2. Installing the Binaries
+2. Installing X11R6.7.0
Please refer to the Installation Document for detailed installation instruc-
tions.
It may be necessary to increase the process stack limit in order to run
-XFree86 on your system. Edit /etc/startab and reboot your system to make the
-changes active before you begin the installation.
+X11R6.7.0 on your system. Edit /etc/startab and reboot your system to make
+the changes active before you begin the installation.
Also, be sure to include /usr/X11R6/bin in your PATH environment variable.
-Refer to the next section Running XFree86 (section 3., page 1) for further
-information on necessary configuration steps before running XFree86 on
+Refer to the next section Running X11R6.7.0 (section 3., page 1) for further
+information on necessary configuration steps before running X11R6.7.0 on
LynxOS.
-2.1 Accessing XFree86 manual pages
+2.1 Accessing X11R6.7.0 manual pages
Include /usr/X11R6/man in the MANPATH environment variable or add the direc-
tory /usr/X11R6/man to /usr/Lib/man.config
-3. Running XFree86
+3. Running X11R6.7.0
This section describes the changes to the LynxOS environment which may be
-necessary to successfully run XFree86.
+necessary to successfully run X11R6.7.0.
3.1 System tuning
3.1.1 Tunable parameters
-To reasonably run XFree86 you may have to adjust a few system parameters.
+To reasonably run X11R6.7.0 you may have to adjust a few system parameters.
On LynxOS 2.5.x and 3.0.x include a line
@@ -97,9 +75,9 @@
3.1.4 MTRR device driver
If you're using an Intel PentiumPRO or Pentium II (or higher) class CPU you
-might want to install the MTRR device driver. This driver enables the XFree86
-X server to manipulate the CPU memory type range registers which may improve
-performance on certain systems.
+might want to install the MTRR device driver. This driver enables the
+X11R6.7.0 X server to manipulate the CPU memory type range registers which
+may improve performance on certain systems.
To install the driver (on LynxOS x86 2.5.0 systems an higher) follow these
steps:
@@ -124,12 +102,12 @@
# make install
# reboot -N
-3.2 Mouse support in XFree86
+3.2 Mouse support in X11R6.7.0
-XFree86 includes support for PnP mice (see also Mouse Support in XFree86).
-The current LynxOS TTY device driver doesn't allow the necessary manipulation
-of the RTS line and therefore the support for PnP mice has been disabled for
-LynxOS.
+X11R6.7.0 includes support for PnP mice (see also Mouse Support in
+X11R6.7.0). The current LynxOS TTY device driver doesn't allow the necessary
+manipulation of the RTS line and therefore the support for PnP mice has been
+disabled for LynxOS.
3.3 PS/2 mouse drivers
@@ -162,30 +140,30 @@
3.5 X Server debug diagnostics output and other VT peculiarities
-Output made by the XFree86 X on its stdout or stderr will be lost after the
-server switches to graphics mode. The XFree86 4.4.0 server stores its output
-in /usr/adm/XFree86.n.log (where n is the screen number).
+Output made by the X11R6.7.0 X on its stdout or stderr will be lost after the
+server switches to graphics mode. The X11R6.7.0 server stores its output in
+/usr/adm/X11R6.7.0.n.log (where n is the screen number).
When the X server is running output made to other consoles will be lost.
After server shutdown the screen contents of other consoles may be inconsis-
tent with what one would expect (i.e. random).
-4. Compiling the XFree86 Distribution
+4. Compiling the X11R6.7.0 Distribution
The next sections contain LynxOS specific notes with respect to the build
process.
4.1 Disk space requirements
-Currently there is no support for shared libraries in the LynxOS XFree86
+Currently there is no support for shared libraries in the LynxOS X11R6.7.0
port. A complete binary installation along with manual pages will require
approximately 100 MBytes of disk space. To compile the system you will need
at least 250 MBytes of free disk space.
4.2 Changes to system environment (LynxOS x86)
-Before compiling the XFree86 distribution you will have to make a few little
-adjustments to your system:
+Before compiling the X11R6.7.0 distribution you will have to make a few lit-
+tle adjustments to your system:
o If not already installed on your system create a shell script named
/lib/cpp as follows:
@@ -228,8 +206,8 @@
make World
-to compile XFree86. After a few hours (and hopefully a successful build of
-the XFree86 system) you can install the software using
+to compile X11R6.7.0. After a few hours (and hopefully a successful build of
+the X11R6.7.0 system) you can install the software using
make install
@@ -239,17 +217,17 @@
subdirectories (eg core dumps, hangups). In this case update to GNU make ver-
sion 3.75 or higher.
-4.4 Installing XFree86 manual pages
+4.4 Installing X11R6.7.0 manual pages
LynxOS uses cat-able manual pages, and because a doc preparation system is
definitely not a vital component of a real-time operating system you must
first install groff-1.09 (or newer).
-XFree86 manual pages may be installed using
+X11R6.7.0 manual pages may be installed using
make install.man
-The index and whatis database for the XFree86 manual pages will be created
+The index and whatis database for the X11R6.7.0 manual pages will be created
automatically. If you already have a whatis database or index file in the
destination directories you should perform a sort/uniq operation to remove
duplicate entries:
@@ -263,7 +241,5 @@
sort /usr/X11R6/man/whatis | uniq > /tmp/tmpfile
mv /tmp/tmpfile /usr/X11R6/man/whatis
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.20 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.19 dawes Exp $
-$XFree86: $
Index: README.NetBSD
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.NetBSD,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/README.NetBSD 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/README.NetBSD 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,52 +1,42 @@
- README for XFree86 4.4.0 on NetBSD
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.67
+2003/02/16 17:19:22 dawes Exp $
-Rich Murphey, David Dawes, Marc Wandschneider, Mark Weaver, Matthieu Herrb
+ README for X11R6.7.0 on NetBSD
- Last modified on: 9 November 2002
+Rich Murphey, David Dawes, Marc Wandschneider, Mark Weaver, Matthieu Herrb
-1. What and Where is XFree86?
+1. What and Where is X11R6.7?
-XFree86 is an Open Source version of the X Window System that supports sev-
+X11R6.7.0 is an Open Source version of the X Window System that supports sev-
eral UNIX(R) and UNIX-like operating systems (such as Linux, the BSDs and
Solaris x86) on Intel and other platforms. This version is compatible with
-X11R6.6.
+X11R6.6, and is based on the XFree86 4.4.0RC2 code base, which, in turn was
+based on the X consortium sample implementation.
See the Copyright Notice.
-The sources for XFree86 are available by anonymous ftp from:
-
-ftp://ftp.XFree86.org/pub/XFree86/4.4.0
-
-Binaries for NetBSD 1.5 and later are available from:
-ftp://ftp.XFree86.org/pub/XFree86/4.4.0/binaries/NetBSD
-
-A list of mirror sites is provided by http://www.xfree86.org/MIRRORS.shtml
-
-XFree86 also builds on other NetBSD architectures. See section Building on
-other architectures (section 8.4, page 1) for details.
-
-XFree86 also supports NetBSD on PC98 machines.
+The sources for X11R6.7.0 are available from:
-2. Bug Reports for This Document
+http://wiki.x.org
-Send email to <herrb at XFree86.Org> (Matthieu Herrb) or <XFree86 at XFree86.org>
-if you have comments or suggestions about this file and we'll revise it.
+X11R6.7.0 also builds on other NetBSD architectures. See section Building on
+other architectures (section 7.4, page 1) for details.
-3. New OS dependent features
+2. New OS dependent features
-See the Release Notes for non-OS dependent new features in XFree86 4.4.0.
+See the Release Notes for non-OS dependent new features in X11R6.7.0.
-3.1 New OS dependent features in 4.2.0
+2.1 New OS dependent features in 4.2.0
o Support of client side on NetBSD/sparc64
o Support for in-kernel MTRR and AGP support in NetBSD 1.5Y
-3.2 New OS dependent features in 4.1.0
+2.2 New OS dependent features in 4.1.0
o Enable wide characters support in NetBSD 1.5P and later.
-3.3 New OS dependent features in 4.0.2
+2.3 New OS dependent features in 4.0.2
o A fix for libXmu OS detection which was broken since unix isn't defined
anymore by the C preprocessor.
@@ -59,35 +49,35 @@
o Add /usr/pkg/bin to the default user path.
-3.4 New OS dependent features in 4.0.1
+2.4 New OS dependent features in 4.0.1
o Support for NetBSD 1.5_ALPHA
o The Xsun server can be built on NetBSD/sparc
-3.5 New OS dependent features in 4.0
+2.5 New OS dependent features in 4.0
o Preliminary APM support.
-3.6 New OS dependent features in 3.9.18
+2.6 New OS dependent features in 3.9.18
o Soft-booting secondary cards through the int10 BIOS interface is now
possible using the x86emu real mode emulator.
-3.7 New OS dependent features in 3.9.17
+2.7 New OS dependent features in 3.9.17
o Support for silken mouse with the wsmouse protocol has been added.
- o A new version of the XFree86 Aperture driver which provides MTRR support
- is included.
+ o A new version of the Aperture driver which provides MTRR support is
+ included.
-4. Installing the Binaries
+3. Installing the Binaries
Refer to the Installation Document for detailed installation instructions.
-5. Configuring X for Your Hardware
+4. Configuring X for Your Hardware
-The /etc/X11/XF86Config file tells the X server what kind of monitor, video
+The /etc/X11/xorg.conf file tells the X server what kind of monitor, video
card and mouse you have. You must create it to tell the server what specific
hardware you have.
@@ -99,36 +89,31 @@
o Your monitor's sync frequencies.
-The recommended way to generate an XF86Config file is to use the xf86cfg
-utility. The xf86config text utility is still there for the (few) cases
-where xf86cfg can't be used. Also, there is a sample file installed as
-/usr/X11R6/lib/X11/XF86Config.eg, which can be used as a starting point.
-
-For details about the XF86Config file format, refer to the XF86Config(5) man-
-ual page.
+For details about the xorg.conf file format, refer to the xorg.conf(5) manual
+page.
-Once you've set up a XF86Config file, you can fine tune the video modes with
+Once you've set up a xorg.conf file, you can fine tune the video modes with
the xvidtune utility.
-5.1 About mouse configuration
+4.1 About mouse configuration
-XFree86 4.4.0 has support for the mouse driver included in the wscons console
+X11R6.7.0 has support for the mouse driver included in the wscons console
driver introduced by NetBSD 1.4. Specify ``wsmouse'' as the protocol and
-``/dev/wsmouse0'' as the device in /etc/X11/XF86Config if you're using NetBSD
+``/dev/wsmouse0'' as the device in /etc/X11/xorg.conf if you're using NetBSD
1.4 or later with a PS/2 mouse.
For older releases, the NetBSD pms mouse driver handles PS/2 style mice as
Busmouse. Specify the protocol as ``busmouse'' in the mouse section of your
-XF86Config file if you're using a PS/2 mouse with NetBSD 1.3 or former
+xorg.conf file if you're using a PS/2 mouse with NetBSD 1.3 or former
releases.
Only standard PS/2 mice are supported by this driver. Newest PS/2 mice that
send more than three bytes at a time (especially Intellimouse, or MouseMan+
with a wheel) are not supported by NetBSD 1.3 and former releases.
-See README.mouse for general instruction on mouse configuration in XFree86.
+See README.mouse for general instruction on mouse configuration.
-6. Running X
+5. Running X
The easiest way for new users to start X windows is to type:
@@ -141,7 +126,7 @@
tomize your X by creating .xinitrc, .xserverrc, and .twmrc files in your home
directory as described in the xinit and startx man pages.
-6.1 Starting Xdm, the display manager
+5.1 Starting Xdm, the display manager
To start the display manager, log in as root on the console and type: ``xdm
-nodaemon''.
@@ -162,7 +147,7 @@
o Make sure the device file exists. If not, ``cd /dev ; ./MAKEDEV
wscons''.
- o Next, make sure your kernel wants to do wscons. (see below (section 7.1,
+ o Next, make sure your kernel wants to do wscons. (see below (section 6.1,
page 1)).
o Next, make sure ``wscons=YES'' in /etc/rc.conf.
@@ -179,17 +164,14 @@
(Thanks to Mason Loring Bliss <mason at acheron.middleboro.ma.us> for this
explanation)
-Note that the binary distributions of XFree86 for NetBSD don't include sup-
-port for the XDM-AUTHORIZATION-1 protocol.
-
-7. Kernel Support for X
+6. Kernel Support for X
To make sure X support is enabled under NetBSD, the following line must be in
your config file in /sys/arch/i386/conf:
options XSERVER, UCONSOLE
-7.1 Console drivers
+6.1 Console drivers
The server supports the standard NetBSD/i386 console drivers: pccons, pcvt
and wscons (in pcvt compatibility mode). They are detected at runtime and no
@@ -212,8 +194,8 @@
in your kernel config file, and rebuild and install your kernel.
Wscons is the current console driver, included in NetBSD 1.4 and later. For
-now, XFree86 supports wscons using the pcvt compatibility mode, so be sure to
-have the lines:
+now, X supports wscons using the pcvt compatibility mode, so be sure to have
+the lines:
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
@@ -224,21 +206,22 @@
wscons(4) and wsmouse(4) manual pages for informations on how to configure
wscons into the kernel.
-7.2 Aperture Driver
+6.2 Aperture Driver
By default NetBSD include the BSD 4.4 kernel security feature that disable
-access to the /dev/mem device when in multi-users mode. But XFree86 servers
-can take advantage (or require) linear access to the display memory.
+access to the /dev/mem device when in multi-users mode. But X.org foundation
+X servers can take advantage (or require) linear access to the display mem-
+ory.
-Most XFree86 4.4.0 card drivers require linear memory access. There are two
-ways to allow XFree86 to access linear memory:
+Most X11R6.7.0 card drivers require linear memory access. There are two ways
+to allow X to access linear memory:
The first way is to disable the kernel security feature by adding ``option
INSECURE'' in the kernel configuration file and build a new kernel.
The second way is to install the aperture driver, included in source form in
-xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar in the XFree86 4.4.0 source
-distribution. Unpack it in a new directory of your choice by running:
+xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar in the X11R6.7.0 source dis-
+tribution. Unpack it in a new directory of your choice by running:
sh apNetBSD.shar
@@ -252,8 +235,7 @@
and set ``lkm=YES'' in /etc/rc.conf
-Reboot your system. XFree86 will auto-detect the aperture driver if avail-
-able.
+Reboot your system. X will auto-detect the aperture driver if available.
Warning 1: if you boot another kernel than /netbsd, loadable kernel modules
can crash your system. Always boot in single user mode when you want to run
@@ -268,10 +250,10 @@
Starting with XFree86 3.9.17, the XFree86 aperture driver also supports MTRR
write combining on Pentiums II and AMD K6 class processors.
-7.3 MIT-SHM
+6.3 MIT-SHM
-NetBSD 1.0 and later supports System V shared memory. If XFree86 detects this
-support in your kernel, it will support the MIT-SHM extension.
+NetBSD 1.0 and later supports System V shared memory. If X detects this sup-
+port in your kernel, it will support the MIT-SHM extension.
To add support for system V shared memory to your kernel add the lines:
@@ -282,13 +264,13 @@
to your kernel config file.
-8. Rebuilding the XFree86 Distribution
+7. Rebuilding the X Distribution
You should configure the distribution by editing xc/config/cf/host.def
before compiling. To compile the sources, invoke ``make World'' in the xc
directory.
-8.1 Perl support
+7.1 Perl support
Starting with XFree86 4.0.2, perl is needed to build the fonts in XFree86.
Since perl is not included with standard NetBSD installation, fonts that need
@@ -299,22 +281,22 @@
#define HasPerl YES
-in xc/config/cf/host.def before rebuilding XFree86.
+in xc/config/cf/host.def before rebuilding X.
-8.2 Aperture driver
+7.2 Aperture driver
-To build the XFree86 server with the Aperture driver enabled, you should
-unpack apNetBSD.shar and install it first.
+To build the X server with the Aperture driver enabled, you should unpack
+apNetBSD.shar and install it first.
Then edit xc/config/cf/host.def and add the line
#define HasNetBSDApertureDriver YES
-to it before rebuilding XFree86.
+to it before rebuilding X.
-8.3 Console drivers
+7.3 Console drivers
-XFree86 has a configuration option to select the console drivers to use in
+X has a configuration option to select the console drivers to use in
host.def:
o if you're using pccons put:
@@ -341,14 +323,14 @@
#define XFree86ConsoleDefines -DPCVT_SUPPORT -DWSCONS_SUPPORT
-8.4 Building on other architectures
+7.4 Building on other architectures
-Note that the NetBSD project has now its own source tree, based on the
-XFree86 source tree, with some local modifications. You may want to start
-with this tree to rebuild from sources. The NetBSD xsrc source tree is
-available at: ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-current/xsrc/
+Note that the NetBSD project has now its own source tree, based on the X
+source tree, with some local modifications. You may want to start with this
+tree to rebuild from sources. The NetBSD xsrc source tree is available at:
+ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-current/xsrc/
-9. Building New X Clients
+8. Building New X Clients
The easiest way to build a new client (X application) is to use xmkmf if an
Imakefile is included in the sources. Type ``xmkmf -a'' to create the Make-
@@ -372,14 +354,12 @@
__FreeBSD__ for FreeBSD, __NetBSD__ for NetBSD, __OpenBSD__ for OpenBSD, and
__bsdi__ for BSD/386.
-10. Thanks
+9. Thanks
Many thanks to all people who contributed to make XFree86 work on *BSD, in
particular: David Dawes, Todd Fries, Rod Grimes, Charles Hannum, Amancio
Hasty, Christoph Robitschko, Matthias Scheler, Michael Smith, Ignatios Sou-
vatzis, Jack Velte, Nate Williams and Pace Willison.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.68 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.OpenBSD
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/README.OpenBSD 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/README.OpenBSD 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,41 +1,38 @@
- README for XFree86 4.4.0 on OpenBSD
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v
+1.32 2003/12/12 03:25:05 dawes Exp $
+
+ README for X11R6.7.0 on OpenBSD
Matthieu Herrb
- Last modified on: 9 December 2003
+ Last modified on: 9 December 2003; updated 25 March 2004 by Jim Gettys for
+ X11R6.7.0
-1. What and Where is XFree86?
+1. What and Where is X11R6.7.0?
-XFree86 is an Open Source version of the X Window System that supports sev-
-eral UNIX(R) and UNIX-like operating systems (such as Linux, the BSDs and
-Solaris x86) on Intel and other platforms. This version is compatible with
-X11R6.6.
+The X.org Foundation X11R6.7.0 is an Open Source version of the X Window Sys-
+tem that supports several UNIX(R) and UNIX-like operating systems (such as
+Linux, the BSDs and Solaris x86) on Intel and other platforms.
See the Copyright Notice.
-The sources for XFree86 4.4.0 are available by anonymous ftp from:
-
-ftp://ftp.XFree86.org/pub/XFree86/4.4.0
-
-Binaries for OpenBSD/i386 3.4 and later are available from:
-
-ftp://ftp.XFree86.org/pub/XFree86/4.4.0/binaries/OpenBSD
+The sources for X11R6.7.0 are available from
-A list of mirror sites is provided by http://www.xfree86.org/MIRRORS.shtml
+http://wiki.x.org
-XFree86 also builds on other OpenBSD architectures. See section Building on
+X11R6.7.0 also builds on other OpenBSD architectures. See section Building on
other architectures (section 8., page 1) for details.
2. Bug Reports for This Document
-Use the XFree86 Bugzilla at <URL:http://bugs.xfree86.org> to submit comments
-or suggestions about this file.
+Use the X.org Bugzilla at <URL:http://bugzilla.freedesktop.org> to submit
+comments or suggestions about this file, using the xorg product.
3. New OS dependent features
-See the Release Notes for non-OS dependent new features in XFree86 4.4.0.
+See the Release Notes for non-OS dependent new features in X11R6.7.0.
-3.1 New OS related features in 4.4
+3.1 New OS related features
o The IPv6 support is enabled on OpenBSD, but XDMCP over IPv6 is not cur-
rently enabled since the code uses IPv6 mapped IPv4 addresses which are
@@ -121,7 +118,7 @@
5. Configuring X for Your Hardware
-The /etc/X11/XF86Config file tells the X server what kind of monitor, video
+The /etc/X11/xorg.conf file tells the X server what kind of monitor, video
card and mouse you have. You must create it to tell the server what specific
hardware you have.
@@ -133,25 +130,25 @@
o Your monitor's sync frequencies.
-The recommended way to generate an XF86Config file is to use the xf86cfg
-utility. The xf86config text utility is still there for the (few) cases
-where xf86cfg can't be used. Also, there is a sample file installed as
-/usr/X11R6/lib/X11/XF86Config.eg, which can be used as a starting point.
+The recommended way to generate an xorg.conf file is to use the xorgcfg util-
+ity. The xorgconfig text utility is still there for the (few) cases where
+xorgcfg can't be used. Also, there is a sample file installed as
+/usr/X11R6/lib/X11/xorg.conf.eg, which can be used as a starting point.
-For details about the XF86Config file format, refer to the XF86Config(5) man-
-ual page.
+For details about the xorg.conf file format, refer to the xorg.conf(5) manual
+page.
-Once you've set up a XF86Config file, you can fine tune the video modes with
+Once you've set up a xorg.conf file, you can fine tune the video modes with
the xvidtune utility.
5.1 About mouse configuration
-XFree86 4.4.0 has support for the mouse driver included in the new wscons
-console driver introduced by OpenBSD-2.9. Specify ``wsmouse'' as the proto-
-col and ``/dev/wsmouse0'' as the device in /etc/X11/XF86Config if you're
-using OpenBSD-2.9 or later with a PS/2 or USB mouse.
+X11R6.7.0 has support for the mouse driver included in the new wscons console
+driver introduced by OpenBSD-2.9. Specify ``wsmouse'' as the protocol and
+``/dev/wsmouse0'' as the device in /etc/X11/xorg.conf if you're using
+OpenBSD-2.9 or later with a PS/2 or USB mouse.
-See README.mouse for general instruction on mouse configuration in XFree86.
+See README.mouse for general instruction on mouse configuration.
6. Running X
@@ -170,10 +167,6 @@
in /etc/rc.conf.
-Note that the binary distributions of XFree86 for OpenBSD on ftp.xfree86.org
-and its mirrors don't include support for the XDM-AUTHORIZATION-1 protocol,
-because of the US export rules.
-
6.2 Running X without the display manager
The easiest way for new users to start X windows is to type: ``startx >&
@@ -201,7 +194,7 @@
7.2 Aperture Driver
By default OpenBSD includes the BSD 4.4 kernel security feature that disables
-access to the /dev/mem device when in multi-user mode. But the XFree86 server
+access to the /dev/mem device when in multi-user mode. But the X server
requires linear access to the display memory in most cases.
OpenBSD requires the aperture driver to be enabled for all X servers, because
@@ -226,27 +219,26 @@
7.3 MIT-SHM
-OpenBSD supports System V shared memory. If XFree86 detects this support in
-your kernel, it will support the MIT-SHM extension.
+OpenBSD supports System V shared memory. If X detects this support in your
+kernel, it will support the MIT-SHM extension.
-8. Rebuilding the XFree86 Distribution
+8. Rebuilding the X Distribution
You should configure the distribution by editing xc/config/cf/host.def
before compiling. To compile the sources, invoke ``make World'' in the xc
directory."
-Note that OpenBSD project now has its own source tree, based on the XFree86
-source tree, with some local modifications. You may want to start with this
-tree to rebuild from sources. The OpenBSD XF4 source tree is available by
-anoncvs from all OpenBSD anoncvs servers. See http://www.openbsd.org/anon-
-cvs.html for details on anoncvs.
+Note that OpenBSD project now has its own source tree, with some local modi-
+fications. You may want to start with this tree to rebuild from sources. The
+OpenBSD XF4 source tree is available by anoncvs from all OpenBSD anoncvs
+servers. See http://www.openbsd.org/anoncvs.html for details on anoncvs.
-XFree86 also compiles on other OpenBSD architectures.
+X11R6.7.0 also compiles on other OpenBSD architectures.
-8.1 XFree86 on OpenBSD/alpha
+8.1 X11R6.7.0 on OpenBSD/alpha
-The XFree86 server is known to work on some VGA cards in alpha machines that
-support BWX I/O, with OpenBSD 3.2 and higher.
+The X server is known to work on some VGA cards in alpha machines that sup-
+port BWX I/O, with OpenBSD 3.2 and higher.
The following cards have been successfully tested for now:
@@ -260,36 +252,35 @@
o Matrox MGA 2064 (8, 16 and 24 bits depth)
-Note that this version of XFree86 doesn't work on TGA cards. The version
-shipped with OpenBSD 3.1 and higher includes an OS-specific driver wsfb that
-is used to support TGA cards.
+Note that this version of doesn't work on TGA cards. The version shipped with
+OpenBSD 3.1 and higher includes an OS-specific driver wsfb that is used to
+support TGA cards.
-8.2 XFree86 on OpenBSD/macppc
+8.2 X11R6.7.0 on OpenBSD/macppc
-The XFree86 server is currently known to work on the G4 Macs and new iBooks
-with ATI Rage 128 cards running OpenBSD 3.0 or later. Other machines are
-more or less untested. Earlier OpenBSD versions lack some kernel support for
-it.
+The X server is currently known to work on the G4 Macs and new iBooks with
+ATI Rage 128 cards running OpenBSD 3.0 or later. Other machines are more or
+less untested. Earlier OpenBSD versions lack some kernel support for it.
-Use xf86config to build a /etc/X11/XF86Config file before starting the server
+Use xorgconfig to build a /etc/X11/xorg.conf file before starting the server
for the first time.
For the Titanium Powerbook G4, you can try the following mode line in
-/etc/X11/XF86Config to match the flat panel resolution:
+/etc/X11/xorg.conf to match the flat panel resolution:
Modeline "1152x768" 64.995 1152 1213 1349 1472 768 771 777 806 -HSync -VSync
-8.3 XFree86 on OpenBSD/sparc
+8.3 OpenBSD/sparc
OpenBSD 3.2 on sparc switched to the wscons device driver and now uses the OS
-specific wsfb driver in the XFree86 server. This driver is not included in
-XFree86 4.3. Please use the version shipped with OpenBSD instead.
+specific wsfb driver in the X server. This driver is not included in
+X11R6.7.0. Please use the version shipped with OpenBSD instead.
-8.4 XFree86 on OpenBSD/sparc64
+8.4 OpenBSD/sparc64
-This version of XFree68 only has support for X clients on OpenBSD/sparc64.
-Note that the version shipped with OpenBSD also has support for the X server
-on both SBus and PCI based machines.
+This version only has support for X clients on OpenBSD/sparc64. Note that the
+version shipped with OpenBSD also has support for the X server on both SBus
+and PCI based machines.
9. Building New X Clients
@@ -301,12 +292,10 @@
10. Thanks
-Many thanks to all people who contributed to make XFree86 work on *BSD, in
+Many thanks to all people who contributed to make X11R6.7.0 work on *BSD, in
particular: David Dawes, Todd Fries, Rod Grimes, Charles Hannum, Amancio
Hasty, Christoph Robitschko, Matthias Scheler, Michael Smith, Ignatios Sou-
vatzis, Jack Velte, Nate Williams and Pace Willison.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.33 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.SCO
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.SCO,v
retrieving revision 1.1.4.3.4.1
retrieving revision 1.1.4.3.4.1.4.1
diff -u -d -r1.1.4.3.4.1 -r1.1.4.3.4.1.4.1
--- a/README.SCO 4 Mar 2004 17:47:34 -0000 1.1.4.3.4.1
+++ b/README.SCO 29 Mar 2004 06:11:45 -0000 1.1.4.3.4.1.4.1
@@ -1,3 +1,6 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.22
+2003/02/17 18:58:07 dawes Exp $
+
Information for SCO OpenServer Users
J. Kean Johnston (jkj at sco.com)
@@ -6,12 +9,12 @@
1. Requirements
-Before you can either compile or execute a binary distribution of XFree86,
+Before you can either compile or execute a binary distribution of X11R6.7.0,
the following conditions must be met:
o Ensure that you are running Release 5.0.4 or later. This is required
because OSS646 is only supported on those platforms. There are no plans
- to support XFree86 on earlier releases of OpenServer.
+ to support X11R6.7.0 on earlier releases of OpenServer.
o Ensure that OSS646, the ``Execution Environment Update'' package is
installed, if appropriate. Check the release notes for that update to
@@ -29,8 +32,8 @@
est version can always be found at the SCO FTP site
<URL:ftp://ftp.sco.com/pub/openserver5/opensrc>.
- o To compile XFree86, you must use the SCO-supported version of the GNU C
- Compiler. It is possible that Skunkware versions of the compiler will
+ o To compile X11R6.7.0, you must use the SCO-supported version of the GNU
+ C Compiler. It is possible that Skunkware versions of the compiler will
work too, but this has not been tested. The ``GNU Development System''
is available for all releases from (and including) SCO OpenServer
Release 5.0.5. It is provided with the operating system in all versions
@@ -42,7 +45,7 @@
o If you are not using OSR 5.0.7 or later, you need to get an updated con-
sole driver. See <URL:http://www.sco.com> for details on OpenServer
supplements. If you can't or don't want to upgrade your console driver,
- XFree86 will still compile, but you may run into problems with some
+ X11R6.7.0 will still compile, but you may run into problems with some
cards such as the Riva TNT and ATI Rage cards. The problem with the
console driver in 5.0.6A and earlier is that when the X server sets
graphics mode, the driver does not set a status bit, so any text that is
@@ -51,18 +54,18 @@
video memory. This just happens to be slap bang in the middle of
palette data for the Riva TNT, so you get color map corruption. The
updated console driver also has an improved mechanism for allocating
- video memory that XFree86 detects at compile time, and it will use it if
- it exists. It is STRONGLY recommended that you get the console driver
- update.
+ video memory that X11R6.7.0 detects at compile time, and it will use it
+ if it exists. It is STRONGLY recommended that you get the console
+ driver update.
-2. Compiling XFree86
+2. Compiling X116.7.0
-Using the GNU Development System, compiling XFree86 should be fairly
+Using the GNU Development System, compiling the distribution should be fairly
straightforward. Before attempting to compile the system though, you should
make sure that you have met all of the requirements above. To actually start
the compilation, perform the following steps:
- o Copy the unmodified xf86site.def in xc/config/cf to host.def. Edit
+ o Copy the unmodified xorgsite.def in xc/config/cf to host.def. Edit
host.def and make any changes you think you need. The most useful
options to change are HasTcl, HasTk, HasXdmAuth if you have the file
WrapHelp.c and GccWarningOptions. Due to the nature of OpenServer's
@@ -85,21 +88,21 @@
o If you want to install the manual pages, execute the command make
install.man 2>&1 | tee -a install.log as root.
-3. Before Running XFree86
+3. Before Running X11R6.7.0
The SCO xterm terminfo description is not compatible with the xterm in the R5
distribution.
To use a Bus/Keyboard or PS2 mouse you should configure the mouse drivers
-using 'mkdev mouse'. You may then use the OsMouse option in your XF86Config
-to specify that XFree86 should use the SCO mouse drivers. To do this, set
-the Protocol to "OsMouse" in the Pointer section of your XF86Config file.
-You can also use "OsMouse" for your serial mouse, especially if you are hav-
-ing trouble getting your mouse to work using the XFree86 mouse drivers.
+using 'mkdev mouse'. You may then use the OsMouse option in your xorg.conf
+to specify that X should use the SCO mouse drivers. To do this, set the Pro-
+tocol to "OsMouse" in the Pointer section of your xorg.conf file. You can
+also use "OsMouse" for your serial mouse, especially if you are having trou-
+ble getting your mouse to work using the X mouse drivers.
4. Switching Consoles
-XFree86 uses similar console switching keys as the SCO R4 and R5 servers.
+X11R6.7.0 uses similar console switching keys as the SCO R4 and R5 servers.
That is, Ctrl-PrntScr takes you to the next console along from the one X is
running on. If this is the last console it will take you to console 1. Ctrl-
Alt-FXX, where XX is a function key between F1 and F12 will switch you to the
@@ -115,8 +118,8 @@
5. Setting up Man Pages
After compiling the tree, or after installing the binary distribution you can
-get man to recognise the XFree86 man pages by adding /usr/X11R6/man to the
-MANPATH in /etc/default/man. The line should look similar to:
+get man to recognise the Xorg man pages by adding /usr/X11R6/man to the MAN-
+PATH in /etc/default/man. The line should look similar to:
MANPATH=/usr/man:/usr/gnu/man:/usr/X11R6/man:/usr/local/man
@@ -135,13 +138,10 @@
6. Using SCO binaries/servers.
-XFree86 will accept connections from SCO binaries (R3 upwards) and the SCO R5
-server will also accept connections from XFree86 binaries. This means you may
-mix and match the two if you have ODT. For example you may still use the
-Panning Motif window manager (pmwm) if you prefer.
-
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.23 dawes Exp $
+X11R6.7.0 will accept connections from SCO binaries (R3 upwards) and the SCO
+R5 server will also accept connections from X11R6.7.0 binaries. This means
+you may mix and match the two if you have ODT. For example you may still use
+the Panning Motif window manager (pmwm) if you prefer.
+ $Id: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 1.1.4.2.4.1 2004/03/04 17:47:35 eich Exp $
-$XFree86: $
-$XdotOrg$
Index: README.SiS
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.SiS,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.4.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.4.1
--- a/README.SiS 4 Mar 2004 17:47:34 -0000 1.1.4.3.2.1
+++ b/README.SiS 29 Mar 2004 06:11:45 -0000 1.1.4.3.2.1.4.1
@@ -1,3 +1,6 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.8
+2003/10/19 19:29:14 dawes Exp $
+
Information for SiS Users
Thomas Winischhofer (<thomas at winischhofer.net>)
@@ -24,7 +27,7 @@
o 8/16/24 bits color depth; old series also 15;
- o XAA (XFree86 Acceleration Architecture)
+ o XAA
o XVideo (Xv)
@@ -47,10 +50,10 @@
detailed documentation and updates. Support for the 661, 741 and 760 is
entirely untested as of this writing, and possibly incomplete for LCD output.
-2. XF86Config Options
+2. xorg.conf Options
The following options are of particular interest for the SiS driver. Each of
-them must be specified in the Device section of the XF86Config file for this
+them must be specified in the Device section of the xorg.conf file for this
card.
2.1 For all chipsets
@@ -178,7 +181,7 @@
Option "MaxXFBMem"
DRI requires the linux kernel's SiS framebuffer driver "sisfb"
and some other modules which come with either the linux kernel or
- XFree86. (On *BSD, the DRI driver does not require any frame-
+ X11R6.7.0. (On *BSD, the DRI driver does not require any frame-
buffer driver.) Sisfb takes care of memory management for tex-
ture data. In order to prevent the X driver and sisfb from over-
writing each others video memory, sisfb reserves an amount of
@@ -189,8 +192,8 @@
the Option "MaxXFBMem" exists.
XFree 4.3.0 disabled SiS DRI support due to a lack of maintenance
- of the SiS DRI driver. XFree86 4.4 contains a newly written SiS
- DRI driver by Eric Anholt.
+ of the SiS DRI driver. X11R6.7.0 and X11R6.7.0 and XFree86 4.4
+ contains a newly written SiS DRI driver by Eric Anholt.
If you intend to use DRI, I recommend setting the total video
memory in the BIOS to 64MB in order to at least overcome the lack
@@ -230,7 +233,5 @@
Document based on 4.1 version written by Joanjo Santamarta and 3.3 version
written by Xavier Ducoin.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.9 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.Solaris
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.Solaris,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.Solaris 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.Solaris 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -1,28 +1,13 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.3
+2002/01/25 21:55:53 tsi Exp $
+
Information for Solaris
David Holland, modified by Marc Aurele La France
2001 October 01
-1. What is XFree86
-
-XFree86 is a port of X11R6.5.1 that supports several versions of Unix. It is
-derived from X386 1.2 which was the X server distributed with X11R5. This
-release consists of many new features and performance improvements as well as
-many bug fixes. The release is available as a source code distribution, as
-well as binary distributions for many architectures.
-
-The sources for XFree86 are available by anonymous ftp from:
-
- ftp://ftp.XFree86.org/pub/XFree86/current
-
-Solaris binaries for XFree86 are available for anonymous ftp at the same
-address. Currently, two binary distributions are available: one for Solaris
-8 x86, the other for previous Solaris x86 releases. They are not inter-
-changeable. No binary distribution is available for Solaris/SPARC as it is
-still under development.
-
-2. The VT-switching sub-system in Solaris x86
+1. The VT-switching sub-system in Solaris x86
The virtual terminal sub-system is a undocumented, and unsupported feature of
Solaris x86. Therefore if you use virtual terminals, you do so at YOUR OWN
@@ -98,15 +83,15 @@
There are only a total of 8 available VT's (7 normal VT's + 1 console) not
the usual 15. If you have all 8 allocated, and you attempt to allocate a
additional VT you will panic the system. (This bug is worked around in the
-Solaris XFree86 Xserver.)
+Solaris X11R6.7.0 Xserver.)
From a programming stand point, they work pretty much as documented in the
AT&T Unix System V/386 Release 4 Integrated Software Development Guide, how-
ever a number of ioctl() calls are broken.
-3. Notes for building XFree86 on Solaris
+2. Notes for building X11R6.7.0 on Solaris
- 1. Both GCC, and ProWorks are supported by XFree86. The minimum recom-
+ 1. Both GCC, and ProWorks are supported by X11R6.7.0. The minimum recom-
mended GCC release is 2.7.2. Some earlier GCC's are known to not work
and should be avoided.
@@ -130,7 +115,7 @@
Whether this behaviour still exists with newer GCC's has not been veri-
fied.
- 4. To build XFree86 with GCC you need gcc and (optionally) c++filt from
+ 4. To build X11R6.7.0 with GCC you need gcc and (optionally) c++filt from
GNU binutils. Don't install gas or ld from GNU binutils, use the one
provided by Sun.
@@ -138,9 +123,9 @@
bolic links named cc, CC, and c++filt pointing respectively to the
actual gcc, g++ and c++filt commands.
- 5. If you are using ProWorks to compile the XFree86 distribution, you need
- to modify your PATH appropriately so the ProWorks tools are available.
- Normally, they should be in /opt/SUNWspro/bin
+ 5. If you are using ProWorks to compile the X11R6.7.0 distribution, you
+ need to modify your PATH appropriately so the ProWorks tools are avail-
+ able. Normally, they should be in /opt/SUNWspro/bin
6. You MUST put /usr/ccs/bin at the front of your PATH. There are known
problems with some GNU replacements for the utilities found there. So
@@ -148,7 +133,7 @@
possible GNU versions. (Most notably GNU 'ar' does not work during the
build).
-4. Notes for running XFree86 on Solaris
+3. Notes for running Xorg on Solaris
1. Depending on the release or architecture of Solaris you are running,
you might need to install an OS driver for an aperture device.
@@ -160,9 +145,9 @@
For older Solaris x86 and for Solaris SPARC releases, the source for
this driver is included in xc/programs/Xserver/hw/xfree86/etc/apSo-
laris.shar of the source distribution. This file can usually also be
- found in the /usr/X11R6/lib/X11/etc directory when XFree86 is
- installed. Building, and installing the driver is relatively straight
- forward. Please read its accompanying README file.
+ found in the /usr/X11R6/lib/X11/etc directory when Xorg is installed.
+ Building, and installing the driver is relatively straight forward.
+ Please read its accompanying README file.
2. If you have not made the Virtual Terminal devices, you will need to
specify the terminal device to run the Xserver on. The correct device
@@ -195,7 +180,7 @@
Be sure to read through each file and make any site-specific changes
that you need.
-5. Known bugs, and work arounds with Solaris
+4. Known bugs, and work arounds with Solaris
1. The Solaris 2.1 for x86 OpenWindows filemgr does not work against a
X11R5 Xserver, it probably will also not work against a X11R6 Xserver.
@@ -210,11 +195,10 @@
(and reported!). It might even have broken some aspects of the x86
port.
-6. Bug Notification
-
-Bug reports should be sent to <XFree86 at XFree86.org>.
+5. Bug Notification
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.4 dawes Exp $
+Bug reports should be reported using the bugzilla.freedesktop.org using the
+xorg product or sent to <xorg at freedesktop.org>.
+ $Id:$.
-$XFree86: $
Index: README.XKB-Config
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.XKB-Config,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.XKB-Config 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.XKB-Config 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -1,3 +1,6 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v
+1.3 2003/04/07 15:29:21 eich Exp $
+
The XKB Configuration Guide
Kamil Toman, Ivan U. Pascal
@@ -6,9 +9,9 @@
Abstract
- This document describes how to configure XFree86 XKB from a user's
- point a few. It converts basic configuration syntax and gives also
- a few examples.
+ This document describes how to configure X11R6.7.0 XKB from a
+ user's point a few. It converts basic configuration syntax and
+ gives also a few examples.
1. Overview
@@ -39,16 +42,16 @@
o XkbOptions - extra xkb configuration options
The proper rules file depends on your vendor. In reality, the commonest file
-of rules is xfree86. For each rules file there is a description file named
-<vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-
-ration subdirectory rules (for example /etc/X11/xkb/rules).
+of rules is xorg. For each rules file there is a description file named <ven-
+dor-rules>.lst, for instance xorg.lst which is located in xkb configuration
+subdirectory rules (for example /etc/X11/xkb/rules).
2.1 Basic Configuration
Let's say you want to configure a PC style America keyboard with 104 keys as
-described in xfree86.lst. It can be done by simply writing several lines from
-below to you XFree86 configuration file (often found as /etc/X11/XF86Config-4
-or /etc/X11/XF86Config):
+described in xorg.lst. It can be done by simply writing several lines from
+below to you xorg.conf configuration file (previously known as
+/etc/X11/XF86Config-4 or /etc/X11/XF86Config):
Section "InputDevice"
Identifier "Keyboard1"
@@ -67,18 +70,18 @@
Of course, this can be also done at runtime using utility setxkbmap. Shell
command loading the same keyboard mapping would look like:
- setxkbmap -rules xfree86 -model pc104 -layout us -option ""
+ setxkbmap -rules xorg -model pc104 -layout us -option ""
The configuration and the shell command would be very analogical for most
other layouts (internationalized mappings).
2.2 Advanced Configuration
-Since XFree86 4.3.x you can use multi-layouts xkb configuration. What does
-it mean? Basically it allows to load up to four different keyboard layouts at
-a time. Each such layout would reside in its own group. The groups (unlike
-complete keyboard remapping) can be switched very fast from one to another by
-a combination of keys.
+You can use multi-layouts xkb configuration. What does it mean? Basically it
+allows to load up to four different keyboard layouts at a time. Each such
+layout would reside in its own group. The groups (unlike complete keyboard
+remapping) can be switched very fast from one to another by a combination of
+keys.
Let's say you want to configure your new Logitech cordless desktop keyboard,
you intend to use three different layouts at the same time - us, czech and
@@ -99,7 +102,7 @@
Of course, this can be also done at runtime using utility setxkbmap. Shell
command loading the same keyboard mapping would look like:
- setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+ setxkbmap -rules xorg -model logicordless -layout "us,cz,de" \
-option "grp:alt_shift_toggle"
2.3 Even More Advanced Configuration
@@ -125,7 +128,7 @@
Analogically, the loading runtime will change to:
- setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+ setxkmap -rules xorg -model logicordless -layout "us,cz,de" \
-variant ",bksl," -option "grp:alt_shift_toggle"
2.4 Basic Global Options
@@ -139,9 +142,9 @@
method is rather "brute force". You precisely need to know the structure and
the meaning of all of used configuration components.
-This method also exposes all xkb configuration details directly into XFree86
-configuration file which is a not very fortunate fact. In rare occasions it
-may be needed, though. So how does it work?
+This method also exposes all xkb configuration details directly into
+xorg.conf configuration file which is a not very fortunate fact. In rare
+occasions it may be needed, though. So how does it work?
3.1 Basic Components
@@ -168,14 +171,14 @@
Identifier "Keyboard0"
Driver "Keyboard"
- Option "XkbKeycodes" "xfree86"
+ Option "XkbKeycodes" "xorg"
Option "XkbTypes" "default"
Option "XkbSymbols" "en_US(pc104)+de+swapcaps"
Option "XkbGeometry" "pc(pc104)"
Option "XkbCompat" "basic+pc+iso9995"
EndSection
-This configuration sets the standard XFree86 default interpretation of key-
+This configuration sets the standard X server default interpretation of key-
board keycodes, sets the default modificator types. The symbol table is com-
posed of extended US keyboard layout in its variant for pc keyboards with 104
keys plus all keys for german layout are redefined respectively. Also the
@@ -192,7 +195,5 @@
ble and allow simpler and more intuitive syntax. It is preserved merely for
compatibility reasons. Avoid using it if it is possible.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.XKB-Enhancing
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.XKB-Enhancing,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.XKB-Enhancing 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.XKB-Enhancing 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -1,3 +1,6 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhanc-
+ing.sgml,v 1.1 2002/12/10 03:52:56 dawes Exp $
+
How to further enhance XKB configuration
Kamil Toman, Ivan U. Pascal
@@ -24,7 +27,7 @@
ment.
Note that this document covers only enhancements which are to be made to
-XFree86 version 4.3.x and above.
+XFree86 version 4.3 and X11R6.7.0 and above.
2. The Basics
@@ -104,10 +107,10 @@
3.1 Levels And Groups
-Since XFree86 4.3.0 you can use multi-layout concept of xkb configuration.
-Though it is still in boundaries of xkb protocol and general ideas, the
-keymap designer must obey new rules when creating new maps. In exchange we
-get a more powerful and cleaner configuration system.
+Since XFree86 4.3.0 and X11R6.7.0 you can use multi-layout concept of xkb
+configuration. Though it is still in boundaries of xkb protocol and general
+ideas, the keymap designer must obey new rules when creating new maps. In
+exchange we get a more powerful and cleaner configuration system.
Remember that it is the application which must decide which symbol matches
which keycode according to effective modifier state. The X server itself
@@ -423,7 +426,7 @@
! model = keycodes
macintosh_old = macintosh
...
- * = xfree86
+ * = xorg
! model = symbols
hp = +inet(%m)
@@ -446,10 +449,10 @@
equal sign ('=') results in. For example a (keyboard) model macintosh_old
instructs xkb to take definitions of keycodes from file keycodes/macintosh
while the rest of models (represented by a wild card '*') instructs it to
-take them from file keycodes/xfree86. The wild card represents all possible
-values on the left side which were not found in any of the previous rules.
-The more specialized (more complete) rules have higher precedence than gen-
-eral ones, i.e. the more general rules supply reasonable default values.
+take them from file keycodes/xorg. The wild card represents all possible val-
+ues on the left side which were not found in any of the previous rules. The
+more specialized (more complete) rules have higher precedence than general
+ones, i.e. the more general rules supply reasonable default values.
As you can see some lines contain substitution parameters - the parameters
preceded by the percent sign ('%'). The first alphabetical character after
@@ -505,7 +508,5 @@
And that should be it. Enjoy creating your own xkb mapping.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.2 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.apm
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.apm,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.4.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.4.1
--- a/README.apm 4 Mar 2004 17:47:34 -0000 1.1.4.2.6.1
+++ b/README.apm 29 Mar 2004 06:11:45 -0000 1.1.4.2.6.1.4.1
@@ -1,6 +1,9 @@
+Based on XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml,v 1.4
+2003/10/19 19:47:17 dawes Exp
+
Information for Alliance Promotion chipset users
- Loïc Grenié (<grenie at math.jussieu.fr>), Henrik Harmsen (<Henrik.Harm-
+ Loc Greni (<grenie at math.jussieu.fr>), Henrik Harmsen (<Henrik.Harm-
sen at erv.ericsson.se>)
6 March 2000
@@ -27,8 +30,8 @@
2. Acceleration
-The apm driver uses the XAA (XFree86 Acceleration Architecture) in the SVGA
-server. It has support for the following acceleration:
+The apm driver uses the XAA in the SVGA server. It has support for the fol-
+lowing acceleration:
o Bitblts (rectangle copy operation)
@@ -73,14 +76,14 @@
Option "ShadowFB"
-in your XF86Config file.
+in your xorg.conf file.
6. Configuration
-First: Run the xf86config program to create a correct configuration.
+First: Run the xorgconfig program to create a correct configuration.
You can turn off hardware cursor by inserting the following line in the
-Device section of the XF86Config file:
+Device section of the xorg.conf file:
Option "SWcursor"
@@ -105,10 +108,8 @@
8. Questions
-Any questions regarding this driver should be sent to Loïc Grenié. It should
+Any questions regarding this driver should be sent to Loc Greni. It should
be possible to add support for the 3210 chipset if someone needs it.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml,v 1.5 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.ati
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.ati,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.4.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.4.1
--- a/README.ati 4 Mar 2004 17:47:34 -0000 1.1.4.2.6.1
+++ b/README.ati 29 Mar 2004 06:11:45 -0000 1.1.4.2.6.1.4.1
@@ -1,3 +1,6 @@
+Based on XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.42
+2003/01/20 03:43:07 dawes Exp
+
ATI Adapters README file
Marc Aurele La France
@@ -6,8 +9,7 @@
Abstract
- This is the README for the XFree86 ATI driver included in this
- release.
+ This is the README for the XAA ATI driver included in this release.
1. Statement of intent
@@ -32,8 +34,8 @@
user has requested such support.
Thus, the level of support provided not only depends on what the driver
-detects in the system, but also, on what the user specifies in the XF86Config
-file. See the ``XF86Config specifications'' section below for details.
+detects in the system, but also, on what the user specifies in the xorg.conf
+file. See the ``xorg.conf specifications'' section below for details.
If none of the above conditions are met, the ATI driver will essentially dis-
able itself to allow other drivers to examine the system.
@@ -133,17 +135,17 @@
The driver does however support the accelerator CRTC present in all ATI
Mach64 adapters. For 256-colour, and higher depth modes, this support will
-be used by default, although an XF86Config option can be specified to use the
+be used by default, although an xorg.conf option can be specified to use the
SuperVGA CRTC instead. A linear video memory aperture is also available in
256-colour and higher depth modes and enabled by default if a 264xT or 3D
Rage controller is detected or, on 88800 controllers, if the accelerator CRTC
-is used. XF86Config options are available to disable this aperture, or (for
+is used. xorg.conf options are available to disable this aperture, or (for
non-PCI adapters) enable it or move it to some other address.
By default, the driver provides some acceleration for Mach64 if the accelera-
tor CRTC is used, and modes whose colour depth greater than or equal to 8 are
to be used. This support is as yet incomplete and can be disabled entirely
-with an XF86Config option.
+with an xorg.conf option.
On non-Intel platforms, the driver can, currently, only support PCI Mach64
adapters.
@@ -153,8 +155,8 @@
Support for generic VGA with non-ATI adapters is also implemented, but has
undergone only limited testing. The driver will intentionally disallow the
use of this support with ATI adapters. This support must be explicitly
-requested through an XF86Config ChipSet specification. This prevents the
-current VGA generic driver from being disabled.
+requested through an xorg.conf ChipSet specification. This prevents the cur-
+rent VGA generic driver from being disabled.
This driver's generic VGA support is intended as an extension of that pro-
vided by the current generic driver. Specifically, within the architectural
@@ -176,9 +178,9 @@
o Colour depths higher than 8 are not available.
-5. XF86Config specifications
+5. xorg.conf specifications
-The driver recognises a number of XF86Config options. In general, all such
+The driver recognises a number of xorg.conf options. In general, all such
options should be specified in a ``Device'' section, and affect only that
``Device'' section.
@@ -261,7 +263,7 @@
5.6 Clocks
-For the purpose of specifying a clock line in your XF86Config, one of four
+For the purpose of specifying a clock line in your xorg.conf, one of four
different situations can occur, as follows.
Those configuring the driver's generic VGA support for a non-ATI adapter, can
@@ -291,7 +293,7 @@
The driver currently supports all programmable clock generators known to
exist on Mach64 adapters. In this case, the driver will completely ignore
-any XF86Config clock specification, and programme the clock generator as
+any xorg.conf clock specification, and programme the clock generator as
needed by the modes used during the X session.
5.6.2 Clocks for unsupported programmable clock generators
@@ -300,7 +302,7 @@
ness.
In this situation, the driver will probe the adapter for clock frequencies
-unless XF86Config clocks are already specified. In either case, the driver
+unless xorg.conf clocks are already specified. In either case, the driver
will then attempt to normalise the clocks to one of the following specifica-
tions:
@@ -397,14 +399,14 @@
The order of the clocks is very important, although the driver will reorder
the specified clocks if it deems it appropriate to do so. Mach32 and Mach64
owners should note that this order is different than what they would use for
-previous XFree86 accelerated servers.
+previous accelerated servers.
5.6.4 Clocks for non-ATI adapters
-If no clocks are specified in the XF86Config, the driver will probe for four
+If no clocks are specified in the xorg.conf, the driver will probe for four
clocks, the second of which will be assumed to be 28.322 MHz. The first
clock will typically be 25.175 MHz, but there are exceptions. You can
-include up to four clock frequencies in your XF86Config to specify the actual
+include up to four clock frequencies in your xorg.conf to specify the actual
values used by the adapter. Any more will be ignored.
5.7 Option ``nopanel_display''
@@ -524,12 +526,12 @@
6. Video modes
-Mode timings can be derived from the information in XFree86's doc subdirec-
-tory. However, it is no longer required to specify such timings in an
-XF86Config's ``Monitor'' section(s), if only standard mode timings are to be
-used. The server automatically inserts VESA standard mode timings in every
-``Monitor'' section, and these modes will be checked first for mode con-
-straints (monitor sync tolerances, video memory size, etc.).
+Mode timings can be derived from the information in X's doc subdirectory.
+However, it is no longer required to specify such timings in an xorg.conf's
+``Monitor'' section(s), if only standard mode timings are to be used. The
+server automatically inserts VESA standard mode timings in every ``Monitor''
+section, and these modes will be checked first for mode constraints (monitor
+sync tolerances, video memory size, etc.).
Furthermore, it is also no longer required to specify mode names in ``Dis-
play'' subsections. Should no mode names be specified (or those specified do
@@ -545,8 +547,8 @@
7. Known problems and limitations
-There are several known problems or limitations related to the XFree86 ATI
-driver. They include:
+There are several known problems or limitations related to the ATI driver.
+They include:
o When using a Mach64's accelerator CRTC, the virtual resolution must be
less than 8192 pixels wide. The VGA CRTC further limits the virtual
@@ -592,8 +594,8 @@
default, be limited to 80MHz, 135MHz, 170MHz, 200MHz or 230MHz, depend-
ing on the specific controller. This limit can only be increased (up to
a driver-calculated absolute maximum) through the DACSpeed specification
- in XF86Config. Be aware however that doing so is untested and might
- damage the adapter.
+ in xorg.conf. Be aware however that doing so is untested and might dam-
+ age the adapter.
o Except as in the previous items, clocks are limited to 80MHz on most
adapters, although many are capable of higher frequencies. This will
@@ -638,20 +640,20 @@
If you are experiencing problems that are not already recorded in this docu-
ment, first ensure that you have the latest current release of this driver
-and XFree86. Check the server's log (usually found in
-/var/log/XFree86.0.log) and ftp://ftp.xfree86.org/pub/XFree86 if you are
-uncertain.
+and the Xorg X server.. Check the server's log (usually found in
+/var/log/Xorg.0.log) and ftp://ftp.freedesktop.org/pub/Xorg if you are uncer-
+tain.
-Secondly, please check XFree86's doc directory for additional information.
+Secondly, please check Xorg's doc directory for additional information.
Thirdly, a scan through the comp.windows.x.i386unix and comp.os.linux.x news-
-groups and the xfree86 mailing list using your favourite archiving service
-can also prove useful in resolving problems.
+groups and the xorg mailing list using your favourite archiving service can
+also prove useful in resolving problems.
If you are still experiencing problems, you can send me non-HTMLised e-mail
at <tsi at xfree86.org>. Please be as specific as possible when describing the
-problem(s), and include an unedited copy of the server's log and the XF86Con-
-fig file used.
+problem(s), and include an unedited copy of the server's log and the
+xorg.conf file used.
9. Driver history
@@ -703,7 +705,5 @@
The introduction of version 6 is a first swipe at porting the driver to non-
Intel architectures.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.43 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.chips
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.chips,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/README.chips 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/README.chips 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,13 +1,21 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.36
+2001/05/19 00:35:42 dawes Exp $
+
Information for Chips and Technologies Users
David Bateman (<dbateman at club-internet.fr>),
- Egbert Eich (<eich at xfree86.org>)
+ Egbert Eich (<eich at freedesktop.org>)
1st January 2001
1. Introduction
-With the release of XFree86 version 4.4.0, the Chips and Technologies driver
+The Chips and Technologies driver release in X11R6.7.0 came from XFree86 4.4
+rc2; this document was originally included in that release and has been
+updated modestly to reflect differences between X11R6.7.0 and XFree86 4.4
+rc2.
+
+With the release of XFree86 version 4.0, the Chips and Technologies driver
has been extensively rewritten and contains many new features. This driver
must be considered work in progress, and those users wanting stability are
encouraged to use the older XFree86 3.3.x versions. However this version of
@@ -149,7 +157,7 @@
second display channel so that the CRT can display independently
of the LCD. (Max Ram: 4Mb Only, Max Dclk: 170MHz at 3.3V)
-3. XF86Config Options
+3. xorg.conf Options
The following options are of particular interest to the Chips and Technolo-
gies driver. It should be noted that the options are case insensitive, and
@@ -215,7 +223,7 @@
Option "UseModeline"
The flat panel timings are related to the panel size and not the
- size of the mode specified in XF86Config. For this reason the
+ size of the mode specified in xorg.conf. For this reason the
default behaviour of the server is to use the panel timings
already installed in the chip. The user can force the panel tim-
ings to be recalculated from the modeline with this option. How-
@@ -527,7 +535,7 @@
the timing for the flat panel are dependent on the specification of the panel
itself and are independent of the particular mode chosen. For this reason it
is recommended to use one of the programs that automatically generate
-XF86Config files, such as "xf86config" or "XF86Setup".
+xorg.conf files, such as "xorgconfig".
However there are many older machines, particularly those with 800x600 screen
or larger, that need to reprogram the panel timings. The reason for this is
@@ -562,17 +570,17 @@
5. Dual Display Channel
-XFree86 releases later than 4.1.0 support dual-channel display on the
-ct69030. This support can be used to give a single display image on two
-screen with different refresh rates, or entirely different images on the two
-displays.
+XFree86 releases later than 4.1.0 and X.Org releases later than 6.7.0 sup-
+port dual-channel display on the ct69030. This support can be used to give a
+single display image on two screen with different refresh rates, or entirely
+different images on the two displays.
Dual refresh rate display can be selected with the "DualRefresh" option
described above. However to use the dual-head support is slightly more com-
plex. Firstly, the ct69030 chipset must be installed on a PCI bus. This is a
driver limitation that might be relaxed in the future. In addition the
-device, screen and layout sections of the "XF86Config" must be correctly con-
-figured. A sample of an incomplete "XF86Config" is given below
+device, screen and layout sections of the "xorg.conf" must be correctly con-
+figured. A sample of an incomplete "xorg.conf" is given below
Section "Device"
Identifier "Chips and Technologies - Pipe A"
@@ -690,7 +698,7 @@
in your startx log file. Note that many chips are capable of higher memory
clocks than actually set by BIOS. You can use the "SetMClk" option in your
-XF86Config file to get a higher MClk. However some video ram, particularly
+xorg.conf file to get a higher MClk. However some video ram, particularly
EDO, might not be fast enough to handle this, resulting in drawing errors on
the screen. The formula to determine the maximum usable dotclock on the HiQV
series of chips is
@@ -859,7 +867,7 @@
the server attempts to read the panel size from the chip. If the
user has used the "UseModeline" or "FixPanelSize" options the
panel timings are derived from the mode, which can be different
- than the panel size. Try deleting theses options from XF86Config
+ than the panel size. Try deleting theses options from xorg.conf
or using an LCD/CRT switch.
I can't get a 320x240 mode to occupy the whole 640x480 LCD
@@ -884,7 +892,7 @@
The right hand edge of the mode isn't visible on the LCD
This is usually due to a problem with the "LcdCenter" option. If
- this option is removed form XF86Config, then the problem might go
+ this option is removed form xorg.conf, then the problem might go
away. Alternatively the manufacturer could have incorrectly pro-
grammed the panel size in the EGA console mode. The "FixPanel-
Size" can be used to force the modeline values into the panel
@@ -930,15 +938,15 @@
colour depths. However, 8 and 24 bit colour depths seem to work
fine.
- My ct69030 machine locks up when starting XFree86
+ My ct69030 machine locks up when starting X
The ct69030 chipset introduced a new dual channel architecture.
- In its current form, XFree86 can not take advantage of this sec-
- ond display channel. In fact if the video BIOS on the machine
- sets the ct69030 to a dual channel mode by default, XFree86 will
- lockup hard at this point. The solution is to use the BIOS setup
- to change to a single display channel mode, ensuring that both
- the IOSS and MSS registers are set to a single channel mode. Work
- is underway to fix this.
+ In its current form, X can not take advantage of this second dis-
+ play channel. In fact if the video BIOS on the machine sets the
+ ct69030 to a dual channel mode by default, X will lockup hard at
+ this point. The solution is to use the BIOS setup to change to a
+ single display channel mode, ensuring that both the IOSS and MSS
+ registers are set to a single channel mode. Work is underway to
+ fix this.
I can't start X-windows with 16, 24 or 32bpp
Firstly, is your machine capable of 16/24/32bpp with the mode
@@ -956,9 +964,9 @@
startx -- -depth 24 -fbbpp 32 8-8-8 RGB truecolor
- however as XFree86 version 4.4.0 allows 32bpp pixmaps to be used
- with framebuffers operating in 24bpp, this mode of operating will
- cost performance for no gain in functionality.
+ however as X11R6.7.0 allows 32bpp pixmaps to be used with frame-
+ buffers operating in 24bpp, this mode of operating will cost per-
+ formance for no gain in functionality.
Note that the "-bpp" option has been removed and replaced with a
"-depth" and "-fbbpp" option because of the confusion between the
@@ -984,16 +992,16 @@
If you are having driver-related problems that are not addressed by this doc-
ument, or if you have found bugs in accelerated functions, you can try con-
-tacting the XFree86 team (the current driver maintainer can be reached at
-<dbateman at club-internet.fr> or <eich at xfree86.org>), or post in the Usenet
-newsgroup "comp.windows.x.i386unix".
+tacting the Xorg team (the current driver maintainer can be reached at
+<eich at freedesktop.org>).
8. Disclaimer
-XFree86, allows the user to do damage to their hardware with software.
-Although the authors of this software have tried to prevent this, they dis-
-claim all responsibility for any damage caused by the software. Use caution,
-if you think the Xserver is frying your screen, TURN THE COMPUTER OFF!!
+The Xorg X server, allows the user to do damage to their hardware with soft-
+ware with old monitors which may not tolerate bad display settings. Although
+the authors of this software have tried to prevent this, they disclaim all
+responsibility for any damage caused by the software. Use caution, if you
+think the X server is frying your screen, TURN THE COMPUTER OFF!!
9. Acknowledgement
@@ -1027,7 +1035,5 @@
We also thank the many people on the net who have contributed by reporting
bugs and extensively testing this server.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.38 eich Exp $
-
+ $Xorg$
-$XFree86: $
Index: README.cyrix
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.cyrix,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.cyrix 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.cyrix 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -19,7 +19,7 @@
o Rather sparse (color depth hardcoded to 8)
-3. XF86Config Option
+3. xorg.conf Option
Option "sw_cursor"
disable the hardware cursor. (Code not verified yet!)
@@ -39,7 +39,7 @@
just after probing for the ``scratchpad size''. If this is the case,
email to <hecker at cat.dfrc.nasa.gov> with the output of
- XFree86 -probeonly -verbose
+ Xorg -probeonly -verbose
and this will be fixed.
@@ -47,7 +47,5 @@
o Richard Hecker <hecker at cat.dfrc.nasa.gov>
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.2 dawes Exp $
-$XFree86: $
Index: README.dps
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.dps,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.dps 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.dps 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -1,11 +1,34 @@
- XFree86 and DPS
+Generated from XdotOrg: $ Based on: $XFree86: xc/programs/Xserv-
+er/hw/xfree86/doc/sgml/dps.sgml,v 1.1 2001/03/02 02:45:37 dawes Exp $
- Juliusz Chroboczek, <jch at xfree86.org>
+ X and DPS
- 27 February 2001
+ Juliusz Chroboczek, <jch at pps.jussieu.fr>
+ Jim Gettys, <jg at freedesktop.org>
+
+ 27 February 2001, updated 25 March 2004
1. Introduction
+ Note that DPS is now obsolete.
+
+At the time when I started this project, there was no decent rendering inter-
+face for X11 other than DPS.
+
+Since then, there has been a large amount of work on a simple and clean X
+server extension, Xrender, which provides the basis for just such an inter-
+face.
+
+Rendering libraries that are being built above Xrender include Xft, a font
+rendering library built on FreeType; Cairo, a geometry rendering library that
+provides PostScript-like rendering primitives but with intrinsic support for
+Porter-Duff compositing (transparency); Pango, a high-level typesetting
+library.
+
+If your application uses DPS, please consider porting it to the above
+libraries. See the DPS extension site <URL:http://dps.sourceforge.net> for
+more details
+
Display Postscript (or DPS for short) is a rendering extension for X11. DPS
is slightly atypical in that it is based on code mobility, the ability to
send executable code from client to server. Thus, a DPS client does not
@@ -13,7 +36,7 @@
server which, when executed, causes a line to be drawn.
This document does not aim at teaching programming with DPS; it is only a
-summary description of the DPS support code included with XFree86. More
+summary description of the DPS support code included with X116.7.0. More
information about DPS, including a DPS bibliography, is available from the
DPS extension site <URL:http://dps.sourceforge.net>.
@@ -28,14 +51,14 @@
``DPS agent.'' In this latter case, the term ``server-side'' is somewhat
misleading.
-At the time of writing, only the client side is included with XFree86; the
+At the time of writing, only the client side is included with X11R6.7.0; the
server side must be obtained separately. Please see server side (section 3.,
page 1) later in this document for more information.
2. The DPS client side
The DPS client side consists of four libraries and a number of basic tools
-for programming and configuration; these are all included with XFree86.
+for programming and configuration; these are all included with X116.7.0.
2.1 Libraries
@@ -66,7 +89,7 @@
DPS.tar.gz file, available from <URL:ftp://dps.source-
forge.net/pub/dps/DPS.tar.gz>.
-The source code for libdpstkXm is included with XFree86; however, as it
+The source code for libdpstkXm is included with X11R6.7.0; however, as it
depends on Motif, this library is not built by default. A GTK-based library
providing some of the functionality of libdpstkXm is available from the
gtkDPS site <URL:http://www.gyve.org/gtkDPS/>.
@@ -79,9 +102,9 @@
they use Xt or not.
This state of affairs is unfortunately true of the version of libdps included
-with XFree86. We are currently considering various solutions to this problem
-(including the use of weak linker symbols or splitting off the guilty func-
-tions into a separate library).
+with X11R6.7.0. We are currently considering various solutions to this prob-
+lem (including the use of weak linker symbols or splitting off the guilty
+functions into a separate library).
2.2 Client-side tools
@@ -101,7 +124,7 @@
2.3 Sample clients
-XFree86 contains three sample DPS clients, dpsinfo, dpsexec and texteroids.
+X11R6.7.0 contains three sample DPS clients, dpsinfo, dpsexec and texteroids.
They are documented in their respective manual pages.
A number of sample clients that depend on Motif are available in
@@ -164,7 +187,5 @@
[PSWRAP] Display PostScript System. pswrap Reference Manual. 15 April 1993.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/dps.sgml,v 1.2 dawes Exp $
-
+ Updated by Jim Gettys.
-$XFree86: $
Index: README.fonts
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.fonts,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.4.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.4.1
--- a/README.fonts 4 Mar 2004 17:47:34 -0000 1.1.4.3.2.1
+++ b/README.fonts 29 Mar 2004 06:11:45 -0000 1.1.4.3.2.1.4.1
@@ -1,14 +1,16 @@
- Fonts in XFree86
+ Fonts in X11R6.7
- Juliusz Chroboczek, <jch at xfree86.org>
+ Juliusz Chroboczek, <jch at pps.jussieu.fr>
+ Updated by Jim Gettys, <jg at freedesktop.org>
- 17 November 2003
+ 25 March 2004
1. Introduction
-This document describes the support for fonts in XFree86. Installing fonts
+This document describes the support for fonts in X11R6.7. Installing fonts
(section 2., page 1) is aimed at the casual user wishing to install fonts in
-XFree86; the rest of the document describes the font support in more detail.
+X11R6.7 or XFree86; the rest of the document describes the font support in
+more detail.
We assume some familiarity with digital fonts. If anything is not clear to
you, please consult Appendix: Background (section 5., page 1) at the end of
@@ -16,10 +18,10 @@
1.1 Two font systems
-XFree86 includes two font systems: the core X11 fonts system, which is
-present in all implementations of X11, and the Xft fonts system, which is not
-currently distributed with implementations of X11 that are not based on
-XFree86 but will hopefully be included by them in the future
+X includes two font systems: the original core X11 fonts system, which is
+present in all implementations of X11, and the Xft fonts system, which may
+not be distributed with implementations of X11 that are not based on X116.7.0
+but will hopefully be included by them in the future
The core X11 fonts system is directly derived from the fonts system included
with X11R1 in 1987, which could only use monochrome bitmap fonts. Over the
@@ -36,7 +38,7 @@
Xft is not compatible with the core fonts system: usage of Xft requires mak-
ing fairly extensive changes to toolkits (user-interface libraries). While
-XFree86 will continue to maintain the core fonts system, toolkit authors are
+X.org will continue to maintain the core fonts system, toolkit authors are
encouraged to switch to Xft as soon as possible.
2. Installing fonts
@@ -48,13 +50,13 @@
Xft has no configuration mechanism itself, rather it relies upon the fontcon-
fig library to configure and customize fonts. That library is not specific
-to XFree86 or indeed on any particular font output mechanism. This discus-
+to X11R6.7.0 or indeed on any particular font output mechanism. This discus-
sion describes how fontconfig, rather than Xft, works.
2.1.1 Installing fonts in Xft
Fontconfig looks for fonts in a set of well-known directories that include
-all of XFree86's standard font directories (`/usr/X11R6/lib/X11/lib/fonts/*')
+all of X11R6.7's standard font directories (`/usr/X11R6/lib/X11/lib/fonts/*')
by default) as well as a directory called `.fonts/' in the user's home direc-
tory. Installing a font for use by Xft applications is as simple as copying
a font file into one of these directories.
@@ -114,9 +116,9 @@
</edit>
</match>
-Xft supports sub-pixel rasterisation on LCD displays. XFree86 should auto-
-matically enable this feature on laptops and when using an LCD monitor con-
-nected with a DVI cable; you can check whether this was done by typing
+Xft supports sub-pixel rasterisation on LCD displays. X11R67 should automat-
+ically enable this feature on laptops and when using an LCD monitor connected
+with a DVI cable; you can check whether this was done by typing
$ xdpyinfo -ext RENDER | grep sub-pixel
@@ -167,10 +169,10 @@
2.1.4 Troubleshooting
If some Xft-based applications don't seem to notice the changes you are mak-
-ing to your configuration files, they may be linked against the XFree86 4.2
-version of Xft. In order to fix the problem, you should relink them against
-a current version of Xft; on most systems, it is enough to install the cur-
-rent version of the Xft and Fontconfig libraries.
+ing to your configuration files, they may be linked against an old version of
+Xft. In order to fix the problem, you should relink them against a current
+version of Xft; on most systems, it is enough to install the current version
+of the Xft and Fontconfig libraries.
If, for some reason, you cannot upgrade the shared libraries, please check
the Xft(3) manual page included with XFree86 4.2 for the configuration mecha-
@@ -185,8 +187,8 @@
2.2.1 Installing bitmap fonts
-The XFree86 server can use bitmap fonts in both the cross-platform BDF format
-and the somewhat more efficient binary PCF format. (XFree86 also supports
+The X11R6.7 server can use bitmap fonts in both the cross-platform BDF format
+and the somewhat more efficient binary PCF format. (X11R6.7 also supports
the obsolete SNF format.)
Bitmap fonts are normally distributed in the BDF format. Before installing
@@ -215,7 +217,7 @@
2.2.2 Installing scalable fonts
-The XFree86 server supports scalable fonts in four formats: Type 1, Speedo,
+The X11R6.7 server supports scalable fonts in four formats: Type 1, Speedo,
TrueType and CIDFont. This section only applies to the former three; for
information on CIDFonts, please see Installing CIDFonts (section 2.2.3, page
1) later in this document.
@@ -251,7 +253,7 @@
Munhwa-Regular--UniKS-UCS2-H
-The CIDFont code in XFree86 requires a very rigid directory structure. The
+The CIDFont code in X11R6.7 requires a very rigid directory structure. The
main directory must be called `CID' (its location defaults to
`/usr/X11R6/lib/X11/fonts/CID' but it may be located anywhere), and it should
contain a subdirectory for every CID collection. Every subdirectory must
@@ -310,7 +312,7 @@
bitmap fonts; this way, the server will prefer bitmap fonts to scalable fonts
when an exact match is possible, but will avoid scaling bitmap fonts when a
scalable font can be used. (The `:unscaled' hack, while still supported,
-should no longer be necessary in XFree86 4.0 and later.)
+should no longer be necessary in X11R6.7.0.)
You may check the font path of the running server by typing the command
@@ -334,15 +336,15 @@
2.2.4.2 Permanent modification of the font path
The default font path (the one used just after server startup or after `xset
-fp default') is specified in the X server's `XF86Config' file. It is com-
-puted by appending all the directories mentioned in the `FontPath' entries of
-the `Files' section in the order in which they appear.
+fp default') is specified in the X server's `xorg.conf' file. It is computed
+by appending all the directories mentioned in the `FontPath' entries of the
+`Files' section in the order in which they appear.
FontPath "/usr/local/fonts/Type1"
...
FontPath "/usr/local/fonts/bitmap"
-For more information, please consult the XF86Config(5) manual page.
+For more information, please consult the xorg.conf(5) manual page.
2.2.5 Troubleshooting
@@ -353,19 +355,19 @@
you are trying to use a font in a format that is not supported by your
server.
-XFree86 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType and
-CIDFont font formats. However, not all XFree86 servers come with all the
-font backends configured in.
+X11R6.7 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType and
+CIDFont font formats. However, not all X11R6.7 or XFree86 servers come with
+all the font backends configured in.
-On most platforms, the XFree86 servers are modular: the font backends are
+On most platforms, the X11R6.7 servers are modular: the font backends are
included in modules that are loaded at runtime. The modules to be loaded are
-specified in the `XF86Config' file using the `Load' directive:
+specified in the `xorg.conf' file using the `Load' directive:
Load "type1"
If you have trouble installing fonts in a specific format, you may want to
check the server's log file in order to see whether the relevant modules are
-properly loaded. The list of font modules distributed with XFree86 is as
+properly loaded. The list of font modules distributed with X11R6.7 is as
follows:
o "bitmap": bitmap fonts (`*.bdf', `*.pcf' and `*.snf');
@@ -382,7 +384,7 @@
Please note that the argument of the `Load' directive is case-sensitive.
-3. Fonts included with XFree86
+3. Fonts included with X11R6.7
3.1 Standard bitmap fonts
@@ -391,7 +393,7 @@
Helvetica and some members of the Lucida family. In the SI, these fonts are
provided in the ISO 8859-1 encoding (ISO Latin Western-European).
-In XFree86, a number of these fonts are provided in Unicode-encoded font
+In X11R6.7, a number of these fonts are provided in Unicode-encoded font
files instead. At build time, these fonts are split into font files encoded
according to legacy encodings, a process which allows us to provide the stan-
dard fonts in a number of regional encodings with no duplication of work.
@@ -469,7 +471,7 @@
3.3 Standard scalable fonts
-XFree86 includes all the scalable fonts distributed with X11R6.
+X11R6.7 includes all the scalable fonts distributed with X11R6.
3.3.1 Standard Type 1 fonts
@@ -491,7 +493,7 @@
/usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
-Finally, XFree86 also comes with Type 1 versions of Bitstream Courier and
+Finally, X11R6.7 also comes with Type 1 versions of Bitstream Courier and
Charter. These fonts have XLFD
-bitstream-courier-*-*-normal--0-0-0-0-m-0-iso8859-1
@@ -503,7 +505,7 @@
3.3.2 Standard Speedo fonts
-XFree86 includes Speedo versions of the Bitstream Courier and Charter fonts.
+X11R6.7 includes Speedo versions of the Bitstream Courier and Charter fonts.
In order to use these fonts, you should ensure that your X server is loading
the `Speedo' font backend; see Troubleshooting (section 2.2.5, page 1).
@@ -519,7 +521,7 @@
3.4 The Bigelow & Holmes Luxi family
-XFree86 includes the Luxi family of scalable fonts, in both TrueType and
+X11R6.7 includes the Luxi family of scalable fonts, in both TrueType and
Type 1 format. This family consists of the fonts Luxi Serif, with XLFD
-b&h-luxi serif-medium-*-normal--*-*-*-*-p-*-*-*
@@ -565,11 +567,11 @@
An earlier version of the Luxi fonts was made available under the name
Lucidux. This name should no longer be used due to trademark uncertainties,
-and all traces of the Lucidux name have been removed from XFree86.
+and all traces of the Lucidux name have been removed from X11R6.7.
4. More about core fonts
-This section describes XFree86-specific enhancements to the core X11 fonts
+This section describes X11R6.7-specific enhancements to the core X11 fonts
system.
4.1 Core fonts and internationalisation
@@ -655,7 +657,7 @@
used to automatically build `encodings.dir' files. Please see the mkfont-
dir(1) manual page for more details.
-A number of encoding files for common encodings are included with XFree86.
+A number of encoding files for common encodings are included with X11R6.7.
Information on writing new encoding files can be found in Format of encodings
directory files (section 4.1.3, page 1) and Format of encoding files (section
4.1.4, page 1) later in this document.
@@ -991,7 +993,7 @@
Since the functionalities for CJKV support introduced by X-TT have been
merged into the new FreeType backend, the X-TT backend will be removed from
-XFree86's tree near the future. Therefore, the use of FreeType backend is
+X11R6.7's tree near the future. Therefore, the use of FreeType backend is
preferred over the X-TT backend.
General information on X-TrueType may be found at the After X-TT Project page
@@ -1138,16 +1140,16 @@
6. References
-XFree86 comes with extensive documentation in the form of manual pages and
+X11R6.7 comes with extensive documentation in the form of manual pages and
typeset documents. Before installing fonts, you really should read the font-
config(3) and mkfontdir(1) manual pages; other manual pages of interest
include X(7), Xserver(1), xset(1), Xft(3), xlsfonts(1) and showfont(1). In
addition, you may want to read the X Logical Font Description document, by
Jim Flowers, which is provided in the file `xc/doc/xlfd.PS.Z'.
-The latest released version of the XFree86 documentation (including this doc-
-ument and all manual pages) is available as current XFree86 documentation
-<URL:http://www.xfree86.org/current/>.
+The latest released version of the X11R6.7 documentation (including this doc-
+ument and all manual pages) can be found from current X11R6.7 documentation
+<URL:http://wiki.x.org/>.
The comp.fonts FAQ <URL:http://www.netmeg.net/faq/computers/fonts/>, which is
unfortunately no longer being maintained, contains a wealth of information
@@ -1181,7 +1183,5 @@
world, often provide interesting information about character set issues; see
for example RFC 373.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.24 dawes Exp $
-
+ Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.23 dawes Exp $. Updated by Jim Gettys.
-$XFree86: $
Index: README.i740
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.i740,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.i740 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.i740 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -115,15 +115,15 @@
5. Configuration
The driver auto-detects all device information necessary to initialize the
-card. The only lines you need in the "Device" section of your XF86Config
-file are:
+card. The only lines you need in the "Device" section of your xorg.conf file
+are:
Section "Device"
Identifier "Intel i740"
Driver "i740"
EndSection
-or let xf86config do this for you.
+or let xorgconfig do this for you.
However, if you have problems with auto-detection, you can specify:
@@ -167,7 +167,9 @@
o Daryll Strauss <daryll at precisioninsight.com>
-This driver was donated to The XFree86 Project by:
+The X11R6.7.0 version of this driver originally came from XFree86 4.4 rc2.
+
+The XFree86 version of this driver was donated to The XFree86 Project by:
Precision Insight, Inc.
Cedar Park, TX
@@ -175,7 +177,5 @@
http://www.precisioninsight.com
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.3 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.2 dawes Exp $
-$XFree86: $
Index: README.i810
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.i810,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.i810 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.i810 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -60,15 +60,15 @@
6. Configuration
The driver auto-detects all device information necessary to initialize the
-card. The only lines you need in the "Device" section of your XF86Config
-file are:
+card. The only lines you need in the "Device" section of your xorg.conf file
+are:
Section "Device"
Identifier "Intel i810"
Driver "i810"
EndSection
-or let xf86config do this for you.
+or let xorgconfig do this for you.
However, if you have problems with auto-detection, you can specify:
@@ -105,7 +105,9 @@
o Keith Whitwell
-This driver was donated to The XFree86 Project by:
+The X11R6.7.0 version of this driver originally came from XFree86 4.4 rc2.
+
+The XFree86 version of this driver was donated to The XFree86 Project by:
Precision Insight, Inc.
Cedar Park, TX
@@ -115,5 +117,3 @@
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i810.sgml,v 1.4 dawes Exp $
-
-$XFree86: $
Index: README.mouse
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.mouse,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/README.mouse 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/README.mouse 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,4 +1,7 @@
- Mouse Support in XFree86
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.12
+2002/02/22 21:45:13 dawes Exp $
+
+ Mouse Support in X11R6.7
Kazutaka Yokota
@@ -6,16 +9,16 @@
1. Introduction
-This document describes mouse support in XFree86 4.4.0.
+This document describes mouse support in X.org Foundation's X11 6.7.0 server.
Mouse configuration has often been mysterious task for novice users. How-
ever, once you learn several basics, it is straightforward to write the mouse
-"InputDevice" section in the XF86Config file by hand.
+"InputDevice" section in the xorg.conf file by hand.
2. Supported Hardware
-The XFree86 X server supports three classes of mice: serial, bus and PS/2
-mice.
+The X.org Foundation X server supports three classes of mice: serial, bus and
+PS/2 mice.
Serial mouse
The serial mouse has been the most popular pointing device for
@@ -26,9 +29,9 @@
The modern serial mouse conforms to the PnP COM device specifica-
tion so that the host computer can automatically detect the mouse
- and load an appropriate driver. The XFree86 X server supports
- this specification and can detect popular PnP serial mouse models
- on most platforms.
+ and load an appropriate driver. The X server supports this spec-
+ ification and can detect popular PnP serial mouse models on most
+ platforms.
Bus mouse
The bus mouse connects to a dedicated interface card in an expan-
@@ -57,8 +60,7 @@
puters. Several devices can be plugged into this bus, including
mices and keyboards.
- The XFree86 server includes support for USB mices on some sys-
- tems.
+ The server includes support for USB mices on some systems.
Many mice nowadays can be used both as a serial mouse and as a PS/2 mouse.
They has a logic to distinguish which interface it is connected to. However,
@@ -67,7 +69,7 @@
find an appropriate adapter with which you can connect the PS/2 mouse to a
serial port or visa versa.
-XFree86 supports the mouse with a wheel, a roller or a knob. Its action is
+X11R6.7 supports the mouse with a wheel, a roller or a knob. Its action is
detected as the Z (third) axis motion of the mouse. As the X server or
clients normally do not use the Z axis movement of the pointing device, a
configuration option, "ZAxisMapping", is provided to assign the Z axis move-
@@ -102,7 +104,7 @@
SP: support is available in a different form
*1 Refer to the following sections for details.
- *2 XFree86/OS2 will support any type of mouse that the OS supports,
+ *2 X11R6.7/OS2 will support any type of mouse that the OS supports,
whether it is serial, bus mouse, or PnP type.
3.2 BSD/OS
@@ -204,10 +206,10 @@
3.12 OS/2
-XFree86/OS2 always uses the native mouse driver of the operating system and
+X11R6.7/OS2 always uses the native mouse driver of the operating system and
will support any type of pointer that the OS supports, whether it is serial,
bus mouse, or PnP type. If the mouse works under Presentation Manager, it
-will also work under XFree86/OS2.
+will also work under X11R6.7/OS2.
Always specify "OSMouse" as the protocol type.
@@ -290,11 +292,10 @@
the PS/2 mouse and the X server will automatically adjust itself.
Serial mouse
- The XFree86 server supports a wide range of mice, both old and
- new. If your mouse is of a relatively new model, it may conform
- to the PnP COM device specification and the X server may be able
- to detect an appropriate protocol type for the mouse automati-
- cally.
+ The server supports a wide range of mice, both old and new. If
+ your mouse is of a relatively new model, it may conform to the
+ PnP COM device specification and the X server may be able to
+ detect an appropriate protocol type for the mouse automatically.
Specify "Auto" as the protocol type and start the X server. If
the mouse is not a PnP mouse, or the X server cannot determine a
@@ -359,8 +360,8 @@
that model of mouse and is using a ``compatible'' protocol
according to PnP information.
- If you suspect this is the case with your mouse, please send a
- report to <XFree86 at XFree86.Org>.
+ If you suspect this is the case with your mouse, please enter a
+ bugreport in bugzilla.freedesktop.org, using the xorg product.
USB mouse
If your mouse is connected to the USB port, it can either be sup-
@@ -376,7 +377,7 @@
Please refer to the OS support section of this file for more
information.
-5. XF86Config Options
+5. xorg.conf Options
The old Pointer section has been replaced by a more general InputDevice sec-
tion. The following is a minimal example of an InputDevice section for a
@@ -430,7 +431,7 @@
server.
NOTE #1: horizontal movement may not always be detected by the current ver-
-sion of the XFree86 X servers, because there appears to be no accepted stan-
+sion of the X11R6.7 X servers, because there appears to be no accepted stan-
dard as to how the horizontal direction is encoded in mouse data.
NOTE #2: Some mice think left is the negative horizontal direction, others
@@ -438,8 +439,7 @@
mounted vertically, and the direction of the second vertical wheel does not
match the first one's.
-Currently this option can not be set in the XF86Setup program. You need to
-edit the XF86Config file by hand to add this option.
+You need to edit the xorg.conf file by hand to add this option.
5.3 Resolution
@@ -448,8 +448,7 @@
Option "Resolution" "N"
-Not all mice and OSs can support this option. This option can be set in the
-XF86Setup program.
+Not all mice and OSs can support this option.
5.4 Drag Lock Buttons
@@ -985,7 +984,5 @@
Option "DragLockButtons" "4"
EndSection
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.13 dawes Exp $
-
+ $Xorg$
-$XFree86: $
Index: README.newport
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.newport,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.newport 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.newport 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -1,6 +1,9 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v 1.6
+2003/02/25 19:31:02 dawes Exp $
+
Information for newport Users
- Guido Günther
+ Guido Gnther
24 February 2003
@@ -18,7 +21,7 @@
3. Notes
- o X -configure does not generate a XF86Config file.
+ o X -configure does not generate a xorg.conf file.
o There's only a 1280x1024 mode.
@@ -26,7 +29,7 @@
The driver auto-detects all device information necessary to initialize the
card on the Indy. The only lines you need in the "Device" section of your
-XF86Config file are:
+xorg.conf file are:
Section "Device"
Identifier "SGI newport"
@@ -60,7 +63,5 @@
o all the guys who wrote the newport_con linux kernel code
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v 1.7 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: README.r128
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.r128,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.r128 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.r128 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -40,15 +40,15 @@
5. Configuration
The driver auto-detects all device information necessary to initialize the
-card. The only lines you need in the "Device" section of your XF86Config
-file are:
+card. The only lines you need in the "Device" section of your xorg.conf file
+are:
Section "Device"
Identifier "Rage 128"
Driver "r128"
EndSection
-or let xf86config do this for you.
+or let xorgconfig do this for you.
However, if you have problems with auto-detection, you can specify:
@@ -78,6 +78,8 @@
8. Authors
+The X11R6.7.0 driver was originally part of XFree86 4.4 rc2.
+
The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
o Rickard E. (Rik) Faith <faith at precisioninsight.com>
@@ -116,7 +118,5 @@
http://www.suse.com
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.8 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.7 dawes Exp $
-$XFree86: $
Index: README.rendition
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.rendition,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.4.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.4.1
--- a/README.rendition 4 Mar 2004 17:47:34 -0000 1.1.4.1.6.1
+++ b/README.rendition 29 Mar 2004 06:11:45 -0000 1.1.4.1.6.1.4.1
@@ -1,4 +1,4 @@
- Information for Rendition (Micron) Verité Users
+ Information for Rendition (Micron) VeritUsers
The XFree86 Project Inc.
@@ -19,7 +19,7 @@
V2x00 cards can work even if not primary, but primary display card will be
disabled when server is run. This is a driver limitation.
-Hopefully these limitations will be workaround and fixed before final XFree86
+Hopefully these limitations were worked around and fixed before final XFree86
4.0 release.
3. Important notices
@@ -57,7 +57,7 @@
o 32 bits per pixel (true colour, sparse 24bit, 16M colors)
-5. XF86Config Option
+5. xorg.conf Option
Option "SW_Cursor"
Disables use of the hardware cursor.
@@ -83,8 +83,9 @@
Option "NoDDC"
Disable probing of DDC-information from your monitor. This infor-
mation is not used yet and is only there for informational pur-
- poses. This might change before final XFree86 4.0 release. Safe
- to disable if you experience problems during startup of X-server.
+ poses. This might have changed before final XFree86 4.0 release.
+ Safe to disable if you experience problems during startup of X-
+ server.
Option "ShadowFB"
If this option is enabled, the driver will cause the CPU to do
@@ -106,21 +107,25 @@
"ShadowFB" and automatically enable it. It also disables the
acceleration. The option is not activated by default.
-6. News in this release (XFree86 4.1)
+6. News in the X11R6.7.0 release
+
+This driver was originally part of the XFree86 4.4 rc2 release.
+
+7. News in the XFree86 4.1 release
o DirectColor support
o SilkenMouse support
-7. Major changes in this release
+8. Major changes in this release
o Gamma works now for >8bpp
-8. Bugfixes
+9. Bugfixes
o Only some code cleanup done. No real bugfixes.
-9. Known problems in current driver
+10. Known problems in current driver
o The acceleration code hangs the computer during X-server startup.
@@ -136,13 +141,11 @@
o Depth 15 & 16 has problems with colors when DirectColor is used.
-10. Work in progress (not finished in time for release)
+11. Work in progress (not finished in time for release)
o Acceleration is disabled for the moment. If you want to play with it
enable the "USE_ACCEL" define in rendition.c file! Beware as it has sev-
eral bugs left to clear out before if is stable for general use.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.13 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.12 dawes Exp $
-$XFree86: $
Index: README.s3virge
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README.s3virge,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.1.4.1
diff -u -d -r1.1.4.4.2.1 -r1.1.4.4.2.1.4.1
--- a/README.s3virge 4 Mar 2004 17:47:34 -0000 1.1.4.4.2.1
+++ b/README.s3virge 29 Mar 2004 06:11:45 -0000 1.1.4.4.2.1.4.1
@@ -1,3 +1,6 @@
+Based on Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.5
+2001/12/21 21:01:57 dawes Exp $
+
Information for S3 ViRGE Users
The XFree86 Project Inc.
@@ -6,14 +9,14 @@
1. Supported hardware
-The s3virge driver in XFree86 4.4.0 supports the S3 ViRGE, ViRGE DX, GX, GX2,
-MX, MX+, and VX chipsets. It also supports Trio3D and Trio3D/2x chips. A
-majority of testing is done on ViRGE DX chips, making them the most stable to
+The s3virge driver in X11R6.7.0 supports the S3 ViRGE, ViRGE DX, GX, GX2, MX,
+MX+, and VX chipsets. It also supports Trio3D and Trio3D/2x chips. A major-
+ity of testing is done on ViRGE DX chips, making them the most stable to
date. This release has added support for doublescan modes on DX.
This driver is moderately stable, however please use caution with any new
-install. Please report any problems to <XFree86 at XFree86.org> using the
-appropriate bug report sheet.
+install. Please report any problems to bugzilla.freedesktop.org, using the
+xorg component.
2. Features:
@@ -40,14 +43,13 @@
4. Documentation:
The driver has several supported options which are documented in the s3virge
-man page. Please refer to it for additional details about XF86Config
+man page. Please refer to it for additional details about configuration
options.
5. Support:
-For support with XFree86 video drivers please refer to our web site at
-XFree86 <URL:http://www.XFree86.org>. For problems not addressed in the web
-page please contact our support email address <XFree86 at XFree86.org>
+For support with X11R6.7.0 video drivers please refer to our web site at
+wiki.x.org <URL:http://wiki.x.org>.
6. Authors
@@ -61,7 +63,5 @@
o Kevin Brosius <cobra at compuserve.com>
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.6 dawes Exp $
-
+ $Id:$
-$XFree86: $
Index: RELNOTES
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/RELNOTES,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/RELNOTES 4 Mar 2004 17:47:34 -0000 1.1.4.5.2.1
+++ b/RELNOTES 29 Mar 2004 06:11:45 -0000 1.1.4.5.2.1.4.1
@@ -1,81 +1,334 @@
- Release Notes for XFree86[tm] 4.4.0
+Based on: Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v
+1.115 2004/02/24 03:41:40 dawes Exp $
- The XFree86 Project, Inc
+ Release Notes for X11R6.7.0
- 29 February 2004
+ The X.org Foundation
+ The XFree86 Project, Inc.
+
[...1081 lines suppressed...]
This product includes software developed by The XFree86 Project, Inc
(http://www.xfree86.org/) and its contributors.
@@ -975,12 +1331,10 @@
This product includes software developed by Christopher G. Demetriou.
This product includes software developed by the NetBSD Foundation, Inc. and
-its contributors
-
-This product includes software developed by X-Oz Technologies (http://www.x-
-oz.com/).
+its contributors.
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.116 dawes Exp $
+This product includes software developed by the X-Oz Technologies and its
+contributors.
+ $Id:$
-$XFree86: $
Index: Versions
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/Versions,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.1.4.1
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.1.4.1
--- a/Versions 4 Mar 2004 17:47:34 -0000 1.1.4.2.2.1
+++ b/Versions 29 Mar 2004 06:11:45 -0000 1.1.4.2.2.1.4.1
@@ -1,48 +1,46 @@
- XFree86 Version Numbering Schemes
+ X.Org and XFree86 Version Numbering Schemes
The XFree86 Project, Inc
+ Updated for X11R6.7.0 by Keith Packard
- 23 February 2003
+ 25 March 2004
Abstract
- The version numbering schemes used by XFree86 have changed from
- time to time. The schemes used since version 3.3 are explained
- here.
+ X.Org has adopted the same basic numbering scheme used by the
+ XFree86 Project, Inc. for their releases. The actual numbers are
+ different, but the basic scheme is the same. This document
+ reflects the policy that X.Org uses. The version numbering schemes
+ used by XFree86 have changed from time to time.
1. Releases, Development Streams and Branches
-As of the release of version 4.0.2 in December 2000, XFree86 has three
-release branches. First is trunk of the CVS repository. This is the main
-development stream, where all new work and work for future releases is done.
+As of the release of version 6.7.0 in March 2004, X.Org has three release
+branches. First is trunk of the CVS repository. This is the main develop-
+ment stream, where all new work and work for future releases is done.
-Second is the stable bugfix branch for the latest full release (4.4.0). It
+Second is the stable bugfix branch for the latest full release (6.7.0). It
is created around the time of the release. The branch for this one is called
-"xf-4_4-branch". Fixes for bugs found in the release will be added to this
+"xo-6.7-branch". Fixes for bugs found in the release will be added to this
branch (as well as the trunk), and updates to this release (if any) will be
cut from this branch. Similar stable branches are present for previous full
releases.
-Finally there is the 3.3.x legacy branch, which is called "xf-3_3-branch".
-While this branch is not actively being maintained, it does include some
-important post-3.3.6 bug fixes and security updates. Relevant security
-updates in particular are usually back-ported to this branch.
-
-XFree86 is planning to make full releases from the main development stream at
+X.Org is planning to make full releases from the main development stream at
regular intervals in the 6-12 month range. The feature freezes for these
releases will usually be 2-3 months before the release dates. This general
plan is a goal, not a binding commitment. The actual release intervals and
-dates will depend to a large degree on the resource available to XFree86.
-Full releases consist of full source code tarballs, plus full binary distri-
-butions for a range of supported platforms. Update/bugfix releases will be
-made on an as-required basis, depending also on the availability of
-resources, and will generally be limited to serious bug and security fixes.
-New features will not usually be added in update releases. Update/bugfix
-releases will not be full releases, and will consist of source code patches,
-plus binary updates to be layered on top of the previous full release.
+dates will depend to a large degree on the resource available to X.Org. Full
+releases consist of full source code tarballs, plus full binary distributions
+for a range of supported platforms. Update/bugfix releases will be made on
+an as-required basis, depending also on the availability of resources, and
+will generally be limited to serious bug and security fixes. New features
+will not usually be added in update releases. Update/bugfix releases will
+not be full releases, and will consist of source code patches, plus binary
+updates to be layered on top of the previous full release.
-The next full release will be version 4.5.0. There is no scheduled update
-release, but if one is needed, the version will be 4.4.1.
+The next full release will be version 7.0.0. There is no scheduled update
+release, but if one is needed, the version will be 6.7.1.
Aside from actual releases, snapshots of the active release branches are
tagged in the CVS repository from time to time. Each such snapshot has an
@@ -50,10 +48,8 @@
2. Current (new) Version Numbering Scheme
-Starting with the main development branch after 4.0.2, the XFree86 versions
-are numbered according to the scheme outlined here. Both the 4.0.2 stable
-branch and the 3.3.x legacy branch continue to use the previous scheme, which
-is outlined in the sections below.
+Starting with the main development branch after 6.7.0, the X.Org versions are
+numbered according to the scheme outlined here.
The version numbering format is M.m.P.s, where M is the major version number,
m is the minor version number, P is the patch level, and s is the snapshot
@@ -67,37 +63,37 @@
Immediately after forming a release stable branch, the patch level number for
the main development branch is bumped to 99, and the snapshot number is
reset. The snapshot number is incremented for each tagged development snap-
-shot. The CVS tag for snapshots is "xf-M_m_P_s". When the development
-branch enters feature freeze, the snapshot number may be bumped to 900, and a
-stable branch may be created for the next full release. The branch is called
-"xf-M_m-branch". The snapshot number is incremented from there until the
-release is finalised. Each of these snapshots is a "release candidate".
-When the release is finalised, the minor version is incremented, the patch
-level is set to zero, and the snapshot number removed.
+shot. The CVS tag for snapshots is "x-M_m_P_s". When the development branch
+enters feature freeze, the snapshot number may be bumped to 900, and a stable
+branch may be created for the next full release. The branch is called "x-
+M_m-branch". The snapshot number is incremented from there until the release
+is finalised. Each of these snapshots is a "release candidate". When the
+release is finalised, the minor version is incremented, the patch level is
+set to zero, and the snapshot number removed.
Here's an example which shows the version number sequence for the development
-leading up to version 4.1.0:
+leading up to version 6.8.0:
- 4.0.99.1
- The first snapshot of the pre-4.1 development branch.
+ 6.7.99.1
+ The first snapshot of the pre-6.8 development branch.
- 4.0.99.23
- The twenty-third snapshot of the pre-4.1 development branch.
+ 6.7.99.23
+ The twenty-third snapshot of the pre-6.8 development branch.
- 4.0.99.900
- The start of the 4.1 feature freeze, which marks the creation of
- the "xf-4_1-branch" branch. That branch is the "stable" branch
- for the 4.1.x releases.
+ 6.7.99.900
+ The start of the 6.8 feature freeze, which marks the creation of
+ the "x-6.8-branch" branch. That branch is the "stable" branch
+ for the 6.8.x releases.
- 4.0.99.903
- The third 4.1.0 release candidate.
+ 6.7.99.903
+ The third 6.8.0 release candidate.
- 4.1.0
- The 4.1.0 release.
+ 6.8.0
+ The 6.8.0 release.
- 4.1.99.1
- The first pre-4.2 development snapshot, which is the first main
- branch snapshot after creating the 4.1 stable branch.
+ 6.8.99.1
+ The first pre-6.9 development snapshot, which is the first main
+ branch snapshot after creating the 6.8 stable branch.
2.2 Stable Branch
@@ -108,237 +104,61 @@
each subsequent release candidate until the update release if finalised. The
patch level value (P) is incremented for each update release.
-Here's an example which shows the version number sequence for the 4.1.x sta-
+Here's an example which shows the version number sequence for the 6.8.x sta-
ble branch.
- 4.0.99.900
- The start of the 4.1 feature freeze, which marks the creation of
- the "xf-4_1-branch" branch. That branch is the "stable" branch
- for the 4.1.x releases.
+ 6.7.99.900
+ The start of the 6.8 feature freeze, which marks the creation of
+ the "x-6.8-branch" branch. That branch is the "stable" branch
+ for the 6.8.x releases.
- 4.0.99.903
- The third 4.1.0 release candidate.
+ 6.7.99.903
+ The third 6.8.0 release candidate.
- 4.1.0
- The 4.1.0 release.
+ 6.8.0
+ The 6.8.0 release.
- 4.1.0.901
- The first pre 4.1.1 snapshot.
+ 6.8.0.901
+ The first pre 6.8.1 snapshot.
- 4.1.0.903
- The third pre 4.1.1 snapshot, also known as the third 4.1.1
+ 6.8.0.903
+ The third pre 6.8.1 snapshot, also known as the third 6.8.1
release candidate.
- 4.1.1
- The 4.1.1 release.
-
- 4.1.1.901
- The first pre 4.1.2 snapshot.
-
- 4.1.2
- The 4.1.2 release.
-
-3. Version Numbering Scheme for XFree86 4.0.x.
-
-The version numbering format for XFree86 4.0.x releases is M.m.nx, where M is
-the major version number (4), m is the minor version number (0), n is the
-sub-minor version number, and x is a letter. Full release versions up to and
-including 4.0.2 were 4.0, 4.0.1, and 4.0.2. Between-release snapshots are
-indicated by including x, a lower case letter. For example, the first
-post-4.0.1 snapshot was 4.0.1a. Release candidates have been indicated by
-setting x to a one or two letter combination with the first letter being "Z".
-For example, 4.0.1Z was the first 4.0.2 release candidate.
-
-The next 4.0.x release will be an update release, not a full release. These
-update releases will be indicated by incrementing the sub-minor version num-
-ber. So, the first post-4.0.2 update release will be 4.0.3. Between-release
-snapshots will continue to be indicated with a lower case letter, so the
-first pre-4.0.3 snapshot will be 4.0.2a.
-
-The following example illustrates the release sequence from 4.0 through to
-the post-4.0.2 update releases.
-
- 4.0
- The 4.0 release.
-
- 4.0a
- The first post-4.0 development snapshot.
-
- 4.0f
- The sixth post-4.0 development snapshot.
-
- 4.0Z
- The 4.0.1 release candidate.
-
- 4.0.1
- The 4.0.1 release.
-
- 4.0.1a
- The first post-4.0.1 development snapshot.
-
- 4.0.1f
- The sixth post-4.0.1 development snapshot.
-
- 4.0Z
- The first 4.0.2 release candidate.
-
- 4.0Zb
- The third 4.0.2 release candidate.
-
- 4.0.2
- The 4.0.2 release.
-
- 4.0.2a
- The first pre-4.0.3 snapshot/release candidate.
-
- 4.0.2c
- The third pre-4.0.3 snapshot/release candidate.
-
- 4.0.3
- The 4.0.3 update release.
-
- 4.0.3a
- The first pre-4.0.4 snapshot/release candidate.
-
- 4.0.4
- The 4.0.4 update release.
-
-4. Pre-4.0 Development Versions
-
-This section is included mostly for historical reasons.
-
-The development leading up to 4.0 started from version 3.2A, but much of it
-happened on a separate development branch. The "new design" work on that
-development branch was first folded into the main development branch at ver-
-sion 3.9N. Up until the XFree86 CVS was made publicly available, all ver-
-sions containing one or more letters were internal development snapshots.
-The internal development snapshots continued through the following sequence:
-3.9N, 3.9Na, ..., 3.9Nz, 3.9P, 3.9Pa, ..., 3.9Py, 3.9.15, 3.9.15a, ...,
-3.9.16, 3.9.16a, ..., 3.9.17, 3.9.17a, ..., 3.9.18, 3.9.18a, ..., 4.0. The
-3.9.15, 3.9.16, etc versions were public pre-4.0 beta releases.
-
-5. Version Numbering Scheme for XFree86 3.3.x.
-
-The version numbering format for XFree86 3.3.x releases is M.m.nx, where M is
-the major version number (3), m is the minor version number (3), n is the
-sub-minor version number, and x is a letter. Between-release snapshots are
-indicated by including x, a lower case letter. An exception to this scheme
-was the 3.3.3.1 release, which was an update to the 3.3.3 release.
-
- 3.3
- The 3.3 release.
-
- 3.3a
- The first post-3.3 development snapshot.
-
- 3.3.1
- The 3.3.1 release.
-
- 3.3.1a
- The first post-3.3.1 development snapshot.
-
- 3.3.2
- The 3.3.2 release.
-
- 3.3.2a
- The first post-3.3.2 development snapshot.
-
- 3.3.3
- The 3.3.3 release.
-
- 3.3.3a
- The first post-3.3.3 development snapshot.
-
- 3.3.3.1
- The 3.3.3.1 release.
-
- 3.3.3.1a
- The first post-3.3.3.1 development snapshot.
-
- 3.3.4
- The 3.3.4 release.
-
- 3.3.4a
- The first post-3.3.4 snapshot.
-
- 3.3.5
- The 3.3.5 release.
-
- 3.3.5a
- The first post-3.3.5 snapshot.
-
- 3.3.6
- The 3.3.6 release.
-
- 3.3.6a
- The first post-3.3.6 snapshot.
+ 6.8.1
+ The 6.8.1 release.
-6. Finding the XFree86 X Server Version From a Client
+ 6.8.1.901
+ The first pre 6.8.2 snapshot.
-The XFree86 X servers report a VendorRelease value that matches the XFree86
-version number. There have been some cases of releases where this value
-wasn't set correctly. The rules for interpreting this value as well as the
-known exceptions are outlined here.
+ 6.8.2
+ The 6.8.2 release.
-For 3.3.x versions, the VendorRelease value is Mmnp. That is, version
-M.m.n.p has VendorRelease set to M * 1000 + m * 100 + n * 10 + p. Exceptions
-to this are: The value wasn't incremented for the 3.3.3.1 release, and for
-the 3.3.4 and 3.3.5 releases the value was incorrectly set to Mmn
-(M * 100 + m * 10 + n). This was corrected for the 3.3.6 release.
+3. Finding the X.Org X Server Version From a Client
-For versions 3.9.15 to 4.0.x, the VendorRelease value is Mmnn. That is, ver-
-sion M.m.n has VendorRelease set to M * 1000 + m * 100 + n. There have been
-no exceptions to this rule.
+The X.Org X servers report a VendorRelease value that matches the X.Org ver-
+sion number. There have been some cases of releases where this value wasn't
+set correctly. The rules for interpreting this value as well as the known
+exceptions are outlined here.
-For post-4.0.2 development and release versions using the new numbering
+For post-6.7.0 development and release versions using the new numbering
scheme, the VendorRelease value is MMmmPPsss. That is, version M.m.P.s has
-VendorRelease set to M * 10000000 + m * 100000 + P * 1000 + s. Note: 4.0.3
-and any other 4.0.x releases will continue with the Mmnn scheme.
+VendorRelease set to M * 10000000 + m * 100000 + P * 1000 + s.
The following is a code fragment taken from xdpyinfo.c that shows how the
VendorRelease information can be interpreted.
- if (strstr(ServerVendor(dpy), "XFree86")) {
+ if (strstr(ServerVendor(dpy), "X.Org")) {
int vendrel = VendorRelease(dpy);
- printf("XFree86 version: ");
- if (vendrel < 336) {
- /*
- * vendrel was set incorrectly for 3.3.4 and 3.3.5, so handle
- * those cases here.
- */
- printf("%d.%d.%d", vendrel / 100,
- (vendrel / 10) % 10,
- vendrel % 10);
- } else if (vendrel < 3900) {
- /* 3.3.x versions, other than the exceptions handled above */
- printf("%d.%d", vendrel / 1000,
- (vendrel / 100) % 10);
- if (((vendrel / 10) % 10) || (vendrel % 10)) {
- printf(".%d", (vendrel / 10) % 10);
- if (vendrel % 10) {
- printf(".%d", vendrel % 10);
- }
- }
- } else if (vendrel < 40000000) {
- /* 4.0.x versions */
- printf("%d.%d", vendrel / 1000,
- (vendrel / 10) % 10);
- if (vendrel % 10) {
- printf(".%d", vendrel % 10);
- }
- } else {
- /* post-4.0.x */
- printf("%d.%d.%d", vendrel / 10000000,
- (vendrel / 100000) % 100,
- (vendrel / 1000) % 100);
- if (vendrel % 1000) {
- printf(".%d", vendrel % 1000);
- }
- }
+ printf("X.Org version: ");
+ printf("%d.%d.%d", vendrel / 10000000,
+ (vendrel / 100000) % 100,
+ (vendrel / 1000) % 100);
+ if (vendrel % 1000) {
+ printf(".%d", vendrel % 1000);
+ }
}
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v 1.4 dawes Exp $
-
+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v 1.3 dawes Exp $
-$XFree86: $
--- README.isc DELETED ---
- Previous message: [xorg-commit-diffs] xc CHANGELOG-RELEASE-1-TM,1.1.2.33,1.1.2.34
- Next message: [xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/doc/sgml
BUILD.sgml, 1.1.4.3.4.1, 1.1.4.3.4.1.4.1 DECtga.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 DESIGN.sgml, 1.1.4.2.2.1,
1.1.4.2.2.1.4.1 Darwin.sgml, 1.1.4.1.4.2,
1.1.4.1.4.2.4.1 I128.sgml, 1.1.10.1, 1.1.10.1.4.1 Imakefile,
1.1.4.4.2.1, 1.1.4.4.2.1.4.1 Install.sgml, 1.1.10.1,
1.1.10.1.4.1 LICENSE.sgml, 1.1.4.4, 1.1.4.4.8.1 LynxOS.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 NetBSD.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 OS2Notes.sgml, 1.1.10.1,
1.1.10.1.4.1 OpenBSD.sgml, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 README.sgml, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 RELNOTES.sgml, 1.1.4.4.2.2,
1.1.4.4.2.2.4.1 SCO.sgml, 1.1.4.2.4.2,
1.1.4.2.4.2.4.1 SiS.sgml, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 Solaris.sgml, 1.1.10.1,
1.1.10.1.4.1 Status.sgml, 1.1.4.2.4.2,
1.1.4.2.4.2.4.1 Versions.sgml, 1.1.10.1,
1.1.10.1.4.1 XKB-Config.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 XKB-Enhancing.sgml, 1.1.10.1,
1.1.10.1.4.1 apm.sgml, 1.1.4.2.6.1, 1.1.4.2.6.1.4.1 ati.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 chips.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 cyrix.sgml, 1.1.10.1, 1.1.10.1.4.1 defs.ent,
1.1.4.4.2.1, 1.1.4.4.2.1.4.1 dps.sgml, 1.1.10.1,
1.1.10.1.4.1 fonts.sgml, 1.1.4.3.2.1,
1.1.4.3.2.1.4.1 i740.sgml, 1.1.10.1, 1.1.10.1.4.1 i810.sgml,
1.1.4.1.6.1, 1.1.4.1.6.1.4.1 mouse.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 newport.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 r128.sgml, 1.1.10.1,
1.1.10.1.4.1 rendition.sgml, 1.1.4.1.6.1,
1.1.4.1.6.1.4.1 s3virge.sgml, 1.1.10.1, 1.1.10.1.4.1 DRI.sgml,
1.1.10.1, NONE DRIcomp.sgml, 1.1.4.1.6.1, NONE isc.sgml,
1.1.4.1.6.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit-diffs
mailing list