Hello community,
here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at 2012-05-08 12:06:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-proto-devel (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-proto-devel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-proto-devel", Maintainer is "sndirsch@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2012-03-02 13:50:37.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11-proto-devel.new/xorg-x11-proto-devel.changes 2012-05-08 12:06:42.000000000 +0200
@@ -1,0 +2,73 @@
+Wed Apr 11 17:23:45 UTC 2012 - vuntz@opensuse.org
+
+- Update many proto to latest versions:
+ + See details for each proto.
+ + Most of them have (sometimes, without any other change):
+ - fixes for author affiliation and copyright text
+ - some trivial documentation cleanup
+ - some build system improvements and cleanup
+- Update applewmproto to version 1.4.2:
+ + Clarifies some ambiguity in the protocol by refering the caller
+ to the Xplugin API for some constants rather than relying on
+ values and meaning within AppleWM (which is just exposing parts
+ of the Xplugin API to X11 clients).
+- Update bigreqsproto to version 1.1.2.
+- Update dmxproto to version 2.3.1.
+- Update evieext to version 1.1.1.
+- Update fontsproto to version 2.1.2.
+- Update glproto to version 1.4.15:
+ + Document GLX_ARB_create_context and
+ GLX_ARB_create_context_profile protocol
+- Update inputproto to version 2.2:
+ + Support for multitouch devices.
+ + Ability for clients to register for and receive touch events.
+ + Changes from version 2.1:
+ - Smooth scrolling support.
+ - New raw event behaviour allows clients to listen to raw
+ events from a device even if that device is currently
+ grabbed.
+- Update kbproto to version 1.0.6:
+ + Convert from Framemaker to DocBook/XML.
+ + Fix formatting of last item in KEYPAD key type list.
+ + Fix bad link anchors.
+ + Remove duplicate 'See see' text.
+ + Remove empty revision history.
+ + Convert images from gif to svg format.
+- Update printproto to version 1.0.5:
+ + Move Xprint protocol spec & overview man pages from xorg-docs.
+- Update recordproto to version 1.14.2.
+- Update resourceproto to version 1.2.0:
+ + Distribute & install resproto.txt with the release.
+ + Two new requests: XResQueryClientIds and XResQueryResourceBytes
+- Update scrnsaverproto to version 1.2.2.
+- Update util-macros to version 1.17:
+ + Add Add XORG_ENABLE_INTEGRATION_TESTS
+ + Several bug fixes
+ + Changes from 1.16.2:
+ - Cache the results of checking compiler flag support in
+ XORG_TESTSET_CFLAG
+ - Define BASE_CXXFLAGS when C++ is the chosen language
+ + Changes from 1.16.1:
+ - Provide a configure option to turn off the selective
+ -Werror=... CFLAGS
+ + Changes from 1.16.0:
+ - Add XORG_TESTSET_CFLAG
+ - Add XORG_COMPILER_FLAGS to replace XORG_CWARNFLAGS
+ - Add an optional argument to XORG_LD_WRAP
+ - Add XORG_MEMORY_CHECK_FLAGS
+- Update xcb-proto to version 1.7.1:
+ + Add ge and xf86vidmode protocol descriptions
+ + Remove now unnecessary files as everything is implemented in
+ xcbgen
+ + Rename the ExprType "parent" attribute to "parents"
+- Update xcmiscproto to version 1.2.2.
+- Update xextproto to version 7.2.1.
+- Update xf86driproto to version 2.1.1.
+- Update xf86vidmodeproto to version 2.3.1.
+- Update xineramaproto to version 1.2.1.
+- Update xproto to version 7.0.23:
+ + Documentation improvements.
+ + Define new keysyms needed for input of various langugages.
+ + Build fixes.
+
+-------------------------------------------------------------------
Old:
----
applewmproto-1.4.1.tar.bz2
bigreqsproto-1.1.1.tar.bz2
dmxproto-2.3.tar.bz2
evieext-1.1.0.tar.bz2
fontsproto-2.1.1.tar.bz2
glproto-1.4.14.tar.bz2
inputproto-2.0.1.tar.bz2
kbproto-1.0.5.tar.bz2
printproto-1.0.4.tar.bz2
recordproto-1.14.1.tar.bz2
resourceproto-1.1.1.tar.bz2
scrnsaverproto-1.2.1.tar.bz2
util-macros-1.15.0.tar.bz2
xcb-proto-1.7.tar.bz2
xcmiscproto-1.2.1.tar.bz2
xextproto-7.2.0.tar.bz2
xf86driproto-2.1.0.tar.bz2
xf86vidmodeproto-2.3.tar.bz2
xineramaproto-1.2.tar.bz2
xproto-7.0.22.tar.bz2
New:
----
applewmproto-1.4.2.tar.bz2
bigreqsproto-1.1.2.tar.bz2
dmxproto-2.3.1.tar.bz2
evieext-1.1.1.tar.bz2
fontsproto-2.1.2.tar.bz2
glproto-1.4.15.tar.bz2
inputproto-2.2.tar.bz2
kbproto-1.0.6.tar.bz2
printproto-1.0.5.tar.bz2
recordproto-1.14.2.tar.bz2
resourceproto-1.2.0.tar.bz2
scrnsaverproto-1.2.2.tar.bz2
util-macros-1.17.tar.bz2
xcb-proto-1.7.1.tar.bz2
xcmiscproto-1.2.2.tar.bz2
xextproto-7.2.1.tar.bz2
xf86driproto-2.1.1.tar.bz2
xf86vidmodeproto-2.3.1.tar.bz2
xineramaproto-1.2.1.tar.bz2
xproto-7.0.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.SuKoW6/_old 2012-05-08 12:06:44.000000000 +0200
+++ /var/tmp/diff_new_pack.SuKoW6/_new 2012-05-08 12:06:44.000000000 +0200
@@ -15,11 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# No README, pretending to be from X.Org
+
%bcond_with VNC
-%define xproto xproto-7.0.22
-%define xcbp xcb-proto-1.7
+%define xproto xproto-7.0.23
+%define xcbp xcb-proto-1.7.1
%define vncp vncproto-20070501
Name: xorg-x11-proto-devel
@@ -27,49 +27,50 @@
BuildRequires: fdupes
BuildRequires: pkg-config
BuildRequires: python-base
-BuildRequires: pkgconfig(xorg-macros) xmlto
+BuildRequires: xmlto
+BuildRequires: pkgconfig(xorg-macros) >= 1.12
# manual provides to avoid dependency loop
# Provides: pkgconfig(applewmproto) pkgconfig(bigreqsprot) pkgconfig(compositeproto) pkgconfig(damageproto) pkgconfig(dmxproto) pkgconfig(dri2proto) pkgconfig(evieext) pkgconfig(fixesproto) pkgconfig(fontcacheproto) pkgconfig(fontsproto) pkgconfig(glproto) pkgconfig(inputproto) pkgconfig(kbproto) pkgconfig(libpthread-stubs) pkgconfig(printproto) pkgconfig(randrproto) pkgconfig(recordproto) pkgconfig(renderproto) pkgconfig(resourceproto) pkgconfig(scrnsaveproto) pkgconfig(trapproto) pkgconfig(util-macros) pkgconfig(videoproto) pkgconfig(vncproto) pkgconfig(windowswmproto) pkgconfig(xcb-proto) pkgconfig(xcliplistproto) pkgconfig(xcmiscproto) pkgconfig(x86bigfontproto) pkgconfig(xf86dgaproto) pkgconfig(xf86driproto) pkgconfig(xf86miscproto) pkgconfig(xf86rushproto) pkgconfig(xf86vidmodeproto) pkgconfig(xineramaproto) pkgconfig(xproto) pkgconfig(xproxymanagementprotocol)
Url: http://xorg.freedesktop.org/
Version: 7.6
Release: 0
-License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Group: Development/Libraries/X11
Summary: Header files and Libraries mandatory for X11 Development
-Source0: applewmproto-1.4.1.tar.bz2
-Source1: bigreqsproto-1.1.1.tar.bz2
+License: MIT
+Group: Development/Libraries/X11
+Source0: applewmproto-1.4.2.tar.bz2
+Source1: bigreqsproto-1.1.2.tar.bz2
Source2: compositeproto-0.4.2.tar.bz2
Source3: damageproto-1.2.1.tar.bz2
-Source4: dmxproto-2.3.tar.bz2
+Source4: dmxproto-2.3.1.tar.bz2
Source5: fixesproto-5.0.tar.bz2
Source6: fontcacheproto-0.1.3.tar.bz2
-Source7: fontsproto-2.1.1.tar.bz2
-Source8: glproto-1.4.14.tar.bz2
-Source9: inputproto-2.0.1.tar.bz2
-Source10: kbproto-1.0.5.tar.bz2
-Source11: printproto-1.0.4.tar.bz2
+Source7: fontsproto-2.1.2.tar.bz2
+Source8: glproto-1.4.15.tar.bz2
+Source9: inputproto-2.2.tar.bz2
+Source10: kbproto-1.0.6.tar.bz2
+Source11: printproto-1.0.5.tar.bz2
Source12: randrproto-1.3.2.tar.bz2
-Source13: recordproto-1.14.1.tar.bz2
+Source13: recordproto-1.14.2.tar.bz2
Source14: renderproto-0.11.1.tar.bz2
-Source15: resourceproto-1.1.1.tar.bz2
-Source16: scrnsaverproto-1.2.1.tar.bz2
+Source15: resourceproto-1.2.0.tar.bz2
+Source16: scrnsaverproto-1.2.2.tar.bz2
Source17: trapproto-X11R7.0-3.4.3.tar.bz2
-Source18: util-macros-1.15.0.tar.bz2
+Source18: util-macros-1.17.tar.bz2
Source19: videoproto-2.3.1.tar.bz2
Source20: windowswmproto-1.0.4.tar.bz2
-Source21: xcmiscproto-1.2.1.tar.bz2
-Source22: xextproto-7.2.0.tar.bz2
+Source21: xcmiscproto-1.2.2.tar.bz2
+Source22: xextproto-7.2.1.tar.bz2
Source23: xf86bigfontproto-1.2.0.tar.bz2
Source24: xf86dgaproto-2.1.tar.bz2
-Source25: xf86driproto-2.1.0.tar.bz2
+Source25: xf86driproto-2.1.1.tar.bz2
Source26: xf86miscproto-0.9.3.tar.bz2
Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2
-Source28: xf86vidmodeproto-2.3.tar.bz2
-Source29: xineramaproto-1.2.tar.bz2
+Source28: xf86vidmodeproto-2.3.1.tar.bz2
+Source29: xineramaproto-1.2.1.tar.bz2
Source30: %{xproto}.tar.bz2
Source31: xproxymanagementprotocol-1.0.3.tar.bz2
-Source32: evieext-1.1.0.tar.bz2
+Source32: evieext-1.1.1.tar.bz2
Source33: %{xcbp}.tar.bz2
Source34: libpthread-stubs-0.3.tar.bz2
%if %{with VNC}
@@ -77,7 +78,8 @@
%endif
Source36: xcliplistproto-20070501.tar.bz2
Source37: dri2proto-2.6.tar.bz2
-Requires: glibc-devel python-xcb-proto-devel = %{version}
+Requires: glibc-devel
+Requires: python-xcb-proto-devel = %{version}
%description
Header files and libraries needed
@@ -86,6 +88,7 @@
%package -n python-xcb-proto-devel
Summary: Python libraries mandatory for XML-XCB Development
+Group: Development/Libraries/X11
Requires: python-base = %{py_ver}
%description -n python-xcb-proto-devel
@@ -158,6 +161,7 @@
/usr/%{_lib}/pkgconfig/*.pc
/usr/share/pkgconfig/*.pc
/usr/share/aclocal/*.m4
+/usr/share/man/man7/Xprint.7%{?ext_man}
/usr/share/xcb/
%doc %{xproto}/COPYING %{xproto}/AUTHORS XML-XCB %{xcbp}/doc/xml-xcb.txt
++++++ applewmproto-1.4.1.tar.bz2 -> applewmproto-1.4.2.tar.bz2 ++++++
++++ 11125 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-1.4.1/COPYING new/applewmproto-1.4.2/COPYING
--- old/applewmproto-1.4.1/COPYING 2009-08-07 06:46:11.000000000 +0200
+++ new/applewmproto-1.4.2/COPYING 2011-03-31 09:09:41.000000000 +0200
@@ -1,12 +1,27 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+/**************************************************************************
-Please submit updated COPYING files to the Xorg bugzilla:
+Copyright (c) 2002-2009 Apple, Inc.
+All Rights Reserved.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
-http://lists.freedesktop.org/mailman/listinfo/xorg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-1.4.1/ChangeLog new/applewmproto-1.4.2/ChangeLog
--- old/applewmproto-1.4.1/ChangeLog 2009-08-27 07:25:39.000000000 +0200
+++ new/applewmproto-1.4.2/ChangeLog 2011-04-07 00:56:15.000000000 +0200
@@ -1,3 +1,115 @@
+commit 2eeb7a70f8e8a3f860e177958c4e444e79f5bd68
+Author: Jeremy Huddleston
+Date: Wed Apr 6 15:55:14 2011 -0700
+
+ configure.ac: Version bump to 1.4.2
+
+ Signed-off-by: Jeremy Huddleston
+
+commit e6dcda815740711b66641545e911a96ac58f805f
+Author: Jeremy Huddleston
+Date: Thu Mar 31 00:19:13 2011 -0700
+
+ Don't provide AppleWMFrame* values in the applewm protocol. Those are
+ determined by libXplugin and are passed straight through. The AppleWM
+ protocol just serves to transport those values between the WM and libXplugin.
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 6137d004f732353d386d03b86ea38b0a55b5999b
+Author: Gaetan Nadon
+Date: Sun Mar 28 19:25:52 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 98593c3b23c60284a45409d1bbfca19e4241d38f
+Author: Gaetan Nadon
+Date: Sun Mar 28 19:00:30 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 5ffe2fc24f01f2f8b5ad32013a1ff81e3fc363d8
+Author: Gaetan Nadon
+Date: Sun Nov 22 19:24:47 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 0ddf96a062a701414d6080abbd4484970097742d
+Author: Jeremy Huddleston
+Date: Tue Nov 17 10:49:59 2009 -0800
+
+ Updated COPYING
+
+commit 8fecb08b6db9efc6563b5c430ae849547dfa361d
+Author: Gaetan Nadon
+Date: Mon Nov 16 11:10:10 2009 -0500
+
+ README: file created or updated #24206
+
+ Contains a set of URLs to freedesktop.org.
+
+commit e5867061370acfe6ff7fdfdbc5ae05d850c8b7da
+Author: Gaetan Nadon
+Date: Sat Nov 14 16:39:09 2009 -0500
+
+ Makefile.am: ChangeLog is not required in EXTRA_DIST or MAINTAINERCLEANFILES
+
+ ChangeLog is a file known to automake and requires no further coding
+
+commit 6d5e7fd9862160a8ecf2c78aac70ec83bc137703
+Author: Gaetan Nadon
+Date: Sat Nov 14 16:37:41 2009 -0500
+
+ configure.ac: AM_MAINTAINER_MODE missing #24238
+
+ This turns off maintainer mode build rules in tarballs.
+ Works in conjunction with autogen.sh --enable-maintainer-mode
+
+commit b79aac3e8dfb81774f2bdca1a22759a678a93742
+Author: Gaetan Nadon
+Date: Sat Nov 14 16:36:38 2009 -0500
+
+ Makefile.am: INSTALL file is missing or incorrect #24206
+
+ The standard GNU file on building/installing tarball is copied
+ using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
+ Add INSTALL target
+
+commit 4e47c876c11b1d9b6d43acf0c42f74d022c852c8
+Author: Gaetan Nadon
+Date: Sat Nov 14 16:29:26 2009 -0500
+
+ configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit e52179b9fa9bb61e1bf6393d786095cde81d67b9
+Author: Gaetan Nadon
+Date: Sat Nov 14 16:26:20 2009 -0500
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit a6696560ef67bf4d2b47a9dbab635de5a272279a
Author: Peter Hutterer
Date: Thu Aug 27 15:24:52 2009 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-1.4.1/INSTALL new/applewmproto-1.4.2/INSTALL
--- old/applewmproto-1.4.1/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/applewmproto-1.4.2/INSTALL 2011-04-07 00:56:15.000000000 +0200
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-1.4.1/Makefile.am new/applewmproto-1.4.2/Makefile.am
--- old/applewmproto-1.4.1/Makefile.am 2009-08-24 03:48:03.000000000 +0200
+++ new/applewmproto-1.4.2/Makefile.am 2011-03-31 09:09:41.000000000 +0200
@@ -6,14 +6,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = applewmproto.pc
-EXTRA_DIST = applewmproto.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
ChangeLog:
$(CHANGELOG_CMD)
+INSTALL:
+ $(INSTALL_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-1.4.1/README new/applewmproto-1.4.2/README
--- old/applewmproto-1.4.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/applewmproto-1.4.2/README 2011-03-31 09:09:41.000000000 +0200
@@ -0,0 +1,31 @@
+ Apple Rootless Window Management Extension
+
+This extension defines a protcol that allows X window managers
+to better interact with the Mac OS X Aqua user interface when
+running X11 in a rootless mode.
+
+Extension name: Apple-WM
+
+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/proto/applewmproto
+
+ http://cgit.freedesktop.org/xorg/proto/applewmproto
+
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-1.4.1/applewmconst.h new/applewmproto-1.4.2/applewmconst.h
--- old/applewmproto-1.4.1/applewmconst.h 2009-08-27 05:47:28.000000000 +0200
+++ new/applewmproto-1.4.2/applewmconst.h 2011-03-31 09:17:50.000000000 +0200
@@ -73,35 +73,12 @@
#define AppleWMNumWindowLevels 5
/* Possible value for frame_rect argument to XAppleWMFrameGetRect() */
-#define AppleWMFrameRectTitleBar 1
-#define AppleWMFrameRectTracking 2
-#define AppleWMFrameRectGrowBox 3
+/* Use xp_frame_rect_enum from */
/* Window frame classes */
-#define AppleWMFrameClassDocument 1 << 0
-#define AppleWMFrameClassDialog 1 << 1
-#define AppleWMFrameClassModalDialog 1 << 2
-#define AppleWMFrameClassSystemModalDialog 1 << 3
-#define AppleWMFrameClassUtility 1 << 4
-#define AppleWMFrameClassToolbar 1 << 5
-#define AppleWMFrameClassMenu 1 << 6
-#define AppleWMFrameClassSplash 1 << 7
-#define AppleWMFrameClassBorderless 1 << 8
+/* Use xp_frame_class_enum from */
/* Window frame attributes */
-#define AppleWMFrameActive 0x0001
-#define AppleWMFrameUrgent 0x0002
-#define AppleWMFrameTitle 0x0004
-#define AppleWMFramePrelight 0x0008
-#define AppleWMFrameShaded 0x0010
-#define AppleWMFrameCloseBox 0x0100
-#define AppleWMFrameCollapseBox 0x0200
-#define AppleWMFrameZoomBox 0x0400
-#define AppleWMFrameAnyBox 0x0700
-#define AppleWMFrameCloseBoxClicked 0x0800
-#define AppleWMFrameCollapseBoxClicked 0x1000
-#define AppleWMFrameZoomBoxClicked 0x2000
-#define AppleWMFrameAnyBoxClicked 0x3800
-#define AppleWMFrameGrowBox 0x4000
+/* Use xp_frame_attr_enum from */
#endif /* _APPLEWMCONST_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-1.4.1/configure.ac new/applewmproto-1.4.2/configure.ac
--- old/applewmproto-1.4.1/configure.ac 2009-08-27 07:25:21.000000000 +0200
+++ new/applewmproto-1.4.2/configure.ac 2011-04-07 00:54:57.000000000 +0200
@@ -1,12 +1,13 @@
-AC_PREREQ([2.57])
-AC_INIT([AppleWMProto], [1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([AppleWMProto], [1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
applewmproto.pc])
++++++ bigreqsproto-1.1.1.tar.bz2 -> bigreqsproto-1.1.2.tar.bz2 ++++++
++++ 8711 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigreqsproto-1.1.1/ChangeLog new/bigreqsproto-1.1.2/ChangeLog
--- old/bigreqsproto-1.1.1/ChangeLog 2010-10-30 05:21:34.000000000 +0200
+++ new/bigreqsproto-1.1.2/ChangeLog 2012-03-23 05:00:23.000000000 +0100
@@ -1,3 +1,214 @@
+commit 9880dfa3489eddd8aaa1bdf24f621b13e514d5db
+Author: Alan Coopersmith
+Date: Thu Mar 22 20:38:40 2012 -0700
+
+ bigreqsproto 1.1.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 65ba594c8e6c28ed5ec99552812bc238855f8f9a
+Author: Matt Dew
+Date: Sat Jan 14 23:02:51 2012 -0700
+
+ informaltable cleanup
+
+ On certain tables, add top and bottom borders to table
+ header and a bottom border to the table. This matches
+ what those tables in the old pdfs looked like.
+
+ the <?dbfo keep-together='always'> prevents tables from
+ splitting across pages. Useful for tiny tables.
+
+ Converting the colwidth to a floating point,
+ WARNING: table-layout="fixed" and column-width unspecified
+ => falling back to proportional-column-width(1)
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit cc6006cb0db1373fffe92e9f00a8d06c8387e914
+Author: Matt Dew <marcoz@osource.org>
+Date: Sat Oct 1 01:52:59 2011 -0600
+
+ 1 - fix the capitolization of the ID attriutes to match either the
+ <title> or <funcdef> string it goes with.
+ 2 - fix any <linkend>'s that were affected by 1.
+ 3 - any <function> in the docs that has an actual funcdef,
+ will become an olink.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit abdd33c74d55238f5db4f7d5b40278f78c13ac25
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Sep 16 17:09:05 2011 -0400
+
+ specs: fix author affiliation
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1d7e57287990ec1631432299bad25cdd4180c62e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 12 16:54:45 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 6540a8ea44213746d76d07c94444e937a791c1ff
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 19:49:54 2011 -0400
+
+ docs: remove <productnumber> which is not used by default
+
+ This element is not rendered by default on the title. A template
+ customization is required to display it.
+ X Window System does not have a product number.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5306b4b7f3254a8ba3d24be86a8dd53b3d0699a1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2e7dba38d2795735d6cbca4b6a799a2050e64313
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d5028b4fd5d4541378fd0523f013a5e3cf1c6414
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 12 17:54:50 2011 -0400
+
+ Install xml versions of specs even if HAVE_XMLTO is false
+
+ DocBook/XML input source is also a usefull output format that can be viewed
+ with an XML viewer or editor and by some O/S help system.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 301dd63364857bc1547f1beb58c787bfdf11e19b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 5 16:27:37 2011 -0400
+
+ Install target dbs alongside generated documents
+
+ This matches a change in xorg-sgml-docs whereby the masterdb will look for
+ the target dbs into the same location as the generated documents.
+
+ The target dbs are now installed alongside the generated documents.
+ Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+ has the potential of installing outside the package prefix and cause
+ distcheck to fail when user does not have write permission in this package.
+
+ Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit f92b5feb06129abb6a7a1eb86504bcb584f94320
+Author: Matt Dew <marcoz@osource.org>
+Date: Wed May 25 22:00:07 2011 -0600
+
+ Add id attribute to funcsynopsis to allow other docs to olink
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f107d40a9e91e0cd06635c29a51633339f0f7465
+Author: Matt Dew <marcoz@osource.org>
+Date: Sun May 22 19:34:50 2011 -0600
+
+ Add olinks to functions decribed in libX11 documentation.
+
+ This patch is used with the libX11 patch.
+ It turns the functions listed in this doc into hyperlinks to the
+ declarations that are in libX11 documentation.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 20537dba79058f09d3dc9cfafb6114f2c77f1e83
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Feb 27 15:06:18 2011 -0500
+
+ Documentation: add Docbook external references support
+
+ When writing technical documentation, it is often necessary to cross
+ reference to other information. When that other information is not in the
+ current document, additional support is needed, namely <olink>.
+
+ A new feature with version 1.7 of xorg-sgml-doctools adds references to
+ other documents within or outside this package.
+
+ This patch adds technical support for this feature but does not change
+ the content of the documentation as seen by the end user.
+
+ Each book or article must generate a database containing the href
+ of sections that can be referred to from another document. This database
+ is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+ the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+ documentation is the same. This forms a virtual document tree.
+
+ This database is consulted by other documents while they are being generated
+ in order to fulfill the missing information for linking.
+ Refer to the xorg-sgml-doctools for further technical information.
+
+ Co-authored-by: Matt Dew <marcoz@osource.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 872a6cb826f1d21c841d7df4b59a5fb993342353
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Feb 24 20:37:00 2011 -0500
+
+ Docbook: change the book id to match the xml file basename
+
+ This is required for the up-coming external references support.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d9ee7b60c2b677323cf71ebb203a73d1aaf3f528
+Author: Paulo Zanoni <pzanoni@mandriva.com>
+Date: Thu Dec 16 13:36:00 2010 -0200
+
+ Use docbookx.dtd version 4.3 for all docs
+
+ Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0c63dfb7abac7648638384cd1807e36c27ff6d0e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Nov 9 15:19:09 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 59730aba859c0b586b7e63e79c07b7741719845d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 20:21:07 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigreqsproto-1.1.1/configure.ac new/bigreqsproto-1.1.2/configure.ac
--- old/bigreqsproto-1.1.1/configure.ac 2010-10-30 05:20:21.000000000 +0200
+++ new/bigreqsproto-1.1.2/configure.ac 2012-03-23 04:39:00.000000000 +0100
@@ -1,18 +1,19 @@
AC_PREREQ([2.60])
-AC_INIT([BigReqsProto], [1.1.1],
+AC_INIT([BigReqsProto], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
+# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
+ [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_WITH_XSLTPROC
+XORG_CHECK_SGML_DOCTOOLS(1.8)
AC_OUTPUT([Makefile
specs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigreqsproto-1.1.1/docbook.am new/bigreqsproto-1.1.2/docbook.am
--- old/bigreqsproto-1.1.1/docbook.am 1970-01-01 01:00:00.000000000 +0100
+++ new/bigreqsproto-1.1.2/docbook.am 2012-03-23 04:39:00.000000000 +0100
@@ -0,0 +1,105 @@
+#
+# 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.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA =
+
+# DocBook/XML file with chapters, appendix and images it includes
+dist_shelf_DATA = $(docbook) $(chapters)
+
+if HAVE_XMLTO
+if HAVE_STYLESHEETS
+
+XMLTO_SEARCHPATH_FLAGS = \
+ --searchpath "$(XORG_SGML_PATH)/X11" \
+ --searchpath "$(abs_top_builddir)"
+XMLTO_HTML_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XMLTO_HTML_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_HTML_STYLESHEET_FLAGS) \
+ $(XMLTO_HTML_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_XMLTO_TEXT
+
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+if HAVE_FOP
+XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+XMLTO_PDF_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+XMLTO_FO_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_FO_STYLESHEET_FLAGS) \
+ $(XMLTO_FO_IMAGEPATH_FLAGS) \
+ $(XMLTO_PDF_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.pdf)
+%.pdf: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+
+shelf_DATA += $(docbook:.xml=.ps)
+%.ps: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+# Generate documents cross-reference target databases
+if HAVE_XSLTPROC
+
+XSLT_SEARCHPATH_FLAGS = \
+ --path "$(XORG_SGML_PATH)/X11" \
+ --path "$(abs_top_builddir)"
+XSLT_OLINK_FLAGS = \
+ --stringparam targets.filename "$@" \
+ --stringparam collect.xref.targets "only" \
+ --stringparam olink.base.uri "$(@:.db=)"
+
+XSLT_HTML_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XSLT_PDF_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+shelf_DATA += $(docbook:.xml=.html.db)
+%.html.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+
+shelf_DATA += $(docbook:.xml=.pdf.db)
+%.pdf.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigreqsproto-1.1.1/specs/Makefile.am new/bigreqsproto-1.1.2/specs/Makefile.am
--- old/bigreqsproto-1.1.1/specs/Makefile.am 2010-07-01 09:39:49.000000000 +0200
+++ new/bigreqsproto-1.1.2/specs/Makefile.am 2012-03-23 04:39:00.000000000 +0100
@@ -1,64 +1,13 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
if ENABLE_SPECS
-doc_sources = bigreq.xml
-dist_doc_DATA = $(doc_sources)
-if HAVE_XMLTO
-doc_DATA = $(doc_sources:.xml=.html)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = bigreq.xml
-if HAVE_FOP
-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
-if HAVE_XMLTO_TEXT
-doc_DATA += $(doc_sources:.xml=.txt)
-endif
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
-endif
-
-CLEANFILES = $(doc_DATA)
-
-SUFFIXES = .xml .ps .pdf .txt .html
-
-.xml.txt:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-.xml.html:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-.xml.pdf:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-.xml.ps:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigreqsproto-1.1.1/specs/bigreq.xml new/bigreqsproto-1.1.2/specs/bigreq.xml
--- old/bigreqsproto-1.1.1/specs/bigreq.xml 2010-10-30 05:18:01.000000000 +0200
+++ new/bigreqsproto-1.1.2/specs/bigreq.xml 2012-03-23 04:39:00.000000000 +0100
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<!DOCTYPE book 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;
+]>
<!-- lifted from troff+ms+XMan by doclifter -->
-<book id="bigreqms">
+<book id="bigreq">
<bookinfo>
<title>Big Requests Extension</title>
<subtitle>X Consortium Standard</subtitle>
- <releaseinfo>X Version 11, Release 6.4</releaseinfo>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <releaseinfo>Version 2.0</releaseinfo>
<authorgroup>
<author>
<firstname>Bob</firstname><surname>Scheifler</surname>
+ <affiliation><orgname>X Consortium</orgname></affiliation>
</author>
</authorgroup>
- <corpname>X Consortium Standard</corpname>
- <copyright><year>1993</year><year>1994</year>
- <holder>X Consortium</holder></copyright>
- <releaseinfo>Version 2.0</releaseinfo>
- <affiliation><orgname>X Consortium</orgname></affiliation>
- <productnumber>X Version 11, Release 7</productnumber>
+ <copyright><year>1993</year><year>1994</year><holder>X Consortium</holder></copyright>
<legalnotice>
<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para>
@@ -35,7 +35,7 @@
</bookinfo>
-<chapter id='overview'>
+<chapter id='Overview'>
<title>Overview</title>
<para>This extension enables the use of protocol requests that exceed 262140 bytes in length.</para>
@@ -46,12 +46,13 @@
<para>For example, a normal <function>PolyLine</function> encoding is:</para>
-<informaltable pgwide='0' frame='none'>
- <tgroup cols='4' align='left'>
- <colspec colwidth='0.5in' colname='c1'/>
- <colspec colwidth='1.5in' colname='c2'/>
- <colspec colwidth='1.5in' colname='c3'/>
- <colspec colwidth='2.0in' colname='c4'/>
+<informaltable id='PolyLine' frame='none'>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='4' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='3.0*'/>
+ <colspec colname='c3' colwidth='2.0*'/>
+ <colspec colname='c4' colwidth='11.0*'/>
<thead>
<row>
<entry namest="c1" nameend="c4"><function>PolyLine</function></entry>
@@ -112,12 +113,13 @@
<para>An extended-length <function>PolyLine</function> encoding is:</para>
-<informaltable pgwide='0' frame='none'>
- <tgroup cols='4' align='left'>
- <colspec colwidth='0.5in' colname='c1'/>
- <colspec colwidth='1.5in' colname='c2'/>
- <colspec colwidth='1.5in' colname='c3'/>
- <colspec colwidth='2.0in' colname='c4'/>
+<informaltable frame='none'>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='4' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='3.0*'/>
+ <colspec colname='c3' colwidth='2.0*'/>
+ <colspec colname='c4' colwidth='11.0*'/>
<thead>
<row>
<entry namest="c1" nameend="c4"><function>PolyLine</function></entry>
@@ -185,7 +187,7 @@
<para>Extended-length protocol encodings, once enabled, can be used on all protocol requests, including all extensions.</para>
</chapter>
-<chapter id='requests'>
+<chapter id='Requests'>
<title>Requests</title>
<para><function>BigReqEnable</function></para>
@@ -197,24 +199,25 @@
<para>This request enables extended-length protocol requests for the requesting client. It also returns the maximum length of a request, in 4-byte units, that can be used in extended-length protocol requests. This value will always be greater than the maximum-request-length returned in the connection setup information.</para>
</chapter>
-<chapter id='events_and_errors'>
+<chapter id='Events_and_Errors'>
<title>Events and Errors</title>
<para>No new events or errors are defined by this extension.</para>
</chapter>
-<chapter id='encoding'>
+<chapter id='Encoding'>
<title>Encoding</title>
<para>Please refer to the X11 Protocol Encoding document as this document uses conventions established there.</para>
<para>The name of this extension is “BIG-REQUESTS”.</para>
-<informaltable pgwide='0' frame='none'>
- <tgroup cols='3' align='left'>
- <colspec colwidth='0.5in' colname='c1'/>
- <colspec colwidth='0.5in' colname='c2'/>
- <colspec colwidth='2.0in' colname='c3'/>
+<informaltable frame='none'>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='2.0*'/>
+ <colspec colname='c3' colwidth='15.0*'/>
<thead>
<row>
<entry namest="c1" nameend="c3">BigReqEnable</entry>
@@ -238,10 +241,10 @@
</row>
</tbody>
</tgroup>
- <tgroup cols='3' align='left'>
- <colspec colwidth='0.5in' colname='c1'/>
- <colspec colwidth='1.5in' colname='c2'/>
- <colspec colwidth='2.0in' colname='c3'/>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='2.0*'/>
+ <colspec colname='c3' colwidth='15.0*'/>
<thead>
<row>
<entry namest="c1" nameend="c3">=></entry>
@@ -284,16 +287,34 @@
</chapter>
-<chapter id='c_language_binding'>
+<chapter id='C_Language_Binding'>
<title>C language binding</title>
-<para>It is desirable for core Xlib, and other extensions, to use this extension internally when necessary. It is also desirable to make the use of this extension as transparent as possible to the X client. For example, if enabling of the extension were delayed until the first time it was needed, an application that used <function>XNextRequest</function> to determine the sequence number of a request would no longer get the correct sequence number. As such, <function>XOpenDisplay</function> will determine if the extension is supported by the server and, if it is, enable extended-length encodings.</para>
-
-<para>The core Xlib functions <function>XDrawLines</function>, <function>XDrawArcs</function>, <function>XFillPolygon</function>, <function>XChangeProperty</function>, <function>XSetClipRectangles</function>, and <function>XSetRegion</function> are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions (<function>XDrawPoints</function>, <function>XDrawRectangles</function>, <function>XDrawSegments</function>. <function>XFillArcs</function>, <function>XFillRectangles</function>, <function>XPutImage</function> is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead.</para>
+<para>It is desirable for core Xlib, and other extensions, to use this extension internally when necessary. It is also desirable to make the use of this extension as transparent as possible to the X client. For example, if enabling of the extension were delayed until the first time it was needed, an application that used
+<olink targetdoc='libX11' targetptr='XNextRequest'><function>XNextRequest</function></olink>
+to determine the sequence number of a request would no longer get the correct sequence number. As such,
+<olink targetdoc='libX11' targetptr='XOpenDisplay'><function>XOpenDisplay</function></olink>
+will determine if the extension is supported by the server and, if it is, enable extended-length encodings.</para>
+
+<para>The core Xlib functions
+<olink targetdoc='libX11' targetptr='XDrawLines'><function>XDrawLines</function></olink>,
+<olink targetdoc='libX11' targetptr='XDrawArcs'><function>XDrawArcs</function></olink>,
+<olink targetdoc='libX11' targetptr='XFillPolygon'><function>XFillPolygon</function></olink>,
+<olink targetdoc='libX11' targetptr='XChangeProperty'><function>XChangeProperty</function></olink>,
+<olink targetdoc='libX11' targetptr='XSetClipRectangles'><function>XSetClipRectangles</function></olink>, and
+<olink targetdoc='libX11' targetptr='XSetRegion'><function>XSetRegion</function></olink>.
+are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions
+(<olink targetdoc='libX11' targetptr='XDrawPoints'><function>XDrawPoints</function></olink>,
+<olink targetdoc='libX11' targetptr='XDrawRectangles'><function>XDrawRectangles</function></olink>,
+<olink targetdoc='libX11' targetptr='XDrawSegments'><function>XDrawSegments</function></olink>.
+<olink targetdoc='libX11' targetptr='XFillArcs'><function>XFillArcs</function></olink>,
+<olink targetdoc='libX11' targetptr='XFillRectangles'><function>XFillRectangles</function></olink>,
+<olink targetdoc='libX11' targetptr='XPutImage'><function>XPutImage</function></olink>
+is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead.</para>
<para>To permit clients to know what the maximum-request-length for extended-length encodings is, the following function is added to Xlib:
-<funcsynopsis>
+<funcsynopsis id='XExtendedMaxRequestSize'>
<funcprototype>
<funcdef>long <function>XExtendedMaxRequestSize</function></funcdef>
<paramdef>Display <parameter> *display</parameter></paramdef>
@@ -303,7 +324,7 @@
Returns zero (0) if the specified display does not support this extension, otherwise returns the maximum-request-length (in 4-byte units) supported by the server through the extended-length encoding.</para>
</chapter>
-<chapter id='acknowledgements'>
+<chapter id='Acknowledgements'>
<title>Acknowledgements</title>
<para>Clive Feather (IXI) originated the extended-length encoding used in this extension proposal.</para>
++++++ dmxproto-2.3.tar.bz2 -> dmxproto-2.3.1.tar.bz2 ++++++
++++ 8375 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dmxproto-2.3/ChangeLog new/dmxproto-2.3.1/ChangeLog
--- old/dmxproto-2.3/ChangeLog 2009-10-01 14:00:06.000000000 +0200
+++ new/dmxproto-2.3.1/ChangeLog 2011-01-06 02:27:55.000000000 +0100
@@ -1,3 +1,135 @@
+commit aade7161f63fd7f5a673e8432abd998fe1d9c7a2
+Author: Alan Coopersmith
+Date: Wed Jan 5 17:26:54 2011 -0800
+
+ dmxproto 2.3.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit d6131b3d0cf6b30fd059fe1a1a17d4be24d00e9b
+Author: Alan Coopersmith
+Date: Tue Dec 28 18:26:35 2010 -0800
+
+ Remove accidentally added config.h header creation
+
+ Signed-off-by: Alan Coopersmith
+
+commit 710bb6773a0eeb3dfccc92ef0b414c97ee553103
+Author: Alan Coopersmith
+Date: Tue Dec 28 17:59:39 2010 -0800
+
+ Add links to DMX website & protocol spec to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit 9e9b74b7b6ba9427fdae736093263f87e098ae59
+Author: Alan Coopersmith
+Date: Tue Dec 28 17:53:22 2010 -0800
+
+ config: Replace obsolete usage of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7df615d96ea2204b3922bf0600a55cbe661b3d69
+Author: Alan Coopersmith
+Date: Tue Dec 28 17:51:15 2010 -0800
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 2cef0867dcf92eb3cb08868fca23371785c19bad
+Author: Gaetan Nadon
+Date: Sun Mar 28 19:25:52 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit a60e6edd191a52287a65cfa1c04915578a1c998c
+Author: Gaetan Nadon
+Date: Sun Mar 28 19:00:30 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 1d12dbdebd0fbf97dba8a77de0c9678b6439203e
+Author: Gaetan Nadon
+Date: Sun Nov 22 19:24:47 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 5932e06e39c7dad609e31d822670913ba352afc8
+Author: Gaetan Nadon
+Date: Mon Nov 16 11:13:29 2009 -0500
+
+ README: file created or updated #24206
+
+ Contains a set of URLs to freedesktop.org.
+
+commit be2d639aa3c509b90cdf78860a0180daead17fac
+Author: Gaetan Nadon
+Date: Sun Nov 15 19:45:26 2009 -0500
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 304e9178168e33dbf6d5441824ac4c721521136a
+Author: Gaetan Nadon
+Date: Sun Nov 15 18:31:28 2009 -0500
+
+ Makefile.am: INSTALL file is missing or incorrect #24206
+
+ The standard GNU file on building/installing tarball is copied
+ using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
+ Add INSTALL target
+
+commit cd7722d7265e6e8f90f4c0e8b6aa7aa39ebfa785
+Author: Gaetan Nadon
+Date: Sun Nov 15 18:11:36 2009 -0500
+
+ configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit efbe0f2a6b4b1231b887f983bfb38f573ae2bf8c
+Author: Gaetan Nadon
+Date: Sun Nov 15 13:55:24 2009 -0500
+
+ configure.ac: AM_MAINTAINER_MODE missing #24238
+
+ This turns off maintainer mode build rules in tarballs.
+ Works in conjunction with autogen.sh --enable-maintainer-mode
+
+commit f7309b32556fd85353c8740fcaa14b57a667ec38
+Author: Gaetan Nadon
+Date: Sat Nov 14 18:26:46 2009 -0500
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit a71c838e1130be28e1639a606b0a7cb56f44a3a8
Author: Peter Hutterer
Date: Thu Oct 1 19:34:15 2009 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dmxproto-2.3/INSTALL new/dmxproto-2.3.1/INSTALL
--- old/dmxproto-2.3/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/dmxproto-2.3.1/INSTALL 2011-01-06 02:27:55.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dmxproto-2.3/Makefile.am new/dmxproto-2.3.1/Makefile.am
--- old/dmxproto-2.3/Makefile.am 2009-08-25 08:01:14.000000000 +0200
+++ new/dmxproto-2.3.1/Makefile.am 2010-04-10 02:48:00.000000000 +0200
@@ -6,14 +6,15 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmxproto.pc
-EXTRA_DIST = dmxproto.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dmxproto-2.3/README new/dmxproto-2.3.1/README
--- old/dmxproto-2.3/README 1970-01-01 01:00:00.000000000 +0100
+++ new/dmxproto-2.3.1/README 2010-12-29 03:00:29.000000000 +0100
@@ -0,0 +1,40 @@
+ Distributed Multihead X (DMX) Extension
+
+This extension defines a protocol for clients to access a front-end proxy
+X server that controls multiple back-end X servers making up a large display.
+
+Extension name: DMX
+
+More information about the DMX software can be found on the original project
+website at:
+ http://dmx.sourceforge.net/
+
+The protocol specification is currently maintained in the xserver git
+repository at hw/dmx/doc/DMXSpec.txt and can be viewed online at:
+
+ http://cgit.freedesktop.org/xorg/xserver/tree/hw/dmx/doc/DMXSpec.txt
+
+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/proto/dmxproto
+
+ http://cgit.freedesktop.org/xorg/proto/dmxproto
+
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dmxproto-2.3/configure.ac new/dmxproto-2.3.1/configure.ac
--- old/dmxproto-2.3/configure.ac 2009-10-01 13:59:23.000000000 +0200
+++ new/dmxproto-2.3.1/configure.ac 2011-01-06 02:26:21.000000000 +0100
@@ -1,12 +1,22 @@
-AC_PREREQ([2.57])
-AC_INIT([DMXProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+dnl
+dnl Process this file with autoconf to create configure.
+
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([DMXProto], [2.3.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_CONFIG_SRCDIR([Makefile.am])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
-
XORG_DEFAULT_OPTIONS
-AC_OUTPUT([Makefile
- dmxproto.pc])
+AC_CONFIG_FILES([Makefile
+ dmxproto.pc])
+AC_OUTPUT
++++++ evieext-1.1.0.tar.bz2 -> evieext-1.1.1.tar.bz2 ++++++
++++ 11403 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/COPYING new/evieext-1.1.1/COPYING
--- old/evieext-1.1.0/COPYING 2009-08-26 03:49:01.000000000 +0200
+++ new/evieext-1.1.1/COPYING 2011-01-06 02:52:50.000000000 +0100
@@ -1,28 +1,20 @@
-Copyright 2003 Sun Microsystems, Inc.
-
-All rights reserved.
+Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/ChangeLog new/evieext-1.1.1/ChangeLog
--- old/evieext-1.1.0/ChangeLog 2009-08-27 03:34:18.000000000 +0200
+++ new/evieext-1.1.1/ChangeLog 2011-01-06 02:56:57.000000000 +0100
@@ -1,3 +1,125 @@
+commit 9a98637885e2c6d61175090574373ff9b86cfb41
+Author: Alan Coopersmith
+Date: Wed Jan 5 17:54:01 2011 -0800
+
+ evieproto 1.1.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8192a839c3a542e869d241b71128c24715bb1546
+Author: Alan Coopersmith
+Date: Wed Jan 5 17:53:24 2011 -0800
+
+ Chop whitespace off of the ends of lines
+
+ Signed-off-by: Alan Coopersmith
+
+commit 77751643fc01bd8f8ef29345bf17ea8d224039bc
+Author: Alan Coopersmith
+Date: Tue Dec 28 18:27:21 2010 -0800
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 819ac2a57b75501f048c9942491ce96285b8f3bd
+Author: Gaetan Nadon
+Date: Tue Dec 28 18:24:11 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 79c2b66520f266bc0458d48a76b847d824117940
+Author: Alan Coopersmith
+Date: Wed Nov 10 21:01:57 2010 -0800
+
+ Sun's copyrights belong to Oracle now
+
+ Signed-off-by: Alan Coopersmith
+
+commit 2cc1693cec306253de308621e298ce967d91af41
+Author: Alan Coopersmith
+Date: Fri Jan 15 13:26:31 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith
+
+commit 54b2fffced04aa7f69c903035b8202a1611b81a2
+Author: Gaetan Nadon
+Date: Sun Nov 22 19:24:48 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit d276272bd0e86ba4344094b642ed73d37cc2601d
+Author: Gaetan Nadon
+Date: Mon Nov 16 11:13:29 2009 -0500
+
+ README: file created or updated #24206
+
+ Contains a set of URLs to freedesktop.org.
+
+commit 632c3d7d02ff9da94f13e4e563be6be4f283465d
+Author: Gaetan Nadon
+Date: Sun Nov 15 19:45:26 2009 -0500
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 765cabb3633ddc262a2ca2faeb0319c8c3cc7723
+Author: Gaetan Nadon
+Date: Sun Nov 15 18:31:28 2009 -0500
+
+ Makefile.am: INSTALL file is missing or incorrect #24206
+
+ The standard GNU file on building/installing tarball is copied
+ using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
+ Add INSTALL target
+
+commit 5a217580a3ef10d1779bef4fa7e9bb98c4b5696b
+Author: Gaetan Nadon
+Date: Sun Nov 15 18:11:36 2009 -0500
+
+ configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 0e7b63ca7ae9585c8c58e8006b36a0f76c6c7ace
+Author: Gaetan Nadon
+Date: Sun Nov 15 13:55:25 2009 -0500
+
+ configure.ac: AM_MAINTAINER_MODE missing #24238
+
+ This turns off maintainer mode build rules in tarballs.
+ Works in conjunction with autogen.sh --enable-maintainer-mode
+
+commit b7d2eb55564994e00f89e31171fce69724227382
+Author: Gaetan Nadon
+Date: Sat Nov 14 18:26:46 2009 -0500
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit c94dd88d55b9b8f28c702b71a3e025c1a3c4c6b6
Author: Peter Hutterer
Date: Wed Aug 26 11:52:54 2009 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/INSTALL new/evieext-1.1.1/INSTALL
--- old/evieext-1.1.0/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/evieext-1.1.1/INSTALL 2011-01-06 02:56:57.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/Makefile.am new/evieext-1.1.1/Makefile.am
--- old/evieext-1.1.0/Makefile.am 2009-08-26 03:51:01.000000000 +0200
+++ new/evieext-1.1.1/Makefile.am 2011-01-06 02:52:50.000000000 +0100
@@ -8,12 +8,14 @@
EXTRA_DIST = evieproto.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/README new/evieext-1.1.1/README
--- old/evieext-1.1.0/README 1970-01-01 01:00:00.000000000 +0100
+++ new/evieext-1.1.1/README 2011-01-06 02:52:50.000000000 +0100
@@ -0,0 +1,31 @@
+ Extended Visual Information Extension (XEVIE)
+
+
+This extension defines a protocol for a client to determine information
+about core X visuals beyond what the core protocol provides.
+
+Extension name: XEVIE
+
+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/proto/evieproto
+
+ http://cgit.freedesktop.org/xorg/proto/evieproto
+
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/configure.ac new/evieext-1.1.1/configure.ac
--- old/evieext-1.1.0/configure.ac 2009-08-26 03:52:41.000000000 +0200
+++ new/evieext-1.1.1/configure.ac 2011-01-06 02:54:50.000000000 +0100
@@ -1,12 +1,20 @@
-AC_PREREQ([2.57])
-AC_INIT([EvIEExt], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+dnl
+dnl Process this file with autoconf to create configure.
+
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([EvIEExt], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_CONFIG_SRCDIR([Makefile.am])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
evieproto.pc])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/evieproto.h new/evieext-1.1.1/evieproto.h
--- old/evieext-1.1.0/evieproto.h 2009-08-26 03:50:37.000000000 +0200
+++ new/evieext-1.1.1/evieproto.h 2011-01-06 02:54:40.000000000 +0100
@@ -1,43 +1,35 @@
-/************************************************************
-
-Copyright 2003 Sun Microsystems, Inc.
-
-All rights reserved.
-
+/************************************************************
+
+Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+
Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-************************************************************/
-
-#ifndef _XEVIEPROTO_H_
-#define _XEVIEPROTO_H_
-
-#define XEVIENAME "XEVIE"
-
-#define XEVIE_MAJOR_VERSION 1
-#define XEVIE_MINOR_VERSION 0
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+************************************************************/
+
+#ifndef _XEVIEPROTO_H_
+#define _XEVIEPROTO_H_
+
+#define XEVIENAME "XEVIE"
+
+#define XEVIE_MAJOR_VERSION 1
+#define XEVIE_MINOR_VERSION 0
#define X_XevieQueryVersion 0
#define X_XevieStart 1
@@ -47,118 +39,118 @@
#define XevieNumberErrors 0
-typedef struct _XevieQueryVersion {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD16 client_major_version B16;
- CARD16 client_minor_version B16;
-} xXevieQueryVersionReq;
-#define sz_xXevieQueryVersionReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD16 server_major_version B16;
- CARD16 server_minor_version B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXevieQueryVersionReply;
-#define sz_xXevieQueryVersionReply 32
-
-typedef struct _XevieStart {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 screen B32;
-} xXevieStartReq;
-#define sz_xXevieStartReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieStartReply;
-#define sz_xXevieStartReply 32
-
-typedef struct _XevieEnd {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 cmap B32;
-} xXevieEndReq;
-#define sz_xXevieEndReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieEndReply;
-#define sz_xXevieEndReply 32
-
-typedef struct _XevieSend {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- xEvent event;
- CARD32 dataType B32;
-} xXevieSendReq;
-#define sz_xXevieSendReq 104
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieSendReply;
-#define sz_xXevieSendReply 32
-
-typedef struct _XevieSelectInput {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 event_mask B32;
-} xXevieSelectInputReq;
-#define sz_xXevieSelectInputReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieSelectInputReply;
-#define sz_xXevieSelectInputReply 32
-
-#endif /* } _XEVIEPROTO_H_ */
-
+typedef struct _XevieQueryVersion {
+ CARD8 reqType;
+ CARD8 xevieReqType;
+ CARD16 length B16;
+ CARD16 client_major_version B16;
+ CARD16 client_minor_version B16;
+} xXevieQueryVersionReq;
+#define sz_xXevieQueryVersionReq 8
+
+typedef struct {
+ BYTE type;
+ BOOL pad1;
+ CARD16 sequence_number B16;
+ CARD32 length B32;
+ CARD16 server_major_version B16;
+ CARD16 server_minor_version B16;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xXevieQueryVersionReply;
+#define sz_xXevieQueryVersionReply 32
+
+typedef struct _XevieStart {
+ CARD8 reqType;
+ CARD8 xevieReqType;
+ CARD16 length B16;
+ CARD32 screen B32;
+} xXevieStartReq;
+#define sz_xXevieStartReq 8
+
+typedef struct {
+ BYTE type;
+ BOOL pad1;
+ CARD16 sequence_number B16;
+ CARD32 length B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ CARD32 pad7 B32;
+} xXevieStartReply;
+#define sz_xXevieStartReply 32
+
+typedef struct _XevieEnd {
+ CARD8 reqType;
+ CARD8 xevieReqType;
+ CARD16 length B16;
+ CARD32 cmap B32;
+} xXevieEndReq;
+#define sz_xXevieEndReq 8
+
+typedef struct {
+ BYTE type; /* X_Reply */
+ BOOL pad1;
+ CARD16 sequence_number B16;
+ CARD32 length B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ CARD32 pad7 B32;
+} xXevieEndReply;
+#define sz_xXevieEndReply 32
+
+typedef struct _XevieSend {
+ CARD8 reqType;
+ CARD8 xevieReqType;
+ CARD16 length B16;
+ xEvent event;
+ CARD32 dataType B32;
+} xXevieSendReq;
+#define sz_xXevieSendReq 104
+
+typedef struct {
+ BYTE type;
+ BOOL pad1;
+ CARD16 sequence_number B16;
+ CARD32 length B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ CARD32 pad7 B32;
+} xXevieSendReply;
+#define sz_xXevieSendReply 32
+
+typedef struct _XevieSelectInput {
+ CARD8 reqType;
+ CARD8 xevieReqType;
+ CARD16 length B16;
+ CARD32 event_mask B32;
+} xXevieSelectInputReq;
+#define sz_xXevieSelectInputReq 8
+
+typedef struct {
+ BYTE type;
+ BOOL pad1;
+ CARD16 sequence_number B16;
+ CARD32 length B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ CARD32 pad7 B32;
+} xXevieSelectInputReply;
+#define sz_xXevieSelectInputReply 32
+
+#endif /* } _XEVIEPROTO_H_ */
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evieext-1.1.0/evieproto.pc.in new/evieext-1.1.1/evieproto.pc.in
--- old/evieext-1.1.0/evieproto.pc.in 2009-08-26 03:49:01.000000000 +0200
+++ new/evieext-1.1.1/evieproto.pc.in 2011-01-06 02:54:40.000000000 +0100
@@ -2,7 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-
+
Name: EvIEExt
Description: EvIE extension headers
Version: @PACKAGE_VERSION@
++++++ fontsproto-2.1.1.tar.bz2 -> fontsproto-2.1.2.tar.bz2 ++++++
++++ 8705 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-2.1.1/ChangeLog new/fontsproto-2.1.2/ChangeLog
--- old/fontsproto-2.1.1/ChangeLog 2010-10-30 06:32:09.000000000 +0200
+++ new/fontsproto-2.1.2/ChangeLog 2012-03-23 05:00:29.000000000 +0100
@@ -1,3 +1,200 @@
+commit 607784e2ad522b7dff32da82480acf6934dc4a23
+Author: Alan Coopersmith
+Date: Thu Mar 22 20:40:21 2012 -0700
+
+ fontsproto 2.1.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 419c6b31ffc3a87caf2861b6eec546cfc661d113
+Author: Matt Dew
+Date: Sun Oct 2 20:15:53 2011 -0600
+
+ 1 - fix the capitolization of the ID attriutes to match either the
+ <title> or <funcdef> string it goes with.
+ 2 - fix any <linkend>'s that were affected by 1.
+ 3 - any <function> in the docs that has an actual funcdef,
+ will become an olink.
+
+ Signed-off-by: Matt Dew
+
+commit 5073454c1a2510c6e33b7847c8e6f83d38ad03f4
+Author: Gaetan Nadon
+Date: Tue Sep 20 19:48:46 2011 -0400
+
+ specs: use <copyright> for the first holder in multi licensing
+
+ Signed-off-by: Gaetan Nadon
+
+commit 5026754b2310858642a50eeab3b01927b937ab8e
+Author: Gaetan Nadon
+Date: Mon Sep 19 07:56:51 2011 -0400
+
+ specs: The strandard name is still "X Consortium Standard"
+
+ This spec, and libX11 spec, are the only two docs with a different
+ standard name.
+
+ http://cgit.freedesktop.org/xorg/doc/xorg-docs/commit/specs/FSProtocol
+ ?h=XORG-RELEASE-1&id=0f51a88d2cf4a4d1394c79faa3339e5151e5f682
+
+ Signed-off-by: Gaetan Nadon
+
+commit 6817307590e4dec36111bdbb16970d98f8a8889e
+Author: Gaetan Nadon
+Date: Sun Sep 18 10:28:19 2011 -0400
+
+ specs: fix multi licensed copyright notice and license text
+
+ For documentation having multiple licenses, the copyright and legalnotice
+ elements sequence cannot instantiated multiple times.
+ The copyright notice and license text are therefore coded inside a legalnotice
+ element. The role attribute on the paragraph is used to allow styling of the
+ copyright notice text which should not be italicized.
+
+ To view the change in the html format, obtain xorg-sgml-doctools
+ at version 1.10.1 or later and rebuild the html version of the spec.
+
+ Signed-off-by: Gaetan Nadon
+
+commit aaf34e37a1a64f9b89c849edc6760c51ad2368d7
+Author: Gaetan Nadon
+Date: Sat Sep 17 20:43:00 2011 -0400
+
+ specs: fix author affiliation markup
+
+ Signed-off-by: Gaetan Nadon
+
+commit ddb83dcf2d4cf3f6f1218240f45983bf086ee001
+Author: Gaetan Nadon
+Date: Mon Sep 12 20:42:31 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon
+
+commit a82382dd66ca300750449f19fcd29f23fe10641d
+Author: Gaetan Nadon
+Date: Sun Sep 11 19:49:54 2011 -0400
+
+ docs: remove <productnumber> which is not used by default
+
+ This element is not rendered by default on the title. A template
+ customization is required to display it.
+ X Window System does not have a product number.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 1be097307ad7eeb54708467a21295cacb101830b
+Author: Gaetan Nadon
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 0192fbcab2810c7b172388d74d19fce35698ae2a
+Author: Gaetan Nadon
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon
+
+commit e4372971363bd8a897cfdc62b84704f339645f45
+Author: Gaetan Nadon
+Date: Sun Jun 12 17:54:50 2011 -0400
+
+ Install xml versions of specs even if HAVE_XMLTO is false
+
+ DocBook/XML input source is also a usefull output format that can be viewed
+ with an XML viewer or editor and by some O/S help system.
+
+ Signed-off-by: Gaetan Nadon
+
+commit c045479c5dad6e50ee711ed18f0f7ed4de84fd88
+Author: Gaetan Nadon
+Date: Sun Jun 5 16:27:37 2011 -0400
+
+ Install target dbs alongside generated documents
+
+ This matches a change in xorg-sgml-docs whereby the masterdb will look for
+ the target dbs into the same location as the generated documents.
+
+ The target dbs are now installed alongside the generated documents.
+ Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+ has the potential of installing outside the package prefix and cause
+ distcheck to fail when user does not have write permission in this package.
+
+ Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit ea8af5fe7fb284f3dc5fb4df972624d8c190399f
+Author: Gaetan Nadon
+Date: Sun Feb 27 15:06:18 2011 -0500
+
+ Documentation: add Docbook external references support
+
+ When writing technical documentation, it is often necessary to cross
+ reference to other information. When that other information is not in the
+ current document, additional support is needed, namely <olink>.
+
+ A new feature with version 1.7 of xorg-sgml-doctools adds references to
+ other documents within or outside this package.
+
+ This patch adds technical support for this feature but does not change
+ the content of the documentation as seen by the end user.
+
+ Each book or article must generate a database containing the href
+ of sections that can be referred to from another document. This database
+ is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+ the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+ documentation is the same. This forms a virtual document tree.
+
+ This database is consulted by other documents while they are being generated
+ in order to fulfill the missing information for linking.
+ Refer to the xorg-sgml-doctools for further technical information.
+
+ Co-authored-by: Matt Dew
+
+ Signed-off-by: Gaetan Nadon
+
+commit 74a10bb2f4626072b76dcf54b5ef6c933d63be15
+Author: Alan Coopersmith
+Date: Thu Dec 16 17:45:23 2010 -0800
+
+ spec: Fix section titles/nesting
+
+ Signed-off-by: Alan Coopersmith
+
+commit 043885855c2e8312a75a106cee5460b694299afe
+Author: Gaetan Nadon
+Date: Tue Nov 9 15:19:09 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon
+
commit 2fce721a9a0c0ff820f2cbbf7309990c25852f02
Author: Alan Coopersmith
Date: Fri Oct 29 21:29:15 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-2.1.1/configure.ac new/fontsproto-2.1.2/configure.ac
--- old/fontsproto-2.1.1/configure.ac 2010-10-30 06:28:50.000000000 +0200
+++ new/fontsproto-2.1.2/configure.ac 2012-03-23 04:40:31.000000000 +0100
@@ -1,18 +1,19 @@
AC_PREREQ([2.60])
-AC_INIT([FontsProto], [2.1.1],
+AC_INIT([FontsProto], [2.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
+# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
+ [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_WITH_XSLTPROC
+XORG_CHECK_SGML_DOCTOOLS(1.8)
AC_OUTPUT([Makefile
specs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-2.1.1/docbook.am new/fontsproto-2.1.2/docbook.am
--- old/fontsproto-2.1.1/docbook.am 1970-01-01 01:00:00.000000000 +0100
+++ new/fontsproto-2.1.2/docbook.am 2012-03-23 04:40:31.000000000 +0100
@@ -0,0 +1,105 @@
+#
+# 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.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA =
+
+# DocBook/XML file with chapters, appendix and images it includes
+dist_shelf_DATA = $(docbook) $(chapters)
+
+if HAVE_XMLTO
+if HAVE_STYLESHEETS
+
+XMLTO_SEARCHPATH_FLAGS = \
+ --searchpath "$(XORG_SGML_PATH)/X11" \
+ --searchpath "$(abs_top_builddir)"
+XMLTO_HTML_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XMLTO_HTML_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_HTML_STYLESHEET_FLAGS) \
+ $(XMLTO_HTML_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_XMLTO_TEXT
+
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+if HAVE_FOP
+XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+XMLTO_PDF_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+XMLTO_FO_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_FO_STYLESHEET_FLAGS) \
+ $(XMLTO_FO_IMAGEPATH_FLAGS) \
+ $(XMLTO_PDF_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.pdf)
+%.pdf: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+
+shelf_DATA += $(docbook:.xml=.ps)
+%.ps: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+# Generate documents cross-reference target databases
+if HAVE_XSLTPROC
+
+XSLT_SEARCHPATH_FLAGS = \
+ --path "$(XORG_SGML_PATH)/X11" \
+ --path "$(abs_top_builddir)"
+XSLT_OLINK_FLAGS = \
+ --stringparam targets.filename "$@" \
+ --stringparam collect.xref.targets "only" \
+ --stringparam olink.base.uri "$(@:.db=)"
+
+XSLT_HTML_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XSLT_PDF_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+shelf_DATA += $(docbook:.xml=.html.db)
+%.html.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+
+shelf_DATA += $(docbook:.xml=.pdf.db)
+%.pdf.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-2.1.1/specs/Makefile.am new/fontsproto-2.1.2/specs/Makefile.am
--- old/fontsproto-2.1.1/specs/Makefile.am 2010-09-04 01:18:30.000000000 +0200
+++ new/fontsproto-2.1.2/specs/Makefile.am 2012-03-23 04:40:31.000000000 +0100
@@ -1,64 +1,13 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
if ENABLE_SPECS
-doc_sources = fsproto.xml
-dist_doc_DATA = $(doc_sources)
-if HAVE_XMLTO
-doc_DATA = $(doc_sources:.xml=.html)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = fsproto.xml
-if HAVE_FOP
-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
-if HAVE_XMLTO_TEXT
-doc_DATA += $(doc_sources:.xml=.txt)
-endif
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
-endif
-
-CLEANFILES = $(doc_DATA)
-
-SUFFIXES = .xml .ps .pdf .txt .html
-
-.xml.txt:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-.xml.html:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-.xml.pdf:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-.xml.ps:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fontsproto-2.1.1/specs/fsproto.xml new/fontsproto-2.1.2/specs/fsproto.xml
--- old/fontsproto-2.1.1/specs/fsproto.xml 2010-10-30 06:22:51.000000000 +0200
+++ new/fontsproto-2.1.2/specs/fsproto.xml 2012-03-23 04:40:31.000000000 +0100
@@ -1,31 +1,28 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!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;
+]>
-<book id="fsproto">
+<article id="fsproto">
-<bookinfo>
+<articleinfo>
<title>The X Font Service Protocol</title>
- <subtitle>X Window System Standard</subtitle>
+ <subtitle>X Consortium Standard</subtitle>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>Version 2.0</releaseinfo>
<authorgroup>
<author>
<firstname>Jim</firstname><surname>Fulton</surname>
- <affiliation><orgname>
-Network Computing Devices, Inc.
- </orgname></affiliation>
+ <affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation>
</author>
</authorgroup>
- <corpname>X Consortium Standard</corpname>
- <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright>
- <copyright><year>1994</year><holder>X Consortium</holder></copyright>
- <affiliation><orgname>X Consortium</orgname></affiliation>
- <productnumber>X Version 11, Release 6.8</productnumber>
<edition>Revised May 2, 1994</edition>
+ <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright>
<legalnotice>
-
<para>
Permission to use, copy, modify, distribute, and sell this
documentation for any purpose is hereby granted without fee,
@@ -35,6 +32,10 @@
of the information in this document. This documentation is
provided "as is" without express or implied warranty.
</para>
+</legalnotice>
+
+<legalnotice>
+<para role="multiLicensing">Copyright © 1994 X Consortium</para>
<para>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -47,27 +48,23 @@
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
</para>
-
<para>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</para>
-
<para>
Except as contained in this notice, the name of the X Consortium shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
</para>
</legalnotice>
-</bookinfo>
+</articleinfo>
-<chapter>
-<title>TITLE</title>
-<sect1 id="introduction">
+<sect1 id='Introduction'>
<title>Introduction</title>
<para>
The management of fonts in large, heterogeneous environments is one of the
@@ -121,7 +118,7 @@
</para>
</sect1>
-<sect1 id="architectural_model">
+<sect1 id='Architectural_Model'>
<title>Architectural Model</title>
<!-- .XS -->
<!-- (SN Architectural Model -->
@@ -240,7 +237,7 @@
</para>
</sect1>
-<sect1 id="font_server_naming">
+<sect1 id='Font_Server_Naming'>
<title>Font Server Naming</title>
<!-- .XS -->
<!-- (SN Font Server Naming -->
@@ -255,7 +252,7 @@
X Consortium.
</para>
-<sect2 id="tcpip_names">
+<sect2 id='TCPIP_Names'>
<title>TCP/IP Names</title>
<!-- .XS -->
<!-- (SN TCP/IP Names -->
@@ -282,7 +279,7 @@
</literallayout>
</sect2>
-<sect2 id="decnet_names">
+<sect2 id='DECnet_Names'>
<title>DECnet Names</title>
<!-- .XS -->
<!-- (SN DECnet Names -->
@@ -312,7 +309,7 @@
</sect2>
</sect1>
-<sect1 id="protocol">
+<sect1 id='Protocol'>
<title>Protocol</title>
<!-- .XS -->
<!-- (SN Protocol -->
@@ -380,7 +377,7 @@
elements of that type, as in: LISTofCARD8
</para>
-<sect2 id="data_types">
+<sect2 id='Data_Types'>
<title>Data Types</title>
<!-- .XS -->
<!-- (SN Data Types -->
@@ -1107,7 +1104,7 @@
</blockquote>
</sect2>
-<sect2 id="requests">
+<sect2 id='Requests'>
<title>Requests</title>
<!-- .XS -->
<!-- (SN Requests -->
@@ -2653,7 +2650,7 @@
</blockquote>
</sect2>
-<sect2 id="errors">
+<sect2 id='Errors'>
<title>Errors</title>
<!-- .XS -->
<!-- (SN Errors -->
@@ -2980,7 +2977,7 @@
</blockquote>
</sect2>
-<sect2 id="events">
+<sect2 id='Events'>
<title>Events</title>
<!-- .XS -->
<!-- (SN Events -->
@@ -3119,7 +3116,7 @@
</sect2>
</sect1>
-<sect1 id="protocol_encoding">
+<sect1 id='Protocol_Encoding'>
<title>Protocol Encoding</title>
<!-- .XS -->
<!-- (SN Protocol Encoding -->
@@ -3167,7 +3164,7 @@
pad(e) = (4 - (e mod 4)) mod 4
</literallayout>
-<sect2 id="data_types_2">
+<sect2 id='Data_Types_2'>
<title>Data Types</title>
<!-- .XS -->
<!-- (SN Data Types -->
@@ -3366,7 +3363,7 @@
</literallayout>
</sect2>
-<sect2 id="requests_2">
+<sect2 id='Requests_2'>
<title>Requests</title>
<para><emphasis role="bold">open connection</emphasis></para>
<literallayout class="monospaced">
@@ -3763,7 +3760,7 @@
</literallayout>
</sect2>
-<sect2 id="errors_2">
+<sect2 id='Errors_2'>
<title>Errors</title>
<literallayout class="monospaced">
@@ -3897,7 +3894,7 @@
</literallayout>
</sect2>
-<sect2 id="events_2">
+<sect2 id='Events_2'>
<title>Events</title>
<literallayout class="monospaced">
<emphasis role="bold">KeepAlive</emphasis>
@@ -3931,7 +3928,7 @@
</sect2>
</sect1>
-<sect1 id="acknowledgements">
+<sect1 id='Acknowledgements'>
<title>Acknowledgements</title>
<!-- .XS -->
<!-- (SN Acknowledgements -->
@@ -3970,7 +3967,6 @@
</biblioentry>
</bibliography>
-</chapter>
<appendix id="suggested_licensing_policies">
<title>Suggested Licensing Policies</title>
@@ -4081,4 +4077,4 @@
</listitem>
</itemizedlist>
</appendix>
-</book>
+</article>
++++++ glproto-1.4.14.tar.bz2 -> glproto-1.4.15.tar.bz2 ++++++
++++ 16030 lines of diff (skipped)
++++++ inputproto-2.0.1.tar.bz2 -> inputproto-2.2.tar.bz2 ++++++
++++ 14049 lines of diff (skipped)
++++++ kbproto-1.0.5.tar.bz2 -> kbproto-1.0.6.tar.bz2 ++++++
++++ 47065 lines of diff (skipped)
++++++ printproto-1.0.4.tar.bz2 -> printproto-1.0.5.tar.bz2 ++++++
++++ 102859 lines of diff (skipped)
++++++ recordproto-1.14.1.tar.bz2 -> recordproto-1.14.2.tar.bz2 ++++++
++++ 9140 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/recordproto-1.14.1/ChangeLog new/recordproto-1.14.2/ChangeLog
--- old/recordproto-1.14.1/ChangeLog 2010-10-30 08:21:13.000000000 +0200
+++ new/recordproto-1.14.2/ChangeLog 2012-03-23 04:47:36.000000000 +0100
@@ -1,3 +1,188 @@
+commit 32236c56b7015a98d845bb1836817328a307edce
+Author: Alan Coopersmith
+Date: Thu Mar 22 20:46:36 2012 -0700
+
+ recordproto 1.14.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 10028272314500dd2e17e5ae7efa0a2d4d118c13
+Author: Matt Dew
+Date: Fri Jan 13 23:20:09 2012 -0700
+
+ informaltable cleanup
+
+ On certain tables, add top and bottom borders to table
+ header and a bottom border to the table. This matches
+ what those tables in the old pdfs looked like.
+
+ the <?dbfo keep-together='always'> prevents tables from
+ splitting across pages. Useful for tiny tables.
+
+ Converting the colwidth to a floating point,
+ IE, 1* -> 1.0* cleans up these build errors:
+ WARNING: table-layout="fixed" and column-width unspecified
+ => falling back to proportional-column-width(1)
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit 5a7a2820665a495df32694d90b6f5192dd53547e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 20:12:54 2011 -0400
+
+ specs: refactor copyright license text for multi licening
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 233ed0eef7526ae02223359851be51e43240652b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 12 16:54:45 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9ecf07de57da54009c5bb4567655996f69ba8deb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 19:49:54 2011 -0400
+
+ docs: remove <productnumber> which is not used by default
+
+ This element is not rendered by default on the title. A template
+ customization is required to display it.
+ X Window System does not have a product number.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c8d4e3eddc07889f0bc493884f120e741226c28b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 08:51:02 2011 -0400
+
+ specs: use more appropriate docbook element to get "Edited by"
+
+ The proper element to use is <editor>.
+ The <contrib> was a hack to insert text and showed up in the wrong location
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1950143424ea47973613bc1dbec805e8a32aa97b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d1011e878c92be804fe896f9adf2b686c01f2172
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cbba0d1e4665b585804b5de33c5ed1a4c3b19727
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 12 17:54:50 2011 -0400
+
+ Install xml versions of specs even if HAVE_XMLTO is false
+
+ DocBook/XML input source is also a usefull output format that can be viewed
+ with an XML viewer or editor and by some O/S help system.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b045d4c13967bd061f6a104136152e841bc432b5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 5 16:27:37 2011 -0400
+
+ Install target dbs alongside generated documents
+
+ This matches a change in xorg-sgml-docs whereby the masterdb will look for
+ the target dbs into the same location as the generated documents.
+
+ The target dbs are now installed alongside the generated documents.
+ Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+ has the potential of installing outside the package prefix and cause
+ distcheck to fail when user does not have write permission in this package.
+
+ Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit dcc64434a3e79931b05fc807906189dfa3a9ddd0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Feb 27 15:06:18 2011 -0500
+
+ Documentation: add Docbook external references support
+
+ When writing technical documentation, it is often necessary to cross
+ reference to other information. When that other information is not in the
+ current document, additional support is needed, namely <olink>.
+
+ A new feature with version 1.7 of xorg-sgml-doctools adds references to
+ other documents within or outside this package.
+
+ This patch adds technical support for this feature but does not change
+ the content of the documentation as seen by the end user.
+
+ Each book or article must generate a database containing the href
+ of sections that can be referred to from another document. This database
+ is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+ the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+ documentation is the same. This forms a virtual document tree.
+
+ This database is consulted by other documents while they are being generated
+ in order to fulfill the missing information for linking.
+ Refer to the xorg-sgml-doctools for further technical information.
+
+ Co-authored-by: Matt Dew <marcoz@osource.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f5813bffb2b642d8b515306caff555eac32b9b43
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:12:58 2010 -0800
+
+ specs/record.xml: Pair copyright notices with matching license notices
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3011b8527ba7370e7e29758ecba0231e7e25bda8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:10:06 2010 -0800
+
+ specs/record.xml: Fix section titles/nesting
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2c1cabffad2903867fd352c19f0157d07adde232
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Nov 9 15:19:09 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 396cdde0242256976fbacec64839e48dfc56d639
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 23:20:43 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/recordproto-1.14.1/configure.ac new/recordproto-1.14.2/configure.ac
--- old/recordproto-1.14.1/configure.ac 2010-10-30 08:20:14.000000000 +0200
+++ new/recordproto-1.14.2/configure.ac 2012-03-23 04:46:42.000000000 +0100
@@ -1,18 +1,19 @@
AC_PREREQ([2.60])
-AC_INIT([RecordProto], [1.14.1],
+AC_INIT([RecordProto], [1.14.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
+# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
+ [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_WITH_XSLTPROC
+XORG_CHECK_SGML_DOCTOOLS(1.8)
AC_OUTPUT([Makefile
specs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/recordproto-1.14.1/docbook.am new/recordproto-1.14.2/docbook.am
--- old/recordproto-1.14.1/docbook.am 1970-01-01 01:00:00.000000000 +0100
+++ new/recordproto-1.14.2/docbook.am 2012-03-23 04:46:42.000000000 +0100
@@ -0,0 +1,105 @@
+#
+# 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.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA =
+
+# DocBook/XML file with chapters, appendix and images it includes
+dist_shelf_DATA = $(docbook) $(chapters)
+
+if HAVE_XMLTO
+if HAVE_STYLESHEETS
+
+XMLTO_SEARCHPATH_FLAGS = \
+ --searchpath "$(XORG_SGML_PATH)/X11" \
+ --searchpath "$(abs_top_builddir)"
+XMLTO_HTML_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XMLTO_HTML_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_HTML_STYLESHEET_FLAGS) \
+ $(XMLTO_HTML_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_XMLTO_TEXT
+
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+if HAVE_FOP
+XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+XMLTO_PDF_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+XMLTO_FO_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_FO_STYLESHEET_FLAGS) \
+ $(XMLTO_FO_IMAGEPATH_FLAGS) \
+ $(XMLTO_PDF_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.pdf)
+%.pdf: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+
+shelf_DATA += $(docbook:.xml=.ps)
+%.ps: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+# Generate documents cross-reference target databases
+if HAVE_XSLTPROC
+
+XSLT_SEARCHPATH_FLAGS = \
+ --path "$(XORG_SGML_PATH)/X11" \
+ --path "$(abs_top_builddir)"
+XSLT_OLINK_FLAGS = \
+ --stringparam targets.filename "$@" \
+ --stringparam collect.xref.targets "only" \
+ --stringparam olink.base.uri "$(@:.db=)"
+
+XSLT_HTML_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XSLT_PDF_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+shelf_DATA += $(docbook:.xml=.html.db)
+%.html.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+
+shelf_DATA += $(docbook:.xml=.pdf.db)
+%.pdf.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/recordproto-1.14.1/specs/Makefile.am new/recordproto-1.14.2/specs/Makefile.am
--- old/recordproto-1.14.1/specs/Makefile.am 2010-08-07 03:50:39.000000000 +0200
+++ new/recordproto-1.14.2/specs/Makefile.am 2012-03-23 04:46:42.000000000 +0100
@@ -1,64 +1,13 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
if ENABLE_SPECS
-doc_sources = record.xml
-dist_doc_DATA = $(doc_sources)
-if HAVE_XMLTO
-doc_DATA = $(doc_sources:.xml=.html)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = record.xml
-if HAVE_FOP
-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
-if HAVE_XMLTO_TEXT
-doc_DATA += $(doc_sources:.xml=.txt)
-endif
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
-endif
-
-CLEANFILES = $(doc_DATA)
-
-SUFFIXES = .xml .ps .pdf .txt .html
-
-.xml.txt:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-.xml.html:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-.xml.pdf:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-.xml.ps:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/recordproto-1.14.1/specs/record.xml new/recordproto-1.14.2/specs/record.xml
--- old/recordproto-1.14.1/specs/record.xml 2010-08-07 03:50:39.000000000 +0200
+++ new/recordproto-1.14.2/specs/record.xml 2012-03-23 04:46:42.000000000 +0100
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
<!-- lifted from troff+ms+XMan by doclifter -->
@@ -14,19 +17,14 @@
<firstname>Martha</firstname><surname>Zimet</surname>
<affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation>
</author>
- <othercredit>
- <contrib>edited by</contrib>
+ <editor>
<firstname>Stephen</firstname><surname>Gildea</surname>
<affiliation><orgname>X Consortium</orgname></affiliation>
- </othercredit>
+ </editor>
</authorgroup>
- <corpname>X Consortium Standard</corpname>
- <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder></copyright>
- <copyright><year>1994</year><holder>X Consortium</holder></copyright>
- <copyright><year>1995</year><holder>X Consortium</holder></copyright>
- <affiliation><orgname>X Consortium</orgname></affiliation>
- <productnumber>Version 1.13</productnumber>
- <releaseinfo>X Version 11, Release 6.7</releaseinfo>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder>
+ </copyright>
<legalnotice>
<para>
@@ -36,8 +34,12 @@
notice appear in all copies. Network Computing Devices, Inc.
makes no representations about the suitability for any purpose
of the information in this document. This documentation is
-provided "as is" without express or implied warranty.
+provided “as is” without express or implied warranty.
</para>
+</legalnotice>
+
+<legalnotice>
+<para role="multiLicensing">Copyright © 1994, 1995 X Consortium</para>
<para>
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -54,7 +56,7 @@
</para>
<para>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
@@ -69,12 +71,11 @@
or other dealings in this Software without prior written authorization
from the X Consortium.
</para>
+<para>X Window System is a trademark of The Open Group.</para>
</legalnotice>
</bookinfo>
-<chapter>
-<title>TITLE</title>
-<sect1 id="Introduction">
+<chapter id="Introduction">
<title>Introduction</title>
<para>
Several proposals have been written over the past few years that address some
@@ -168,7 +169,7 @@
information it needs using RECORD facilities.
</para>
-<sect2 id="Acknowledgements">
+<sect1 id="Acknowledgements">
<title>Acknowledgements</title>
<para>
The document represents the culmination of two years of debate and
@@ -189,9 +190,9 @@
Performance Awareness has assisted in clarification of the timestamp
policy.
</para>
-</sect2>
+</sect1>
-<sect2 id="Goals">
+<sect1 id="Goals">
<title>Goals</title>
<itemizedlist>
<listitem>
@@ -216,9 +217,9 @@
</para>
</listitem>
</itemizedlist>
-</sect2>
+</sect1>
-<sect2 id="Requirements">
+<sect1 id="Requirements">
<title>Requirements</title>
<para>
The extension should function as follows:
@@ -256,17 +257,17 @@
</para>
</listitem>
</itemizedlist>
-</sect2>
</sect1>
+</chapter>
-<sect1 id="Design">
+<chapter id="Design">
<title>Design</title>
<para>
This section gives an overview of the RECORD extension and discusses
its overall operation and data types.
</para>
-<sect2 id="Overview">
+<sect1 id="Overview">
<title>Overview</title>
<para>
The mechanism used by this extension for recording is to intercept
@@ -287,7 +288,7 @@
extension does not provide data compression before intercepted protocol
is returned to the recording clients.
</para>
-<sect3 id="Data_Delivery">
+<sect2 id="Data_Delivery">
<title>Data Delivery</title>
<!-- .XS -->
<!-- (SN Data Delivery -->
@@ -314,8 +315,8 @@
into a single reply.
Nevertheless, all data are returned to the client in a timely manner.
</para>
-</sect3>
-<sect3 id="Record_Context">
+</sect2>
+<sect2 id="Record_Context">
<title>Record Context</title>
<!-- .XS -->
<!-- (SN Record Context -->
@@ -342,9 +343,9 @@
the server to wait until recording is enabled to register clients
or recording is disabled to unregister clients.
</para>
-</sect3>
+</sect2>
-<sect3 id="Record_Client_Connections">
+<sect2 id="Record_Client_Connections">
<title>Record Client Connections</title>
<!-- .XS -->
<!-- (SN Record Client Connections -->
@@ -374,8 +375,8 @@
recording client never has the need to disable the interception and reporting
of protocol data, two client connections are necessary.
</para>
-</sect3>
-<sect3 id="Events">
+</sect2>
+<sect2 id="Events">
<title>Events</title>
<!-- .XS -->
<!-- (SN Events -->
@@ -429,9 +430,9 @@
<function>KeyRelease</function>
device events are reported.
</para>
-</sect3>
+</sect2>
-<sect3 id="Timing">
+<sect2 id="Timing">
<title>Timing</title>
<!-- .XS -->
<!-- (SN Timing -->
@@ -441,10 +442,10 @@
they are executed; the time associated with a request is the server
time when it is recorded.
</para>
-</sect3>
</sect2>
+</sect1>
-<sect2 id="Types">
+<sect1 id="Types">
<title>Types</title>
<para>
The following new types are used in the request definitions that appear
@@ -460,27 +461,28 @@
</para>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="4.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>RANGE8:</entry>
<entry>[first, last:</entry>
<entry>CARD8]</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>RANGE16:</entry>
<entry>[first, last:</entry>
<entry>CARD16]</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>EXTRANGE:</entry>
<entry>[major:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>minor:</entry>
<entry>RANGE16]</entry>
@@ -490,52 +492,53 @@
</informaltable>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.5*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="4.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>RECORDRANGE:</entry>
<entry>[core-requests:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>core-replies:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>ext-requests:</entry>
<entry>EXTRANGE</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>ext-replies:</entry>
<entry>EXTRANGE</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>delivered-events:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>device-events:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>errors:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>client-started:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>client-died:</entry>
<entry>BOOL]</entry>
@@ -691,22 +694,23 @@
</itemizedlist>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="2.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>ELEMENT_HEADER:</entry>
<entry>[from-server-time:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>from-client-time:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>from-client-sequence:</entry>
<entry>BOOL]</entry>
@@ -843,17 +847,18 @@
</para>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="3.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>CLIENT_INFO:</entry>
<entry>[client-resource:</entry>
<entry>CLIENTSPEC</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>intercepted-protocol:</entry>
<entry>LISTofRECORDRANGE]</entry>
@@ -869,9 +874,9 @@
<emphasis remap='I'>intercepted-protocol</emphasis> field specifies the protocol to intercept
for the <emphasis remap='I'>client-resource</emphasis>.
</para>
-</sect2>
+</sect1>
-<sect2 id="Errors">
+<sect1 id="Errors">
<title>Errors</title>
<para>
<emphasis role="bold">RecordContext</emphasis>
@@ -887,10 +892,10 @@
</para>
</listitem>
</itemizedlist>
-</sect2>
</sect1>
+</chapter>
-<sect1 id="Protocol_Requests">
+<chapter id="Protocol_Requests">
<title>Protocol Requests</title>
<!-- .XS -->
<!-- (SN Protocol Requests -->
@@ -945,30 +950,31 @@
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>ranges</emphasis>: LISTofRECORDRANGE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1063,30 +1069,31 @@
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>ranges</emphasis>: LISTofRECORDRANGE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1189,20 +1196,21 @@
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1282,40 +1290,41 @@
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
->
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>enabled</emphasis>: BOOL
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>intercepted-clients</emphasis>: LISTofCLIENT_INFO
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<function>RecordContext</function>
</entry>
@@ -1365,20 +1374,20 @@
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
->+
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>category</emphasis>:
{<function>FromServer</function>, <function>FromClient</function>,
@@ -1388,37 +1397,37 @@
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-swapped</emphasis>: BOOL
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>id-base</emphasis>: XIDBASE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>server-time</emphasis>: TIMESTAMP
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>recorded-sequence-number</emphasis>: CARD32
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>data</emphasis>: LISTofBYTE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match</function>,
@@ -1599,15 +1608,16 @@
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>RecordContext</function>
@@ -1678,9 +1688,9 @@
<function>RecordContext</function>
error results.
</para>
-</sect1>
+</chapter>
-<sect1 id="Encoding">
+<chapter id="Encoding">
<title>Encoding</title>
<para>
Please refer to the X11 Protocol Encoding document as this document uses
@@ -1691,7 +1701,7 @@
The name of this extension is "RECORD".
</para>
-<sect2 id="Types_2">
+<sect1 id="Types_2">
<title>Types</title>
<para>
RC: CARD32
@@ -1756,8 +1766,8 @@
24n LISTofRECORDRANGE intercepted-protocol
</literallayout>
-</sect2>
-<sect2 id="Errors_2">
+</sect1>
+<sect1 id="Errors_2">
<title>Errors</title>
<literallayout class="monospaced">
@@ -1768,9 +1778,9 @@
4 CARD32 invalid record context
24 unused
</literallayout>
-</sect2>
+</sect1>
-<sect2 id="Requests">
+<sect1 id="Requests">
<title>Requests</title>
<literallayout class="monospaced">
@@ -1889,7 +1899,6 @@
4 RC context
</literallayout>
-</sect2>
</sect1>
</chapter>
</book>
++++++ resourceproto-1.1.1.tar.bz2 -> resourceproto-1.2.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/COPYING new/resourceproto-1.2.0/COPYING
--- old/resourceproto-1.1.1/COPYING 2009-10-16 23:25:35.000000000 +0200
+++ new/resourceproto-1.2.0/COPYING 2011-01-07 07:16:31.000000000 +0100
@@ -1,3 +1,5 @@
+Copyright (c) 2002 XFree86 Inc
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/ChangeLog new/resourceproto-1.2.0/ChangeLog
--- old/resourceproto-1.1.1/ChangeLog 2010-12-09 07:20:28.000000000 +0100
+++ new/resourceproto-1.2.0/ChangeLog 2011-05-28 06:26:58.000000000 +0200
@@ -1,3 +1,57 @@
+commit 4be619918d604cbf63994ebe8357b811b5bd2452
+Author: Erkki Seppälä
+Date: Fri May 27 21:25:39 2011 -0700
+
+ Bumped version number: 1.1.1 => 1.2.0
+
+ Signed-off-by: Erkki Seppälä
+ Signed-off-by: Alan Coopersmith
+
+commit c4228d3189b1d12fa65e826ab356b2eee4f0548b
+Author: Alan Coopersmith
+Date: Tue May 24 15:01:42 2011 -0700
+
+ Distribute & install resproto.txt with the release
+
+ Signed-off-by: Alan Coopersmith
+
+commit b2629d78ae8acfbfc449f6b0e973716975d4e8d7
+Author: Erkki Seppälä
+Date: Tue Nov 30 14:12:58 2010 +0200
+
+ Protocol records for XRes v1.2
+
+ Incorporates comments from the list.
+
+ Signed-off-by: Erkki Seppälä
+ Reviewed-by: Rami Ylimäki
+ Signed-off-by: Alan Coopersmith
+
+commit 1eb1d726921493db463b9b790bf25532fdc43287
+Author: Rami Ylimäki
+Date: Fri Dec 31 14:21:08 2010 +0200
+
+ Added protocol description for XRes v1.2
+
+ Version 1.2 of XResource protocol adds two requests:
+ XResQueryClientIds and XResQueryResourceBytes. They can be used for
+ more exactly determining which resources are used by which clients.
+
+ This patch incorporates comments from the mailing list.
+
+ Acked-by: Gaetan Nadon
+ Reviewed-by: Erkki Seppälä
+ Signed-off-by: Rami Ylimäki
+ Signed-off-by: Alan Coopersmith
+
+commit 386946098f97b9137af3265b5608fdcf22c7d49a
+Author: Alan Coopersmith
+Date: Thu Jan 6 22:16:55 2011 -0800
+
+ Add missing XFree86 copyright notice to COPYING
+
+ Signed-off-by: Alan Coopersmith
+
commit 2cbf7d2ba3da72c2454d707e0109732c46a0c9d9
Author: Alan Coopersmith
Date: Wed Dec 8 22:19:47 2010 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/Makefile.am new/resourceproto-1.2.0/Makefile.am
--- old/resourceproto-1.1.1/Makefile.am 2010-04-10 02:48:45.000000000 +0200
+++ new/resourceproto-1.2.0/Makefile.am 2011-05-25 00:02:26.000000000 +0200
@@ -5,6 +5,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = resourceproto.pc
+dist_doc_DATA = resproto.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/Makefile.in new/resourceproto-1.2.0/Makefile.in
--- old/resourceproto-1.1.1/Makefile.in 2010-12-09 07:20:18.000000000 +0100
+++ new/resourceproto-1.2.0/Makefile.in 2011-05-28 06:26:35.000000000 +0200
@@ -36,10 +36,11 @@
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(resource_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/resourceproto.pc.in $(top_srcdir)/configure COPYING \
- ChangeLog INSTALL config.guess config.sub install-sh missing
+DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
+ $(resource_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/resourceproto.pc.in \
+ $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
+ config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -78,9 +79,9 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
+am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(resourcedir)"
-DATA = $(pkgconfig_DATA)
+DATA = $(dist_doc_DATA) $(pkgconfig_DATA)
HEADERS = $(resource_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -157,6 +158,7 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
@@ -216,6 +218,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = resourceproto.pc
+dist_doc_DATA = resproto.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
all: all-am
@@ -256,6 +259,26 @@
$(am__aclocal_m4_deps):
resourceproto.pc: $(top_builddir)/config.status $(srcdir)/resourceproto.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+install-dist_docDATA: $(dist_doc_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+ 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)$(docdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+ done
+
+uninstall-dist_docDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(docdir)" && rm -f $$files
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@@ -503,7 +526,7 @@
check: check-am
all-am: Makefile $(DATA) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(resourcedir)"; do \
+ for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(resourcedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -553,7 +576,8 @@
info-am:
-install-data-am: install-pkgconfigDATA install-resourceHEADERS
+install-data-am: install-dist_docDATA install-pkgconfigDATA \
+ install-resourceHEADERS
install-dvi: install-dvi-am
@@ -599,7 +623,8 @@
ps-am:
-uninstall-am: uninstall-pkgconfigDATA uninstall-resourceHEADERS
+uninstall-am: uninstall-dist_docDATA uninstall-pkgconfigDATA \
+ uninstall-resourceHEADERS
.MAKE: install-am install-strip
@@ -609,15 +634,16 @@
distcheck distclean distclean-generic distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am 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-pkgconfigDATA install-ps install-ps-am \
- install-resourceHEADERS install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-data-am install-dist_docDATA 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-pkgconfigDATA install-ps \
+ install-ps-am install-resourceHEADERS install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-pkgconfigDATA uninstall-resourceHEADERS
+ uninstall-dist_docDATA uninstall-pkgconfigDATA \
+ uninstall-resourceHEADERS
.PHONY: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/XResproto.h new/resourceproto-1.2.0/XResproto.h
--- old/resourceproto-1.1.1/XResproto.h 2009-10-16 23:25:35.000000000 +0200
+++ new/resourceproto-1.2.0/XResproto.h 2011-05-25 00:02:20.000000000 +0200
@@ -6,15 +6,24 @@
#define _XRESPROTO_H
#define XRES_MAJOR_VERSION 1
-#define XRES_MINOR_VERSION 0
+#define XRES_MINOR_VERSION 2
#define XRES_NAME "X-Resource"
+/* v1.0 */
#define X_XResQueryVersion 0
#define X_XResQueryClients 1
#define X_XResQueryClientResources 2
#define X_XResQueryClientPixmapBytes 3
+/* Version 1.1 has been accidentally released from the version */
+/* control and while it doesn't have differences to version 1.0, the */
+/* next version is labeled 1.2 in order to remove the risk of confusion. */
+
+/* v1.2 */
+#define X_XResQueryClientIds 4
+#define X_XResQueryResourceBytes 5
+
typedef struct {
CARD32 resource_base;
CARD32 resource_mask;
@@ -125,5 +134,94 @@
} xXResQueryClientPixmapBytesReply;
#define sz_xXResQueryClientPixmapBytesReply 32
+/* v1.2 XResQueryClientIds */
+
+#define X_XResClientXIDMask 0x01
+#define X_XResLocalClientPIDMask 0x02
+
+typedef struct _XResClientIdSpec {
+ CARD32 client B32;
+ CARD32 mask B32;
+} xXResClientIdSpec;
+#define sz_xXResClientIdSpec 8
+
+typedef struct _XResClientIdValue {
+ xXResClientIdSpec spec;
+ CARD32 length B32;
+ // followed by length CARD32s
+} xXResClientIdValue;
+#define sz_xResClientIdValue (sz_xXResClientIdSpec + 4)
+
+typedef struct _XResQueryClientIds {
+ CARD8 reqType;
+ CARD8 XResReqType;
+ CARD16 length B16;
+ CARD32 numSpecs B32;
+ // followed by numSpecs times XResClientIdSpec
+} xXResQueryClientIdsReq;
+#define sz_xXResQueryClientIdsReq 8
+
+typedef struct {
+ CARD8 type;
+ CARD8 pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 numIds B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ // followed by numIds times XResClientIdValue
+} xXResQueryClientIdsReply;
+#define sz_xXResQueryClientIdsReply 32
+
+/* v1.2 XResQueryResourceBytes */
+
+typedef struct _XResResourceIdSpec {
+ CARD32 resource;
+ CARD32 type;
+} xXResResourceIdSpec;
+#define sz_xXResResourceIdSpec 8
+
+typedef struct _XResQueryResourceBytes {
+ CARD8 reqType;
+ CARD8 XResReqType;
+ CARD16 length B16;
+ CARD32 client B32;
+ CARD32 numSpecs B32;
+ // followed by numSpecs times XResResourceIdSpec
+} xXResQueryResourceBytesReq;
+#define sz_xXResQueryResourceBytesReq 12
+
+typedef struct _XResResourceSizeSpec {
+ xXResResourceIdSpec spec;
+ CARD32 bytes B32;
+ CARD32 refCount B32;
+ CARD32 useCount B32;
+} xXResResourceSizeSpec;
+#define sz_xXResResourceSizeSpec (sz_xXResResourceIdSpec + 12)
+
+typedef struct _XResResourceSizeValue {
+ xXResResourceSizeSpec size;
+ CARD32 numCrossReferences B32;
+ // followed by numCrossReferences times XResResourceSizeSpec
+} xXResResourceSizeValue;
+#define sz_xXResResourceSizeValue (sz_xXResResourceSizeSpec + 4)
+
+typedef struct {
+ CARD8 type;
+ CARD8 pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 numSizes B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ // followed by numSizes times XResResourceSizeValue
+} xXResQueryResourceBytesReply;
+#define sz_xXResQueryResourceBytesReply 32
#endif /* _XRESPROTO_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/aclocal.m4 new/resourceproto-1.2.0/aclocal.m4
--- old/resourceproto-1.1.1/aclocal.m4 2010-12-09 07:20:16.000000000 +0100
+++ new/resourceproto-1.2.0/aclocal.m4 2011-05-28 06:26:34.000000000 +0200
@@ -1055,7 +1055,7 @@
# 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.11.0])
+m4_define([vers_have], [1.14.0])
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,,
@@ -1082,7 +1082,8 @@
# which is not the best choice for supporting other OS'es, but covers most
# of the ones we need for now.
AC_MSG_CHECKING([if $RAWCPP requires -undef])
-AC_LANG_CONFTEST([Does cpp redefine unix ?])
+AC_LANG_CONFTEST([Does cpp redefine unix ?
+ AC_LANG_DEFINES_PROVIDED])
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
AC_MSG_RESULT([no])
else
@@ -1100,7 +1101,8 @@
rm -f conftest.$ac_ext
AC_MSG_CHECKING([if $RAWCPP requires -traditional])
-AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
+AC_LANG_CONFTEST([Does cpp preserve "whitespace"?
+ AC_LANG_DEFINES_PROVIDED])
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
AC_MSG_RESULT([no])
else
@@ -1450,6 +1452,69 @@
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
+# XORG_WITH_XSLTPROC([MIN-VERSION], [DEFAULT])
+# --------------------------------------------
+# Minimum version: 1.12.0
+# Minimum version for optional DEFAULT argument: 1.12.0
+#
+# XSLT (Extensible Stylesheet Language Transformations) is a declarative,
+# XML-based language used for the transformation of XML documents.
+# The xsltproc command line tool is for applying XSLT stylesheets to XML documents.
+# It is used under the cover by xmlto to generate html files from DocBook/XML.
+# The XSLT processor is often used as a standalone tool for transformations.
+# It should not be assumed that this tool is used only to work with documnetation.
+# When DEFAULT is not specified, --with-xsltproc assumes 'auto'.
+#
+# Interface to module:
+# HAVE_XSLTPROC: used in makefiles to conditionally generate documentation
+# XSLTPROC: returns the path of the xsltproc program found
+# returns the path set by the user in the environment
+# --with-xsltproc: 'yes' user instructs the module to use xsltproc
+# 'no' user instructs the module not to use xsltproc
+# have_xsltproc: returns yes if xsltproc found in PATH or no
+#
+# If the user sets the value of XSLTPROC, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_XSLTPROC],[
+AC_ARG_VAR([XSLTPROC], [Path to xsltproc command])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(xsltproc,
+ AS_HELP_STRING([--with-xsltproc],
+ [Use xsltproc for the transformation of XML documents (default: ]_defopt[)]),
+ [use_xsltproc=$withval], [use_xsltproc=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_xsltproc" = x"auto"; then
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ if test "x$XSLTPROC" = "x"; then
+ AC_MSG_WARN([xsltproc not found - cannot transform XML documents])
+ have_xsltproc=no
+ else
+ have_xsltproc=yes
+ fi
+elif test "x$use_xsltproc" = x"yes" ; then
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ if test "x$XSLTPROC" = "x"; then
+ AC_MSG_ERROR([--with-xsltproc=yes specified but xsltproc not found in PATH])
+ fi
+ have_xsltproc=yes
+elif test "x$use_xsltproc" = x"no" ; then
+ if test "x$XSLTPROC" != "x"; then
+ AC_MSG_WARN([ignoring XSLTPROC environment variable since --with-xsltproc=no was specified])
+ fi
+ have_xsltproc=no
+else
+ AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no'])
+fi
+
+# Checking for minimum version is not implemented
+# but we want to keep the interface consistent with other commands
+m4_ifval([$1],[AC_MSG_WARN(Checking for MIN-VERSION is not implemented.)])
+
+AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes])
+]) # XORG_WITH_XSLTPROC
+
+
# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
@@ -1906,6 +1971,194 @@
AC_MSG_RESULT([$build_specs])
]) # XORG_ENABLE_SPECS
+# XORG_ENABLE_UNIT_TESTS (enable_unit_tests=auto)
+# ----------------------------------------------
+# Minimum version: 1.13.0
+#
+# This macro enables a builder to enable/disable unit testing
+# It makes no assumption about the test cases implementation
+# Test cases may or may not use Automake "Support for test suites"
+# They may or may not use the software utility library GLib
+#
+# When used in conjunction with XORG_WITH_GLIB, use both AM_CONDITIONAL
+# ENABLE_UNIT_TESTS and HAVE_GLIB. Not all unit tests may use glib.
+# The variable enable_unit_tests is used by other macros in this file.
+#
+# Interface to module:
+# ENABLE_UNIT_TESTS: used in makefiles to conditionally build tests
+# enable_unit_tests: used in configure.ac for additional configuration
+# --enable-unit-tests: 'yes' user instructs the module to build tests
+# 'no' user instructs the module not to build tests
+# parm1: specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[
+AC_BEFORE([$0], [XORG_WITH_GLIB])
+AC_BEFORE([$0], [XORG_LD_WRAP])
+m4_define([_defopt], m4_default([$1], [auto]))
+AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests],
+ [Enable building unit test cases (default: ]_defopt[)]),
+ [enable_unit_tests=$enableval], [enable_unit_tests=]_defopt)
+m4_undefine([_defopt])
+AM_CONDITIONAL(ENABLE_UNIT_TESTS, [test "x$enable_unit_tests" != xno])
+AC_MSG_CHECKING([whether to build unit test cases])
+AC_MSG_RESULT([$enable_unit_tests])
+]) # XORG_ENABLE_UNIT_TESTS
+
+# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
+# ----------------------------------------
+# Minimum version: 1.13.0
+#
+# GLib is a library which provides advanced data structures and functions.
+# This macro enables a module to test for the presence of Glib.
+#
+# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing.
+# Otherwise the value of $enable_unit_tests is blank.
+#
+# Interface to module:
+# HAVE_GLIB: used in makefiles to conditionally build targets
+# with_glib: used in configure.ac to know if GLib has been found
+# --with-glib: 'yes' user instructs the module to use glib
+# 'no' user instructs the module not to use glib
+#
+AC_DEFUN([XORG_WITH_GLIB],[
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(glib, AS_HELP_STRING([--with-glib],
+ [Use GLib library for unit testing (default: ]_defopt[)]),
+ [with_glib=$withval], [with_glib=]_defopt)
+m4_undefine([_defopt])
+
+have_glib=no
+# Do not probe GLib if user explicitly disabled unit testing
+if test "x$enable_unit_tests" != x"no"; then
+ # Do not probe GLib if user explicitly disabled it
+ if test "x$with_glib" != x"no"; then
+ m4_ifval(
+ [$1],
+ [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $1], [have_glib=yes], [have_glib=no])],
+ [PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])]
+ )
+ fi
+fi
+
+# Not having GLib when unit testing has been explicitly requested is an error
+if test "x$enable_unit_tests" = x"yes"; then
+ if test "x$have_glib" = x"no"; then
+ AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
+ fi
+fi
+
+# Having unit testing disabled when GLib has been explicitly requested is an error
+if test "x$enable_unit_tests" = x"no"; then
+ if test "x$with_glib" = x"yes"; then
+ AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
+ fi
+fi
+
+# Not having GLib when it has been explicitly requested is an error
+if test "x$with_glib" = x"yes"; then
+ if test "x$have_glib" = x"no"; then
+ AC_MSG_ERROR([--with-glib=yes specified but glib-2.0 not found])
+ fi
+fi
+
+AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes])
+]) # XORG_WITH_GLIB
+
+# XORG_LD_WRAP
+# ------------
+# Minimum version: 1.13.0
+#
+# Check if linker supports -wrap, passed via compiler flags
+#
+# When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit testing.
+# Otherwise the value of $enable_unit_tests is blank.
+#
+AC_DEFUN([XORG_LD_WRAP],[
+XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no])
+# Not having ld wrap when unit testing has been explicitly requested is an error
+if test "x$enable_unit_tests" = x"yes"; then
+ if test "x$have_ld_wrap" = x"no"; then
+ AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is not available])
+ fi
+fi
+AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes])
+#
+]) # XORG_LD_WRAP
+
+# XORG_CHECK_LINKER_FLAGS
+# -----------------------
+# SYNOPSIS
+#
+# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
+#
+# DESCRIPTION
+#
+# Check whether the given linker FLAGS work with the current language's
+# linker, or whether they give an error.
+#
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+# success/failure.
+#
+# NOTE: Based on AX_CHECK_COMPILER_FLAGS.
+#
+# LICENSE
+#
+# Copyright (c) 2009 Mike Frysinger
+# Copyright (c) 2009 Steven G. Johnson
+# Copyright (c) 2009 Matteo Frigo
+#
+# 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 3 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, see http://www.gnu.org/licenses/.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.#
+AC_DEFUN([XORG_CHECK_LINKER_FLAGS],
+[AC_MSG_CHECKING([whether the linker accepts $1])
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
+AS_LITERAL_IF([$1],
+ [AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [
+ ax_save_FLAGS=$LDFLAGS
+ LDFLAGS="$1"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+ AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
+ AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
+ LDFLAGS=$ax_save_FLAGS])],
+ [ax_save_FLAGS=$LDFLAGS
+ LDFLAGS="$1"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+ eval AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
+ eval AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
+ LDFLAGS=$ax_save_FLAGS])
+eval xorg_check_linker_flags=$AS_TR_SH(xorg_cv_linker_flags_[$1])
+AC_MSG_RESULT($xorg_check_linker_flags)
+if test "x$xorg_check_linker_flags" = xyes; then
+ m4_default([$2], :)
+else
+ m4_default([$3], :)
+fi
+]) # XORG_CHECK_LINKER_FLAGS
+
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
@@ -2057,6 +2310,23 @@
]) # XORG_LINT_LIBRARY
+# XORG_COMPILER_BRAND
+# -------------------
+# Minimum version: 1.14.0
+#
+# Checks for various brands of compilers and sets flags as appropriate:
+# GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes"
+# clang compiler - sets CLANGCC to "yes"
+# Intel compiler - sets INTELCC to "yes"
+# Sun/Oracle Solaris Studio cc - sets SUNCC to "yes"
+#
+AC_DEFUN([XORG_COMPILER_BRAND], [
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"])
+AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
+AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+]) # XORG_COMPILER_BRAND
+
# XORG_CWARNFLAGS
# ---------------
# Minimum version: 1.2.0
@@ -2065,6 +2335,7 @@
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_COMPILER_BRAND])
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
@@ -2075,7 +2346,6 @@
;;
esac
else
- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test "x$SUNCC" = "xyes"; then
CWARNFLAGS="-v"
fi
@@ -2087,28 +2357,43 @@
# -----------------------
# Minimum version: 1.3.0
#
-# Add configure option to enable strict compilation
+# Add configure option to enable strict compilation flags, such as treating
+# warnings as fatal errors.
+# If --enable-strict-compilation is passed to configure, adds strict flags to
+# $CWARNFLAGS.
+#
+# Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or
+# when strict compilation is unconditionally desired.
AC_DEFUN([XORG_STRICT_OPTION], [
# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_COMPILER_BRAND])
AC_REQUIRE([XORG_CWARNFLAGS])
AC_ARG_ENABLE(strict-compilation,
AS_HELP_STRING([--enable-strict-compilation],
[Enable all warnings from compiler and make them errors (default: disabled)]),
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$GCC" = xyes ; then
+ STRICT_CFLAGS="-pedantic -Werror"
+ # Add -Werror=attributes if supported (gcc 4.2 & later)
+ AC_MSG_CHECKING([if $CC supports -Werror=attributes])
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([return 0;])],
+ [STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes"
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
+ CFLAGS="$save_CFLAGS"
+elif test "x$SUNCC" = "xyes"; then
+ STRICT_CFLAGS="-errwarn"
+elif test "x$INTELCC" = "xyes"; then
+ STRICT_CFLAGS="-Werror"
+fi
if test "x$STRICT_COMPILE" = "xyes"; then
- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
- AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
- if test "x$GCC" = xyes ; then
- STRICT_CFLAGS="-pedantic -Werror"
- elif test "x$SUNCC" = "xyes"; then
- STRICT_CFLAGS="-errwarn"
- elif test "x$INTELCC" = "xyes"; then
- STRICT_CFLAGS="-Werror"
- fi
+ CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
fi
-CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+AC_SUBST([STRICT_CFLAGS])
AC_SUBST([CWARNFLAGS])
]) # XORG_STRICT_OPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/configure new/resourceproto-1.2.0/configure
--- old/resourceproto-1.1.1/configure 2010-12-09 07:20:17.000000000 +0100
+++ new/resourceproto-1.2.0/configure 2011-05-28 06:26:35.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ResourceProto 1.1.1.
+# Generated by GNU Autoconf 2.68 for ResourceProto 1.2.0.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -561,8 +561,8 @@
# Identity of this package.
PACKAGE_NAME='ResourceProto'
PACKAGE_TARNAME='resourceproto'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='ResourceProto 1.1.1'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='ResourceProto 1.2.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -635,6 +635,7 @@
INSTALL_CMD
PKG_CONFIG
CHANGELOG_CMD
+STRICT_CFLAGS
CWARNFLAGS
EGREP
GREP
@@ -1279,7 +1280,7 @@
# 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 ResourceProto 1.1.1 to adapt to many kinds of systems.
+\`configure' configures ResourceProto 1.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1349,7 +1350,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ResourceProto 1.1.1:";;
+ short | recursive ) echo "Configuration of ResourceProto 1.2.0:";;
esac
cat <<\_ACEOF
@@ -1444,7 +1445,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ResourceProto configure 1.1.1
+ResourceProto configure 1.2.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1655,7 +1656,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ResourceProto $as_me 1.1.1, which was
+It was created by ResourceProto $as_me 1.2.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2473,7 +2474,7 @@
# Define the identity of the package.
PACKAGE='resourceproto'
- VERSION='1.1.1'
+ VERSION='1.2.0'
cat >>confdefs.h <<_ACEOF
@@ -4105,6 +4106,30 @@
+ac_fn_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default"
+if test "x$ac_cv_have_decl___clang__" = xyes; then :
+ CLANGCC="yes"
+else
+ CLANGCC="no"
+fi
+
+ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default"
+if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then :
+ INTELCC="yes"
+else
+ INTELCC="no"
+fi
+
+ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then :
+ SUNCC="yes"
+else
+ SUNCC="no"
+fi
+
+
+
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -4363,6 +4388,7 @@
+
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
@@ -4373,13 +4399,6 @@
;;
esac
else
- ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
-if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then :
- SUNCC="yes"
-else
- SUNCC="no"
-fi
-
if test "x$SUNCC" = "xyes"; then
CWARNFLAGS="-v"
fi
@@ -4391,6 +4410,7 @@
+
# Check whether --enable-strict-compilation was given.
if test "${enable_strict_compilation+set}" = set; then :
enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
@@ -4398,30 +4418,36 @@
STRICT_COMPILE=no
fi
-if test "x$STRICT_COMPILE" = "xyes"; then
- ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
-if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then :
- SUNCC="yes"
+if test "x$GCC" = xyes ; then
+ STRICT_CFLAGS="-pedantic -Werror"
+ # Add -Werror=attributes if supported (gcc 4.2 & later)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5
+$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; }
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+return 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- SUNCC="no"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
- ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default"
-if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then :
- INTELCC="yes"
-else
- INTELCC="no"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+elif test "x$SUNCC" = "xyes"; then
+ STRICT_CFLAGS="-errwarn"
+elif test "x$INTELCC" = "xyes"; then
+ STRICT_CFLAGS="-Werror"
fi
-
- if test "x$GCC" = xyes ; then
- STRICT_CFLAGS="-pedantic -Werror"
- elif test "x$SUNCC" = "xyes"; then
- STRICT_CFLAGS="-errwarn"
- elif test "x$INTELCC" = "xyes"; then
- STRICT_CFLAGS="-Werror"
- fi
+if test "x$STRICT_COMPILE" = "xyes"; then
+ CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
fi
-CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+
@@ -5145,7 +5171,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ResourceProto $as_me 1.1.1, which was
+This file was extended by ResourceProto $as_me 1.2.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5202,7 +5228,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ResourceProto config.status 1.1.1
+ResourceProto config.status 1.2.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/configure.ac new/resourceproto-1.2.0/configure.ac
--- old/resourceproto-1.1.1/configure.ac 2010-12-09 07:19:27.000000000 +0100
+++ new/resourceproto-1.2.0/configure.ac 2011-05-25 00:02:26.000000000 +0200
@@ -3,7 +3,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([ResourceProto],[1.1.1],
+AC_INIT([ResourceProto],[1.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_CONFIG_SRCDIR([Makefile.am])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/resourceproto-1.1.1/resproto.txt new/resourceproto-1.2.0/resproto.txt
--- old/resourceproto-1.1.1/resproto.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/resourceproto-1.2.0/resproto.txt 2011-05-25 00:02:06.000000000 +0200
@@ -0,0 +1,462 @@
+ DRAFT FOR REVIEW
+ The X Resource Extension
+ Version 1.2
+ Rami Ylimäki
+ rami.ylimaki@vincit.fi
+
+ ❧❧❧❧❧❧❧❧❧❧❧
+
+1. Introduction
+
+The protocol description of X Resource Extension version 1.1 has been
+either lost or has never been written. This specification documents
+version 1.0 based on reverse engineered library and server
+code. Version 1.1 has been accidentally released from the version
+control and while it doesn't have differences to version 1.0, this
+version is labeled 1.2 in order to remove the risk of confusion. In
+addition to the 1.0 description, this document introduces a new 1.2
+version of the extension.
+
+Version 1.2 is a minor release and therefore the changes are
+compatible with the previous version. Main enhancements over version
+1.0 are:
+
+- Client identification is now possible. For example, servers
+ supporting version 1.2 may report PID of local clients.
+
+- Size of any resource can be queried from the server. Servers may not
+ necessarily support size calculation for every resource. However,
+ clients have now at least the chance to let the server do resource
+ size estimation for them.
+
+ ❧❧❧❧❧❧❧❧❧❧❧
+
+2. Notations used in this document
+
+Notation for data types and requests follows the guidelines set in
+sections 2-4 of X Window System Protocol standard.
+
+ ❧❧❧❧❧❧❧❧❧❧❧
+
+3. Interoperability between version 1.1 and 1.2
+
+Version 1.2 only introduces two new requests. However, these requests
+could be seen as generalized versions of existing requests. Even
+though we aren't deprecating any old requests, libraries could
+implement some old requests using the new ones.
+
+The new XResQueryClientIds request could be used instead of
+XResQueryClients.
+
+The new XResQueryResourceBytes request could be used instead of
+XResQueryClientPixmapBytes.
+
+Using the old requests is still acceptable because we don't want to
+change the semantics of existing requests between version 1.1 and 1.2.
+
+ ❧❧❧❧❧❧❧❧❧❧❧
+
+4. Data types
+
+4.1 Types in version 1.0
+
+CLIENTXIDRANGE [ resource_base: CARD32
+ resource_mask: CARD32 ]
+
+This type is used for reply of XResQueryClients in version 1.1. It
+represents the range of resource allocated for a client and can be
+also used for client identification.
+
+resource_base
+ First resource ID reserved for a client. Used also to identify the
+ clients themselves.
+resource_mask
+ Mask that can be used to identify a client from some resource
+ ID. Just zero the bits indicated by this mask from any resource ID
+ to identify the client that owns the resource.
+
+CLIENTXID [ client: XID ]
+
+This type identifies a single client by a resource owned by that
+client or by the first resource ID allocated for the client
+(resource_base of CLIENTXIDRANGE). Whenever a resource ID is used, it
+is masked by resource_mask of CLIENTXIDRANGE to find out the client
+that owns the resource.
+
+CLIENTRESOURCETYPECOUNT [ resource_type: ATOM
+ count: CARD32 ]
+
+This type is used for reply of XResQueryClientResources in version
+1.1. It represents the number of certain type of resources that are
+owned by some client.
+
+resource_type
+ Atom specifying the type of a resource.
+count
+ Number of resources of the given type owned by a client.
+
+4.2 Types in version 1.2
+
+4.2.1 Types used by XResQueryClientIds
+
+CLIENTIDMASK { ClientXid = 0x1, LocalClientPid = 0x2 }
+
+A bitmask specifying a client identification method. Currently only
+the PID of local clients is supported in the form of
+LocalClientPid. ClientXid is provided for backward compatibility with
+version 1.0 so that the new 1.2 requests (XResQueryClientIds) can be
+used in place of the older ones (XResQueryClients).
+
+CLIENTIDSPEC [ client: CLIENTXID or None
+ mask: SETofCLIENTIDMASK or None ]
+
+A data structure for selecting client IDs.
+
+client
+ ID of a resource allocated for some client. Only the part
+ identifying a client is actually used. The resource_base of
+ CLIENTXIDRANGE can be used if the client doesn't own any
+ resources. However, any resource ID is accepted because that makes
+ identifying the owners of existing resources easy. The null
+ resource None can be used to select all clients.
+mask
+ Collection of identification methods that should be applied on the
+ client. The special value None can be used to apply all supported
+ identification methods.
+
+CLIENTIDVALUE [ spec: CLIENTIDSPEC
+ length: CARD32
+ value: LISTofCARD32 ]
+
+A data structure specifying a single client ID.
+
+spec
+ A unique identifier for a specific ID of some client. Wildcards
+ such as None and bitmask unions aren't allowed. The data structure
+ must always identify a single client and single ID type. However,
+ the client doesn't have to be specified as the resource_base of
+ CLIENTXIDRANGE and can be any resource owned by the client.
+length
+ Specifies the length of an ID in units of CARD32. The length
+ depends on the ID type. In version 1.2 the lengths are 0 for
+ ClientXid and 4 for LocalClientPid. The length of ClientXid is 0
+ because that is already stored in the spec field.
+value
+ Actual ID data. In version 1.2 this is missing for ClientXid and
+ consists of a single CARD32 for LocalClientPid.
+
+4.2.2 Types used by XResQueryResourceBytes
+
+To better understand how resources are related to each other, it's
+useful to introduce the concepts of main resource and cross
+reference. By main resource we just mean a normal resource that has a
+valid XID. By cross reference we mean a resource that is used by some
+other resource.
+
+The same resource may have both of these roles depending on the
+context. For example, there could be an ordinary pixmap resource. When
+we talk about this resource in isolation the term main resource is
+used. We call the exact same resource a cross reference when we are
+concentrating on some higher level resource, such as window or
+graphics context, that is using the lower level resource. Cross
+references may also be internal server resources that don't have a
+valid XID.
+
+RESOURCEIDSPEC [ resource: XID or None
+ type: ATOM or None/AnyPropertyType ]
+
+A data structure for selecting or identifying resources. The
+interpretation of fields changes depending on the context. The
+differences in interpretation are described below.
+
+resource
+ An XID of a resource. The null resource None can be used to select
+ all resources matching some type if the data structure is used in
+ XResQueryResourceBytes request. The null resource None can be used
+ to mark private server resources if the data structure is used in
+ a cross reference of XResQueryResourceBytes reply.
+type
+ An atom identifying the resource type. The null atom
+ None/AnyPropertyType can be used to select all resource types
+ matching some resource ID if the data structure is used in
+ XResQueryResourceBytes request.
+
+RESOURCESIZESPEC [ spec: RESOURCEIDSPEC
+ bytes: CARD32
+ ref_count: CARD32
+ use_count: CARD32 ]
+
+A data structure specifying the size of a single resource.
+
+spec
+ Uniquely identifies a single resource. Wildcards such as None and
+ AnyPropertyType aren't allowed for main resources. In cross
+ references, None is used to mark internal server resources.
+bytes
+ Number of bytes allocated for the resource. The size of a resource
+ is never divided by a reference count. This is the number of bytes
+ released in server when there are no more references left to the
+ resource.
+ref_count
+ Number of total users of the resource. Typically the reference
+ count is 1 but for pixmaps and other resources used from different
+ contexts the count may be larger.
+use_count
+ Number of times the resource is used by some other resource. For
+ main resources this is typically 1, because a resource doesn't
+ usually use itself recursively. For cross references this is the
+ number of times the resource is used and is also 1 usually.
+
+RESOURCESIZEVALUE [ size: RESOURCESIZESPEC
+ num_cross_references: CARD32
+ cross_references: LISTofRESOURCESIZESPEC ]
+
+A data structure specifying sizes of cross references to other
+resources in addition to the main resource size.
+
+size
+ Size of a main resource.
+num_cross_references
+ Number of cross references to other resources from the main
+ resource. Currently resources can only have pixmaps as cross
+ references but this can be extended to other types in the
+ future. For simple resources this field is therefore 0 and the
+ cross_references list is missing.
+cross_references:
+ Size specifications for cross references. Note that cross
+ references may contain resources that don't have a valid XID. For
+ example, a DRI2 drawable might have a cross reference to a private
+ pixmap that is used internally in the server only. These private
+ cross references are contained in this list also. This makes it
+ possible to emulate XResGetClientPixmapBytes with
+ XResGetResourceBytes.
+
+ ❧❧❧❧❧❧❧❧❧❧❧
+
+5. Requests
+
+5.1 Requests in version 1.0
+
+┌───
+ XResQueryVersion
+ client_major: CARD8
+ client_minor: CARD8
+ ▶
+ server_major: CARD16
+ server_minor: CARD16
+└───
+
+The client sends the highest supported version to the server and the
+server sends the highest version it supports, but no higher than the
+requested version. Major version changes can introduce
+incompatibilities in existing functionality, minor version changes
+introduce only backward compatible changes. It is the client's
+responsibility to ensure that the server supports a version which is
+compatible with its expectations.
+
+client_major
+ Major X Resource Extension version supported by client.
+client_minor
+ Minor X Resource Extension version supported by client.
+server_major
+ Highest version supported by server that is compatible with
+ client.
+server_minor
+ Highest version supported by server that is compatible with
+ client.
+
+┌───
+ XResQueryClients
+ ▶
+ num_clients: CARD32
+ clients: LISTofCLIENTXIDRANGE
+└───
+
+The request asks X server to return the list of all currently
+connected clients.
+
+num_clients
+ Number of currently connected clients.
+clients
+ List of XID ranges allocated for the connected clients.
+
+┌───
+ XResQueryClientResources
+ client: CLIENTXID
+ ▶
+ num_types: CARD32
+ types: LISTofCLIENTRESOURCETYPECOUNT
+
+ Errors: Value
+└───
+
+This request can be used to ask the number of resources owned by a
+client. The server will return the counts of each type of resource.
+
+client
+ An XID in the resource range of a client. This identifies the
+ client and not some specific resource.
+num_types
+ Number of different resource types owned by the client.
+types
+ A list of counts for each resource type.
+
+A value error is generated if invalid resource or client XID is given
+in the request.
+
+┌───
+ XResQueryClientPixmapBytes
+ client: CLIENTXID
+ ▶
+ bytes: CARD32
+ bytes_overflow: CARD32
+
+ Errors: Value
+└───
+
+This request is used to get the pixmap usage of some client. The
+returned number is a sum of memory usage of each pixmap that can be
+attributed to the given client. Ideally the server goes through all
+pixmaps and divides each pixmap size by the pixmap reference count to
+get a pixmap reference size. The reference size is then added to the
+returned sum if the client happens to be referencing that pixmap. In
+practice some pixmap references may be missed, because it would be too
+difficult to keep track of all pixmap references. However, the server
+will check the most important client resources that are using pixmaps
+and tries to estimate the pixmap usage as well as is possible. In
+other words, the server need only make a best-effort attempt to
+calculate resource source, so actual resource size may differ from
+that reported in practice.
+
+client
+ Identifies a client by an ID in its resource ID range.
+bytes:
+ Number of bytes attributed to pixmap references from the client
+ resources.
+bytes_overflow:
+ Higher order word for the bytes field in case the sum of pixmap
+ reference sizes doesn't fit in CARD32.
+
+A value error is generated if invalid resource or client XID is given
+in the request.
+
+5.2 Requests in version 1.2
+
+┌───
+ XResQueryClientIds
+ num_specs: CARD32
+ client_specs: LISTofCLIENTIDSPEC
+ ▶
+ num_ids: CARD32
+ client_ids: LISTofCLIENTIDVALUE
+
+ Errors: Value
+└───
+
+XResQueryClientIds can be used to identify a given set of clients with
+some identification method. The request sends a list of specifiers
+that select clients and identification methods to server. The server
+then tries to identify the chosen clients using the identification
+methods specified for each client. The server returns IDs for those
+clients that were successfully identified. It's not an error condition
+if some identification method couldn't be applied to a client. If the
+server is unable to identify some clients, they simply aren't included
+in the returned list.
+
+The request supports wildcards in the client specifications so that in
+the most general case all IDs of all clients can be queried with a
+single CLIENTIDSPEC.
+
+The CLIENTIDSPEC of request and CLIENTIDSPEC of CLIENTIDVALUE in reply
+usually match each other. For example, if a request selected a client
+by a resource ID owned by the client, then the client is identified by
+the same resource ID in the reply. This has been done so that it would
+be easy to identify an owner of some resource.
+
+However, the CLIENTIDSPEC of returned CLIENTIDVALUE never contains any
+wildcards. If the request used a wildcard to specify all clients in a
+single CLIENTIDSPEC, then the reply has expanded the wildcard and
+returns separate CLIENTIDVALUE records for each client. In this case
+wildcarded clients are identified by resource_base of CLIENTXIDRANGE.
+
+The LocalClientPid type of IDs are included in the reply list only if
+the client executing the request asked for it and was also a local
+client itself. It doesn't make sense for remote clients to ask PIDs of
+local clients.
+
+num_specs
+ Number of client ID specifications.
+client_specs
+ A list specifying identification methods for clients. Supports
+ multiple identification methods and clients in a single
+ specification. See CLIENTIDSPEC for details.
+num_ids
+ Number of IDs that were successfully determined. Can be different
+ from num_specs or even zero if the server didn't support any
+ identification methods for the given clients.
+client_ids
+ A list specifying ID information for successfully identified
+ clients. If wildcards were used in a single CLIENTIDSPEC of
+ client_specs, then multiple CLIENTIDVALUE records may be returned
+ for that CLIENTIDSPEC. See CLIENTIDVALUE for details.
+
+A Value error is returned if the request specifies an invalid client
+XID or invalid identification method type.
+
+┌───
+ XResQueryResourceBytes
+ client: CLIENTXID or None
+ num_specs: CARD32
+ resource_specs: LISTofRESOURCEIDSPEC
+ ▶
+ num_sizes: CARD32
+ sizes: LISTofRESOURCESIZEVALUE
+
+ Errors: Atom, Value
+└───
+
+XResQueryResourceBytes can be used to ask the sizes of resources from
+X server. The request sends a list of specifiers that selects
+resources for size calculation. The server tries to calculate the
+sizes of chosen resources and returns an estimate for a resource only
+if the size could be determined. It's not an error condition if a size
+couldn't be calculated. In that case the resources simply aren't
+included in the returned list.
+
+The request supports wildcards so that in the most general case sizes
+of all resources of all clients can be queried with a single
+RESOURCEIDSPEC. However, the reply has all wildcards expanded and
+reports a size of a single resource in each RESOURCESIZEVALUE.
+
+client
+ An ID of a client can be given to limit the query to resources of
+ that client. Just like in CLIENTIDSPEC, any resource ID can be
+ given to identify a client and None can be used if the query
+ shouldn't be limited to a specific client. Note that in some cases
+ this field is redundant because resource_specs already fully
+ determines which resources are selected. If the client ID doesn't
+ match the owner of any resource in resource_specs, no sizes are
+ returned and no error is generated.
+num_specs
+ Number of resource specifications.
+resource_specs
+ A list of resource specifications. Each specification can either
+ uniquely identify a single resource or multiple resources if
+ wildcarding is used. See RESOURCEIDSPEC for details.
+num_sizes
+ Number of resources whose size could be determined. Can be
+ different from num_specs or even zero if the server didn't support
+ size calculation for the given resources.
+sizes
+ A list of resource sizes. Each resource size is linked to a unique
+ resource. Wildcards are never used in the returned size
+ records. For example, it's not possible to receive a single
+ RESOURCESIZEVALUE that would specify the size of all pixmaps if
+ the sizes of pixmap type resources were asked. Instead, a single
+ RESOURCESIZEVALUE would be returned for each pixmap in that case.
+
+An Atom error is returned if the request specifies an invalid resource
+type. A Value error is returned if the request specifies an invalid
+XID for a client or a resource.
+
+ ❧❧❧❧❧❧❧❧❧❧❧
++++++ scrnsaverproto-1.2.1.tar.bz2 -> scrnsaverproto-1.2.2.tar.bz2 ++++++
++++ 8924 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-1.2.1/ChangeLog new/scrnsaverproto-1.2.2/ChangeLog
--- old/scrnsaverproto-1.2.1/ChangeLog 2010-10-30 08:28:08.000000000 +0200
+++ new/scrnsaverproto-1.2.2/ChangeLog 2012-03-23 04:50:16.000000000 +0100
@@ -1,3 +1,197 @@
+commit c33f4368e85d976b112dda4a34ca254944cb354d
+Author: Alan Coopersmith
+Date: Thu Mar 22 20:49:20 2012 -0700
+
+ scrnsaverproto 1.2.2
+
+commit 27cf3d03cdd502c1228e59ba560eab77d8393405
+Author: Matt Dew
+Date: Sat Jan 14 22:21:00 2012 -0700
+
+ informaltable cleanup
+
+ On certain tables, add top and bottom borders to table
+ header and a bottom border to the table. This matches
+ what those tables in the old pdfs looked like.
+
+ the <?dbfo keep-together='always'> prevents tables from
+ splitting across pages. Useful for tiny tables.
+
+ Converting the colwidth to a floating point,
+ IE, 1* -> 1.0* cleans up these build errors:
+ WARNING: table-layout="fixed" and column-width unspecified
+ => falling back to proportional-column-width(1)
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit ffbc319b69b1e3502a9b14195e7fa94f2beee3b6
+Author: Matt Dew <marcoz@osource.org>
+Date: Sat Sep 24 20:07:44 2011 -0600
+
+ Fix id attributes, linkend and olinks
+
+ #1 - fix the capitolization of the ID attriutes to match either the <title> or <funcdef> string it goes with.
+ #2 - fix any <linkend>'s that were affected by #1
+ #3 - any <function> in the docs that has an actual funcdef, will become an olink if external, xref if internal.
+
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4aa72b32c7707bd78fc8dd8e287e3030eeb85d05
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 20:17:40 2011 -0400
+
+ specs: fix markup for single license dual holder
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d9c42cb0ba35e1c5e5a36a8cbde81eb311350931
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 12 11:04:11 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 378e4e73352a6bc11589460fdb4e6ceead2e82dc
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 19:49:54 2011 -0400
+
+ docs: remove <productnumber> which is not used by default
+
+ This element is not rendered by default on the title. A template
+ customization is required to display it.
+ X Window System does not have a product number.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit feaac4aaccb25d79d29a6020e75fca5a9938bf8a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 25764e51ecdea56df02063ae3b9d625d41a1209d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e80d85902dcd19edd9bdb5f574ca47d0811ac0aa
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 12 17:54:50 2011 -0400
+
+ Install xml versions of specs even if HAVE_XMLTO is false
+
+ DocBook/XML input source is also a usefull output format that can be viewed
+ with an XML viewer or editor and by some O/S help system.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8f407c9417ffe2c1e01b37e18c71469d2baee970
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 5 16:27:37 2011 -0400
+
+ Install target dbs alongside generated documents
+
+ This matches a change in xorg-sgml-docs whereby the masterdb will look for
+ the target dbs into the same location as the generated documents.
+
+ The target dbs are now installed alongside the generated documents.
+ Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+ has the potential of installing outside the package prefix and cause
+ distcheck to fail when user does not have write permission in this package.
+
+ Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit 2408165cb190a10e2d899bdc259866cbf7a8e125
+Author: Matt Dew <marcoz@osource.org>
+Date: Wed May 25 22:04:10 2011 -0600
+
+ add id attributes to funcsynopsis to allow other docs to olink to them.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2cd4a9898644dde49a876eeb53037149c85a37f0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Feb 27 15:06:18 2011 -0500
+
+ Documentation: add Docbook external references support
+
+ When writing technical documentation, it is often necessary to cross
+ reference to other information. When that other information is not in the
+ current document, additional support is needed, namely <olink>.
+
+ A new feature with version 1.7 of xorg-sgml-doctools adds references to
+ other documents within or outside this package.
+
+ This patch adds technical support for this feature but does not change
+ the content of the documentation as seen by the end user.
+
+ Each book or article must generate a database containing the href
+ of sections that can be referred to from another document. This database
+ is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+ the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+ documentation is the same. This forms a virtual document tree.
+
+ This database is consulted by other documents while they are being generated
+ in order to fulfill the missing information for linking.
+ Refer to the xorg-sgml-doctools for further technical information.
+
+ Co-authored-by: Matt Dew <marcoz@osource.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9d7dc8242feae5690e7aef48a386555c04183e9f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:16:54 2010 -0800
+
+ specs: change othercredit tags to author tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d50038590f72f02bc95712d8a4c37654f6d05a64
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:15:19 2010 -0800
+
+ spec: Fix section titles/nesting
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f85ed94ac012675dff25afbd3161dbbd3f62882b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Nov 9 15:19:09 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit b4899c5d6090efdf292f5686cc23ed90e3729e4b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 23:27:16 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-1.2.1/configure.ac new/scrnsaverproto-1.2.2/configure.ac
--- old/scrnsaverproto-1.2.1/configure.ac 2010-10-30 08:26:53.000000000 +0200
+++ new/scrnsaverproto-1.2.2/configure.ac 2012-03-23 04:49:42.000000000 +0100
@@ -1,18 +1,19 @@
AC_PREREQ([2.60])
-AC_INIT([ScrnSaverProto], [1.2.1],
+AC_INIT([ScrnSaverProto], [1.2.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
+# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
+ [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_WITH_XSLTPROC
+XORG_CHECK_SGML_DOCTOOLS(1.8)
AC_OUTPUT([Makefile
specs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-1.2.1/docbook.am new/scrnsaverproto-1.2.2/docbook.am
--- old/scrnsaverproto-1.2.1/docbook.am 1970-01-01 01:00:00.000000000 +0100
+++ new/scrnsaverproto-1.2.2/docbook.am 2012-03-23 04:49:42.000000000 +0100
@@ -0,0 +1,105 @@
+#
+# 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.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA =
+
+# DocBook/XML file with chapters, appendix and images it includes
+dist_shelf_DATA = $(docbook) $(chapters)
+
+if HAVE_XMLTO
+if HAVE_STYLESHEETS
+
+XMLTO_SEARCHPATH_FLAGS = \
+ --searchpath "$(XORG_SGML_PATH)/X11" \
+ --searchpath "$(abs_top_builddir)"
+XMLTO_HTML_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XMLTO_HTML_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_HTML_STYLESHEET_FLAGS) \
+ $(XMLTO_HTML_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_XMLTO_TEXT
+
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+if HAVE_FOP
+XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+XMLTO_PDF_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+XMLTO_FO_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_FO_STYLESHEET_FLAGS) \
+ $(XMLTO_FO_IMAGEPATH_FLAGS) \
+ $(XMLTO_PDF_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.pdf)
+%.pdf: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+
+shelf_DATA += $(docbook:.xml=.ps)
+%.ps: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+# Generate documents cross-reference target databases
+if HAVE_XSLTPROC
+
+XSLT_SEARCHPATH_FLAGS = \
+ --path "$(XORG_SGML_PATH)/X11" \
+ --path "$(abs_top_builddir)"
+XSLT_OLINK_FLAGS = \
+ --stringparam targets.filename "$@" \
+ --stringparam collect.xref.targets "only" \
+ --stringparam olink.base.uri "$(@:.db=)"
+
+XSLT_HTML_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XSLT_PDF_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+shelf_DATA += $(docbook:.xml=.html.db)
+%.html.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+
+shelf_DATA += $(docbook:.xml=.pdf.db)
+%.pdf.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-1.2.1/specs/Makefile.am new/scrnsaverproto-1.2.2/specs/Makefile.am
--- old/scrnsaverproto-1.2.1/specs/Makefile.am 2010-08-07 03:50:48.000000000 +0200
+++ new/scrnsaverproto-1.2.2/specs/Makefile.am 2012-03-23 04:49:42.000000000 +0100
@@ -1,64 +1,13 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
if ENABLE_SPECS
-doc_sources = saver.xml
-dist_doc_DATA = $(doc_sources)
-if HAVE_XMLTO
-doc_DATA = $(doc_sources:.xml=.html)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = saver.xml
-if HAVE_FOP
-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
-if HAVE_XMLTO_TEXT
-doc_DATA += $(doc_sources:.xml=.txt)
-endif
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
-endif
-
-CLEANFILES = $(doc_DATA)
-
-SUFFIXES = .xml .ps .pdf .txt .html
-
-.xml.txt:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-.xml.html:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-.xml.pdf:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-.xml.ps:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scrnsaverproto-1.2.1/specs/saver.xml new/scrnsaverproto-1.2.2/specs/saver.xml
--- old/scrnsaverproto-1.2.1/specs/saver.xml 2010-08-07 03:50:48.000000000 +0200
+++ new/scrnsaverproto-1.2.2/specs/saver.xml 2012-03-23 04:49:42.000000000 +0100
@@ -1,29 +1,35 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
<book id="saver">
<bookinfo>
<title>X11 Screen Saver Extension</title>
<subtitle>MIT X Consortium Proposed Standard</subtitle>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>Version 1.0</releaseinfo>
<authorgroup>
- <othercredit>
+ <author>
<firstname>Jim</firstname><surname>Fulton</surname>
<affiliation><orgname>Network Computing Devices, Inc</orgname></affiliation>
- </othercredit>
- <othercredit>
+ </author>
+ <author>
<firstname>Keith</firstname><surname>Packard</surname>
<affiliation><orgname>
X Consortium, Laboratory for Computer Science, Massachusetts Institute of Technology
</orgname></affiliation>
- </othercredit>
+ </author>
</authorgroup>
- <copyright><year>1992</year><holder>Massachusetts Institute of Technology and Network Computing Devices, Inc</holder></copyright>
+ <copyright><year>1992</year>
+ <holder>Massachusetts Institute of Technology</holder>
+ <holder>Network Computing Devices, Inc</holder>
+ </copyright>
- <productnumber>X Version 11, Release 5</productnumber>
<legalnotice>
<para>
@@ -39,9 +45,7 @@
</legalnotice>
</bookinfo>
-<chapter id="title">
-<title>TITLE</title>
-<sect1 id="Introduction_">
+<chapter id='Introduction'>
<title>Introduction</title>
<para>
The X Window System provides support for changing the image on a display screen
@@ -61,9 +65,9 @@
instructions on how to reactivate the screen, and automatic screen-locking
utilities. This extension provides a means for writing such clients.
</para>
-</sect1>
+</chapter>
-<sect1 id="Assumptions">
+<chapter id="Assumptions">
<title>Assumptions</title>
<para>
This extension exports the notion of a special screen saver window that is
@@ -73,9 +77,9 @@
returned by <function>QueryTree</function> requests on the root window, so it is typically
not visible to other clients.
</para>
-</sect1>
+</chapter>
-<sect1 id="Overview">
+<chapter id="Overview">
<title>Overview</title>
<para>
The core
@@ -106,9 +110,9 @@
location, visual, colormap) to be used when the window is mapped. These
requirements form the basis of this extension.
</para>
-</sect1>
+</chapter>
-<sect1 id="Issues">
+<chapter id="Issues">
<title>Issues</title>
<para>
This extension raises several interesting issues. First is the question of
@@ -130,33 +134,34 @@
screen saver clients may find that the requests that reference the screen
saver window may fail when the window is not displayed.
</para>
-</sect1>
+</chapter>
-<sect1 id="Protocol">
+<chapter id="Protocol">
<title>Protocol</title>
<para>
The Screen Saver extension is as follows:
</para>
-<sect2 id="Types">
+<sect1 id="Types">
<title>Types</title>
<para>
In adition to the comon types described in the core protocol, the following
type is used in the request and event definitions in subsequent sections.
</para>
-<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+<informaltable frame="topbot">
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.5*"/>
<thead>
- <row>
+ <row rowsep='1'>
<entry>Name</entry>
<entry>Value</entry>
</row>
</thead>
<tbody>
- <row rowsep="0">
+ <row>
<entry>SCREENSAVEREVENT</entry>
<entry><emphasis role="bold">ScreenSaverNotify</emphasis>,
<emphasis role="bold">ScreenSaverCycle</emphasis></entry>
@@ -164,16 +169,16 @@
</tbody>
</tgroup>
</informaltable>
-</sect2>
+</sect1>
-<sect2 id="Errors">
+<sect1 id="Errors">
<title>Errors</title>
<para>
The Screen Saver extension adds no errors beyond the core protocol.
</para>
-</sect2>
+</sect1>
-<sect2 id="Requests">
+<sect1 id="Requests">
<title>Requests</title>
<para>
The Screen Saver extension adds the following requests:
@@ -232,11 +237,12 @@
</para>
<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="5.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Off</emphasis></entry>
<entry>
The screen is not currently being saved;
@@ -245,7 +251,7 @@
activate.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">On</emphasis></entry>
<entry>
The screen is currently being saved;
@@ -253,7 +259,7 @@
the number of milliseconds since the screen saver activated.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Disabled</emphasis></entry>
<entry>
The screen saver is currently disabled;
@@ -270,21 +276,22 @@
</para>
<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="5.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Blanked</emphasis></entry>
<entry>The video signal to the display monitor was disabled.</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Internal</emphasis></entry>
<entry>A server-dependent, built-in screen saver image was displayed; either no
client had set the screen saver window attributes or a different client
had the server grabbed when the screen saver activated.</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">External</emphasis></entry>
<entry>The screen saver window was mapped with attributes set by a
client using the <function>ScreenSaverSetAttributes</function> request.</entry>
@@ -328,18 +335,19 @@
</para>
<informaltable frame="none">
- <tgroup cols='2' align='center'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="3.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">ScreenSaverNotify</emphasis></entry>
<entry>
If this bit is set, <emphasis role="bold">ScreenSaverNotify</emphasis> events are generated whenever
the screen saver is activated or deactivated.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">ScreenSaverCycle</emphasis></entry>
<entry>
If this bit is set, <emphasis role="bold">ScreenSaverNotify</emphasis> events are generated whenever
@@ -464,9 +472,9 @@
This request is ignored if the client has not previously set the screen saver
window attributes.
</para>
-</sect2>
+</sect1>
-<sect2 id="Events_">
+<sect1 id="Events">
<title>Events</title>
<para>
The Screen Saver extension adds one event:
@@ -500,25 +508,26 @@
</para>
<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="5.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Off</emphasis></entry>
<entry>
The screen saver deactivated; this event is sent if the client has set the
ScreenSaverNotify bit in its event mask.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">On</emphasis></entry>
<entry>
The screen saver activated. This event is sent if the client has set the
ScreenSaverNotify bit in its event mask.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Cycle</emphasis></entry>
<entry>
The cycle interval passed and the client is expected to change the image on
@@ -550,10 +559,10 @@
The <emphasis remap='I'>time</emphasis> field indicates the server time
when the event was generated.
</para>
-</sect2>
</sect1>
+</chapter>
-<sect1 id="Encoding">
+<chapter id="Encoding">
<title>Encoding</title>
<para>
Please refer to the X11 Protocol Encoding document as this document uses
@@ -563,16 +572,16 @@
The name of this extension is "SCREEN-SAVER".
</para>
-<sect2 id="Common_Types">
+<sect1 id="Common_Types">
<title>Common Types</title>
<literallayout class="monospaced">
SETofSCREENSAVEREVENT
#x00000001 ScreenSaverNotifyMask
#x00000002 ScreenSaverCycleMask
</literallayout>
-</sect2>
+</sect1>
-<sect2 id="Requests_2">
+<sect1 id="Requests_2">
<title>Requests</title>
<literallayout class="monospaced">
<emphasis role="bold">ScreenSaverQueryVersion</emphasis>
@@ -649,9 +658,9 @@
2 3 request length
4 DRAWABLE drawable associated with screen
</literallayout>
-</sect2>
+</sect1>
-<sect2 id="Events">
+<sect1 id="Events_2">
<title>Events</title>
<literallayout class="monospaced">
@@ -672,10 +681,10 @@
1 BOOL forced
14 unused
</literallayout>
-</sect2>
</sect1>
+</chapter>
-<sect1 id="Inter_Client_Communications_Conventions_">
+<chapter id='Inter_Client_Communications_Conventions'>
<title>Inter-Client Communications Conventions</title>
<para>
Screen saver clients should create at least one resource value whose
@@ -691,9 +700,9 @@
<emphasis role="bold">FONT</emphasis>, or
<emphasis role="bold">COLORMAP</emphasis>.
</para>
-</sect1>
+</chapter>
-<sect1 id="C_language_binding">
+<chapter id="C_language_binding">
<title>C language binding</title>
<para>
@@ -707,7 +716,7 @@
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverQueryExtension'>
<funcprototype>
<funcdef>Bool <function>XScreenSaverQueryExtension</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -730,7 +739,7 @@
of <emphasis remap='I'>error_base</emphasis> are not defined.
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverQueryVersion'>
<funcprototype>
<funcdef>Status <function>XScreenSaverQueryVersion</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -755,14 +764,14 @@
<para>
This routine allocates and returns an
<emphasis role="bold">XScreenSaverInfo</emphasis> structure
-for use in calls to <function>XScreenSaverQueryInfo</function>.
+for use in calls to <xref linkend='XScreenSaverQueryInfo' xrefstyle='select: title'/>.
All fields in the
structure are initialized to zero. If insufficient memory is available,
NULL is returned. The results of this routine can be released
-using <emphasis remap='I'>XFree</emphasis>.
+using <olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>.
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverQueryInfo'>
<funcprototype>
<funcdef>Status <function>XScreenSaverQueryInfo</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -797,7 +806,7 @@
is returned.
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverSelectInput'>
<funcprototype>
<funcdef>void <function>XScreenSaverSelectInput</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -834,7 +843,7 @@
of the allowed event masks. <!-- xref ? -->
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverSetAttributes'>
<funcprototype>
<funcdef>void <function>XScreenSaverSetAttributes</function></funcdef>
<paramdef>Display <parameter>*dpy</parameter></paramdef>
@@ -860,7 +869,7 @@
description of each of the arguments.
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverUnsetAttributes'>
<funcprototype>
<funcdef>void <function>XScreenSaverUnsetAttributes</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -874,7 +883,7 @@
any previous screen saver window attributes set by this client.
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverRegister'>
<funcprototype>
<funcdef>Status <function>XScreenSaverRegister</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -893,7 +902,7 @@
non-zero.
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverUnregister'>
<funcprototype>
<funcdef>Status <function>XScreenSaverUnregister</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -908,7 +917,7 @@
otherwise it returns non-zero.
</para>
-<funcsynopsis>
+<funcsynopsis id='XScreenSaverGetRegistered'>
<funcprototype>
<funcdef>Status <function>XScreenSaverGetRegistered</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -930,6 +939,5 @@
format; otherwise it returns non-zero.
</para>
-</sect1>
</chapter>
</book>
++++++ util-macros-1.15.0.tar.bz2 -> util-macros-1.17.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.15.0/ChangeLog new/util-macros-1.17/ChangeLog
--- old/util-macros-1.15.0/ChangeLog 2011-06-24 02:15:52.000000000 +0200
+++ new/util-macros-1.17/ChangeLog 2012-03-14 00:49:42.000000000 +0100
@@ -1,3 +1,319 @@
+commit c0c42057e0d357c144e7933ee413b522950a0f17
+Author: Gaetan Nadon
+Date: Tue Mar 13 19:45:12 2012 -0400
+
+ Version bump: 1.17
+
+ Signed-off-by: Gaetan Nadon
+
+commit 51f69514e65637f575df901ef942515e70314f6a
+Author: Chase Douglas
+Date: Mon Mar 12 11:49:28 2012 -0700
+
+ Separate unknown warning options by language
+
+ If XORG_COMPILER_FLAGS is called more than once with separate languages,
+ the unknown warning options used internally for unknown warning checking
+ will be set the first time and then the cached value will be used for
+ subsequent languages. This is a problem if the compilers differ between
+ the languages.
+
+ This change ensures that the unknown warning options are namespaced so
+ multiple XORG_COMPILER_FLAGS calls with different languages are checked
+ separately.
+
+ Signed-off-by: Chase Douglas
+ Reviewed-by: Gaetan Nadon
+
+commit a1fec11ca3de6774fb70052f5f5ab167bf658690
+Author: Chase Douglas
+Date: Mon Mar 12 10:59:55 2012 -0700
+
+ Fix cflag test compiler message and cache ids
+
+ When the language is C++, the flag checking message references $CC
+ instead of $CXX. The cache id is also xorg_cv_cc_* instead of
+ xorg_cv_cxx_*. This change fixes both issues.
+
+ Signed-off-by: Chase Douglas
+ Reviewed-by: Gaetan Nadon
+
+commit a02a9048a1b831d13d32413e2af429ac8d7a5c2b
+Author: Jon TURNEY
+Date: Sat Mar 10 15:04:28 2012 +0000
+
+ Don't use AS_ECHO in XORG_TESTSET_CFLAG
+
+ Further to commit 52ef6f6, since AS_ECHO isn't supported in autoconf 2.61 either,
+ rewrite use of cache variable in XORG_TESTSET_CFLAG so 'echo' isn't needed at all.
+
+ Signed-off-by: Jon TURNEY
+ Reviewed-by: Gaetan Nadon
+ Reviewed-by: Chase Douglas
+ Signed-off-by: Chase Douglas
+
+commit 299ae797eff46900e7d5914ff4502662f97f2062
+Author: Chase Douglas
+Date: Fri Mar 9 14:46:00 2012 -0800
+
+ Add XORG_ENABLE_INTEGRATION_TESTS
+
+ This macro enables a builder to enable/disable integration testing
+ It makes no assumption about the test cases' implementation
+ Test cases may or may not use Automake "Support for test suites"
+
+ Unit test support usually requires less dependencies and may be built
+ and run under less stringent environments than integration tests. Thus,
+ two separate options for unit and integration testing is desirable.
+
+ Copied from XORG_ENABLE_UNIT_TESTS.
+
+ Signed-off-by: Chase Douglas
+ Reviewed-by: Gaetan Nadon
+
+commit db238c632bb7136e3e44345820d514106e317420
+Author: Gaetan Nadon
+Date: Mon Mar 5 09:39:17 2012 -0500
+
+ Version bump: 1.16.2
+
+ Signed-off-by: Gaetan Nadon
+
+commit 44aa8e75c8e54c5bc09d0cbff2f7207abe80c980
+Author: Chase Douglas
+Date: Wed Feb 29 12:18:51 2012 -0800
+
+ Define BASE_CXXFLAGS when C++ is the chosen language
+
+ You can use this functionality by setting the language to C++ before
+ calling XORG_DEFAULT_OPTIONS. This can accomplished with AC_LANG(C++).
+
+ Signed-off-by: Chase Douglas
+ Reviewed-by: Gaetan Nadon
+
+commit 543ce698747dc998ca0ed987ef1ab0c35fb501b1
+Author: Chase Douglas
+Date: Wed Feb 29 09:51:02 2012 -0800
+
+ Make XORG_TESTSET_CFLAG work for multiple languages
+
+ Signed-off-by: Chase Douglas
+ Reviewed-by: Gaetan Nadon
+
+commit 52ef6f666a4fb46b693c81dc7a44612e6b78239d
+Author: Jon TURNEY
+Date: Tue Feb 14 21:59:38 2012 +0000
+
+ Use AS_ECHO rather than AS_ECHO_N in XORG_TESTSET_CFLAG
+
+ The AS_ECHO_N macro was only introduced in autoconf 2.62.
+ Backticks remove trailing newlines, so we don't need to use echo -n
+
+ Signed-off-by: Jon TURNEY
+ Reviewed-by: Gaetan Nadon
+
+commit a1809fde56e45639556a44fd3c3ef9213204c5a9
+Author: Jon TURNEY
+Date: Mon Jan 2 19:42:10 2012 +0000
+
+ Cache the results of checking compiler flag support in XORG_TESTSET_CFLAG
+
+ Since checking all those warning flags takes an amount of time I find irritating,
+ here is an attempt at caching the results of checking compiler warning flag support
+
+ A couple of aspects which need definitely need review or testing:
+
+ * I've tried to get things right when not the first flag in the list of alternates is
+ supported, but this really needs testing with a compiler other than gcc
+
+ * The cache variable naming policy is a bit opaque me, so the names used may need corecting
+
+ * I've tried to be careful, but who knows what portability sins I have committed :-)
+
+ This change reduces the time to run the ./configure script produced from a configure.ac
+ containing just
+
+ AC_INIT([test], 1.0)
+ XORG_COMPILER_FLAGS
+ XORG_CWARNFLAGS
+ XORG_STRICT_OPTION
+ AC_OUTPUT()
+
+ from ~60s to ~20s on my cygwin machine, and from ~15s to ~9s on a linux VM running on the
+ same hardware
+
+ v2: AS_TR_SH transforms characters which are invalid in shell variable names, so we don't
+ have to use sed to transform spaces ourself
+
+ Signed-off-by: Jon TURNEY
+ Reviewed-by: Gaetan Nadon
+
+commit 214132d470ef98b5d3cdc71662cb586025746bb5
+Author: Jeremy Huddleston
+Date: Fri Jan 20 23:46:56 2012 -0800
+
+ Version bump: 1.16.1
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 088c848e74ac47bbd84eac70ef18a3d2abe96936
+Author: Jeremy Huddleston
+Date: Sun Dec 18 15:57:43 2011 -0800
+
+ Provide a configure option to turn off the selective -Werror=... CFLAGS
+
+ Provide end users with a workaround if they find code doesn't build with
+ the -Werror=... flags provided by BASE_CFLAGS. This can be useful if
+ newer util-macros are used with older source code that had problems, or
+ in the rare case when warnings are expanded to hit more cases (although
+ this case should not happen too much in practice).
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 55f387315c4429704d2d5212fb1e3b130638e097
+Author: Jeremy Huddleston
+Date: Sat Dec 10 11:55:29 2011 -0800
+
+ Remove -Winline from BASE_CFLAGS
+
+ This might be useful for performance tuning builds against specific
+ compilers, but it is a bit too noisy to be used in general.
+
+ Signed-off-by: Jeremy Huddleston
+
+commit a8f51b6864c65ab226f2febd7322354fb00b9444
+Author: Gaetan Nadon
+Date: Wed Dec 7 15:15:54 2011 -0500
+
+ Version bump: 1.16.0
+
+ Signed-off-by: Gaetan Nadon
+
+commit 87340dcccf97c3e1f0ab918bb6740abf47d65558
+Author: Alan Coopersmith
+Date: Thu Dec 1 13:12:59 2011 -0800
+
+ XORG_TESTSET_CFLAG: Try to both compile & link with the flags
+
+ Catches build problems caused by compilers that ignore unknown flags
+ at compile time and pass them to the linker at link time, when the
+ linker considers unknown flags to be fatal errors.
+
+ Reviewed-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 2d4a7a4cf645c9cb586cf2f77f8d3f61d6c71883
+Author: Jeremy Huddleston
+Date: Thu Nov 10 23:45:57 2011 -0800
+
+ XORG_TESTSET_CFLAG: Add support fot -Werror=unused-command-line-argument
+
+ This warning was was added to clang in r144365
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 9d8a1e5809b4dd397efe2e62bbf2c8a6c4deb795
+Author: Alan Coopersmith
+Date: Thu Nov 3 18:14:15 2011 -0700
+
+ Add XORG_MEMORY_CHECK_FLAGS and require it in XORG_ENABLE_UNIT_TESTS
+
+ Based on the checks already in libXt/configure.ac and proposed for
+ xserver/configure.ac - makes a common implementation before we make
+ more copies.
+
+ Callers should be able to just add
+ TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
+
+ If built with an older xorg-macros, then the tests will simply be
+ less stringent, matching what happens on platforms without any
+ simple malloc debugging facilities available.
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Jeremy Huddleston
+
+commit 9b4a8bae3528950bdb87df095c212d646e15dbdb
+Author: Alan Coopersmith
+Date: Thu Nov 3 17:41:24 2011 -0700
+
+ Define __wrap_exit in test program source for XORG_LD_WRAP
+
+ Otherwise the test fails on Solaris releases that actually have support
+ for ld -wrap because the linker instead returns an error that __wrap_exit
+ is an undefined symbol.
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Jeremy Huddleston
+
+commit 0295ee03ab45c55771581664d6c903c6d2f87e53
+Author: Alan Coopersmith
+Date: Thu Nov 3 15:54:25 2011 -0700
+
+ Add an optional argument to XORG_LD_WRAP
+
+ Allows specifying if ld -wrap support is 'required' or 'optional' for
+ unit tests, so that builds like the xserver which only need ld -wrap
+ for some tests can allow users to enable the others when ld -wrap is
+ not available.
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Jeremy Huddleston
+
+commit b8a13e531db208a7c4c9a43b74b196104e7c66ed
+Author: Jeremy Huddleston
+Date: Tue Nov 1 12:59:55 2011 -0700
+
+ Add additional flags to XORG_COMPILER_FLAGS
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 08877399839f5a30a5edd2167fb4275d3dd9d473
+Author: Jeremy Huddleston
+Date: Tue Nov 1 12:44:48 2011 -0700
+
+ Update XORG_CWARNFLAGS to use XORG_COMPILER_FLAGS
+
+ Signed-off-by: Jeremy Huddleston
+
+commit b406f730d64dfb8b699631ffb3ee5f3a1f0db8c4
+Author: Jeremy Huddleston
+Date: Tue Nov 1 12:19:24 2011 -0700
+
+ Add XORG_COMPILER_FLAGS to replace XORG_CWARNFLAGS
+
+ See: https://bugs.freedesktop.org/show_bug.cgi?id=31238
+
+ Signed-off-by: Jeremy Huddleston
+
+commit b175fe0e07fce86cf029695e9e93b573ada54b0c
+Author: Jeremy Huddleston
+Date: Tue Nov 1 11:53:44 2011 -0700
+
+ Use XORG_TESTSET_CFLAG in XORG_STRICT_OPTION
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 9f427611f4bb6db60cb8cbdda6296a3bf66a5a6c
+Author: Jeremy Huddleston
+Date: Tue Nov 1 11:39:14 2011 -0700
+
+ Add XORG_TESTSET_CFLAG which can be used to test what flags the compiler supports
+
+ Signed-off-by: Jeremy Huddleston
+ Reviewed-by: Gaetan Nadon
+
+commit 4a6ecc7b8e338483fb5ea6bfc9b2fb26f890807b
+Author: Jeremy Huddleston
+Date: Tue Nov 1 11:49:41 2011 -0700
+
+ Fix the test for -Werror=attributes
+
+ The current test was always failing to compile because 'return 0;' was
+ global rather than in the body of a function.
+
+ Signed-off-by: Jeremy Huddleston
+ Reviewed-by: Gaetan Nadon
+
commit 08dd5d30c137abe43d5b1673edc39eb569881d66
Author: Gaetan Nadon
Date: Thu Jun 23 08:03:13 2011 -0400
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.15.0/configure new/util-macros-1.17/configure
--- old/util-macros-1.15.0/configure 2011-06-23 14:06:38.000000000 +0200
+++ new/util-macros-1.17/configure 2012-03-14 00:44:05.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for util-macros 1.15.0.
+# Generated by GNU Autoconf 2.68 for util-macros 1.17.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -560,8 +560,8 @@
# Identity of this package.
PACKAGE_NAME='util-macros'
PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.15.0'
-PACKAGE_STRING='util-macros 1.15.0'
+PACKAGE_VERSION='1.17'
+PACKAGE_STRING='util-macros 1.17'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1183,7 +1183,7 @@
# 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 util-macros 1.15.0 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1249,7 +1249,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of util-macros 1.15.0:";;
+ short | recursive ) echo "Configuration of util-macros 1.17:";;
esac
cat <<\_ACEOF
@@ -1323,7 +1323,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-util-macros configure 1.15.0
+util-macros configure 1.17
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1340,7 +1340,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by util-macros $as_me 1.15.0, which was
+It was created by util-macros $as_me 1.17, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2156,7 +2156,7 @@
# Define the identity of the package.
PACKAGE='util-macros'
- VERSION='1.15.0'
+ VERSION='1.17'
cat >>confdefs.h <<_ACEOF
@@ -2837,7 +2837,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by util-macros $as_me 1.15.0, which was
+This file was extended by util-macros $as_me 1.17, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2890,7 +2890,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-util-macros config.status 1.15.0
+util-macros config.status 1.17
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.15.0/configure.ac new/util-macros-1.17/configure.ac
--- old/util-macros-1.15.0/configure.ac 2011-06-23 14:02:56.000000000 +0200
+++ new/util-macros-1.17/configure.ac 2012-03-14 00:43:55.000000000 +0100
@@ -23,7 +23,7 @@
AC_PREREQ([2.60])
AC_INIT([util-macros],
- [1.15.0],
+ [1.17],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[util-macros])
AC_CONFIG_SRCDIR([Makefile.am])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.15.0/xorg-macros.m4.in new/util-macros-1.17/xorg-macros.m4.in
--- old/util-macros-1.15.0/xorg-macros.m4.in 2011-06-23 02:31:19.000000000 +0200
+++ new/util-macros-1.17/xorg-macros.m4.in 2012-03-13 14:52:44.000000000 +0100
@@ -1045,6 +1045,7 @@
AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[
AC_BEFORE([$0], [XORG_WITH_GLIB])
AC_BEFORE([$0], [XORG_LD_WRAP])
+AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests],
[Enable building unit test cases (default: ]_defopt[)]),
@@ -1055,6 +1056,39 @@
AC_MSG_RESULT([$enable_unit_tests])
]) # XORG_ENABLE_UNIT_TESTS
+# XORG_ENABLE_INTEGRATION_TESTS (enable_unit_tests=auto)
+# ------------------------------------------------------
+# Minimum version: 1.17.0
+#
+# This macro enables a builder to enable/disable integration testing
+# It makes no assumption about the test cases' implementation
+# Test cases may or may not use Automake "Support for test suites"
+#
+# Please see XORG_ENABLE_UNIT_TESTS for unit test support. Unit test support
+# usually requires less dependencies and may be built and run under less
+# stringent environments than integration tests.
+#
+# Interface to module:
+# ENABLE_INTEGRATION_TESTS: used in makefiles to conditionally build tests
+# enable_integration_tests: used in configure.ac for additional configuration
+# --enable-integration-tests: 'yes' user instructs the module to build tests
+# 'no' user instructs the module not to build tests
+# parm1: specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_INTEGRATION_TESTS],[
+AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS])
+m4_define([_defopt], m4_default([$1], [auto]))
+AC_ARG_ENABLE(integration-tests, AS_HELP_STRING([--enable-integration-tests],
+ [Enable building integration test cases (default: ]_defopt[)]),
+ [enable_integration_tests=$enableval],
+ [enable_integration_tests=]_defopt)
+m4_undefine([_defopt])
+AM_CONDITIONAL([ENABLE_INTEGRATION_TESTS],
+ [test "x$enable_integration_tests" != xno])
+AC_MSG_CHECKING([whether to build unit test cases])
+AC_MSG_RESULT([$enable_integration_tests])
+]) # XORG_ENABLE_INTEGRATION_TESTS
+
# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
# ----------------------------------------
# Minimum version: 1.13.0
@@ -1065,6 +1099,10 @@
# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing.
# Otherwise the value of $enable_unit_tests is blank.
#
+# Please see XORG_ENABLE_INTEGRATION_TESTS for integration test support. Unit
+# test support usually requires less dependencies and may be built and run under
+# less stringent environments than integration tests.
+#
# Interface to module:
# HAVE_GLIB: used in makefiles to conditionally build targets
# with_glib: used in configure.ac to know if GLib has been found
@@ -1116,8 +1154,8 @@
AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes])
]) # XORG_WITH_GLIB
-# XORG_LD_WRAP
-# ------------
+# XORG_LD_WRAP([required|optional])
+# ---------------------------------
# Minimum version: 1.13.0
#
# Check if linker supports -wrap, passed via compiler flags
@@ -1125,10 +1163,18 @@
# When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit testing.
# Otherwise the value of $enable_unit_tests is blank.
#
+# Argument added in 1.16.0 - default is "required", to match existing behavior
+# of returning an error if enable_unit_tests is yes, and ld -wrap is not
+# available, an argument of "optional" allows use when some unit tests require
+# ld -wrap and others do not.
+#
AC_DEFUN([XORG_LD_WRAP],[
-XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no])
+XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no],
+ [AC_LANG_PROGRAM([#include
+ void __wrap_exit(int status) { return; }],
+ [exit(0);])])
# Not having ld wrap when unit testing has been explicitly requested is an error
-if test "x$enable_unit_tests" = x"yes"; then
+if test "x$enable_unit_tests" = x"yes" -a "x$1" != "xoptional"; then
if test "x$have_ld_wrap" = x"no"; then
AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is not available])
fi
@@ -1141,7 +1187,7 @@
# -----------------------
# SYNOPSIS
#
-# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
+# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE], [PROGRAM-SOURCE])
#
# DESCRIPTION
#
@@ -1151,6 +1197,8 @@
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
# success/failure.
#
+# PROGRAM-SOURCE is the program source to link with, if needed
+#
# NOTE: Based on AX_CHECK_COMPILER_FLAGS.
#
# LICENSE
@@ -1191,7 +1239,7 @@
[AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [
ax_save_FLAGS=$LDFLAGS
LDFLAGS="$1"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+ AC_LINK_IFELSE([m4_default([$4],[AC_LANG_PROGRAM()])],
AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
LDFLAGS=$ax_save_FLAGS])],
@@ -1210,6 +1258,52 @@
fi
]) # XORG_CHECK_LINKER_FLAGS
+# XORG_MEMORY_CHECK_FLAGS
+# -----------------------
+# Minimum version: 1.16.0
+#
+# This macro attempts to find appropriate memory checking functionality
+# for various platforms which unit testing code may use to catch various
+# forms of memory allocation and access errors in testing.
+#
+# Interface to module:
+# XORG_MALLOC_DEBUG_ENV - environment variables to set to enable debugging
+# Usually added to TESTS_ENVIRONMENT in Makefile.am
+#
+# If the user sets the value of XORG_MALLOC_DEBUG_ENV, it is used verbatim.
+#
+AC_DEFUN([XORG_MEMORY_CHECK_FLAGS],[
+
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_ARG_VAR([XORG_MALLOC_DEBUG_ENV],
+ [Environment variables to enable memory checking in tests])
+
+# Check for different types of support on different platforms
+case $host_os in
+ solaris*)
+ AC_CHECK_LIB([umem], [umem_alloc],
+ [malloc_debug_env='LD_PRELOAD=libumem.so UMEM_DEBUG=default'])
+ ;;
+ *-gnu*) # GNU libc - Value is used as a single byte bit pattern,
+ # both directly and inverted, so should not be 0 or 255.
+ malloc_debug_env='MALLOC_PERTURB_=15'
+ ;;
+ darwin*)
+ malloc_debug_env='MallocPreScribble=1 MallocScribble=1 DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib'
+ ;;
+ *bsd*)
+ malloc_debug_env='MallocPreScribble=1 MallocScribble=1'
+ ;;
+esac
+
+# User supplied flags override default flags
+if test "x$XORG_MALLOC_DEBUG_ENV" != "x"; then
+ malloc_debug_env="$XORG_MALLOC_DEBUG_ENV"
+fi
+
+AC_SUBST([XORG_MALLOC_DEBUG_ENV],[$malloc_debug_env])
+]) # XORG_WITH_LINT
+
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
@@ -1367,41 +1461,248 @@
#
# Checks for various brands of compilers and sets flags as appropriate:
# GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes"
+# GNU g++ - relies on AC_PROG_CXX to set GXX to "yes"
# clang compiler - sets CLANGCC to "yes"
# Intel compiler - sets INTELCC to "yes"
# Sun/Oracle Solaris Studio cc - sets SUNCC to "yes"
#
AC_DEFUN([XORG_COMPILER_BRAND], [
-AC_REQUIRE([AC_PROG_CC_C99])
+AC_LANG_CASE(
+ [C], [
+ AC_REQUIRE([AC_PROG_CC_C99])
+ ],
+ [C++], [
+ AC_REQUIRE([AC_PROG_CXX])
+ ]
+)
AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"])
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
]) # XORG_COMPILER_BRAND
+# XORG_TESTSET_CFLAG(<variable>, <flag>, [<alternative flag>, ...])
+# ---------------
+# Minimum version: 1.16.0
+#
+# Test if the compiler works when passed the given flag as a command line argument.
+# If it succeeds, the flag is appeneded to the given variable. If not, it tries the
+# next flag in the list until there are no more options.
+#
+# Note that this does not guarantee that the compiler supports the flag as some
+# compilers will simply ignore arguments that they do not understand, but we do
+# attempt to weed out false positives by using -Werror=unknown-warning-option and
+# -Werror=unused-command-line-argument
+#
+AC_DEFUN([XORG_TESTSET_CFLAG], [
+m4_if([$#], 0, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])])
+m4_if([$#], 1, [m4_fatal([XORG_TESTSET_CFLAG was given with an unsupported number of arguments])])
+
+AC_LANG_COMPILER_REQUIRE
+
+AC_LANG_CASE(
+ [C], [
+ AC_REQUIRE([AC_PROG_CC_C99])
+ define([PREFIX], [C])
+ define([CACHE_PREFIX], [cc])
+ define([COMPILER], [$CC])
+ ],
+ [C++], [
+ define([PREFIX], [CXX])
+ define([CACHE_PREFIX], [cxx])
+ define([COMPILER], [$CXX])
+ ]
+)
+
+[xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]"
+
+if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "x" ; then
+ PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
+ AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unknown-warning-option],
+ [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option],
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
+ [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=yes],
+ [xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=no]))
+ [xorg_testset_]CACHE_PREFIX[_unknown_warning_option]=$[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option]
+ PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
+fi
+
+if test "x$[xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]" = "x" ; then
+ if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "xyes" ; then
+ PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
+ fi
+ PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
+ AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unused-command-line-argument],
+ [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument],
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
+ [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=yes],
+ [xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=no]))
+ [xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]=$[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument]
+ PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
+fi
+
+found="no"
+m4_foreach([flag], m4_cdr($@), [
+ if test $found = "no" ; then
+ if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
+ fi
+
+ if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
+ fi
+
+ PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
+
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
+ AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
+ cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
+ AC_CACHE_VAL($cacheid,
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
+ [eval $cacheid=yes],
+ [eval $cacheid=no])])
+
+ PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
+
+ eval supported=\$$cacheid
+ AC_MSG_RESULT([$supported])
+ if test "$supported" = "yes" ; then
+ $1="$$1 ]flag["
+ found="yes"
+ fi
+ fi
+])
+]) # XORG_TESTSET_CFLAG
+
+# XORG_COMPILER_FLAGS
+# ---------------
+# Minimum version: 1.16.0
+#
+# Defines BASE_CFLAGS or BASE_CXXFLAGS to contain a set of command line
+# arguments supported by the selected compiler which do NOT alter the generated
+# code. These arguments will cause the compiler to print various warnings
+# during compilation AND turn a conservative set of warnings into errors.
+#
+# The set of flags supported by BASE_CFLAGS and BASE_CXXFLAGS will grow in
+# future versions of util-macros as options are added to new compilers.
+#
+AC_DEFUN([XORG_COMPILER_FLAGS], [
+AC_REQUIRE([XORG_COMPILER_BRAND])
+
+AC_ARG_ENABLE(selective-werror,
+ AS_HELP_STRING([--disable-selective-werror],
+ [Turn off selective compiler errors. (default: enabled)]),
+ [SELECTIVE_WERROR=$enableval],
+ [SELECTIVE_WERROR=yes])
+
+AC_LANG_CASE(
+ [C], [
+ define([PREFIX], [C])
+ ],
+ [C++], [
+ define([PREFIX], [CXX])
+ ]
+)
+# -v is too short to test reliably with XORG_TESTSET_CFLAG
+if test "x$SUNCC" = "xyes"; then
+ [BASE_]PREFIX[FLAGS]="-v"
+else
+ [BASE_]PREFIX[FLAGS]=""
+fi
+
+# This chunk of warnings were those that existed in the legacy CWARNFLAGS
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wall])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-arith])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-declarations])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wformat=2], [-Wformat])
+
+AC_LANG_CASE(
+ [C], [
+ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wstrict-prototypes])
+ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
+ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
+ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
+ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
+ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
+ ]
+)
+
+# This chunk adds additional warnings that could catch undesired effects.
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
+
+# These are currently disabled because they are noisy. They will be enabled
+# in the future once the codebase is sufficiently modernized to silence
+# them. For now, I don't want them to drown out the other warnings.
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
+
+# Turn some warnings into errors, so we don't accidently get successful builds
+# when there are problems that should be fixed.
+
+if test "x$SELECTIVE_WERROR" = "xyes" ; then
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=implicit], [-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=nonnull])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=init-self])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=main])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=missing-braces])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=sequence-point])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=return-type], [-errwarn=E_FUNC_HAS_NO_RETURN_STMT])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=trigraphs])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=array-bounds])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=write-strings])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=address])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=int-to-pointer-cast], [-errwarn=E_BAD_PTR_INT_COMBINATION])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Werror=pointer-to-int-cast]) # Also -errwarn=E_BAD_PTR_INT_COMBINATION
+else
+AC_MSG_WARN([You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wimplicit])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnonnull])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Winit-self])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmain])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-braces])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wsequence-point])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wreturn-type])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wtrigraphs])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Warray-bounds])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wwrite-strings])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Waddress])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wint-to-pointer-cast])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wpointer-to-int-cast])
+fi
+
+AC_SUBST([BASE_]PREFIX[FLAGS])
+]) # XORG_COMPILER_FLAGS
+
# XORG_CWARNFLAGS
# ---------------
# Minimum version: 1.2.0
+# Deprecated since: 1.16.0 (Use XORG_COMPILER_FLAGS instead)
#
# Defines CWARNFLAGS to enable C compiler warnings.
#
+# This function is deprecated because it defines -fno-strict-aliasing
+# which alters the code generated by the compiler. If -fno-strict-aliasing
+# is needed, then it should be added explicitly in the module when
+# it is updated to use BASE_CFLAGS.
+#
AC_DEFUN([XORG_CWARNFLAGS], [
-AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_COMPILER_FLAGS])
AC_REQUIRE([XORG_COMPILER_BRAND])
-if test "x$GCC" = xyes ; then
- CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
--Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
--Wbad-function-cast -Wformat=2"
- case `$CC -dumpversion` in
- 3.4.* | 4.*)
- CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
- ;;
- esac
-else
- if test "x$SUNCC" = "xyes"; then
- CWARNFLAGS="-v"
- fi
-fi
-AC_SUBST(CWARNFLAGS)
+AC_LANG_CASE(
+ [C], [
+ CWARNFLAGS="$BASE_CFLAGS"
+ if test "x$GCC" = xyes ; then
+ CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing"
+ fi
+ AC_SUBST(CWARNFLAGS)
+ ]
+)
]) # XORG_CWARNFLAGS
# XORG_STRICT_OPTION
@@ -1411,41 +1712,43 @@
# Add configure option to enable strict compilation flags, such as treating
# warnings as fatal errors.
# If --enable-strict-compilation is passed to configure, adds strict flags to
-# $CWARNFLAGS.
+# $BASE_CFLAGS or $BASE_CXXFLAGS and the deprecated $CWARNFLAGS.
#
# Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or
# when strict compilation is unconditionally desired.
AC_DEFUN([XORG_STRICT_OPTION], [
-# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
-AC_REQUIRE([AC_PROG_CC_C99])
-AC_REQUIRE([XORG_COMPILER_BRAND])
AC_REQUIRE([XORG_CWARNFLAGS])
+AC_REQUIRE([XORG_COMPILER_FLAGS])
AC_ARG_ENABLE(strict-compilation,
AS_HELP_STRING([--enable-strict-compilation],
[Enable all warnings from compiler and make them errors (default: disabled)]),
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
-if test "x$GCC" = xyes ; then
- STRICT_CFLAGS="-pedantic -Werror"
- # Add -Werror=attributes if supported (gcc 4.2 & later)
- AC_MSG_CHECKING([if $CC supports -Werror=attributes])
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([return 0;])],
- [STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes"
- AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])])
- CFLAGS="$save_CFLAGS"
-elif test "x$SUNCC" = "xyes"; then
- STRICT_CFLAGS="-errwarn"
-elif test "x$INTELCC" = "xyes"; then
- STRICT_CFLAGS="-Werror"
-fi
+
+AC_LANG_CASE(
+ [C], [
+ define([PREFIX], [C])
+ ],
+ [C++], [
+ define([PREFIX], [CXX])
+ ]
+)
+
+[STRICT_]PREFIX[FLAGS]=""
+XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-pedantic])
+XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror], [-errwarn])
+
+# Earlier versions of gcc (eg: 4.2) support -Werror=attributes, but do not
+# activate it with -Werror, so we add it here explicitly.
+XORG_TESTSET_CFLAG([[STRICT_]PREFIX[FLAGS]], [-Werror=attributes])
+
if test "x$STRICT_COMPILE" = "xyes"; then
- CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+ [BASE_]PREFIX[FLAGS]="$[BASE_]PREFIX[FLAGS] $[STRICT_]PREFIX[FLAGS]"
+ AC_LANG_CASE([C], [CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"])
fi
-AC_SUBST([STRICT_CFLAGS])
-AC_SUBST([CWARNFLAGS])
+AC_SUBST([STRICT_]PREFIX[FLAGS])
+AC_SUBST([BASE_]PREFIX[FLAGS])
+AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS]))
]) # XORG_STRICT_OPTION
# XORG_DEFAULT_OPTIONS
@@ -1456,6 +1759,7 @@
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
AC_REQUIRE([AC_PROG_INSTALL])
+XORG_COMPILER_FLAGS
XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_RELEASE_VERSION
++++++ xcb-proto-1.7.tar.bz2 -> xcb-proto-1.7.1.tar.bz2 ++++++
++++ 1717 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/Makefile.am new/xcb-proto-1.7.1/Makefile.am
--- old/xcb-proto-1.7/Makefile.am 2011-11-10 15:36:48.000000000 +0100
+++ new/xcb-proto-1.7.1/Makefile.am 2012-03-23 15:31:46.000000000 +0100
@@ -3,4 +3,4 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcb-proto.pc
-EXTRA_DIST=doc xcb-proto.pc.in
+EXTRA_DIST=doc xcb-proto.pc.in autogen.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/NEWS new/xcb-proto-1.7.1/NEWS
--- old/xcb-proto-1.7/NEWS 2012-01-11 17:27:11.000000000 +0100
+++ new/xcb-proto-1.7.1/NEWS 2012-03-23 16:23:51.000000000 +0100
@@ -1,3 +1,9 @@
+Release 1.7.1 (2012-03-23)
+==========================
+* Add ge and xf86vidmode protocol descriptions
+* Remove now unnecessary files as everything is implemented in xcbgen
+* Rename the ExprType "parent" attribute to "parents"
+
Release 1.7 (2012-01-11)
========================
* Add missing padding bytes to ChangeKeyboardMapping request
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/autogen.sh new/xcb-proto-1.7.1/autogen.sh
--- old/xcb-proto-1.7/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/xcb-proto-1.7.1/autogen.sh 2011-11-10 15:36:48.000000000 +0100
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/configure.ac new/xcb-proto-1.7.1/configure.ac
--- old/xcb-proto-1.7/configure.ac 2012-01-11 17:27:22.000000000 +0100
+++ new/xcb-proto-1.7.1/configure.ac 2012-03-23 16:23:10.000000000 +0100
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([XCB Proto],
- 1.7,
+ 1.7.1,
[xcb@lists.freedesktop.org])
AC_CONFIG_SRCDIR([xcb-proto.pc.in])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/missing new/xcb-proto-1.7.1/missing
--- old/xcb-proto-1.7/missing 2012-01-11 17:27:49.000000000 +0100
+++ new/xcb-proto-1.7.1/missing 2012-03-23 16:24:25.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -226,7 +216,7 @@
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/py-compile new/xcb-proto-1.7.1/py-compile
--- old/xcb-proto-1.7/py-compile 2012-01-11 17:27:49.000000000 +0100
+++ new/xcb-proto-1.7.1/py-compile 2012-03-23 16:24:26.000000000 +0100
@@ -1,10 +1,10 @@
#!/bin/sh
# py-compile - Compile a Python program
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-06-08.12; # UTC
-# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free
+# Software Foundation, Inc.
# 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
@@ -32,28 +32,36 @@
PYTHON=python
fi
+me=py-compile
+
+usage_error ()
+{
+ echo "$me: $*" >&2
+ echo "Try \`$me --help' for more information." >&2
+ exit 1
+}
+
basedir=
destdir=
-files=
while test $# -ne 0; do
case "$1" in
--basedir)
- basedir=$2
- if test -z "$basedir"; then
- echo "$0: Missing argument to --basedir." 1>&2
- exit 1
+ if test $# -lt 2; then
+ usage_error "option '--basedir' requires an argument"
+ else
+ basedir=$2
fi
shift
;;
--destdir)
- destdir=$2
- if test -z "$destdir"; then
- echo "$0: Missing argument to --destdir." 1>&2
- exit 1
+ if test $# -lt 2; then
+ usage_error "option '--destdir' requires an argument"
+ else
+ destdir=$2
fi
shift
;;
- -h|--h*)
+ -h|--help)
cat <<\EOF
Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
@@ -69,20 +77,27 @@
EOF
exit $?
;;
- -v|--v*)
- echo "py-compile $scriptversion"
+ -v|--version)
+ echo "$me $scriptversion"
exit $?
;;
+ --)
+ shift
+ break
+ ;;
+ -*)
+ usage_error "unrecognized option '$1'"
+ ;;
*)
- files="$files $1"
+ break
;;
esac
shift
done
+files=$*
if test -z "$files"; then
- echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
- exit 1
+ usage_error "no files given"
fi
# if basedir was given, then it should be prepended to filenames before
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/src/Makefile.am new/xcb-proto-1.7.1/src/Makefile.am
--- old/xcb-proto-1.7/src/Makefile.am 2011-11-10 15:36:48.000000000 +0100
+++ new/xcb-proto-1.7.1/src/Makefile.am 2012-03-23 15:31:46.000000000 +0100
@@ -6,6 +6,7 @@
damage.xml \
dpms.xml \
dri2.xml \
+ ge.xml \
glx.xml \
randr.xml \
record.xml \
@@ -18,6 +19,7 @@
xc_misc.xml \
xevie.xml \
xf86dri.xml \
+ xf86vidmode.xml \
xfixes.xml \
xinerama.xml \
xinput.xml \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/src/ge.xml new/xcb-proto-1.7.1/src/ge.xml
--- old/xcb-proto-1.7/src/ge.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xcb-proto-1.7.1/src/ge.xml 2011-11-10 15:36:48.000000000 +0100
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2009 Open Text Corporation. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+-->
+
+
+ <!-- Version 1 -->
+ <request name="QueryVersion" opcode="0">
+ <field type="CARD16" name="client_major_version" />
+ <field type="CARD16" name="client_minor_version" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD16" name="major_version" />
+ <field type="CARD16" name="minor_version" />
+ <pad bytes="20" />
+ </reply>
+ </request>
+
+</xcb>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/src/xf86vidmode.xml new/xcb-proto-1.7.1/src/xf86vidmode.xml
--- old/xcb-proto-1.7/src/xf86vidmode.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/xcb-proto-1.7.1/src/xf86vidmode.xml 2011-11-10 15:36:48.000000000 +0100
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2009 Open Text Corporation. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+-->
+
+
+
+ <!-- In places where there are multiple versions of the protocol, this
+ describes version 2.2. If you do not call xcb_xf86vidmode_set_client_version()
+ then some requests may fail and some replies may not be what you expect. -->
+
+ <typedef oldname="CARD32" newname="SYNCRANGE" /> <!-- Min and Max fixed-decimal-point values -->
+ <typedef oldname="CARD32" newname="DOTCLOCK" /> <!-- A single fixed-decimal-point value -->
+
+ <enum name="ModeFlag">
+ <item name="Positive_HSync"> <bit>0</bit></item>
+ <item name="Negative_HSync"> <bit>1</bit></item>
+ <item name="Positive_VSync"> <bit>2</bit></item>
+ <item name="Negative_VSync"> <bit>3</bit></item>
+ <item name="Interlace"> <bit>4</bit></item>
+ <item name="Composite_Sync"> <bit>5</bit></item>
+ <item name="Positive_CSync"> <bit>6</bit></item>
+ <item name="Negative_CSync"> <bit>7</bit></item>
+ <item name="HSkew"> <bit>8</bit></item>
+ <item name="Broadcast"> <bit>9</bit></item>
+ <item name="Pixmux"> <bit>10</bit></item>
+ <item name="Double_Clock"> <bit>11</bit></item>
+ <item name="Half_Clock"> <bit>12</bit></item>
+ </enum>
+
+ <enum name="ClockFlag">
+ <item name="Programable"> <bit>0</bit></item>
+ </enum>
+
+ <enum name="Permission">
+ <item name="Read"> <bit>0</bit></item>
+ <item name="Write"> <bit>1</bit></item>
+ </enum>
+
+ <struct name="ModeInfo">
+ <field type="DOTCLOCK" name="dotclock" />
+ <field type="CARD16" name= "hdisplay" />
+ <field type="CARD16" name= "hsyncstart" />
+ <field type="CARD16" name= "hsyncend" />
+ <field type="CARD16" name= "htotal" />
+ <field type="CARD32" name= "hskew" />
+ <field type="CARD16" name= "vdisplay" />
+ <field type="CARD16" name= "vsyncstart" />
+ <field type="CARD16" name= "vsyncend" />
+ <field type="CARD16" name= "vtotal" />
+ <pad bytes="4" />
+ <field type="CARD32" name="flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <field type="CARD32" name="privsize" />
+ </struct>
+
+ <request name="QueryVersion" opcode="0">
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD16" name="major_version" />
+ <field type="CARD16" name="minor_version" />
+ </reply>
+ </request>
+
+ <request name="GetModeLine" opcode="1">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <reply>
+ <pad bytes="1" />
+ <field type="DOTCLOCK" name="dotclock" />
+ <field type="CARD16" name= "hdisplay" />
+ <field type="CARD16" name= "hsyncstart" />
+ <field type="CARD16" name= "hsyncend" />
+ <field type="CARD16" name= "htotal" />
+ <field type="CARD16" name= "hskew" />
+ <field type="CARD16" name= "vdisplay" />
+ <field type="CARD16" name= "vsyncstart" />
+ <field type="CARD16" name= "vsyncend" />
+ <field type="CARD16" name= "vtotal" />
+ <pad bytes="2" />
+ <field type="CARD32" name="flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <field type="CARD32" name="privsize" />
+ <list type="CARD8" name="private">
+ <fieldref>privsize</fieldref>
+ </list>
+ </reply>
+ </request>
+
+ <request name="ModModeLine" opcode="2">
+ <field type="CARD32" name="screen" />
+ <field type="CARD16" name= "hdisplay" />
+ <field type="CARD16" name= "hsyncstart" />
+ <field type="CARD16" name= "hsyncend" />
+ <field type="CARD16" name= "htotal" />
+ <field type="CARD16" name= "hskew" />
+ <field type="CARD16" name= "vdisplay" />
+ <field type="CARD16" name= "vsyncstart" />
+ <field type="CARD16" name= "vsyncend" />
+ <field type="CARD16" name= "vtotal" />
+ <pad bytes="2" />
+ <field type="CARD32" name="flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <field type="CARD32" name="privsize" />
+ <list type="CARD8" name="private">
+ <fieldref>privsize</fieldref>
+ </list>
+ </request>
+
+ <request name="SwitchMode" opcode="3">
+ <field type="CARD16" name="screen" />
+ <field type="CARD16" name="zoom" />
+ </request>
+
+ <request name="GetMonitor" opcode="4">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD8" name="vendor_length" />
+ <field type="CARD8" name="model_length" />
+ <field type="CARD8" name="num_hsync" />
+ <field type="CARD8" name="num_vsync" />
+ <pad bytes="20" />
+ <list type="SYNCRANGE" name="hsync">
+ <fieldref>num_hsync</fieldref>
+ </list>
+ <list type="SYNCRANGE" name="vsync">
+ <fieldref>num_vsync</fieldref>
+ </list>
+ <list type="char" name="vendor">
+ <fieldref>vendor_length</fieldref>
+ </list>
+ <list type="void" name="alignment_pad">
+ <op op="-">
+ <op op="&">
+ <op op="+">
+ <fieldref>vendor_length</fieldref>
+ <value> 3 </value>
+ </op>
+ <unop op="~">
+ <value>3</value>
+ </unop>
+ </op>
+ <fieldref>vendor_length</fieldref>
+ </op>
+ </list>
+ <list type="char" name="model">
+ <fieldref>model_length</fieldref>
+ </list>
+ </reply>
+ </request>
+
+ <request name="LockModeSwitch" opcode="5">
+ <field type="CARD16" name="screen" />
+ <field type="CARD16" name="lock" />
+ </request>
+
+ <request name="GetAllModeLines" opcode="6">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD32" name="modecount" />
+ <pad bytes="20" />
+ <list type="ModeInfo" name="modeinfo">
+ <fieldref>modecount</fieldref>
+ </list>
+ </reply>
+ </request>
+
+ <request name="AddModeLine" opcode="7">
+ <field type="CARD32" name="screen" />
+ <field type="DOTCLOCK" name="dotclock" />
+ <field type="CARD16" name= "hdisplay" />
+ <field type="CARD16" name= "hsyncstart" />
+ <field type="CARD16" name= "hsyncend" />
+ <field type="CARD16" name= "htotal" />
+ <field type="CARD16" name= "hskew" />
+ <field type="CARD16" name= "vdisplay" />
+ <field type="CARD16" name= "vsyncstart" />
+ <field type="CARD16" name= "vsyncend" />
+ <field type="CARD16" name= "vtotal" />
+ <pad bytes="2" />
+ <field type="CARD32" name="flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <field type="CARD32" name="privsize" />
+ <field type="DOTCLOCK" name="after_dotclock" />
+ <field type="CARD16" name= "after_hdisplay" />
+ <field type="CARD16" name= "after_hsyncstart" />
+ <field type="CARD16" name= "after_hsyncend" />
+ <field type="CARD16" name= "after_htotal" />
+ <field type="CARD16" name= "after_hskew" />
+ <field type="CARD16" name= "after_vdisplay" />
+ <field type="CARD16" name= "after_vsyncstart" />
+ <field type="CARD16" name= "after_vsyncend" />
+ <field type="CARD16" name= "after_vtotal" />
+ <pad bytes="2" />
+ <field type="CARD32" name="after_flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <list type="CARD8" name="private">
+ <fieldref>privsize</fieldref>
+ </list>
+ </request>
+
+ <request name="DeleteModeLine" opcode="8">
+ <field type="CARD32" name="screen" />
+ <field type="DOTCLOCK" name="dotclock" />
+ <field type="CARD16" name= "hdisplay" />
+ <field type="CARD16" name= "hsyncstart" />
+ <field type="CARD16" name= "hsyncend" />
+ <field type="CARD16" name= "htotal" />
+ <field type="CARD16" name= "hskew" />
+ <field type="CARD16" name= "vdisplay" />
+ <field type="CARD16" name= "vsyncstart" />
+ <field type="CARD16" name= "vsyncend" />
+ <field type="CARD16" name= "vtotal" />
+ <pad bytes="2" />
+ <field type="CARD32" name="flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <field type="CARD32" name="privsize" />
+ <list type="CARD8" name="private">
+ <fieldref>privsize</fieldref>
+ </list>
+ </request>
+
+ <request name="ValidateModeLine" opcode="9">
+ <field type="CARD32" name="screen" />
+ <field type="DOTCLOCK" name="dotclock" />
+ <field type="CARD16" name= "hdisplay" />
+ <field type="CARD16" name= "hsyncstart" />
+ <field type="CARD16" name= "hsyncend" />
+ <field type="CARD16" name= "htotal" />
+ <field type="CARD16" name= "hskew" />
+ <field type="CARD16" name= "vdisplay" />
+ <field type="CARD16" name= "vsyncstart" />
+ <field type="CARD16" name= "vsyncend" />
+ <field type="CARD16" name= "vtotal" />
+ <pad bytes="2" />
+ <field type="CARD32" name="flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <field type="CARD32" name="privsize" />
+ <list type="CARD8" name="private">
+ <fieldref>privsize</fieldref>
+ </list>
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD32" name="status" />
+ <pad bytes="20" />
+ </reply>
+ </request>
+
+ <request name="SwitchToMode" opcode="10">
+ <field type="CARD32" name="screen" />
+ <field type="DOTCLOCK" name="dotclock" />
+ <field type="CARD16" name= "hdisplay" />
+ <field type="CARD16" name= "hsyncstart" />
+ <field type="CARD16" name= "hsyncend" />
+ <field type="CARD16" name= "htotal" />
+ <field type="CARD16" name= "hskew" />
+ <field type="CARD16" name= "vdisplay" />
+ <field type="CARD16" name= "vsyncstart" />
+ <field type="CARD16" name= "vsyncend" />
+ <field type="CARD16" name= "vtotal" />
+ <pad bytes="2" />
+ <field type="CARD32" name="flags" mask="ModeFlag" />
+ <pad bytes="12" />
+ <field type="CARD32" name="privsize" />
+ <list type="CARD8" name="private">
+ <fieldref>privsize</fieldref>
+ </list>
+ </request>
+
+ <request name="GetViewPort" opcode="11">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD32" name="x" />
+ <field type="CARD32" name="y" />
+ <pad bytes="16" />
+ </reply>
+ </request>
+
+ <request name="SetViewPort" opcode="12">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <field type="CARD32" name="x" />
+ <field type="CARD32" name="y" />
+ </request>
+
+ <!-- new for version 2.x -->
+ <request name="GetDotClocks" opcode="13">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD32" name="flags" mask="ClockFlag" />
+ <field type="CARD32" name="clocks" />
+ <field type="CARD32" name="maxclocks" />
+ <pad bytes="12" />
+ <list type="CARD32" name="clock">
+ <!-- Only if flags does not include Programable:
+ (1 - (flags & 1)) * clocks
+ -->
+ <op op="*">
+ <op op = "-">
+ <value>1</value>
+ <op op="&">
+ <fieldref>flags</fieldref>
+ <value>1</value>
+ </op>
+ </op>
+ <fieldref>clocks</fieldref>
+ </op>
+ </list>
+ </reply>
+ </request>
+
+ <request name="SetClientVersion" opcode="14">
+ <field type="CARD16" name="major" />
+ <field type="CARD16" name="minor" />
+ </request>
+
+ <request name="SetGamma" opcode="15">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <field type="CARD32" name="red" />
+ <field type="CARD32" name="green" />
+ <field type="CARD32" name="blue" />
+ <pad bytes="12" />
+ </request>
+
+ <request name="GetGamma" opcode="16">
+ <field type="CARD16" name="screen" />
+ <pad bytes="26" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD32" name="red" />
+ <field type="CARD32" name="green" />
+ <field type="CARD32" name="blue" />
+ <pad bytes="12" />
+ </reply>
+ </request>
+
+ <request name="GetGammaRamp" opcode="17">
+ <field type="CARD16" name="screen" />
+ <field type="CARD16" name="size" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD16" name="size" />
+ <pad bytes="22" />
+ <list type="CARD16" name="red">
+ <op op="&">
+ <op op = "+">
+ <fieldref>size</fieldref>
+ <value>1</value>
+ </op>
+ <unop op="~">
+ <value>1</value>
+ </unop>
+ </op>
+ </list>
+ <list type="CARD16" name="green">
+ <op op="&">
+ <op op = "+">
+ <fieldref>size</fieldref>
+ <value>1</value>
+ </op>
+ <unop op="~">
+ <value>1</value>
+ </unop>
+ </op>
+ </list>
+ <list type="CARD16" name="blue">
+ <op op="&">
+ <op op = "+">
+ <fieldref>size</fieldref>
+ <value>1</value>
+ </op>
+ <unop op="~">
+ <value>1</value>
+ </unop>
+ </op>
+ </list>
+ </reply>
+ </request>
+
+ <request name="SetGammaRamp" opcode="18">
+ <field type="CARD16" name="screen" />
+ <field type="CARD16" name="size" />
+ <list type="CARD16" name="red">
+ <op op="&">
+ <op op = "+">
+ <fieldref>size</fieldref>
+ <value>1</value>
+ </op>
+ <unop op="~">
+ <value>1</value>
+ </unop>
+ </op>
+ </list>
+ <list type="CARD16" name="green">
+ <op op="&">
+ <op op = "+">
+ <fieldref>size</fieldref>
+ <value>1</value>
+ </op>
+ <unop op="~">
+ <value>1</value>
+ </unop>
+ </op>
+ </list>
+ <list type="CARD16" name="blue">
+ <op op="&">
+ <op op = "+">
+ <fieldref>size</fieldref>
+ <value>1</value>
+ </op>
+ <unop op="~">
+ <value>1</value>
+ </unop>
+ </op>
+ </list>
+ </request>
+
+ <request name="GetGammaRampSize" opcode="19">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD16" name="size" />
+ <pad bytes="22" />
+ </reply>
+ </request>
+
+ <request name="GetPermissions" opcode="20">
+ <field type="CARD16" name="screen" />
+ <pad bytes="2" />
+ <reply>
+ <pad bytes="1" />
+ <field type="CARD32" name="permissions" mask="Permission" />
+ <pad bytes="20" />
+ </reply>
+ </request>
+
+ <error name="BadClock" number="0" />
+ <error name="BadHTimings" number="1" />
+ <error name="BadVTimings" number="2" />
+ <error name="ModeUnsuitable" number="3" />
+ <error name="ExtensionDisabled" number="4" />
+ <error name="ClientNotLocal" number="5" />
+ <error name="ZoomLocked" number="6" />
+
+</xcb>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-proto-1.7/xcbgen/xtypes.py new/xcb-proto-1.7.1/xcbgen/xtypes.py
--- old/xcb-proto-1.7/xcbgen/xtypes.py 2011-11-10 15:36:48.000000000 +0100
+++ new/xcb-proto-1.7.1/xcbgen/xtypes.py 2012-03-23 15:31:57.000000000 +0100
@@ -221,11 +221,11 @@
Public fields added:
expr is an Expression object containing the value of the field.
'''
- def __init__(self, elt, member, *parent):
+ def __init__(self, elt, member, *parents):
Type.__init__(self, member.name)
self.is_expr = True
self.member = member
- self.parent = parent
+ self.parents = parents
self.expr = Expression(list(elt)[0], self)
++++++ xcmiscproto-1.2.1.tar.bz2 -> xcmiscproto-1.2.2.tar.bz2 ++++++
++++ 8516 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcmiscproto-1.2.1/ChangeLog new/xcmiscproto-1.2.2/ChangeLog
--- old/xcmiscproto-1.2.1/ChangeLog 2010-10-30 09:05:01.000000000 +0200
+++ new/xcmiscproto-1.2.2/ChangeLog 2012-03-23 04:52:37.000000000 +0100
@@ -1,3 +1,172 @@
+commit f18667046964759f1fe086ade26829f6ced4fea7
+Author: Alan Coopersmith
+Date: Thu Mar 22 20:52:02 2012 -0700
+
+ xcmiscproto 1.2.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8bdaa79348896ecbf4f69df9773ec4681eb46410
+Author: Matt Dew
+Date: Sun Oct 2 20:29:17 2011 -0600
+
+ 1 - fix the capitalization of the ID attriutes to match either the
+ <title> or <funcdef> string it goes with.
+ 2 - fix any <linkend>'s that were affected by 1.
+ 3 - any <function> in the docs that has an actual funcdef,
+ will become an olink.
+
+ Signed-off-by: Matt Dew
+
+commit 7252c99f0bdfb560efe980f6f87786f4ccedeccd
+Author: Gaetan Nadon
+Date: Tue Sep 20 20:20:46 2011 -0400
+
+ specs: fix author affiliation
+
+ Signed-off-by: Gaetan Nadon
+
+commit 2d793cc635ca8a20a9ee0c99bcc0337c4f82bd7b
+Author: Gaetan Nadon
+Date: Mon Sep 12 16:54:45 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon
+
+commit 4ecb4f1559d2ce1c74a1ff2763b1ad2746961d53
+Author: Gaetan Nadon
+Date: Sun Sep 11 19:49:54 2011 -0400
+
+ docs: remove <productnumber> which is not used by default
+
+ This element is not rendered by default on the title. A template
+ customization is required to display it.
+ X Window System does not have a product number.
+
+ Signed-off-by: Gaetan Nadon
+
+commit e3affab380afc20a7d202ec40896ad43e65a477e
+Author: Gaetan Nadon
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon
+
+commit d8e1aee8520fe74d921bef604f2acbb4c0899900
+Author: Gaetan Nadon
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 905336a989f14dbbcc0c8d1648a2a51724203a09
+Author: Gaetan Nadon
+Date: Sun Jun 12 17:54:50 2011 -0400
+
+ Install xml versions of specs even if HAVE_XMLTO is false
+
+ DocBook/XML input source is also a usefull output format that can be viewed
+ with an XML viewer or editor and by some O/S help system.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 4179eb64ad35ab425cf00447bff334c387e23306
+Author: Gaetan Nadon
+Date: Sun Jun 5 16:27:37 2011 -0400
+
+ Install target dbs alongside generated documents
+
+ This matches a change in xorg-sgml-docs whereby the masterdb will look for
+ the target dbs into the same location as the generated documents.
+
+ The target dbs are now installed alongside the generated documents.
+ Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+ has the potential of installing outside the package prefix and cause
+ distcheck to fail when user does not have write permission in this package.
+
+ Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit fd4973cb7986e69bf47264430fbd17c58be9d0cd
+Author: Gaetan Nadon
+Date: Sun Feb 27 15:06:18 2011 -0500
+
+ Documentation: add Docbook external references support
+
+ When writing technical documentation, it is often necessary to cross
+ reference to other information. When that other information is not in the
+ current document, additional support is needed, namely <olink>.
+
+ A new feature with version 1.7 of xorg-sgml-doctools adds references to
+ other documents within or outside this package.
+
+ This patch adds technical support for this feature but does not change
+ the content of the documentation as seen by the end user.
+
+ Each book or article must generate a database containing the href
+ of sections that can be referred to from another document. This database
+ is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+ the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+ documentation is the same. This forms a virtual document tree.
+
+ This database is consulted by other documents while they are being generated
+ in order to fulfill the missing information for linking.
+ Refer to the xorg-sgml-doctools for further technical information.
+
+ Co-authored-by: Matt Dew
+
+ Signed-off-by: Gaetan Nadon
+
+commit 485c361562e986efa1cf05d2c70553e99c1b9382
+Author: Gaetan Nadon
+Date: Fri Feb 25 08:44:47 2011 -0500
+
+ Docbook: change the book id to match the xml file basename
+
+ This is required for the up-coming external references support.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 56424da60f0587a0fba8bcbf81536dd043412e87
+Author: Paulo Zanoni
+Date: Thu Dec 16 13:37:28 2010 -0200
+
+ Use docbookx.dtd version 4.3 for all docs
+
+ Signed-off-by: Paulo Zanoni
+ Signed-off-by: Alan Coopersmith
+
+commit 357c04268c4801fb17e4f1f495ec113d565b5be2
+Author: Gaetan Nadon
+Date: Tue Nov 9 15:19:09 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon
+
commit bff39d1e68056ffdf83924e708e55730236655dd
Author: Alan Coopersmith
Date: Sat Oct 30 00:04:11 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcmiscproto-1.2.1/configure.ac new/xcmiscproto-1.2.2/configure.ac
--- old/xcmiscproto-1.2.1/configure.ac 2010-10-30 09:03:49.000000000 +0200
+++ new/xcmiscproto-1.2.2/configure.ac 2012-03-23 04:52:11.000000000 +0100
@@ -1,18 +1,19 @@
AC_PREREQ([2.60])
-AC_INIT([XCMiscProto], [1.2.1],
+AC_INIT([XCMiscProto], [1.2.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
+# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
+ [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_WITH_XSLTPROC
+XORG_CHECK_SGML_DOCTOOLS(1.8)
AC_OUTPUT([Makefile
specs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcmiscproto-1.2.1/docbook.am new/xcmiscproto-1.2.2/docbook.am
--- old/xcmiscproto-1.2.1/docbook.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xcmiscproto-1.2.2/docbook.am 2012-03-23 04:52:11.000000000 +0100
@@ -0,0 +1,105 @@
+#
+# 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.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA =
+
+# DocBook/XML file with chapters, appendix and images it includes
+dist_shelf_DATA = $(docbook) $(chapters)
+
+if HAVE_XMLTO
+if HAVE_STYLESHEETS
+
+XMLTO_SEARCHPATH_FLAGS = \
+ --searchpath "$(XORG_SGML_PATH)/X11" \
+ --searchpath "$(abs_top_builddir)"
+XMLTO_HTML_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XMLTO_HTML_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_HTML_STYLESHEET_FLAGS) \
+ $(XMLTO_HTML_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_XMLTO_TEXT
+
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+if HAVE_FOP
+XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+XMLTO_PDF_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+ --stringparam current.docid="$(<:.xml=)"
+XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+XMLTO_FO_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_FO_STYLESHEET_FLAGS) \
+ $(XMLTO_FO_IMAGEPATH_FLAGS) \
+ $(XMLTO_PDF_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.pdf)
+%.pdf: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+
+shelf_DATA += $(docbook:.xml=.ps)
+%.ps: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+# Generate documents cross-reference target databases
+if HAVE_XSLTPROC
+
+XSLT_SEARCHPATH_FLAGS = \
+ --path "$(XORG_SGML_PATH)/X11" \
+ --path "$(abs_top_builddir)"
+XSLT_OLINK_FLAGS = \
+ --stringparam targets.filename "$@" \
+ --stringparam collect.xref.targets "only" \
+ --stringparam olink.base.uri "$(@:.db=)"
+
+XSLT_HTML_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XSLT_PDF_FLAGS = \
+ $(XSLT_SEARCHPATH_FLAGS) \
+ $(XSLT_OLINK_FLAGS) \
+ --nonet --xinclude \
+ $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+shelf_DATA += $(docbook:.xml=.html.db)
+%.html.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+
+shelf_DATA += $(docbook:.xml=.pdf.db)
+%.pdf.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcmiscproto-1.2.1/specs/Makefile.am new/xcmiscproto-1.2.2/specs/Makefile.am
--- old/xcmiscproto-1.2.1/specs/Makefile.am 2010-07-01 09:41:01.000000000 +0200
+++ new/xcmiscproto-1.2.2/specs/Makefile.am 2012-03-23 04:52:11.000000000 +0100
@@ -1,64 +1,13 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
if ENABLE_SPECS
-doc_sources = xc-misc.xml
-dist_doc_DATA = $(doc_sources)
-if HAVE_XMLTO
-doc_DATA = $(doc_sources:.xml=.html)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = xc-misc.xml
-if HAVE_FOP
-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
-if HAVE_XMLTO_TEXT
-doc_DATA += $(doc_sources:.xml=.txt)
-endif
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
-endif
-
-CLEANFILES = $(doc_DATA)
-
-SUFFIXES = .xml .ps .pdf .txt .html
-
-.xml.txt:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-.xml.html:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-.xml.pdf:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-.xml.ps:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcmiscproto-1.2.1/specs/xc-misc.xml new/xcmiscproto-1.2.2/specs/xc-misc.xml
--- old/xcmiscproto-1.2.1/specs/xc-misc.xml 2010-10-30 09:02:44.000000000 +0200
+++ new/xcmiscproto-1.2.2/specs/xc-misc.xml 2012-03-23 04:52:11.000000000 +0100
@@ -1,27 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<!DOCTYPE book 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;
+]>
<!-- lifted from troff+ms+XMan by doclifter -->
-<book id="xcmisc">
+<book id="xc-misc">
<bookinfo>
<title>XC-MISC Extension</title>
<subtitle>X Consortium Standard</subtitle>
- <releaseinfo>X Version 11, Release 6.9/7.0</releaseinfo>
<authorgroup>
<author>
<firstname>Bob</firstname><surname>Scheifler</surname>
+ <affiliation><orgname>X Consortium</orgname></affiliation>
</author>
<author>
- <firstname>David</firstname><surname>Wiggins</surname>
+ <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname>
+ <affiliation><orgname>X Consortium</orgname></affiliation>
</author>
- <corpauthor>X Consortium</corpauthor>
</authorgroup>
- <copyright><year>1994</year><holder>X Consortium</holder></copyright>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>Version 1.1</releaseinfo>
- <affiliation><orgname>X Consortium</orgname></affiliation>
- <productnumber>X Version 11, Release 6.9/7.0</productnumber>
+ <copyright><year>1994</year><holder>X Consortium</holder></copyright>
<legalnotice>
@@ -38,7 +40,7 @@
</bookinfo>
-<chapter id='overview'>
+<chapter id='Overview'>
<title>Overview</title>
<para>When an X client connects to an X server, it receives a fixed range of
@@ -68,7 +70,7 @@
exhausted its current pool of resource IDs.</para>
</chapter>
-<chapter id='requests'>
+<chapter id='Requests'>
<title>Requests</title>
<para>
@@ -129,13 +131,13 @@
The number returned may be smaller than the number requested.</para>
</chapter>
-<chapter id='events_and_errors'>
+<chapter id='Events_and_Errors'>
<title>Events and Errors</title>
<para>No new events or errors are defined by this extension.</para>
</chapter>
-<chapter id='encoding'>
+<chapter id='Encoding'>
<title>Encoding</title>
<para>Please refer to the X11 Protocol Encoding document as this document uses
++++++ xextproto-7.2.0.tar.bz2 -> xextproto-7.2.1.tar.bz2 ++++++
++++ 37127 lines of diff (skipped)
++++++ xf86driproto-2.1.0.tar.bz2 -> xf86driproto-2.1.1.tar.bz2 ++++++
++++ 11244 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-2.1.0/COPYING new/xf86driproto-2.1.1/COPYING
--- old/xf86driproto-2.1.0/COPYING 2009-03-10 00:29:54.000000000 +0100
+++ new/xf86driproto-2.1.1/COPYING 2010-01-14 18:43:02.000000000 +0100
@@ -1,12 +1,24 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-2.1.0/ChangeLog new/xf86driproto-2.1.1/ChangeLog
--- old/xf86driproto-2.1.0/ChangeLog 2009-08-27 03:04:11.000000000 +0200
+++ new/xf86driproto-2.1.1/ChangeLog 2011-01-06 04:57:33.000000000 +0100
@@ -1,3 +1,123 @@
+commit 3040728fda7c54eb0c606adef43f766483c57d85
+Author: Alan Coopersmith
+Date: Wed Jan 5 19:57:04 2011 -0800
+
+ xf86driproto 2.1.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit c0c8ff516f40d5b9f0d595c0c381c895c39309b9
+Author: Alan Coopersmith
+Date: Wed Jan 5 19:55:21 2011 -0800
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6f3c1924a6018f8fc090f57e0fcab00d50707dcb
+Author: Gaetan Nadon
+Date: Sun Mar 28 19:25:52 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 08685b196d8d23316c4af71c92bce064960d6a7e
+Author: Gaetan Nadon
+Date: Sun Mar 28 19:00:31 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon
+
+commit da649277299743e8a718279d9c2c540a6e27f471
+Author: Gaetan Nadon
+Date: Mon Nov 16 11:47:45 2009 -0500
+
+ COPYING: add Copyright from Precision Insight
+
+ And also from VA Linux Systems.
+ The COPYING file contains all Copyright notices from source code.
+ Refer to xf86dri.h.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 524ce1c2915ddc7036975effaa3207b7ad12f7b9
+Author: Gaetan Nadon
+Date: Sun Nov 22 19:24:48 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit ee3c810505fa7231c8161437cf7d1b68a0b1c1a7
+Author: Gaetan Nadon
+Date: Mon Nov 16 11:13:30 2009 -0500
+
+ README: file created or updated #24206
+
+ Contains a set of URLs to freedesktop.org.
+
+commit ea4ec54bbca6b04c26214ead0a49db38f12c3119
+Author: Gaetan Nadon
+Date: Sun Nov 15 19:45:27 2009 -0500
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 8cf234fc7fb91ed42c3a4b3b97fd90ece48497ab
+Author: Gaetan Nadon
+Date: Sun Nov 15 18:31:29 2009 -0500
+
+ Makefile.am: INSTALL file is missing or incorrect #24206
+
+ The standard GNU file on building/installing tarball is copied
+ using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
+ Add INSTALL target
+
+commit 30320a369e8f07b950347361fdedddb4b3f289a3
+Author: Gaetan Nadon
+Date: Sun Nov 15 18:11:36 2009 -0500
+
+ configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 437f9e034a4a75879a8cf48e46f22edb3e67b2d6
+Author: Gaetan Nadon
+Date: Sun Nov 15 13:55:25 2009 -0500
+
+ configure.ac: AM_MAINTAINER_MODE missing #24238
+
+ This turns off maintainer mode build rules in tarballs.
+ Works in conjunction with autogen.sh --enable-maintainer-mode
+
+commit 99ee5f56cd6dee625972bd2d077171c6233b4bb7
+Author: Gaetan Nadon
+Date: Sat Nov 14 18:26:47 2009 -0500
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit f4e8747d545ec7785e3e0d965dcc151f625e2a70
Author: Peter Hutterer
Date: Wed Aug 26 12:06:02 2009 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-2.1.0/INSTALL new/xf86driproto-2.1.1/INSTALL
--- old/xf86driproto-2.1.0/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86driproto-2.1.1/INSTALL 2011-01-06 04:57:33.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-2.1.0/Makefile.am new/xf86driproto-2.1.1/Makefile.am
--- old/xf86driproto-2.1.0/Makefile.am 2009-08-26 04:03:45.000000000 +0200
+++ new/xf86driproto-2.1.1/Makefile.am 2010-04-10 02:49:16.000000000 +0200
@@ -4,14 +4,15 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xf86driproto.pc
-EXTRA_DIST = xf86driproto.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-2.1.0/README new/xf86driproto-2.1.1/README
--- old/xf86driproto-2.1.0/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86driproto-2.1.1/README 2009-11-21 05:35:49.000000000 +0100
@@ -0,0 +1,30 @@
+ XFree86 Direct Rendering Infrastructure Extension
+
+This extension defines a protocol to allow user applications to access
+the video hardware without requiring data to be passed through the X server.
+
+Extension name: XFree86-DRI
+
+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/proto/xf86driproto
+
+ http://cgit.freedesktop.org/xorg/proto/xf86driproto
+
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-2.1.0/configure.ac new/xf86driproto-2.1.1/configure.ac
--- old/xf86driproto-2.1.0/configure.ac 2009-08-26 07:47:43.000000000 +0200
+++ new/xf86driproto-2.1.1/configure.ac 2011-01-06 04:56:41.000000000 +0100
@@ -1,12 +1,21 @@
-AC_PREREQ([2.57])
-AC_INIT([XF86DRIProto], [2.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+dnl
+dnl Process this file with autoconf to create configure.
+
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([XF86DRIProto], [2.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_CONFIG_SRCDIR([Makefile.am])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
xf86driproto.pc])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-2.1.0/missing new/xf86driproto-2.1.1/missing
--- old/xf86driproto-2.1.0/missing 2009-03-10 00:37:20.000000000 +0100
+++ new/xf86driproto-2.1.1/missing 2011-01-06 04:57:22.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://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
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
++++++ xf86vidmodeproto-2.3.tar.bz2 -> xf86vidmodeproto-2.3.1.tar.bz2 ++++++
++++ 8514 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86vidmodeproto-2.3/ChangeLog new/xf86vidmodeproto-2.3.1/ChangeLog
--- old/xf86vidmodeproto-2.3/ChangeLog 2009-10-01 12:12:27.000000000 +0200
+++ new/xf86vidmodeproto-2.3.1/ChangeLog 2011-01-06 05:06:15.000000000 +0100
@@ -1,3 +1,111 @@
+commit 4ffa46d9d10267f0156b803a941de05e1c0e47a6
+Author: Alan Coopersmith
+Date: Wed Jan 5 20:05:42 2011 -0800
+
+ xf86vidmodeproto 2.3.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit d95a95c5b862648c2c7da8011abe6f0abb6f2064
+Author: Alan Coopersmith
+Date: Wed Jan 5 20:05:06 2011 -0800
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith