diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2022-08-31 08:25:15 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2022-08-31 08:25:15 +0000 |
| commit | 8de3f5de2d66cc7aaf6a4fb228ce1834a281098c (patch) | |
| tree | 900a834201a22756642ecd844ffbd882add5fb24 /doc/xorg-docs | |
| parent | 98bfa43f18f6676c818a71619e34493868413eaa (diff) | |
Update xorg-docs to version 1.7.2
Diffstat (limited to 'doc/xorg-docs')
40 files changed, 1037 insertions, 1281 deletions
diff --git a/doc/xorg-docs/ChangeLog b/doc/xorg-docs/ChangeLog index f20426736..392034fd1 100644 --- a/doc/xorg-docs/ChangeLog +++ b/doc/xorg-docs/ChangeLog @@ -1,3 +1,284 @@ +commit cd4a375968a85e3c96b5bc2217b8a4143fa1707a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Apr 3 17:18:21 2022 -0700 + + xorg-docs 1.7.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 50ff7534e827585ba70f978f85a8e567ab4c8aed +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jan 9 14:05:55 2022 -0800 + + registry: address updates for Oracle contacts + + Drop paper mail addresses that are no longer correct & never used + Update Sun/Oracle contact from Stuart to Niveditha & myself + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 47b07a56b44bb8c12cea4a338720f5aa347d812f +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jan 9 14:04:55 2022 -0800 + + Fix spelling/wording issues + + Found by using: + codespell --builtin clear,rare,usage,informal,code,names + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 5c6744270a155104184360c8b63be2345121adab +Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Thu Jan 28 09:54:16 2021 -0800 + + Update AppleWM and XQuartz maintainers + + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +commit c2900e727242bad74123ec59c36d03bdd49ce9bf +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Tue Jul 16 18:13:19 2019 -0400 + + assign maintainer for Xaw, twm + +commit 1c1cf18a52a1806a638eccedf678dea8bdada5ea +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Jun 24 16:29:57 2019 -0700 + + Update Versions doc to better reflect current releases + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit b4b950363c3b3d43c5a2e6eb4eb4273292f630a5 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jun 23 15:43:01 2019 -0700 + + platforms/Solaris: Drop obsolete notes on apeture drivers + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 75ed93c7aabf904587d25abd29895d037cf0dd3b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jun 23 13:13:20 2019 -0700 + + Drop LBX algortihm specs + + X.Org dropped LBX support a decade ago, we don't need to keep the + spec in our current doc collection any more. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit a79d244a8e07d8ab962c13c49e7cca5c33b15fff +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Mon Apr 22 04:48:27 2019 -0400 + + fix typo + +commit de5b06ff708e30978f6ce1bf7ab4c3a1448d467b +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Sun Apr 21 18:48:02 2019 -0400 + + assign libxt maintainer + +commit 59a4a97a4cea328d94a183fdd18dab0866c2f50b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Mar 3 10:35:32 2019 -0800 + + MAINTAINERS: disclaim maintenance of xdm + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d1ff7e2b96f9ae6d9548496bffd4eab9b47eb2e1 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Feb 24 12:50:03 2019 -0800 + + The Katamari is dead! Long live the Katamari! + + I come not to praise the Katamari, but to bury it... + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + +commit 606e019df1674f92cd9cfe08592c07c8d010ce1b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Feb 19 16:32:58 2019 -0800 + + Update README.xml & XOrgFoundation.man to reflect SPI merger + + Fixes: https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues/2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Bryce Harrington <bryce@bryceharrington.org> + +commit 813b9c32130fea0ebccc21c7161a55299a587f69 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Nov 17 14:25:02 2018 -0800 + + Mass http -> https replacement where appropriate + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + +commit ba29c13a59f3c22c3a444b42efb17ca227de9850 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Nov 17 13:30:33 2018 -0800 + + Update MAINTAINERS for gitlab migration + + Replace dozens of links to wiki.x.org with gitlab project links + Change status to "Deactivated" for projects marked "Archived" in gitlab + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + +commit 45c64cbd68d4ca97d1d3e63d22133a2f9d33c884 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Nov 17 11:37:01 2018 -0800 + + Update configure.ac for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + +commit f1e595f150a369d3fbbe4aad75b265ae2f4a6878 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Nov 17 11:36:17 2018 -0800 + + Update docs for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + +commit 80be2193862cdb9961cd6802f74110ea21cd9bf1 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Nov 16 23:39:43 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 32f09b0b8fefb9cd98d14165a22ab2ed14b0277a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Sep 22 13:14:07 2018 -0700 + + Add conf.d to fontconfig configuration files list + + Fixes: https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues/1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 34c00a29d2b99db1cc1f367489d2ac4e5d87cfef +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Feb 20 14:53:54 2018 -0800 + + Update Solaris info in MAINTAINERS file + +commit 2ee2b7f0f0304879214f09d48c43c742894cf82e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Apr 13 13:24:48 2017 -0700 + + Update Solaris URL in MAINTAINERS file + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Niveditha Rau <niveditha.rau@oracle.com> + +commit ebc0ba09cb2fe7d4fb1e223e274feec4879d8536 +Author: Mihail Konev <k.mvc@ya.ru> +Date: Thu Jan 26 13:52:48 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <k.mvc@ya.ru> + +commit 6177cf7e8156c6c0f65b603e898d842ea9c1c946 +Author: Emil Velikov <emil.l.velikov@gmail.com> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 5be837f3f57f5f06c82cc557d58c55d3bd5d73dc +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> + +commit 299e213f14d8d1586eb5d47d974c4fcffc807679 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Oct 27 19:27:49 2015 -0700 + + X.man: move XLOCAL documentation from Xorg(1) man page + + These settings affect clients, not server, so belong here, next to + the information about how to set $DISPLAY. + + Also updated to drop ISC and correct description of Unix domain sockets. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +commit 9e48239436c256ff695cefea1433cdb2868667a9 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Oct 27 19:06:53 2015 -0700 + + X.man: document protocol/ syntax in display string + + See http://www.x.org/releases/X11R7.7/doc/libX11/libX11/libX11.html#Opening_the_Display + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +commit b0348bd9f9c79b87c93e2d71dba674ebcb31d8f7 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Oct 27 18:15:06 2015 -0700 + + X.man: update program lists/info for modern era + + We no longer have a monolithic X.Org distribution, nor a separate + user-contributed distribution from X.Org, but instead many OS distros. + + Also stop recommending so much abandonware, but do point out the programs + we've added over the years and still maintain. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +commit 02a513c7847ce37ba3bc1e6f2f5ed5a77062a60d +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Oct 27 17:49:44 2015 -0700 + + X.man: give pointers to specs & other docs + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +commit cdf00c1095f9e7dd26dccad3049442684768da62 +Author: Ingo Schwarze <schwarze@usta.de> +Date: Sun Aug 30 15:22:10 2015 +0200 + + remove bogus \/ escapes + + some X manuals use then escape sequence \/ when they want to render + a slash. That's bad because \/ is not a slash but an italic + correction, never producing any output, having no effect at all in + terminal output, and only changing spacing in a minor way in typeset + output. + + Reviewed-by: Mark Kettenis <kettenis@openbsd.org> + Signed-off-by: Matthieu Herrb <matthieu@herrb.eu> + commit 703974aee2f4e380076427b4b04da407b663ed2c Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Thu Apr 30 23:09:58 2015 -0700 @@ -2637,7 +2918,7 @@ Date: Mon May 12 17:46:58 2008 +0930 Conflicts: - specs/Xi/protocol.xml + specs/Xi/protocol.xml commit 4c4b977b3f53b14a33028160bc3b43b6f49bba3c Author: Peter Hutterer <peter@cs.unisa.edu.au> @@ -3198,8 +3479,8 @@ Date: Mon Oct 30 20:56:08 2006 -0500 Conflicts: - sgml/dps.sgml - sgml/fonts.sgml + sgml/dps.sgml + sgml/fonts.sgml commit 34b795ce4b40d0c3a7283c5fcf54ac954ad590ff Author: David Nusinow <dnusinow@debian.org> @@ -3739,7 +4020,7 @@ Date: Fri Sep 3 16:18:22 2004 +0000 Keith Packard). commit 719ac6c84480381069b74220fc93500e1ed2c453 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Mon Aug 30 21:01:21 2004 +0000 Update release notes diff --git a/doc/xorg-docs/MAINTAINERS b/doc/xorg-docs/MAINTAINERS index e0b2d2756..2199b141e 100644 --- a/doc/xorg-docs/MAINTAINERS +++ b/doc/xorg-docs/MAINTAINERS @@ -35,7 +35,7 @@ S: Status, one of the following: should be using that. For patch submission instructions, see: - http://www.x.org/wiki/Development/Documentation/SubmittingPatches + https://www.x.org/wiki/Development/Documentation/SubmittingPatches Send all patches for modules without a specific maintainer address listed to xorg-devel@lists.x.org @@ -46,14 +46,14 @@ DRM library P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/mesa/drm S: Maintained PCI Access Library P: Ian Romanick M: ? L: xorg-devel@lists.x.org -W: http://wiki.freedesktop.org/wiki/PciRework +W: https://gitlab.freedesktop.org/xorg/lib/libpciaccess S: Supported X.Org apps @@ -74,6 +74,9 @@ S: Obsolete - CID font support has been dropped pclcomp S: Obsolete - only used by Xprint +proxymngr +S: Obsolete + rstart S: Obsolete - use ssh instead @@ -81,63 +84,63 @@ xauth P: Dr. Tilmann Bubeck M: t.bubeck@reinform.de L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xauth S: Maintained xbiff P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xbiff S: Maintained xcalc P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xcalc S: Maintained xclock P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xclock S: Maintained xconsole P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xconsole S: Maintained xdm -P: Alan Coopersmith -M: alan.coopersmith@oracle.com +P: ? +M: xorg-devel@lists.x.org L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Maintained +W: https://gitlab.freedesktop.org/xorg/app/xdm +S: Unmaintained xedit P: Paulo César Pereira de Andrade M: pcpa@mandriva.com.br L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xedit S: Maintained xinput P: Peter Hutterer M: peter.hutterer@who-t.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xinput S: Maintained xkbcomp P: Daniel Stone M: daniel@fooishbar.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xkbcomp S: Maintained S: XKB being overhauled S: Please contact Daniel if you're planning to work on this @@ -146,26 +149,29 @@ xload P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xload S: Maintained xman P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xman S: Maintained xmessage P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xmessage S: Maintained xmh S: Obsolete - use exmh instead +xrx +S: Obsolete - all major browsers have dropped NSAPI plugin support now + xsetmode S: Obsolete - use xinput instead @@ -176,20 +182,22 @@ xsetroot P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app/xsetroot S: Maintained +xtrap +S: Obsolete + all others P: ? M: xorg-devel@lists.x.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/app S: Unmaintained X.Org libraries --------------- -AppleWM FS ICE SM @@ -197,14 +205,22 @@ WindowsWM XRes XScrnSaver Xau -Xaw S: Unmaintained +AppleWM +P: Jeremy Huddleston Sequoia +M: jeremyhu@apple.com +L: xquartz-dev@lists.macosforge.org +W: https://www.xquartz.org/ +L: xorg-devel@lists.x.org +W: https://wiki.x.org +S: Maintained + X11, Xcomposite, Xcursor, Xdamage, Xfixes, Xrandr, Xrender P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/lib S: Maintained Xdmcp @@ -228,14 +244,14 @@ Xi P: Peter Hutterer M: peter.hutterer@who-t.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/lib/libxi S: Maintained xkbfile P: Daniel Stone M: daniel@fooishbar.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/lib/libxkbfile S: Maintained S: XKB being overhauled S: Please contact Daniel if you're planning to work on this @@ -249,12 +265,18 @@ S: Unmaintained Xp S: Obsolete -S: maintained solely for binary compatibilty for software like Motif +S: maintained solely for binary compatibility for software like Motif XprintAppUtil, XprintUtil S: Obsolete -Xt +Xt, Xaw, twm +P: Thomas E. Dickey +M: dickey@his.com +L: xorg-devel@lists.x.org +W: https://gitlab.freedesktop.org/xorg/lib/libxt +S: Maintained + Xtst Xv XvMC @@ -283,7 +305,7 @@ xtrans P: Bill Crawford M: billcrawford1970@gmail.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/lib/libxtrans S: Maintained X.Org core @@ -292,84 +314,84 @@ Composite extension P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Configuration subsystem P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Damage extension P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Device Independent X (DIX) P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained DRI subsystem P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained EXA subsystem P: Eric Anholt M: anholt@freebsd.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained GL subsystem P: Ian Romanick M: idr@us.ibm.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained KDrive P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Loader subsystem P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Randr extension P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Render extension P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained XAA subsystem P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Despised XACE subsystem (security policy extensions framework) @@ -383,14 +405,14 @@ Xfixes extension P: Keith Packard M: keith.packard@intel.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained XKB P: Daniel Stone M: daniel@fooishbar.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained, being seriously overhauled S: Please contact Daniel if you're planning to work on this @@ -400,7 +422,7 @@ M: daniel@fooishbar.org P: Peter Hutterer M: peter.hutterer@who-t.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained, being overhauled S: Please contact Daniel or Peter if you're planning to work on this @@ -409,8 +431,8 @@ P: Drew Parsons P: Felix Schulte M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Maintained +W: https://gitlab.freedesktop.org/xorg/xserver-xprint +S: Deactivated X.Org OS ports -------------- @@ -418,98 +440,98 @@ FreeBSD P: Eric Anholt M: anholt@freebsd.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Linux/i386 P: Egbert Eich M: eich@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Linux/x86_64 P: Egbert Eich M: eich@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Linux/ia64 P: Jesse Barnes M: jbarnes@virtuousgeek.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Linux/ppc P: Benjamin Herrenschmidt M: benh@kernel.crashing.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Linux/sparc P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Unmaintained LynxOS S: Obsolete / Removed Mac OS X (Xquartz) -P: Ben Byer -M: bbyer@apple.com -P: Jeremy Huddleston +P: Jeremy Huddleston Sequoia M: jeremyhu@apple.com L: xquartz-dev@lists.macosforge.org -W: http://xquartz.macosforge.org +W: https://www.xquartz.org/ L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained NetBSD P: ? M: xorg-devel@lists.x.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Unmaintained OpenBSD P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained SCO (OpenServer 5) P: Kean Johnston M: jkj@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained System V (other than Solaris & SCO) P: ? M: xorg-devel@lists.x.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Unmaintained (libraries/apps) ; Obsolete/Removed (Xorg server) Solaris (x86 & sparc) P: Alan Coopersmith M: alan.coopersmith@oracle.com +P: Niveditha Rau +M: niveditha.rau@oracle.com L: xorg-devel@lists.x.org -W: http://wiki.x.org & http://solaris-x11.java.net/ +W: https://github.com/oracle/solaris-userland/tree/master/components/x11 S: Maintained USL (UnixWare 7.1.x, OpenServer 6) P: Kean Johnston M: jkj@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Maintained Cygwin @@ -518,7 +540,7 @@ M: jon.turney@dronecode.org.uk P: Yaakov Selkowitz M: yselkowitz@users.sourceforge.net L: cygwin-xfree@cygwin.com -W: http://x.cygwin.com/ +W: https://x.cygwin.com/ S: Maintained MinGW @@ -530,7 +552,7 @@ S: Maintained GNU/Hurd P: Samuel Thibault M: samuel.thibault@ens-lyon.org -W: http://wiki.x.org +W: https://wiki.x.org L: bug-hurd@gnu.org S: Maintained @@ -540,231 +562,231 @@ xf86-input-acecad P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-acecad +S: Deactivated xf86-input-aiptek P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-aiptek +S: Deactivated xf86-input-calcomp P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-calcomp S: Deactivated xf86-input-citron P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-citron S: Deactivated xf86-input-digitaledge P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-digitaledge S: Deactivated xf86-input-dmc P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-dmc S: Deactivated xf86-input-dynapro P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-dynapro S: Deactivated xf86-input-elo2300 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-elo2300 S: Deactivated xf86-input-elographics P: Marc Balmer M: marc.balmer@arcapos.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-elographics S: Maintained xf86-input-evdev P: Peter Hutterer M: peter.hutterer@who-t.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev S: Maintained xf86-input-fpit P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-fpit +S: Deactivated xf86-input-hyperpen P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-hyperpen +S: Deactivated xf86-input-jamstudio P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-jamstudio S: Deactivated xf86-input-joystick P: Sascha Hlusiak M: saschahlusiak@arcor.de L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick S: Maintained xf86-input-keyboard P: Alan Coopersmith M: alan.coopersmith@oracle.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard S: Maintained xf86-input-magellan P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-magellan S: Deactivated xf86-input-magictouch P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-magictouch S: Deactivated xf86-input-microtouch P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-microtouch S: Deactivated xf86-input-mouse P: Alan Coopersmith M: alan.coopersmith@oracle.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse S: Maintained xf86-input-mutouch P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-mutouch +S: Deactivated xf86-input-palmax P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-palmax S: Deactivated xf86-input-penmount P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-penmount +S: Deactivated xf86-input-sample P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W https://gitlab.freedesktop.org/xorg/driver/xf86-input-sample S: Obsolete xf86-input-spaceorb P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-spaceorb S: Deactivated xf86-input-summa P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-summa S: Deactivated xf86-input-synaptics P: Peter Hutterer M: peter.hutterer@who-t.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics S: Maintained xf86-input-tek4957 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-tek4957 S: Deactivated xf86-input-ur98 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-ur98 S: Deactivated xf86-input-vmmouse P: VMware Linux Graphics Maintainer M: linux-graphics-maintainer@vmware.com L: xorg-devel@lists.x.org -W: http://wiki.x.org/wiki/vmware +W: https://wiki.x.org/wiki/vmware S: Supported xf86-input-void P: Peter Hutterer M: peter.hutterer@who-t.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-input-void S: Maintained xf86-video-apm P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-apm +S: Deactivated xf86-video-ark P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ark +S: Deactivated xf86-video-ast P: Y.C. Chen M: yc_chen@aspeedtech.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ast S: Maintained xf86-video-ati @@ -773,71 +795,71 @@ P: Ben Herrenschmidt P: et al M: ? L: xorg-driver-ati@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati S: Maintained xf86-video-chips P: Egbert Eich M: eich@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-chips S: Maintained xf86-video-cirrus P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-cirrus S: Unmaintained xf86-video-cyrix P: ? M: ? L: xorg-driver-geode@lists.x.org -W: http://www.x.org/wiki/GeodeDriver +W: https://www.x.org/wiki/GeodeDriver S: Obsolete - mostly replaced by xf86-video-geode xf86-video-dummy P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy S: Maintained xf86-video-fbdev P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev S: Unmaintained xf86-video-geode P: ? M: ? L: xorg-driver-geode@lists.x.org -W: http://lists.x.org/mailman/listinfo/xorg-driver-geode -W: http://www.x.org/wiki/GeodeDriver +W: https://lists.x.org/mailman/listinfo/xorg-driver-geode +W: https://www.x.org/wiki/GeodeDriver S: Maintained xf86-video-glide P: Guillem Jover M: guillem@hadrons.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-glide S: Obsolete, yet still somehow maintained xf86-video-glint P: Alan Hourihane M: alanh@fairlite.demon.co.uk L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint S: Maintained xf86-video-i128 P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-i128 S: Maintained xf86-video-i740 @@ -845,98 +867,98 @@ P: Egbert Eich P: ?? M: eich@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740 S: Unmaintained +xf86-video-imstt +P: ? +M: ? +L: xorg-devel@lists.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-imstt +S: Deactivated + xf86-video-intel P: Eric Anholt M: eric@anholt.net L: intel-gfx@lists.freedesktop.org -W: http://intellinuxgraphics.org/ +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel S: Supported xf86-video-mach64 P: Luc Verhaegen M: libv@skynet.be L: xorg-driver-ati@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64 S: Maintained -xf86-video-imstt -P: ? -M: ? -L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained - xf86-video-mga P: Ian Romanick M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga S: Maintained xf86-video-modesetting P: Dave Airlie M: airlied@redhat.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/xserver S: Maintained xf86-video-neomagic P: Egbert Eich M: eich@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic S: Maintained xf86-video-nested P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested S: Maintained xf86-video-newport P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-newport S: Unmaintained xf86-video-nsc P: Alan Hourihane M: alanh@fairlite.demon.co.uk L: xorg-driver-geode@lists.x.org -W: http://www.x.org/wiki/GeodeDriver +W: https://www.x.org/wiki/GeodeDriver S: Obsolete - mostly replaced by xf86-video-geode xf86-video-nv P: Aaron Plattner M: aplattner@freedesktop.org -L: xorg-devel@lists.x.org -W: http://wiki.x.org +L: https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv +W: https://wiki.x.org S: Maintained xf86-video-omap P: Rob Clark M: robclark@freedesktop.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-omap S: Maintained xf86-video-qxl P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl S: Maintained xf86-video-rendition P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-rendition S: Odd fixes. xf86-video-r128 @@ -945,7 +967,7 @@ P: Ben Herrenschmidt P: et al M: ? L: xorg-driver-ati@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128 S: Maintained radeon driver (xf86-video-ati) @@ -954,140 +976,140 @@ P: Ben Herrenschmidt P: et al M: ? L: xorg-driver-ati@lists.x.org -W: http://www.x.org/wiki/radeon +W: https://www.x.org/wiki/radeon S: Maintained xf86-video-s3 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3 S: Unmaintained xf86-video-s3virge P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3virge S: Unmaintained xf86-video-savage P: Alex Deucher M: agd5f@yahoo.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-savage S: Maintained xf86-video-siliconmotion P: Alex Deucher M: agd5f@yahoo.com L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-siliconmotion S: Unmaintained xf86-video-sis P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis S: Unmaintained xf86-video-sisusb P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sisusb S: Unmaintained xf86-video-sunbw2 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org -S: Unmaintained +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunbw2 +S: Deactivated xf86-video-suncg14 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg14 S: Unmaintained xf86-video-suncg3 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg3 S: Unmaintained xf86-video-suncg6 P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6 S: Unmaintained xf86-video-sunffb P: David S. Miller M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb S: Odd fixes xf86-video-sunleo P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo S: Unmaintained xf86-video-suntcx P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-suntcx S: Unmaintained xf86-video-tdfx P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx S: Maintained xf86-video-tga P: Alan Hourihane M: alanh@fairlite.demon.co.uk L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-tga S: Maintained xf86-video-trident P: Alan Hourihane M: alanh@fairlite.demon.co.uk L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident S: Maintained xf86-video-tseng P: Luc Verhaegen M: libv@skynet.be L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-tseng S: Maintained xf86-video-v4l P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-v4l S: Unmaintained xf86-video-vesa P: Adam Jackson M: ajax@nwnk.net L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa S: Maintained xf86-video-vga @@ -1100,35 +1122,35 @@ xf86-video-vmware P: VMware Linux Graphics Maintainer M: linux-graphics-maintainer@vmware.com L: xorg-devel@lists.x.org -W: http://wiki.x.org/vmware +W: https://wiki.x.org/vmware S: Maintained xf86-video-voodoo P: Alan Cox M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo S: Odd fixes xf86-video-wsfb P: Matthieu Herrb M: matthieu.herrb@laas.fr L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-wsfb S: Maintained xf86-video-xgi P: Ian Romanick M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi S: Maintained xf86-video-xgixp P: ? M: ? L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgixp S: Unmaintained Other modules @@ -1138,7 +1160,7 @@ data/bitmaps, data/cursors, doc/*, fonts/*, util/* P: ? M: xorg-devel@lists.x.org L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://gitlab.freedesktop.org/xorg/ S: Unmaintained xkbdata @@ -1151,20 +1173,20 @@ Mailing lists (lists.x.org) P: ? M: mailman@lists.x.org L: mailman@lists.x.org -W: http://lists.x.org/mailman/listinfo/ +W: https://lists.x.org/mailman/listinfo/ S: Maintained Website (www.x.org) P: Stuart Anderson M: anderson@netsweng.com L: xorg-devel@lists.x.org -W: http://www.x.org/ +W: https://www.x.org/ S: Maintained Supply of pastries, other food, beverages P: Luc Verhaegen M: libv@skynet.be L: xorg-devel@lists.x.org -W: http://wiki.x.org +W: https://wiki.x.org S: Disrepair S: 'Other food' may induce illness. Beware. diff --git a/doc/xorg-docs/Makefile.am b/doc/xorg-docs/Makefile.am index 7ac492db2..491e1ef80 100644 --- a/doc/xorg-docs/Makefile.am +++ b/doc/xorg-docs/Makefile.am @@ -26,6 +26,7 @@ dist_doc_DATA = MAINTAINERS MAINTAINERCLEANFILES = ChangeLog INSTALL EXTRA_DIST = \ + README.md \ misc/xlogo.epsi \ misc/xlogo.svg \ registry \ diff --git a/doc/xorg-docs/Makefile.in b/doc/xorg-docs/Makefile.in index 8cf42750c..c9b955dea 100644 --- a/doc/xorg-docs/Makefile.in +++ b/doc/xorg-docs/Makefile.in @@ -73,7 +73,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ +DIST_COMMON = $(am__configure_deps) $(dist_doc_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/configure ChangeLog INSTALL compile config.guess \ config.sub install-sh missing @@ -309,6 +309,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -321,6 +322,7 @@ SUBDIRS = man dist_doc_DATA = MAINTAINERS MAINTAINERCLEANFILES = ChangeLog INSTALL EXTRA_DIST = \ + README.md \ misc/xlogo.epsi \ misc/xlogo.svg \ registry \ diff --git a/doc/xorg-docs/README b/doc/xorg-docs/README deleted file mode 100644 index 7bd3eba42..000000000 --- a/doc/xorg-docs/README +++ /dev/null @@ -1,28 +0,0 @@ -This package provides miscellaneous documentation for the X Window System -that doesn't better fit into other packages. - -The preferred documentation format for these documents is DocBook XML. - -All questions regarding this software should be directed at the -Xorg mailing list: - - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -The master development code repository can be found at: - - git://anongit.freedesktop.org/git/xorg/doc/xorg-docs - - http://cgit.freedesktop.org/xorg/doc/xorg-docs - -For patch submission instructions, see: - - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage - diff --git a/doc/xorg-docs/README.md b/doc/xorg-docs/README.md new file mode 100644 index 000000000..bb6944406 --- /dev/null +++ b/doc/xorg-docs/README.md @@ -0,0 +1,20 @@ +This package provides miscellaneous documentation for the X Window System +that doesn't better fit into other packages. + +The preferred documentation format for these documents is DocBook XML. + +All questions regarding this software should be directed at the +Xorg mailing list: + + https://lists.x.org/mailman/listinfo/xorg + +The primary development code repository can be found at: + + https://gitlab.freedesktop.org/xorg/doc/xorg-docs + +Please submit bug reports and requests to merge patches there. + +For patch submission instructions, see: + + https://www.x.org/wiki/Development/Documentation/SubmittingPatches + diff --git a/doc/xorg-docs/aclocal.m4 b/doc/xorg-docs/aclocal.m4 index c0dbcfb1f..d0a818e1e 100644 --- a/doc/xorg-docs/aclocal.m4 +++ b/doc/xorg-docs/aclocal.m4 @@ -19,32 +19,63 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + +dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -66,18 +97,19 @@ if test -n "$PKG_CONFIG"; then PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -87,8 +119,10 @@ m4_ifvaln([$3], [else $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -100,10 +134,11 @@ m4_define([_PKG_CONFIG], else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -111,26 +146,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -140,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -161,7 +194,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -177,16 +210,40 @@ else AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -197,16 +254,18 @@ AC_ARG_WITH([pkgconfigdir], AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -217,7 +276,24 @@ AC_ARG_WITH([noarch-pkgconfigdir], AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2012 Free Software Foundation, Inc. # @@ -1242,7 +1318,7 @@ AC_SUBST([am__untar]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -1279,7 +1355,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.0]) +m4_define([vers_have], [1.19.2]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1357,6 +1433,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_PROG_SED]) +case $host_os in + solaris*) + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we + # check for a man page file found in later versions that use + # traditional section numbers instead + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) + ;; + *) SYSV_MAN_SECTIONS=false ;; +esac + if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 fi @@ -1372,9 +1459,9 @@ if test x$LIB_MAN_DIR = x ; then fi if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; + case $SYSV_MAN_SECTIONS in + true) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then @@ -1382,9 +1469,9 @@ if test x$FILE_MAN_DIR = x ; then fi if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; + case $SYSV_MAN_SECTIONS in + true) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then @@ -1392,9 +1479,9 @@ if test x$MISC_MAN_DIR = x ; then fi if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; + case $SYSV_MAN_SECTIONS in + true) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then @@ -1402,9 +1489,9 @@ if test x$DRIVER_MAN_DIR = x ; then fi if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; + case $SYSV_MAN_SECTIONS in + true) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; esac fi if test x$ADMIN_MAN_DIR = x ; then @@ -1665,13 +1752,24 @@ m4_ifval([$1], fi]) # Test for the ability of xmlto to generate a text target +# +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the +# following test for empty XML docbook files. +# For compatibility reasons use the following empty XML docbook file and if +# it fails try it again with a non-empty XML file. have_xmlto_text=no cat > conftest.xml << "EOF" EOF AS_IF([test "$have_xmlto" = yes], [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], [have_xmlto_text=yes], - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) + [# Try it again with a non-empty XML file. + cat > conftest.xml << "EOF" +<x></x> +EOF + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], + [have_xmlto_text=yes], + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) rm -f conftest.xml AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) @@ -3067,8 +3165,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ +touch \$(top_srcdir)/INSTALL; \ +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" AC_SUBST([INSTALL_CMD]) ]) # XORG_INSTALL dnl Copyright 2005 Red Hat, Inc @@ -3129,10 +3228,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # # AC_DEFUN([XORG_CHANGELOG], [ -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ +touch \$(top_srcdir)/ChangeLog; \ +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG diff --git a/doc/xorg-docs/compile b/doc/xorg-docs/compile index a85b723c7..df363c8fb 100644 --- a/doc/xorg-docs/compile +++ b/doc/xorg-docs/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/doc/xorg-docs/configure b/doc/xorg-docs/configure index b0beecae9..7daa7bbee 100644 --- a/doc/xorg-docs/configure +++ b/doc/xorg-docs/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorg-docs 1.7.1. +# Generated by GNU Autoconf 2.69 for xorg-docs 1.7.2. # -# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,7 +267,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -641,9 +641,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xorg-docs' PACKAGE_TARNAME='xorg-docs' -PACKAGE_VERSION='1.7.1' -PACKAGE_STRING='xorg-docs 1.7.1' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='1.7.2' +PACKAGE_STRING='xorg-docs 1.7.2' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -807,6 +807,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -893,6 +894,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1145,6 +1147,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1282,7 +1293,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1395,7 +1406,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-docs 1.7.1 to adapt to many kinds of systems. +\`configure' configures xorg-docs 1.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,6 +1446,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1465,7 +1477,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-docs 1.7.1:";; + short | recursive ) echo "Configuration of xorg-docs 1.7.2:";; esac cat <<\_ACEOF @@ -1521,7 +1533,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +Report bugs to <https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues>. _ACEOF ac_status=$? fi @@ -1584,7 +1596,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-docs configure 1.7.1 +xorg-docs configure 1.7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1841,7 +1853,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-docs $as_me 1.7.1, which was +It was created by xorg-docs $as_me 1.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2668,7 +2680,7 @@ fi # Define the identity of the package. PACKAGE='xorg-docs' - VERSION='1.7.1' + VERSION='1.7.2' cat >>confdefs.h <<_ACEOF @@ -10312,10 +10324,11 @@ _ACEOF -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ +touch \$(top_srcdir)/ChangeLog; \ +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" @@ -10323,13 +10336,44 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)" macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ +touch \$(top_srcdir)/INSTALL; \ +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" + +case $host_os in + solaris*) + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we + # check for a man page file found in later versions that use + # traditional section numbers instead + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } +if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/usr/share/man/man7/attributes.7"; then + ac_cv_file__usr_share_man_man7_attributes_7=yes +else + ac_cv_file__usr_share_man_man7_attributes_7=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : + SYSV_MAN_SECTIONS=false +else + SYSV_MAN_SECTIONS=true +fi + + ;; + *) SYSV_MAN_SECTIONS=false ;; +esac if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 @@ -10346,9 +10390,9 @@ if test x$LIB_MAN_DIR = x ; then fi if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; + case $SYSV_MAN_SECTIONS in + true) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then @@ -10356,9 +10400,9 @@ if test x$FILE_MAN_DIR = x ; then fi if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; + case $SYSV_MAN_SECTIONS in + true) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then @@ -10366,9 +10410,9 @@ if test x$MISC_MAN_DIR = x ; then fi if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; + case $SYSV_MAN_SECTIONS in + true) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then @@ -10376,9 +10420,9 @@ if test x$DRIVER_MAN_DIR = x ; then fi if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; + case $SYSV_MAN_SECTIONS in + true) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; esac fi if test x$ADMIN_MAN_DIR = x ; then @@ -10649,6 +10693,11 @@ esac fi # Test for the ability of xmlto to generate a text target +# +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the +# following test for empty XML docbook files. +# For compatibility reasons use the following empty XML docbook file and if +# it fails try it again with a non-empty XML file. have_xmlto_text=no cat > conftest.xml << "EOF" EOF @@ -10656,10 +10705,18 @@ if test "$have_xmlto" = yes; then : if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : have_xmlto_text=yes else + # Try it again with a non-empty XML file. + cat > conftest.xml << "EOF" +<x></x> +EOF + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : + have_xmlto_text=yes +else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5 $as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;} fi fi +fi rm -f conftest.xml if test $have_xmlto_text = yes; then HAVE_XMLTO_TEXT_TRUE= @@ -10973,7 +11030,7 @@ fi -ac_config_files="$ac_config_files Makefile general/Makefile general/fonts/Makefile general/input/Makefile general/graphics/Makefile general/platforms/Makefile man/Makefile specs/Makefile specs/CTEXT/Makefile specs/ICCCM/Makefile specs/Xext/Makefile specs/XLFD/Makefile specs/Xserver/Makefile" +ac_config_files="$ac_config_files Makefile general/Makefile general/fonts/Makefile general/input/Makefile general/graphics/Makefile general/platforms/Makefile man/Makefile specs/Makefile specs/CTEXT/Makefile specs/ICCCM/Makefile specs/XLFD/Makefile specs/Xserver/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11573,7 +11630,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-docs $as_me 1.7.1, which was +This file was extended by xorg-docs $as_me 1.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11624,13 +11681,13 @@ $config_files Configuration commands: $config_commands -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." +Report bugs to <https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorg-docs config.status 1.7.1 +xorg-docs config.status 1.7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -11759,7 +11816,6 @@ do "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;; "specs/CTEXT/Makefile") CONFIG_FILES="$CONFIG_FILES specs/CTEXT/Makefile" ;; "specs/ICCCM/Makefile") CONFIG_FILES="$CONFIG_FILES specs/ICCCM/Makefile" ;; - "specs/Xext/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Xext/Makefile" ;; "specs/XLFD/Makefile") CONFIG_FILES="$CONFIG_FILES specs/XLFD/Makefile" ;; "specs/Xserver/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Xserver/Makefile" ;; diff --git a/doc/xorg-docs/configure.ac b/doc/xorg-docs/configure.ac index 80d7307c6..e0996b330 100644 --- a/doc/xorg-docs/configure.ac +++ b/doc/xorg-docs/configure.ac @@ -23,8 +23,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xorg-docs], - [1.7.1], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [1.7.2], + [https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues], [xorg-docs]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -53,7 +53,6 @@ AC_CONFIG_FILES([Makefile specs/Makefile specs/CTEXT/Makefile specs/ICCCM/Makefile - specs/Xext/Makefile specs/XLFD/Makefile specs/Xserver/Makefile]) AC_OUTPUT diff --git a/doc/xorg-docs/general/License.xml b/doc/xorg-docs/general/License.xml index a01be2cfb..9f04ef7fc 100644 --- a/doc/xorg-docs/general/License.xml +++ b/doc/xorg-docs/general/License.xml @@ -34,10 +34,10 @@ contact us with details at <email>xorg@lists.freedesktop.org</email>. <para> Most of these licenses are based on the MIT, X Consortium, or BSD (original and revised) licenses. All of them are consistent with the -<ulink url="http://www.opensource.org/docs/definition.php" +<ulink url="https://www.opensource.org/docs/definition.php" >Open Source Definition</ulink>, and most are consistent with the Free Software Foundation's <ulink -url="http://www.fsf.org/philosophy/free-sw.html">Free Software +url="https://www.fsf.org/philosophy/free-sw.html">Free Software Definition</ulink>. </para> @@ -45,7 +45,7 @@ Definition</ulink>. While the current licenses are all open source licenses, the X.Org Foundation is attempting, over time, to bring as much as possible of the code's licenses in the distribution into compliance with the -<ulink url="http://www.debian.org/social_contract#guidelines" +<ulink url="https://www.debian.org/social_contract#guidelines" >Debian Free Software Guidelines</ulink>. </para> @@ -59,7 +59,7 @@ The X.Org Foundation has chosen the following format of the MIT License as the preferred format for code included in the X Window System distribution. This is a slight variant of the common MIT license form published by the Open Source Initiative at -<ulink url="http://www.opensource.org/licenses/mit-license.php"></ulink>. +<ulink url="https://www.opensource.org/licenses/mit-license.php"></ulink>. </para> <blockquote> diff --git a/doc/xorg-docs/general/Makefile.in b/doc/xorg-docs/general/Makefile.in index 1fbb5c0ad..1e5f4e05f 100644 --- a/doc/xorg-docs/general/Makefile.in +++ b/doc/xorg-docs/general/Makefile.in @@ -290,6 +290,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/general/README.xml b/doc/xorg-docs/general/README.xml index 7446fa06d..d5bad5f5d 100644 --- a/doc/xorg-docs/general/README.xml +++ b/doc/xorg-docs/general/README.xml @@ -10,7 +10,7 @@ <title>README for X11R&relvers;</title> -<corpauthor><ulink url="http://www.x.org/wiki/XorgFoundation"> +<corpauthor><ulink url="https://www.x.org/wiki/XorgFoundation"> The X.Org Foundation </ulink></corpauthor> @@ -52,7 +52,7 @@ issues, fixes for driver bugs, and fixes that improve stability. <![ %minorrel [ --> <para> -X11R&relvers; is the &whichfullrel; release in the X11R&majorvers; series. +X11R&relvers; was the &whichfullrel; release in the X11R&majorvers; series. </para> <!-- ]]> @@ -103,15 +103,17 @@ related documentation. <para> The X.Org Foundation X releases are produced by the X.Org Foundation. -The X.Org Foundation has been formed as a Delaware corporation organized -to operate as a scientific charity under IRS code 501(c)(3) chartered +The X.Org Foundation is a member project of +<ulink url="https://spi-inc.org/">Software in the Public Interest (SPI)</ulink>, +which operates as a scientific charity under IRS code 501(c)(3). +The X.Org Foundation is chartered to develop and execute effective strategies which provide world-wide stewardship of the X Window System technology and standards. Membership in 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 <ulink -url="http://www.x.org/wiki/Membership" +url="https://www.x.org/wiki/Membership" >membership application</ulink>. The X11R&relvers; release has been produced by the many contributors to the X.Org community and members of the X.Org Foundation and includes code from the X Consortium, the Open @@ -178,11 +180,11 @@ Attributions are included with documentation accompanying binaries. Most of these licenses are based on the MIT, X Consortium, or BSD (original and revised) licenses. All of them are consistent with the <ulink -url="http://www.opensource.org/docs/definition.php" +url="https://www.opensource.org/docs/definition.php" >Open Source Definition</ulink >, and most are consistent with the Free Software Foundation's <ulink -url="http://www.fsf.org/philosophy/free-sw.html" +url="https://www.fsf.org/philosophy/free-sw.html" >Free Software Definition</ulink >. </para> @@ -197,7 +199,7 @@ If you find any omissions in that document, please contact us with details at 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 -<ulink url="http://www.debian.org/social_contract#guidelines" +<ulink url="https://www.debian.org/social_contract#guidelines" >Debian Free Software Guidelines</ulink>. </para> @@ -208,7 +210,7 @@ possible of the code's licenses in the distribution into compliance with the <para> The documentation for this release can be found online at the <ulink -url="http://www.x.org/">X.Org web site</ulink>. +url="https://www.x.org/">X.Org web site</ulink>. </para> <para> @@ -218,7 +220,7 @@ Document</olink>. </para> <para> -Additional information may be available at the <ulink url="http://wiki.x.org/" +Additional information may be available at the <ulink url="https://wiki.x.org/" >X.Org Foundation Wiki</ulink>. </para> @@ -229,10 +231,10 @@ Additional information may be available at the <ulink url="http://wiki.x.org/" <para> Current information about the X.Org Foundation public mailing lists is -available on <ulink url="http://www.x.org/wiki/XorgMailingLists">the X.Org +available on <ulink url="https://www.x.org/wiki/XorgMailingLists">the X.Org mailing list page</ulink> and related desktop technology mailing lists can be found on <ulink -url="http://freedesktop.org/mailman/listinfo">Freedesktop.org's mailing list +url="https://freedesktop.org/mailman/listinfo/">Freedesktop.org's mailing list page</ulink>. </para> @@ -243,13 +245,12 @@ page</ulink>. <para> If you have any new work or enhancements/bug fixes for existing work, -please send them as git format patches to -<email>xorg-devel@lists.freedesktop.org</email> or to our -<ulink url="https://bugs.freedesktop.org/">bug tracking system</ulink> -using the xorg component. This will help ensure that they are included +please submit them via +<ulink url="https://gitlab.freedesktop.org/xorg">the gitlab.freedesktop.org code management system</ulink>. +This will help ensure that they are included in future releases. More details on patch submission and review process are available on the -<ulink url="http://www.x.org/wiki/Development/Documentation/SubmittingPatches"> +<ulink url="https://www.x.org/wiki/Development/Documentation/SubmittingPatches"> SubmittingPatches</ulink> page of the X.Org wiki. </para> @@ -261,7 +262,7 @@ SubmittingPatches</ulink> page of the X.Org wiki. <!-- <![ %snapshot; [ <para> -X11R&relvers; can be found from the <ulink url="http://wiki.x.org">X.Org +X11R&relvers; can be found from the <ulink url="https://wiki.x.org">X.Org Foundation wiki</ulink>, and at mirrors of this server. </para> ]]> @@ -271,7 +272,7 @@ Foundation wiki</ulink>, and at mirrors of this server. <para> Information about X11R&relvers; can be found from the <ulink -url="http://wiki.x.org" +url="https://wiki.x.org" >X.Org Foundation wiki</ulink>, and at mirrors of this server. </para> @@ -283,17 +284,17 @@ mirrors of this server. <title>X11R&relvers;</title> <para> -This is the &whichfullrel; release of the new modular source code tree. The -source code has been split into nine logical modules: app, data, doc, +X11R&relvers; was the &whichfullrel; release of the modular source code tree. +The source code has been split into nine logical modules: app, data, doc, driver, font, lib. proto, util and xserver. Each of these modules contain one or more packages that can be configured, built and installed -separately. Please see an X11R&relvers; release site for a complete +separately. Please see an X.Org release site for a complete list of the tarballs. </para> <para> For information on how to build the modular tree packages see the <ulink -url="http://wiki.x.org/wiki/ModularDevelopersGuide" +url="https://wiki.x.org/wiki/ModularDevelopersGuide" >Modular Developer's Guide</ulink >. This guide also contains information for developers who want to help improve the modular @@ -309,7 +310,7 @@ build system and modular code base. The X source code for this and all releases/snapshots as well as development versions can also be accessed via the Freedesktop.org git repository. It's also possible to browse the <ulink -url="http://cgit.freedesktop.org/xorg/" +url="https://gitlab.freedesktop.org/xorg/" >freedesktop git repository</ulink >. </para> @@ -327,8 +328,8 @@ To check out the latest development version, don't specify any tag. <para> Bugs should be reported to freedesktop.org's <ulink -url="https://bugs.freedesktop.org/">bug tracking system</ulink> -using the xorg component. Before +url="https://gitlab.freedesktop.org/xorg/">code management system</ulink>. +Before reporting bugs, please check the server log file, which can be found at <filename>/var/log/Xorg.0.log</filename> on most platforms. If you can't resolve the problem yourself, send the entire log file with your bug report but diff --git a/doc/xorg-docs/general/ReleaseNotes.xml b/doc/xorg-docs/general/ReleaseNotes.xml index 0b0c91315..1e60d42b9 100644 --- a/doc/xorg-docs/general/ReleaseNotes.xml +++ b/doc/xorg-docs/general/ReleaseNotes.xml @@ -12,7 +12,7 @@ <title>Release Notes for X11R&relvers;</title> <corpauthor> - <ulink url="http://www.x.org/wiki/XorgFoundation"> + <ulink url="https://www.x.org/wiki/XorgFoundation"> The X.Org Foundation </ulink> </corpauthor> @@ -34,18 +34,16 @@ <title>Introduction to the X11R&relvers; Release</title> <para> - This release is the &whichfullrel; modular release of the + X11R&relvers; was the &whichfullrel; modular release of the <productname>X Window System</productname>. - The next full release will be X11R&nextrelvers; and is expected in - &nextfullreldate;. </para> <para> - Unlike X11R1 through X11R6.9, X11R7.x releases are not built from one + Unlike X11R1 through X11R6.9, X11R7.x releases were not built from one monolithic source tree, but many individual modules. These modules are distributed as individual source code releases, and each one is released when it is ready, instead of only when the overall window - system is ready for release. The X11R7.x releases are made by + system is ready for release. The X11R7.x releases were made by “rolling up” the individual module releases into a collection that is often affectionately called the “<foreignphrase>katamari</foreignphrase>” by the developers. @@ -71,29 +69,30 @@ <para> Once their window system build is established, most builders watch for announcements of individual module updates on the <ulink - url="http://lists.x.org/mailman/listinfo/xorg-announce" + url="https://lists.x.org/mailman/listinfo/xorg-announce" >xorg-announce mailing list</ulink> and update to those as needed. - The X.Org Foundation currently releases the X Window System - katamari releases approximately once a year, but many modules, - especially the X servers and drivers, are updated more frequently - between those releases. + </para> + + <para> + There are no plans for any further + “<foreignphrase>katamari</foreignphrase>” releases of the + X Window System at this time, only releases of the individual modules + are planned for now. </para> <para> For help with how to build and develop in the modular tree see the - <ulink url="http://wiki.x.org/wiki/ModularDevelopersGuide">Modular + <ulink url="https://wiki.x.org/wiki/ModularDevelopersGuide">Modular Developer's Guide</ulink> in the X.Org wiki. </para> <para> - We encourage you to report bugs using - freedesktop.org's <ulink url="https://bugs.freedesktop.org/"> - bug tracking system</ulink> using the xorg product, and to - submit bug fixes and enhancements to - <email>xorg-devel@lists.x.org</email>. + We encourage you to report bugs, and to + submit bug fixes and enhancements via +<ulink url="https://gitlab.freedesktop.org/xorg">the gitlab.freedesktop.org code management system</ulink>. More details on patch submission and review process are available on the <ulink - url="http://www.x.org/wiki/Development/Documentation/SubmittingPatches"> + url="https://www.x.org/wiki/Development/Documentation/SubmittingPatches"> SubmittingPatches</ulink> page of the X.Org wiki. </para> @@ -108,7 +107,7 @@ were based on X version 10. The MIT X Consortium and its successors, the X Consortium, the Open Group X Project Team, and the X.Org Group released versions X11R3 through X11R6.6. Since the founding of the X.Org Foundation in early 2004, many further releases have been -issued, from X11R6.7 to the current &relvers;. +issued, from X11R6.7 to the current module releases. </para> <para> @@ -119,7 +118,7 @@ as well as what is new in the latest full release (&fullrelvers;). ]]> <![ %majorrel [ --> -The next section describes what is new in the latest full release +The next section describes what was new in the last full release (&relvers;) compared with the previous full release (&prevrelvers;). <!-- @@ -185,7 +184,7 @@ The next section describes what is new in the latest version hase been added. On most systems these documents will be installed under <filename>/usr/share/doc/</filename>. They are also posted on the X.Org website at - <ulink url="http://www.x.org/releases/X11R7.7/" />. + <ulink url="https://www.x.org/releases/X11R7.7/" />. </para> </listitem> @@ -782,7 +781,7 @@ The next section describes what is new in the latest version autodetection previously worked) must now set DPI or some other scaling factor explicitly, either via the X server's <option>-dpi</option> option, a DPI setting in their graphical - enironment, or an alternate scaling mechanism provided by their + environment, or an alternate scaling mechanism provided by their environment. </para> </sect4> @@ -795,9 +794,9 @@ The next section describes what is new in the latest version Direct rendered OpenGL® support is provided for several hardware platforms by the Direct Rendering Infrastructure (DRI). Further information about DRI can be found at the <ulink - url="http://dri.sf.net/">DRI Project's web site</ulink>. The 3D + url="https://dri.freedesktop.org/">DRI Project's web site</ulink>. The 3D core rendering component is provided by <ulink - url="http://www.mesa3d.org">Mesa</ulink>. + url="https://www.mesa3d.org">Mesa</ulink>. </para> <para> @@ -888,7 +887,7 @@ The next section describes what is new in the latest version X server in this release be sure to also ensure xkeyboard-config is a safe version. More details about this issue may be found in <ulink -url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" +url="https://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" >advisories for CVE-2012-0064</ulink>. </para> </warning> @@ -1030,8 +1029,8 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" turn these selected warnings into errors by adding <option>--disable-selective-werror</option> to the configure command for the affected module. If that is necessary for any X.Org modules, - please report a bug in the xorg product on - <ulink url="https://bugs.freedesktop.org/" />. + please report a bug in the project for that module on + <ulink url="https://gitlab.freedesktop.org/xorg" />. </para> <para> @@ -1100,7 +1099,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" <listitem> <para> Enables or disables use of the <ulink - url="http://xmlgraphics.apache.org/fop/" + url="https://xmlgraphics.apache.org/fop/" >Apache <command>fop</command></ulink> command to translate DocBook XML to PostScript and PDF formats. </para> @@ -1237,7 +1236,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" <listitem> <para> Xorg server 1.4 started using the <ulink - url="http://www.freedesktop.org/wiki/Software/hal">HAL + url="https://www.freedesktop.org/wiki/Software/hal">HAL framework</ulink> to discover connected input devices, receive notification of hotplug events for them, and to retrieve configuration parameters for them. The HAL @@ -1346,7 +1345,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" This section lists the credits for the X11R&relvers; release. For a more detailed breakdown, refer to the ChangeLog file in the source tree for each module, the history in <ulink - url="http://cgit.freedesktop.org/xorg/">the xorg product in + url="https://gitlab.freedesktop.org/xorg">the xorg projects in freedesktop.org's git repositories</ulink> or the '<userinput>git log</userinput>' information for individual source files. </para> @@ -1748,7 +1747,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" <member>Zhigang Gong</member> <member>Zou Nan hai</member> </simplelist> - and the members of <ulink url="http://translationproject.org/">the + and the members of <ulink url="https://translationproject.org/">the Translation Project</ulink>. </para> @@ -2202,12 +2201,12 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" <para> This product includes software developed by The XFree86 Project, Inc - (<ulink url="http://www.xfree86.org/"></ulink>) and its contributors. + (<ulink url="https://www.xfree86.org/"></ulink>) and its contributors. </para> <para> This product includes software that is based in part on the work of the - FreeType Team (<ulink url="http://www.freetype.org/"></ulink>). + FreeType Team (<ulink url="https://www.freetype.org/"></ulink>). </para> <para> @@ -2221,7 +2220,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" <para> This product includes software developed by the NetBSD Foundation, Inc. - (<ulink url="http://www.netbsd.org/"></ulink>) and its contributors. + (<ulink url="https://www.netbsd.org/"></ulink>) and its contributors. </para> <para> diff --git a/doc/xorg-docs/general/Versions.xml b/doc/xorg-docs/general/Versions.xml index 9c3f338e0..b3d5dcd5c 100644 --- a/doc/xorg-docs/general/Versions.xml +++ b/doc/xorg-docs/general/Versions.xml @@ -13,7 +13,7 @@ The XFree86 Project, Inc <corpauthor> Updated for X.Org by Keith Packard, Kevin E. Martin, and Alan Coopersmith </corpauthor> -<pubdate>November 2010</pubdate> +<pubdate>June 2019</pubdate> <abstract> @@ -34,12 +34,9 @@ basic scheme is the same. This document reflects the policy that X.Org uses. Starting with the X11R7.0 release, each module has its own version number. For those without a natural starting point, the version numbers started at 1.0. For instance, the X11R7.0 release included the xorg-server 1.0 -module. As modules are released independently from the rest of the -window system, the module version is the most accurate source of version -information. For instance, there are many X server releases in a year, -but generally only one window system release, so an X server version number -such as 1.7.7 is more informative than the X11R7.5 version for the window -system <quote>katamari</quote> release. +module. As X.Org no longer produces the <quote>katamari</quote> releases +of the entire window system (X11R7.x), the module version is the only +accurate source of version information. </para> <para> @@ -75,12 +72,6 @@ releases. </para> <para> -The X.Org Foundation 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 X.Org. 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 diff --git a/doc/xorg-docs/general/fonts/Makefile.in b/doc/xorg-docs/general/fonts/Makefile.in index 2556cf91f..fec30dca8 100644 --- a/doc/xorg-docs/general/fonts/Makefile.in +++ b/doc/xorg-docs/general/fonts/Makefile.in @@ -249,6 +249,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/general/fonts/fonts.xml b/doc/xorg-docs/general/fonts/fonts.xml index 0f58d5dcd..1516aeb30 100644 --- a/doc/xorg-docs/general/fonts/fonts.xml +++ b/doc/xorg-docs/general/fonts/fonts.xml @@ -86,7 +86,7 @@ system to access newly-installed fonts. <para> Xft has no configuration mechanism itself, it relies upon the -<ulink url="http://www.fontconfig.org/">fontconfig</ulink> +<ulink url="https://www.fontconfig.org/">fontconfig</ulink> library to configure and customise fonts. That library is not specific to the X Window system, and does not rely on any particular font output mechanism. @@ -135,6 +135,7 @@ $ su -c fc-cache <para> Fontconfig's behaviour is controlled by a set of configuration files: a standard configuration file, <quote><filename>/etc/fonts/fonts.conf</filename></quote>, +the files in a standard configuration directory, <quote><filename>/etc/fonts/conf.d/</filename></quote>, a host-specific configuration file, <quote><filename>/etc/fonts/local.conf</filename></quote>, and a user-specific file called <quote><filename>.fonts.conf</filename></quote> in the user's home directory (this can be overridden with the @@ -861,7 +862,7 @@ to TrueType and Type1 font programs and implemented the grid-fitting For more information, please contact <email>design@bigelowandholmes.com</email> or <email>info@urwpp.de</email>, or consult -<ulink url="http://www.urwpp.de">the URW++ web site</ulink>. +<ulink url="https://www.urwpp.de/">the URW++ web site</ulink>. </para> <para> @@ -1516,7 +1517,7 @@ url="mkfontdir.1.html" <para> The <emphasis remap="it">FreeType</emphasis> backend (formerly <emphasis remap="it">xfsft</emphasis>) is a backend based on version 2 of the FreeType library (see <ulink -url="http://www.freetype.org/" +url="https://www.freetype.org/" >the FreeType web site</ulink >) and has the X-TT functionalities for CJKV support provided by the After X-TT @@ -1811,10 +1812,7 @@ standard <quote><literal remap="tt">fixed</literal></quote> and <quote><literal <title>Unicode</title> <para> -Unicode (<ulink -url="http://www.unicode.org" ->http://www.unicode.org</ulink ->) is a coded character +Unicode (<ulink url="https://www.unicode.org/" />) is a coded character set with the goal of uniquely identifying all characters for all scripts, current and historical. While Unicode was explicitly not designed as a glyph encoding scheme, it is often possible to use it as @@ -1894,7 +1892,7 @@ of information about digital fonts. <para> Xft and Fontconfig are described on <ulink -url="http://www.fontconfig.org" +url="https://www.fontconfig.org" >the Fontconfig site</ulink >. </para> @@ -1933,12 +1931,12 @@ url="http://x-tt.sourceforge.jp/" <para> While the <ulink -url="http://www.unicode.org" +url="https://www.unicode.org/" >Unicode consortium site</ulink > may be of interest, you are more likely to find what you need in Markus Kuhn's <ulink -url="http://www.cl.cam.ac.uk/~mgk25/unicode.html" +url="https://www.cl.cam.ac.uk/~mgk25/unicode.html" >UTF-8 and Unicode FAQ</ulink >. </para> diff --git a/doc/xorg-docs/general/graphics/Makefile.in b/doc/xorg-docs/general/graphics/Makefile.in index ed5c40d81..7c7e1ee34 100644 --- a/doc/xorg-docs/general/graphics/Makefile.in +++ b/doc/xorg-docs/general/graphics/Makefile.in @@ -249,6 +249,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/general/input/Makefile.in b/doc/xorg-docs/general/input/Makefile.in index 49c430da7..fcd69743c 100644 --- a/doc/xorg-docs/general/input/Makefile.in +++ b/doc/xorg-docs/general/input/Makefile.in @@ -249,6 +249,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/general/input/XKB-Config.xml b/doc/xorg-docs/general/input/XKB-Config.xml index cda04d20a..67d4013e2 100644 --- a/doc/xorg-docs/general/input/XKB-Config.xml +++ b/doc/xorg-docs/general/input/XKB-Config.xml @@ -31,7 +31,7 @@ of view. It covers basic configuration syntax and gives also a few examples. <para> This version covers Xorg server versions 1.8 and later, used with the data files from the <ulink -url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" +url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" >xkeyboard-config</ulink> project. </para> @@ -118,7 +118,7 @@ files of rules to be used for keyboard mapping composition <para> The rules file used depends on your system. The rules files commonly used with Xorg are provided by the <ulink -url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" +url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" >xkeyboard-config</ulink> project. On Linux systems, the <filename>evdev</filename> rules are most commonly used, on other systems the <filename>base</filename> rules diff --git a/doc/xorg-docs/general/input/XKB-Enhancing.xml b/doc/xorg-docs/general/input/XKB-Enhancing.xml index b0b63ca4b..aba44f9a6 100644 --- a/doc/xorg-docs/general/input/XKB-Enhancing.xml +++ b/doc/xorg-docs/general/input/XKB-Enhancing.xml @@ -38,7 +38,7 @@ keyboard layout. Unlike other documents this guide accents the keymap developer' <para> The developer of a new layout should read the xkb protocol specification (<ulink -url="http://www.x.org/docs/XKB/XKBproto.pdf" +url="https://www.x.org/docs/XKB/XKBproto.pdf" >The X Keyboard Extension: Protocol Specification</ulink >) at least to clarify for himself some xkb-specific terms used in this document @@ -355,7 +355,7 @@ want to use on of four predefined latin alphabet layouts. <!-- TODO: more details - TODO: something similiar for phonetic layouts + TODO: something similar for phonetic layouts TODO: what are pc/pc layouts good for??? --> diff --git a/doc/xorg-docs/general/platforms/Darwin.xml b/doc/xorg-docs/general/platforms/Darwin.xml index 38e6801cb..c6b1a790c 100644 --- a/doc/xorg-docs/general/platforms/Darwin.xml +++ b/doc/xorg-docs/general/platforms/Darwin.xml @@ -21,21 +21,21 @@ <para> <productname>X11R&relvers;</productname>, a freely redistributable open-source implementation of the - <ulink url="http://www.x.org/">X Window System</ulink> from - the <ulink url="http://www.x.org/wiki/XorgFoundation">X.Org + <ulink url="https://www.x.org/">X Window System</ulink> from + the <ulink url="https://www.x.org/wiki/XorgFoundation">X.Org Foundation</ulink>, has been ported to <ulink url="http://developer.apple.com/Darwin/">Darwin</ulink> - and <ulink url="http://www.apple.com/macosx/">Mac OS X</ulink>. + and <ulink url="https://www.apple.com/macosx/">Mac OS X</ulink>. </para> <para> Most of the current work on X for Darwin and Mac OS X is centered around the - <ulink url="http://xquartz.macosforge.org/">XQuartz Project</ulink> - at <ulink url="http://macosforge.org/">MacOSforge</ulink>. + <ulink url="https://www.xquartz.org/">XQuartz Project</ulink> + at <ulink url="https://macosforge.org/">MacOSforge</ulink>. If you are interested in up-to-date status, want to report a bug, or are interested in working on X11 for Darwin, stop by the project - website at <ulink url="http://xquartz.macosforge.org/"></ulink> + website at <ulink url="https://www.xquartz.org/"></ulink> </para> </sect1> diff --git a/doc/xorg-docs/general/platforms/Makefile.in b/doc/xorg-docs/general/platforms/Makefile.in index b7056cf9f..8b5e000d1 100644 --- a/doc/xorg-docs/general/platforms/Makefile.in +++ b/doc/xorg-docs/general/platforms/Makefile.in @@ -249,6 +249,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/general/platforms/Solaris.xml b/doc/xorg-docs/general/platforms/Solaris.xml index dfd2106cd..a09a4602d 100644 --- a/doc/xorg-docs/general/platforms/Solaris.xml +++ b/doc/xorg-docs/general/platforms/Solaris.xml @@ -15,19 +15,19 @@ <authorgroup> <author> <firstname>David</firstname><surname>Holland</surname> - <affiliation><orgname><ulink url="http://www.xfree86.org/">XFree86 + <affiliation><orgname><ulink url="https://www.xfree86.org/">XFree86 Project</ulink></orgname></affiliation> </author> <author> <firstname>Marc</firstname><surname>Aurele La France</surname> - <affiliation><orgname><ulink url="http://www.xfree86.org/">XFree86 + <affiliation><orgname><ulink url="https://www.xfree86.org/">XFree86 Project</ulink></orgname></affiliation> </author> <author> <firstname>Alan</firstname><surname>Coopersmith</surname> - <affiliation><orgname><ulink url="http://www.oracle.com/">Oracle + <affiliation><orgname><ulink url="https://www.oracle.com/">Oracle Corp.</ulink></orgname></affiliation> </author> </authorgroup> @@ -119,54 +119,12 @@ these programs must be found before any possible GNU versions. </sect1> -<sect1 id='Notes_for_running_Xorg_on_Solaris'> -<title>Notes for running Xorg on Solaris</title> - -<para> - -<orderedlist> -<listitem> -<para> -Depending on the release or architecture of Solaris you are running, you might -need to install an OS driver for an aperture device. -</para> -<para> -Under Solaris x86 2.5 and later, there's a system driver -(<filename class="devicefile">/dev/xsvc</filename>) -that provides this functionality. -It will be detected automatically by the server, so you don't need to install -the aperture driver. -</para> - -<para> -For older Solaris x86 and for Solaris SPARC releases, the source for this -driver is included in -<filename>hw/xfree86/os-support/solaris/apSolaris.shar</filename> -in the xserver source distribution. -Building, and installing the driver is relatively straight forward. Please read -its accompanying README file. -</para> -</listitem> -<listitem> -<para> -Xqueue is <emphasis remap="bf">NOT</emphasis> supported under Solaris. -</para> -</listitem> - -</orderedlist> - -</para> - -</sect1> - - <sect1 id='Bug_Notification'> <title>Bug Notification</title> <para> Bug reports should be reported at -<ulink url="http://bugs.freedesktop.org/"></ulink> using the -xorg product or sent to <email>xorg@lists.freedesktop.org</email>. +<ulink url="https://gitlab.freedesktop.org/xorg" />. </para> </sect1> diff --git a/doc/xorg-docs/man/Makefile.in b/doc/xorg-docs/man/Makefile.in index 8fdb65b1a..22f5c051a 100644 --- a/doc/xorg-docs/man/Makefile.in +++ b/doc/xorg-docs/man/Makefile.in @@ -251,6 +251,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/man/X.man b/doc/xorg-docs/man/X.man index 8d2d01ea4..b9e08f677 100644 --- a/doc/xorg-docs/man/X.man +++ b/doc/xorg-docs/man/X.man @@ -1,4 +1,4 @@ -.\" t +'\" t .\" .\" Copyright (c) 1994, 2004 The Open Group .\" Copyright \(co 2000 The XFree86 Project, Inc. @@ -76,39 +76,53 @@ the \fIXlib - C Language X Interface\fP manual, the \fIX Window System Protocol\fP specification, the \fIX Toolkit Intrinsics - C Language Interface\fP manual, and various toolkit documents. +.\" Use .UR macro from groff's man(7) if available, otherwise just +.\" display URL as plain text for other processors. +.if !d UR \{ +.de UR +.RI < \\$1 > +.. +.de UE +.RI \\$1 +.. \} +.\" +Those manuals, specifications, & documents may be found in +__datadir__/doc or on the X.Org Foundation website at +.UR "https://www.x.org/releases/current/doc/" +.UE . .PP The number of programs that use \fIX\fP is quite large. -Programs provided in the core X.Org Foundation distribution include: +Sample programs provided by the X.Org Foundation include: a terminal emulator, \fIxterm\fP; a window manager, \fItwm\fP; +a compositing manager, \fIxcompmgr\fP; a display manager, \fIxdm\fP; a console redirect program, \fIxconsole\fP; -a bitmap editor, \fIbitmap\fP; +utilities for managing input and output devices, \fIxinput\fP and \fIxrandr\fP; resource listing/manipulation tools, \fIappres\fP, \fIeditres\fP; access control programs, \fIxauth\fP, \fIxhost\fP, and \fIiceauth\fP; -user preference setting programs, \fIxrdb\fP, \fIxcmsdb\fP, +user preference setting programs, \fItransset\fP, \fIxrdb\fP, \fIxcmsdb\fP, \fIxset\fP, \fIxsetroot\fP, \fIxstdcmap\fP, and \fIxmodmap\fP; clocks, \fIxclock\fP and \fIoclock\fP; -a font displayer, \fIxfd\fP; -utilities for listing information about fonts, windows, and displays, -\fIxlsfonts\fP, \fIxwininfo\fP, \fIxlsclients\fP, -\fIxdpyinfo\fP, \fIxlsatoms\fP, and \fIxprop\fP; +font display utilities, \fIxfd\fP and \fIxfontsel\fP; +utilities for listing information about displays, extensions, and resources, +\fIxdpyinfo\fP, \fIxdriinfo\fP, \fIxvinfo\fP, \fIxwininfo\fP, \fIxlsclients\fP, +\fIxprop\fP, \fIxlsatoms\fP, \fIxlsclients\fP, and \fIxlsfonts\fP; screen image manipulation utilities, \fIxwd\fP, \fIxwud\fP, and \fIxmag\fP; a performance measurement utility, \fIx11perf\fP; a font compiler, \fIbdftopcf\fP; -a font server and related utilities, \fIxfs\fP, \fIfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP; +a font server and related utilities, \fIxfs\fP, \fIxfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP; a display server and related utilities, \fIXserver\fP, \fIrgb\fP, \fImkfontdir\fP; a clipboard manager, \fIxclipboard\fP; keyboard description compiler and related utilities, \fIxkbcomp\fP, \fIsetxkbmap\fP \fIxkbprint\fP, \fIxkbbell\fP, \fIxkbevd\fP, \fIxkbvleds\fP, and \fIxkbwatch\fP; a utility to terminate clients, \fIxkill\fP; -a firewall security proxy, \fIxfwp\fP; and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP. .PP Many other utilities, window managers, games, toolkits, etc. are included -as user-contributed software in the X.Org Foundation distribution, or are +as packages in many operating system distributions, or are available on the Internet. -See your site administrator for details. +See your site administrator or distro package manager for details. .SH "STARTING UP" .PP There are two main ways of getting the X server and an initial set of @@ -151,15 +165,34 @@ form: .RS \fIhostname:displaynumber.screennumber\fP .RE +or +.RS +\fIprotocol/hostname:displaynumber.screennumber\fP +.RE .sp This information is used by the application to determine how it should connect to the server and which screen it should use by default (on displays with multiple monitors): .TP 8 +.I protocol +The \fIprotocol\fP specifies the protocol to use for communication. +Exactly which protocols are supported is platform dependent, but most +commonly supported ones are: +.TS +l l. +tcp TCP over IPv4 or IPv6 +inet TCP over IPv4 only +inet6 TCP over IPv6 only +unix UNIX Domain Sockets (same host only) +local Platform preferred local connection method +.TE +If the protocol is not specified, Xlib uses whatever it believes is the +most efficient transport. +.TP 8 .I hostname The \fIhostname\fP specifies the name of the machine to which the display is -physically connected. If the hostname is not given, the most efficient way of -communicating to a server on the same machine will be used. +physically connected. If the hostname is not given, a connection to a server +on the same machine will be used. .TP 8 .I displaynumber The phrase "display" is usually used to refer to a collection of monitors that @@ -227,6 +260,55 @@ addresses, and IPv6 addresses are all allowed. For example: \fIx.org:0\fP, \fIexpo:0\fP, \fI[::1]:0\fP, \fI198.112.45.11:0\fP, \fIbigmachine:1\fP, and \fIhydra:0.1\fP. .PP +.SH "LOCAL CONNECTIONS" +For operating systems that support local connections other than Unix +Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying +the order in which local connections should be attempted. This list +can be overridden by the +.I XLOCAL +environment variable described below. If the display name indicates a +best-choice connection should be made (e.g. +.BR :0.0 ), +each connection mechanism is tried until a connection succeeds or no +more mechanisms are available. +.PP +The +.I XLOCAL +environment variable should contain a list of one more +more of the following: +.PP +.RS 8 +.nf +NAMED +PTS +SCO +UNIX +.fi +.RE +.PP +which represent SVR4 Named Streams pipe, Old-style USL Streams pipe, +SCO XSight Streams pipe, and Unix domain sockets, respectively. You can +select a single mechanism (e.g. +.IR XLOCAL=NAMED ), +or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP). +This variable overrides the compiled-in defaults. For SVR4 it is +recommended that +.I NAMED +be the first preference connection. The default setting is +platform-dependent. +.PP +To globally override the compiled-in defaults, you should define (and +export if using +.B sh +or +.BR ksh ) +.I XLOCAL +globally. If you use startx(1) or xinit(1), the definition should be +at the top of your +.I .xinitrc +file. If you use xdm(1), the definitions should be early on in the +.I __projectroot__/lib/X11/xdm/Xsession +script. .SH "ACCESS CONTROL" An X server can use several types of access control. Mechanisms provided in Release 7 are: @@ -357,12 +439,12 @@ to explicitly draw the window's region on the screen with the pointer, for example). .PP Since window managers are regular (albeit complex) client programs, -a variety of different user interfaces can be built. The X.Org Foundation distribution -comes with a window manager named \fItwm\fP which supports overlapping windows, +a variety of different user interfaces can be built. The X.Org Foundation +provides a window manager named \fItwm\fP which supports overlapping windows, popup menus, point-and-click or click-to-type input models, title bars, nice icons (and an icon manager for those who don't like separate icon windows). .PP -See the user-contributed software in the X.Org Foundation distribution for other +See your distro package manager for other popular window managers. .SH "FONT NAMES" Collections of characters for displaying text and symbols in X are known as @@ -1199,16 +1281,15 @@ the appropriate instance name can be placed before the asterisk: .BR bdftopcf (__appmansuffix__), .BR bitmap (__appmansuffix__), .BR editres (__appmansuffix__), -.BR fsinfo (__appmansuffix__), .BR fslsfonts (__appmansuffix__), .BR fstobdf (__appmansuffix__), .BR iceauth (__appmansuffix__), -.BR imake (__appmansuffix__), -.BR makedepend (__appmansuffix__), .BR mkfontdir (__appmansuffix__), +.BR mkfontscale (__appmansuffix__), .BR oclock (__appmansuffix__), .BR resize (__appmansuffix__), .BR smproxy (__appmansuffix__), +.BR transset (__appmansuffix__), .BR twm (__appmansuffix__), .BR x11perf (__appmansuffix__), .BR x11perfcomp (__appmansuffix__), @@ -1216,12 +1297,16 @@ the appropriate instance name can be placed before the asterisk: .BR xclipboard (__appmansuffix__), .BR xclock (__appmansuffix__), .BR xcmsdb (__appmansuffix__), +.BR xcompmgr (__appmansuffix__), .BR xconsole (__appmansuffix__), .BR xdm (__appmansuffix__), .BR xdpyinfo (__appmansuffix__), +.BR xdriinfo (__appmansuffix__), +.BR xev (__appmansuffix__), .BR xfd (__appmansuffix__), +.BR xfontsel (__appmansuffix__), .BR xfs (__appmansuffix__), -.BR xfwp (__appmansuffix__), +.BR xfsinfo (__appmansuffix__), .BR xhost (__appmansuffix__), .BR xinit (__appmansuffix__), .BR xkbbell (__appmansuffix__), @@ -1238,14 +1323,17 @@ the appropriate instance name can be placed before the asterisk: .BR xmag (__appmansuffix__), .BR xmodmap (__appmansuffix__), .BR xprop (__appmansuffix__), +.BR xrandr (__appmansuffix__), .BR xrdb (__appmansuffix__), .BR xrefresh (__appmansuffix__), -.BR xrx (__appmansuffix__), +.BR xrestop (__appmansuffix__), +.BR xscope (__appmansuffix__), .BR xset (__appmansuffix__), .BR xsetroot (__appmansuffix__), .BR xsm (__appmansuffix__), .BR xstdcmap (__appmansuffix__), .BR xterm (__appmansuffix__), +.BR xvinfo (__appmansuffix__), .BR xwd (__appmansuffix__), .BR xwininfo (__appmansuffix__), .BR xwud (__appmansuffix__). @@ -1255,10 +1343,17 @@ the appropriate instance name can be placed before the asterisk: .BR Xephyr (__appmansuffix__), .BR Xnest (__appmansuffix__), .BR Xvfb (__appmansuffix__), +.PP .\" specifications .I "Xlib \- C Language X Interface\fR,\fP" and .I "X Toolkit Intrinsics \- C Language Interface" +.PP +Those specifications, and additional specifications & documentation for the +X Window System may also be found in __datadir__/doc or on the X.Org Foundation +website at +.UR "http://www.x.org/releases/current/doc/" +.UE . .SH TRADEMARKS .PP X Window System is a trademark of The Open Group. diff --git a/doc/xorg-docs/man/XOrgFoundation.man b/doc/xorg-docs/man/XOrgFoundation.man index 0ed0779d2..1ecf3fa2d 100644 --- a/doc/xorg-docs/man/XOrgFoundation.man +++ b/doc/xorg-docs/man/XOrgFoundation.man @@ -27,14 +27,15 @@ XOrgFoundation \- X.Org Foundation information Release 6.7 and later of X Version 11 is brought to you by the X.Org Foundation. .SH DESCRIPTION -The X.Org Foundation is an independent, not-for-profit 501(c)(3) charity +The X.Org Foundation is a member project of Software in the Public Interest +(SPI), an independent, not-for-profit 501(c)(3) charity corporation. It was formed in 2004 as the successor to the X.Org Group at The Open Group. The purpose of the X.Org Foundation is to foster the development, evolution, and maintenance of the X Window System, a comprehensive set of vendor-neutral, system-architecture neutral, network-transparent windowing and user interface standards. Membership in the X.Org Foundation is free and open to anyone. The X.Org Foundation -hosts a public git repository of the source code on freedesktop.org. +hosts public git repositories of the source code on freedesktop.org. .PP The X Window System was created in the mid-1980s at the Massachusetts Institute of Technology. In 1988, MIT formed a member-funded consortium to @@ -48,10 +49,12 @@ to the X Window System were assigned to The Open Group (then known as the Open Software Foundation). .PP .SH "ADDRESSES" -The X.Org Foundation's web site is http://www.x.org/ +The X.Org Foundation's web site is https://www.x.org/ +.SH "ADDRESSES" +SPI's web site is https://spi-inc.org/ .PP The X.Org Foundation's public ftp site is ftp://ftp.x.org/ .PP -Information about the X.Org Foundation git repository is on the -X.Org web site at http://www.x.org/wiki/Development/git +The X.Org Foundation's public source repositories are at +https://gitlab.freedesktop.org/xorg .fi diff --git a/doc/xorg-docs/registry b/doc/xorg-docs/registry index 4c332ed21..3e9bf9abe 100644 --- a/doc/xorg-docs/registry +++ b/doc/xorg-docs/registry @@ -6,14 +6,6 @@ items, to aid in avoiding conflicts and to aid in sharing of such items. Requests to register items, or questions about registration, should be addressed to xregistry@x.org -or to - The X.Org Foundation -- X11 Registry - c/o Alan Coopersmith - Oracle Corporation - M/S SCA17-3824 - 4170 Network Circle - Santa Clara, CA 95054 - USA Electronic mail will be acknowledged upon receipt. Please allow up to 4 weeks for a formal response to registration and inquiries. @@ -21,7 +13,7 @@ Please allow up to 4 weeks for a formal response to registration and inquiries. The registry is published as part of the X software distribution from The X.Org Foundation. The latest registry can be found at: - http://cgit.freedesktop.org/xorg/doc/xorg-docs/tree/registry + https://gitlab.freedesktop.org/xorg/doc/xorg-docs/blob/master/registry All registered items must have the postal address of someone responsible for the item, or a reference to a document describing the item and the postal @@ -681,7 +673,7 @@ Name Reference "HP-Hebrew8" [36] HPHEBREW8 8-bit character set "HP-Japanese15" [36] - HPJAPAN15 15-bit characer set, + HPJAPAN15 15-bit character set, modified from industry defacto standard Shift-JIS "HP-Kana8" [36] @@ -1077,7 +1069,7 @@ REFERENCES [7] The Open Group Apex Plaza,Forbury Road, Reading,Berks.RG1 1AX,England - http://www.opengroup.org/contacts/ + https://www.opengroup.org/offices [8] The X standards body maintaining X11 and related standards: 1988-1993 The MIT X Consortium @@ -1088,23 +1080,15 @@ REFERENCES The X.Org Foundation current contact information: - X.Org website: http://www.x.org/ + X.Org website: https://www.x.org/ X.Org mailing lists: - http://www.x.org/wiki/XorgMailingLists + https://www.x.org/wiki/XorgMailingLists X.Org Foundation Board of Directors: - http://www.x.org/wiki/BoardOfDirectors + https://www.x.org/wiki/BoardOfDirectors board@foundation.x.org - Board Secretary: - Alan Coopersmith - Oracle Corporation - M/S SCA17-3824 - 4170 Network Circle - Santa Clara, CA 95054 - USA - [9] PEX Protocol Specification PEX Protocol Encoding PEX Introduction and Overview @@ -1330,13 +1314,11 @@ REFERENCES MIT Station Cambridge, MA 02139-0901 -[57] (Previously David Rosenthal, Steve Swales, Sun Microsystems) - Stuart Kreitman +[57] (Previously David Rosenthal, Steve Swales, Stuart Kreitman, + Sun Microsystems) + Alan Coopersmith, Niveditha Rau Oracle Corporation - M/S SCA17-3856 - 4170 Network Circle - Santa Clara, CA 95054 - stuart.kreitman@oracle.com + alan.coopersmith@oracle.com, niveditha.rau@oracle.com [58] (Originally Murali V. Srinivasan) See Reference [57] diff --git a/doc/xorg-docs/specs/CTEXT/Makefile.in b/doc/xorg-docs/specs/CTEXT/Makefile.in index dcedb0e83..348744730 100644 --- a/doc/xorg-docs/specs/CTEXT/Makefile.in +++ b/doc/xorg-docs/specs/CTEXT/Makefile.in @@ -249,6 +249,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/specs/ICCCM/Makefile.in b/doc/xorg-docs/specs/ICCCM/Makefile.in index 1bfcb462c..73c968ab9 100644 --- a/doc/xorg-docs/specs/ICCCM/Makefile.in +++ b/doc/xorg-docs/specs/ICCCM/Makefile.in @@ -249,6 +249,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/specs/Makefile.am b/doc/xorg-docs/specs/Makefile.am index dbe46517f..136579113 100644 --- a/doc/xorg-docs/specs/Makefile.am +++ b/doc/xorg-docs/specs/Makefile.am @@ -1 +1 @@ -SUBDIRS=CTEXT ICCCM Xext XLFD Xserver +SUBDIRS=CTEXT ICCCM XLFD Xserver diff --git a/doc/xorg-docs/specs/Makefile.in b/doc/xorg-docs/specs/Makefile.in index 4198fbd61..4ad65248c 100644 --- a/doc/xorg-docs/specs/Makefile.in +++ b/doc/xorg-docs/specs/Makefile.in @@ -235,6 +235,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -243,7 +244,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = CTEXT ICCCM Xext XLFD Xserver +SUBDIRS = CTEXT ICCCM XLFD Xserver all: all-recursive .SUFFIXES: diff --git a/doc/xorg-docs/specs/XLFD/Makefile.in b/doc/xorg-docs/specs/XLFD/Makefile.in index 0a2e11429..58fdcfd7b 100644 --- a/doc/xorg-docs/specs/XLFD/Makefile.in +++ b/doc/xorg-docs/specs/XLFD/Makefile.in @@ -249,6 +249,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/specs/Xext/Makefile.am b/doc/xorg-docs/specs/Xext/Makefile.am deleted file mode 100644 index f9c4253bf..000000000 --- a/doc/xorg-docs/specs/Xext/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ - -if ENABLE_SPECS - -# Main DocBook/XML files (DOCTYPE book) -docbook = lbxalg.xml - -# The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir)/xext - -# Generate DocBook/XML output formats with or without stylesheets -include $(top_srcdir)/docbook.am - -endif ENABLE_SPECS diff --git a/doc/xorg-docs/specs/Xext/Makefile.in b/doc/xorg-docs/specs/Xext/Makefile.in deleted file mode 100644 index eb008c64b..000000000 --- a/doc/xorg-docs/specs/Xext/Makefile.in +++ /dev/null @@ -1,573 +0,0 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# Generate output formats for a single DocBook/XML with/without chapters -# -# Variables set by the calling Makefile: -# shelfdir: the location where the docs/specs are installed. Typically $(docdir) -# docbook: the main DocBook/XML file, no chapters, appendix or image files -# chapters: all files pulled in by an XInclude statement and images. -# - -# -# This makefile is intended for Users Documentation and Functional Specifications. -# Do not use for Developer Documentation which is not installed and does not require olink. -# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 -# for an explanation on documents classification. -# - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/docbook.am -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) -subdir = specs/Xext -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__dist_shelf_DATA_DIST = lbxalg.xml -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" -DATA = $(dist_shelf_DATA) $(shelf_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ -ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APP_MAN_DIR = @APP_MAN_DIR@ -APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BASE_CFLAGS = @BASE_CFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHANGELOG_CMD = @CHANGELOG_CMD@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CWARNFLAGS = @CWARNFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ -DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FILE_MAN_DIR = @FILE_MAN_DIR@ -FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -FOP = @FOP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_CMD = @INSTALL_CMD@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIB_MAN_DIR = @LIB_MAN_DIR@ -LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAN_SUBSTS = @MAN_SUBSTS@ -MISC_MAN_DIR = @MISC_MAN_DIR@ -MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRICT_CFLAGS = @STRICT_CFLAGS@ -STRIP = @STRIP@ -STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ -VERSION = @VERSION@ -XMLTO = @XMLTO@ -XORG_MAN_PAGE = @XORG_MAN_PAGE@ -XORG_SGML_PATH = @XORG_SGML_PATH@ -XSLTPROC = @XSLTPROC@ -XSL_STYLESHEET = @XSL_STYLESHEET@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -# Main DocBook/XML files (DOCTYPE book) -@ENABLE_SPECS_TRUE@docbook = lbxalg.xml - -# The location where the DocBook/XML files and their generated formats are installed -@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/xext - -# DocBook/XML generated output formats to be installed -@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ -@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) - -# DocBook/XML file with chapters, appendix and images it includes -@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" - -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" - -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) - -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" - -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) - - -# Generate documents cross-reference target databases -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" - -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" - -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl - -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl - -@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/Xext/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign specs/Xext/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; -$(top_srcdir)/docbook.am: - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-dist_shelfDATA: $(dist_shelf_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ - done - -uninstall-dist_shelfDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) -install-shelfDATA: $(shelf_DATA) - @$(NORMAL_INSTALL) - @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ - done - -uninstall-shelfDATA: - @$(NORMAL_UNINSTALL) - @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-dist_shelfDATA install-shelfDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_shelfDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-shelfDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_shelfDATA uninstall-shelfDATA - -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< - -# Generate DocBook/XML output formats with or without stylesheets - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/doc/xorg-docs/specs/Xext/lbxalg.xml b/doc/xorg-docs/specs/Xext/lbxalg.xml deleted file mode 100644 index 27ae898db..000000000 --- a/doc/xorg-docs/specs/Xext/lbxalg.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" -[ -<!ENTITY % defs SYSTEM "defs.ent"> %defs; -]> - -<article id='lbxalg'> - <articleinfo> - <title>LBX X Consortium Algorithms</title> - <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> -</articleinfo> - -<sect1 id='Introduction'> -<title>Introduction</title> -<para> -The Low Bandwidth X extension allows for negotiating various algorithms used -by LBX. This document describes the algorithms used in the Consortium -implementation of LBX in the X11 Release 6.4. -</para> - -</sect1> -<sect1 id='Streaming_Compression'> -<title>Streaming Compression</title> - -<para> -LBX negotiates the use of a stream compressor. The consortium implementation defines a stream -compressor named XC-ZLIB, which is based on the Zlib version 1.0 compression library by -Gailly & Adler. -</para> - -<para> -The XC-ZLIB compressor is presented with a simple byte stream - the X and LBX message -boundaries are not apparent. The data is broken up into fixed sized blocks. Each block is compressed -using zlib, then a two byte header is prepended, and then the entire packet is transmitted. -The header has the following information: -</para> - -<para><programlisting> - out[0] (length & 0xfff) >> 8 | ((compflag) ? 0x80 : 0); - out[1] = length & 0xff; -</programlisting></para> - -<para> -If the compflag is false, then the contents of the block are not compressed. -</para> - -</sect1> - -<sect1 id='Bitmap_Compression'> -<title>Bitmap Compression</title> -<para> -LBX also negotiates for bitmap compression. The consortium -implementation defines a bitmap compressor named XC-FaxG42D, -which uses the CCITT Group 4 2D compression algorithm. -</para> - -</sect1> - -<sect1 id='Pixmap_Compression'> -<title>Pixmap Compression</title> - -<para> -LBX allows for the negotiation of pixmap compression. The -consortium implementation does not define a pixmap compression -algorithm. (A run-length encoding algorithm was proposed, but -experimentation proved it was less efficient than allowing the -stream compressor to compress the image. -</para> - -</sect1> - -<sect1 id='Colormap_Algorithm'> -<title>Colormap Algorithm</title> -<para> -LBX negotiates for use of a colormap algorithm, used for color -matching when the proxy allocates pixels in a grabbed colormap. -The consortium implementation defines an algorithm named -XC-CMAP. This algorithm consists of three parts, resolving to a -hardware color, finding the closest existing color, and what free -cell to allocate. -</para> - -<para> -The XC-CMAP algorithm resolves a color to a hardware color in the -following manner: -</para> - -<para><programlisting> -#define RESCALE(x, nbits) (x >> (16 - nbits)) * 65535 / ((1 << nbits) - 1) -#define GRAY(r, g, b) (30L * r + 59L * g + 11L * b) / 100 - -sigbits = pVisual->bitsPerRGB; - -switch (pVisual->class) { - case PseudoColor: - case DirectColor: - case StaticColor: - /* rescale to rgb bits */ - *red = RESCALE(*red, sigbits); - *green = RESCALE(*green, sigbits); - *blue = RESCALE(*blue, sigbits); - break; - case GrayScale: - /* rescale to gray then rgb bits */ - *blue = *green = *red = RESCALE(GRAY(*red, *green, *blue), sigbits); - break; - case StaticGray: - /* rescale to gray then [0..limg] then [0..65535] then rgb bits */ - *blue = *green = *red = RESCALE(RESCALE(GRAY(*red, *green, *blue), -pVisual>numPixelBits), sigbits); - break; - case TrueColor: - /* rescale to [0..limN] then [0..65535] then rgb bits */ - *red = RESCALE(RESCALE(*red, pVisual->numRedBits), sigbits); - *green = RESCALE(RESCALE(*green, pVisual->numGreenBits), sigbits); - *blue = RESCALE(RESCALE(*blue, pVisual->numBlueBits), sigbits); - break; - } -</programlisting></para> - -<para> -The XC-CMAP algorithm matches a color to an existing pixel in -static visuals by finding the pixel with the lowest color match -error, computed as follows: -</para> - -<para><programlisting> -error = errRed * errRed + errGreen * errGreen + errBlue * errBlue -</programlisting></para> - -<para> -The XC-CMAP algorithm selects a free pixel to allocate by selecting -the free pixel with the lowest index from the free pixels known to -the proxy. For direct visuals, it uses the lowest free or matching -pixel subfield known to the proxy for each color. -</para> - -</sect1> - -<sect1 id='Extensions'> -<title>Extensions</title> -<para> -LBX allows for extensions to LBX to enable additional compression -or short-circuiting. The consortium implementation does not define -any extensions to LBX. -</para> - -</sect1> -</article> diff --git a/doc/xorg-docs/specs/Xserver/Makefile.in b/doc/xorg-docs/specs/Xserver/Makefile.in index 5ffb80333..dfe651f4e 100644 --- a/doc/xorg-docs/specs/Xserver/Makefile.in +++ b/doc/xorg-docs/specs/Xserver/Makefile.in @@ -250,6 +250,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/doc/xorg-docs/specs/Xserver/XACE-Spec.xml b/doc/xorg-docs/specs/Xserver/XACE-Spec.xml index 7be9e1d6a..29476846a 100644 --- a/doc/xorg-docs/specs/Xserver/XACE-Spec.xml +++ b/doc/xorg-docs/specs/Xserver/XACE-Spec.xml @@ -546,7 +546,7 @@ </row> <row> <entry><literal>DixWriteAccess</literal></entry> - <entry>The state of the device is being programatically manipulated.</entry> + <entry>The state of the device is being programmatically manipulated.</entry> <entry>WarpPointer, XTestFakeInput, XiSendExtensionEvent</entry> </row> <row> diff --git a/doc/xorg-docs/specs/Xserver/analysis.xml b/doc/xorg-docs/specs/Xserver/analysis.xml index 2de1a15a7..be283ec22 100644 --- a/doc/xorg-docs/specs/Xserver/analysis.xml +++ b/doc/xorg-docs/specs/Xserver/analysis.xml @@ -417,7 +417,7 @@ the X protocol, so we won't have to maintain any illusions about its value. <note> <para> ISSUE: Some vendors have extensions to let you query the window background. Do -we need to accomodate that? +we need to accommodate that? </para> </note> @@ -1069,7 +1069,7 @@ Defense: send Window error. <para> A client can use SendEvent to cause events of any type to be sent to windows of other clients. Similarly, a client could SendEvent to one of its own -windows with propagate set to True and arrange for the event to be propogated +windows with propagate set to True and arrange for the event to be propagated up to a window it does not own. Clients can detect events generated by SendEvent, but we cannot assume that they will. </para> diff --git a/doc/xorg-docs/specs/specindex.html b/doc/xorg-docs/specs/specindex.html index c7dd2125f..2e2a03da8 100644 --- a/doc/xorg-docs/specs/specindex.html +++ b/doc/xorg-docs/specs/specindex.html @@ -63,7 +63,7 @@ <li><a href="ice.html">ICE (Inter-Client Exchange) Protocol</a> <a href="../PDF/ice.pdf">[PDF]</a></li> <li><a href="ICElib.html">ICE (Inter-Client Exchange) Library API</a> <a href="../PDF/ICElib.pdf">[PDF]</a></li> <li><a href="icccm.html">ICCCM (Inter-Client Communcations Conventions Manual)</a> <a href="../PDF/icccm.pdf">[PDF]</a></li> - <li><a href="xsmp.html">SM (X Session Managemenet) Protocol</a> <a href="../PDF/xsmp.pdf">[PDF]</a></li> + <li><a href="xsmp.html">SM (X Session Management) Protocol</a> <a href="../PDF/xsmp.pdf">[PDF]</a></li> <li><a href="SMlib.html">SM (X Session Management) Library API</a> <a href="../PDF/SMlib.pdf">[PDF]</a></li> </ul> |