Hello community,
here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory
checked in at Thu Sep 9 14:59:02 CEST 2010.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-08-23 16:44:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2010-09-05 04:19:27.000000000 +0200
@@ -1,0 +2,14 @@
+Sun Sep 5 01:53:58 UTC 2010 - sndirsch@novell.com
+
+- evieext 1.1.0
+- fontcacheproto 0.1.3
+- glproto 1.4.12
+- kbproto 1.0.5
+- renderproto 0.11.1
+- videoproto 2.3.1
+- xextproto 7.1.2
+- xf86miscproto 0.9.3
+- xproxymanagementprotocol 1.0.3
+- make use of %fdupes macro
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
evieext-X11R7.0-1.0.2.tar.bz2
fontcacheproto-X11R7.0-0.1.2.tar.bz2
glproto-1.4.11.tar.bz2
kbproto-1.0.4.tar.bz2
renderproto-0.11.tar.bz2
videoproto-2.3.0.tar.bz2
xextproto-7.1.1.tar.bz2
xf86miscproto-X11R7.0-0.9.2.tar.bz2
xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2
New:
----
evieext-1.1.0.tar.bz2
fontcacheproto-0.1.3.tar.bz2
glproto-1.4.12.tar.bz2
kbproto-1.0.5.tar.bz2
renderproto-0.11.1.tar.bz2
videoproto-2.3.1.tar.bz2
xextproto-7.1.2.tar.bz2
xf86miscproto-0.9.3.tar.bz2
xproxymanagementprotocol-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.0ADhSl/_old 2010-09-09 14:46:13.000000000 +0200
+++ /var/tmp/diff_new_pack.0ADhSl/_new 2010-09-09 14:46:13.000000000 +0200
@@ -19,12 +19,12 @@
Name: xorg-x11-proto-devel
-BuildRequires: pkg-config python-base
+BuildRequires: fdupes pkg-config python-base
# 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.5
-Release: 9
+Release: 10
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -35,33 +35,33 @@
Source3: damageproto-1.2.0.tar.bz2
Source4: dmxproto-2.3.tar.bz2
Source5: fixesproto-4.1.1.tar.bz2
-Source6: fontcacheproto-X11R7.0-0.1.2.tar.bz2
+Source6: fontcacheproto-0.1.3.tar.bz2
Source7: fontsproto-2.1.0.tar.bz2
-Source8: glproto-1.4.11.tar.bz2
+Source8: glproto-1.4.12.tar.bz2
Source9: inputproto-2.0.tar.bz2
-Source10: kbproto-1.0.4.tar.bz2
+Source10: kbproto-1.0.5.tar.bz2
Source11: printproto-1.0.4.tar.bz2
Source12: randrproto-1.3.1.tar.bz2
Source13: recordproto-1.14.tar.bz2
-Source14: renderproto-0.11.tar.bz2
+Source14: renderproto-0.11.1.tar.bz2
Source15: resourceproto-1.1.0.tar.bz2
Source16: scrnsaverproto-1.2.0.tar.bz2
Source17: trapproto-X11R7.0-3.4.3.tar.bz2
Source18: util-macros-1.10.0.tar.bz2
-Source19: videoproto-2.3.0.tar.bz2
+Source19: videoproto-2.3.1.tar.bz2
Source20: windowswmproto-1.0.4.tar.bz2
Source21: xcmiscproto-1.2.0.tar.bz2
-Source22: xextproto-7.1.1.tar.bz2
+Source22: xextproto-7.1.2.tar.bz2
Source23: xf86bigfontproto-1.2.0.tar.bz2
Source24: xf86dgaproto-2.1.tar.bz2
Source25: xf86driproto-2.1.0.tar.bz2
-Source26: xf86miscproto-X11R7.0-0.9.2.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
Source30: xproto-7.0.18.tar.bz2
-Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2
-Source32: evieext-X11R7.0-1.0.2.tar.bz2
+Source31: xproxymanagementprotocol-1.0.3.tar.bz2
+Source32: evieext-1.1.0.tar.bz2
Source33: xcb-proto-1.6.tar.bz2
Source34: libpthread-stubs-0.1.tar.bz2
Source35: vncproto-20070501.tar.bz2
@@ -113,9 +113,14 @@
popd
done
# Bug 260745
-mv $RPM_BUILD_ROOT/usr/share/doc/*/*.txt .
+mv $RPM_BUILD_ROOT/usr/share/doc/{*/*.txt,xextproto,xproxymanagementprotocol} .
rmdir $RPM_BUILD_ROOT/usr/share/doc/*
rm -f $RPM_BUILD_ROOT/usr/share/util-macros/INSTALL
+%if %suse_version > 1110
+%fdupes -s $RPM_BUILD_ROOT/%python_sitelib/xcbgen/
+%else
+%fdupes -s $RPM_BUILD_ROOT/usr/%{_lib}/python2.6/site-packages/xcbgen/
+%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -126,7 +131,7 @@
%files
%defattr(-,root,root)
-%doc *.txt
+%doc *.txt xextproto xproxymanagementprotocol
%dir /usr/include/GL
%dir /usr/include/GL/internal
%dir /usr/include/X11/PM
++++++ evieext-X11R7.0-1.0.2.tar.bz2 -> evieext-1.1.0.tar.bz2 ++++++
++++ 8319 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-X11R7.0-1.0.2/autogen.sh new/evieext-1.1.0/autogen.sh
--- old/evieext-X11R7.0-1.0.2/autogen.sh 2005-05-06 03:46:30.000000000 +0200
+++ new/evieext-1.1.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /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/evieext-X11R7.0-1.0.2/ChangeLog new/evieext-1.1.0/ChangeLog
--- old/evieext-X11R7.0-1.0.2/ChangeLog 2005-12-15 01:24:37.000000000 +0100
+++ new/evieext-1.1.0/ChangeLog 2009-08-27 03:34:18.000000000 +0200
@@ -1,10 +1,146 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c94dd88d55b9b8f28c702b71a3e025c1a3c4c6b6
+Author: Peter Hutterer
+Date: Wed Aug 26 11:52:54 2009 +1000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ evieproto 1.1.0
+
+ Signed-off-by: Peter Hutterer
-2005-05-27 Alan Coopersmith
+commit bb660bf2b11db7a661941ec56f87ff10bdef5184
+Author: Peter Hutterer
+Date: Wed Aug 26 11:52:03 2009 +1000
- * Makefile.am (evie_HEADERS): Removed Xevie.h since it's now only
- library prototypes and as such is in lib/Xevie.
+ Move Xeviestr.h to evieproto.h for consistency with other modules.
+
+ A stub Xeviestr.h is provided to avoid breaking clients.
+
+ Signed-off-by: Peter Hutterer
+commit 6cfd47671edb554c2d1b44550b58bd8bc5990cfc
+Author: Peter Hutterer
+Date: Wed Aug 26 11:49:25 2009 +1000
+
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer
+
+commit cb157d3388d977b057dac5c985326e01e5e41460
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 89ae43b7876c9febe8ebbfbf3f5f396ec4d9a53f
+Author: James Cloos
+Date: Thu Dec 6 16:38:58 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit f5207dba8195fd269d950a54abb7660b50024ac2
+Author: James Cloos
+Date: Mon Sep 3 05:54:01 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 93439d6acc0f2aef3959f53f35225af7b53f61c2
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:10 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit cb3aed6f3b9a97c5bd5eb71fda479309c466f4b4
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:37 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 5e917f737fdcde9a18a8da57df1f62ed69c16bb6
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:13 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit dc484c73f468130bcbbf2a7d3b0f24efb0fc6286
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:38 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit f3ac570c62aa2c7bb14efa09c7821ace84f7ced0
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:55 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 7739b24ffe32a84391ccd22c7b6ddf64fd859337
+Author: Alan Coopersmith
+Date: Sat May 28 02:31:19 2005 +0000
+
+ Removed Xevie.h since it's now only library prototypes and as such is in
+ lib/Xevie.
+
+commit ff59ff27eb61e2b2ef69c2af74a4c9c353a27426
+Author: Alan Coopersmith
+Date: Sun May 22 01:20:14 2005 +0000
+
+ Move request id definitions to Xeviestr.h, leaving Xevie.h for client
+ library definitions and Xeviestr.h for protocol definitions to allow
+ cleaner split in modularization.
+
+commit 451aba41359641a9f736896bd004729ef9f7adeb
+Author: Daniel Stone
+Date: Sat May 21 03:49:50 2005 +0000
+
+ Change version to 1.0.
+
+commit 3122eb59addb1887c6591e9e39d0ac3ec81024a6
+Author: Adam Jackson
+Date: Thu May 19 00:22:38 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 7c2b5f0f77abce523757271e23a5a2db174905e5
+Author: Adam Jackson
+Date: Thu May 19 00:10:17 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit f1e52c450dcbf611fbf67da65aee3bb6547fc80e
+Author: Josh Triplett
+Date: Sat May 14 07:55:10 2005 +0000
+
+ Add some COPYING files.
+
+commit 6e0ba01312789e4fe857ed32d9417e3db5843553
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:04 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit d65d2d14e9f570ae4f743c215068eeddaf328e18
+Author: Kevin E Martin
+Date: Fri May 6 01:46:30 2005 +0000
+
+ Initial build system files for proto module.
+
+commit 617e62bea3ea385ab2cddd94223a673567c4bb75
+Author: Stuart Kreitman
+Date: Fri Jul 30 01:31:08 2004 +0000
+
+ Integration of XEVIE branch to trunk
+ https://freedesktop.org/bugzilla/show_bug.cgi?id=947
+ Modified Files: Imakefile Added Files: Xevie.h Xeviestr.h
+
+commit a897a51fb62a2fa2834596fd6ca74789ebb42b1a
+Author: Stuart Kreitman
+Date: Wed Feb 25 22:38:16 2004 +0000
+
+ file Xeviestr.h was initially added on branch XEVIE.
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-X11R7.0-1.0.2/configure.ac new/evieext-1.1.0/configure.ac
--- old/evieext-X11R7.0-1.0.2/configure.ac 2005-12-15 01:24:37.000000000 +0100
+++ new/evieext-1.1.0/configure.ac 2009-08-26 03:52:41.000000000 +0200
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([EvIEExt], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([EvIEExt], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# 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
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-X11R7.0-1.0.2/evieproto.h new/evieext-1.1.0/evieproto.h
--- old/evieext-X11R7.0-1.0.2/evieproto.h 1970-01-01 01:00:00.000000000 +0100
+++ new/evieext-1.1.0/evieproto.h 2009-08-26 03:50:37.000000000 +0200
@@ -0,0 +1,164 @@
+/************************************************************
+
+Copyright 2003 Sun Microsystems, Inc.
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, 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
+
+#define X_XevieQueryVersion 0
+#define X_XevieStart 1
+#define X_XevieEnd 2
+#define X_XevieSend 3
+#define X_XevieSelectInput 4
+
+#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_ */
+
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-X11R7.0-1.0.2/Makefile.am new/evieext-1.1.0/Makefile.am
--- old/evieext-X11R7.0-1.0.2/Makefile.am 2005-05-28 04:31:19.000000000 +0200
+++ new/evieext-1.1.0/Makefile.am 2009-08-26 03:51:01.000000000 +0200
@@ -1,8 +1,19 @@
eviedir = $(includedir)/X11/extensions
evie_HEADERS = \
+ evieproto.h \
Xeviestr.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = evieproto.pc
-EXTRA_DIST = autogen.sh evieproto.pc.in
+EXTRA_DIST = evieproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
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-X11R7.0-1.0.2/missing new/evieext-1.1.0/missing
--- old/evieext-X11R7.0-1.0.2/missing 2005-12-21 07:55:11.000000000 +0100
+++ new/evieext-1.1.0/missing 2009-08-26 03:53:51.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# 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
@@ -14,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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, 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
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
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]"
+ 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 $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,42 +105,69 @@
exit 1
;;
- aclocal*)
+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). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # 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.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
- tar)
+ tar*)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
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-X11R7.0-1.0.2/Xeviestr.h new/evieext-1.1.0/Xeviestr.h
--- old/evieext-X11R7.0-1.0.2/Xeviestr.h 2005-05-22 03:20:14.000000000 +0200
+++ new/evieext-1.1.0/Xeviestr.h 2009-08-26 03:51:57.000000000 +0200
@@ -1,165 +1,3 @@
-/* $XdotOrg: $ */
-/************************************************************
-
-Copyright 2003 Sun Microsystems, Inc.
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, 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 _XEVIESTR_H_
-#define _XEVIESTR_H_
-
-#define XEVIENAME "XEVIE"
-
-#define XEVIE_MAJOR_VERSION 1
-#define XEVIE_MINOR_VERSION 0
-
-#define X_XevieQueryVersion 0
-#define X_XevieStart 1
-#define X_XevieEnd 2
-#define X_XevieSend 3
-#define X_XevieSelectInput 4
-
-#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 /* } _XEVIESTR_H_ */
-
+#warning "Xeviestr.h is obsolete and may be removed in the future."
+#warning "include for the protocol defines."
+#include
++++++ fontcacheproto-X11R7.0-0.1.2.tar.bz2 -> fontcacheproto-0.1.3.tar.bz2 ++++++
++++ 14406 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/fontcacheproto-X11R7.0-0.1.2/autogen.sh new/fontcacheproto-0.1.3/autogen.sh
--- old/fontcacheproto-X11R7.0-0.1.2/autogen.sh 2005-05-06 03:46:30.000000000 +0200
+++ new/fontcacheproto-0.1.3/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /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/fontcacheproto-X11R7.0-0.1.2/ChangeLog new/fontcacheproto-0.1.3/ChangeLog
--- old/fontcacheproto-X11R7.0-0.1.2/ChangeLog 2005-12-15 01:24:37.000000000 +0100
+++ new/fontcacheproto-0.1.3/ChangeLog 2009-10-03 04:30:49.000000000 +0200
@@ -1,4 +1,163 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 79b075876c6874f1ad6605962973f2865b2a082a
+Author: Alan Coopersmith
+Date: Fri Oct 2 19:30:03 2009 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ fontcacheproto 0.1.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7c8e261c218ff5c0a2806a429725dba437241970
+Author: Alan Coopersmith
+Date: Fri Oct 2 19:26:08 2009 -0700
+
+ Add pointers to mailing list, git repo, and wiki to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6388965137d61913cbb1b8b3b718e6fd359052cc
+Author: Alan Coopersmith
+Date: Fri Oct 2 19:20:34 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 211eb4c16534f83527df992c4f68936254455e7b
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit a3055497adbbdf626db22176cedb7795e5684567
+Author: James Cloos
+Date: Thu Dec 6 16:39:00 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit f4d701aa7c2d2ece96e3701747cedaee0ad57a44
+Author: James Cloos
+Date: Mon Sep 3 05:54:03 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 7e722460a355cbf22d554c7cfc69e7ce03454f06
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:13 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit a51ca6a8a428b5be64dc5ad0ad13ff29350768ca
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:37 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit cc6820d803058730369b94f0b62d590d309355cc
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit edf62f591f28a217b9bc0781e118ce6f762c3fcb
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:38 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 455a177ede4620d9effa1fb167a9e07e747ebd48
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:55 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 83c131b8611f32f9a292a629d13629c6200b5984
+Author: Daniel Stone
+Date: Sat May 21 03:50:53 2005 +0000
+
+ Change version to 0.1.
+
+commit 1bee3aeab31877963efc323700e19aa259520c88
+Author: Adam Jackson
+Date: Thu May 19 00:22:39 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 5901343a49c424da552a7ef40b53d01b1b77b291
+Author: Adam Jackson
+Date: Thu May 19 00:10:17 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 6da9cb33ea4b587f47fcb0a4e086943afb5f6039
+Author: Josh Triplett
+Date: Sat May 14 08:39:45 2005 +0000
+
+ Add COPYING file for Fontcache.
+
+commit 32157c7dc40ecf148db657ee8e6c01cf4e23ebb4
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:04 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 4653ec6e4e4f1917eb374c5ca8211993c76e643d
+Author: Kevin E Martin
+Date: Fri May 6 01:46:30 2005 +0000
+
+ Initial build system files for proto module.
+
+commit cc2328e65469115c32617c2c7434e5110e383d4c
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit e15f038c34265c2f984be29b4323786362f3724e
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 47edd8743037411048cf5122eb911b916ccf2fba
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 5f059cd0b8c545917405b434ae570a57a31c0267
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:13 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 0bd7bac3ccb3ef436ff8f306ec03cac6252e210d
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit e9dacf494c059dc3e66a564378679146ff55ed3e
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit fd314bc875543d6f017cc1910f97e2e723248770
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit d5552d5100a83653e00cd0f5296dc4557e52754a
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ Initial revision
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/fontcacheproto-X11R7.0-0.1.2/configure.ac new/fontcacheproto-0.1.3/configure.ac
--- old/fontcacheproto-X11R7.0-0.1.2/configure.ac 2005-12-15 01:24:37.000000000 +0100
+++ new/fontcacheproto-0.1.3/configure.ac 2009-10-03 04:29:39.000000000 +0200
@@ -1,8 +1,11 @@
AC_PREREQ([2.57])
-AC_INIT([FontcacheProto], [0.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FontcacheProto], [0.1.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-XORG_RELEASE_VERSION
+# 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])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
fontcacheproto.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/fontcacheproto-X11R7.0-0.1.2/Makefile.am new/fontcacheproto-0.1.3/Makefile.am
--- old/fontcacheproto-X11R7.0-0.1.2/Makefile.am 2005-05-09 20:20:04.000000000 +0200
+++ new/fontcacheproto-0.1.3/Makefile.am 2009-10-03 04:07:29.000000000 +0200
@@ -7,4 +7,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontcacheproto.pc
-EXTRA_DIST = autogen.sh fontcacheproto.pc.in
+EXTRA_DIST = fontcacheproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
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/fontcacheproto-X11R7.0-0.1.2/missing new/fontcacheproto-0.1.3/missing
--- old/fontcacheproto-X11R7.0-0.1.2/missing 2005-12-21 07:55:22.000000000 +0100
+++ new/fontcacheproto-0.1.3/missing 2009-10-03 04:30:25.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# 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
@@ -14,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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, 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
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
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]"
+ 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 $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,42 +105,69 @@
exit 1
;;
- aclocal*)
+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). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # 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.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
- tar)
+ tar*)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
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/fontcacheproto-X11R7.0-0.1.2/README new/fontcacheproto-0.1.3/README
--- old/fontcacheproto-X11R7.0-0.1.2/README 1970-01-01 01:00:00.000000000 +0100
+++ new/fontcacheproto-0.1.3/README 2009-10-03 04:21:27.000000000 +0200
@@ -0,0 +1,24 @@
+
+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/fontcacheproto
+
+ http://cgit.freedesktop.org/xorg/proto/fontcacheproto
+
+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
+
++++++ glproto-1.4.11.tar.bz2 -> glproto-1.4.12.tar.bz2 ++++++
++++ 5565 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/glproto-1.4.11/ChangeLog new/glproto-1.4.12/ChangeLog
--- old/glproto-1.4.11/ChangeLog 2010-01-08 21:15:02.000000000 +0100
+++ new/glproto-1.4.12/ChangeLog 2010-08-10 16:01:16.000000000 +0200
@@ -1,3 +1,68 @@
+commit b173af9ea5361b4794d4cca79f7c7dddd8401a87
+Author: Adam Jackson
+Date: Wed Aug 4 09:44:14 2010 -0400
+
+ Remove structure tag for xGLXHyperpipeConfigSGIXReq
+
+ X request structs don't have tags, in general, and this particular one
+ causes a conflict with glxext.h which defines GLXHyperpipeConfigSGIX for
+ the client-side API.
+
+ Signed-off-by: Adam Jackson
+
+commit 8e7ef2d30ea8a98b6e90540e674b60d066a71fef
+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 bba203c33e943d8de1bfe545434bee1db52a2245
+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 9c58144688d0200e7683882549490827868a44b5
+Author: Luc Verhaegen
+Date: Fri Mar 5 15:32:11 2010 +0100
+
+ Sync glcore.h with mesa HEAD.
+
+ EXT_texture_from_pixmap was added close to 4ys ago, but this file never
+ got updated, leading to "interesting" behaviour when anything slightly less
+ standard is attempted.
+
+ Signed-off-by: Luc Verhaegen
+
+commit fa99593342f13220fb675a1c3c17b6a3d755abda
+Author: Ian Romanick
+Date: Tue Feb 9 15:20:59 2010 -0800
+
+ Update tokens for GLX_INTEL_swap_event to match final version of spec
+
+commit 2c7f76a1d42fbd4be995de56563c94882dd4a058
+Author: Gaetan Nadon
+Date: Mon Nov 16 11:47:44 2009 -0500
+
+ COPYING: add Copyright from Silicon Graphics
+
+ The COPYING file contains all Copyright notices from source code.
+ Refer to glxproto.h
+
+ Signed-off-by: Gaetan Nadon
+
commit 3966379209ec48f14a1d12e48f51b687d48cc6ac
Author: Jesse Barnes
Date: Fri Jan 8 15:11:48 2010 -0500
@@ -5,7 +70,7 @@
Bump version for release
commit 6a9361aaec49495d566db1267a21a0f4ed1b9480
-Merge: c35f05d... f2b9a6a...
+Merge: c35f05d f2b9a6a
Author: Jesse Barnes
Date: Fri Jan 8 11:43:07 2010 -0500
@@ -172,7 +237,7 @@
Bump to 1.4.9 so we can depend on SGI pbuffer structs.
commit e89ed37e56e2dec95fd43778f3a72bafca1d56e3
-Merge: 2adf876... 750a853...
+Merge: 2adf876 750a853
Author: James Cloos
Date: Mon Sep 3 06:17:08 2007 -0400
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/glproto-1.4.11/configure.ac new/glproto-1.4.12/configure.ac
--- old/glproto-1.4.11/configure.ac 2010-01-08 21:11:45.000000000 +0100
+++ new/glproto-1.4.12/configure.ac 2010-08-10 16:00:53.000000000 +0200
@@ -1,5 +1,5 @@
-AC_PREREQ([2.57])
-AC_INIT([GLProto], [1.4.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([GLProto], [1.4.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_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/glproto-1.4.11/COPYING new/glproto-1.4.12/COPYING
--- old/glproto-1.4.11/COPYING 2010-01-08 17:42:43.000000000 +0100
+++ new/glproto-1.4.12/COPYING 2010-08-10 16:00:33.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.
+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+Copyright (C) 1991-2000 Silicon Graphics, 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, 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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice including the dates of first publication and
+either this permission notice or a reference to
+http://oss.sgi.com/projects/FreeB/
+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 NONINFRINGEMENT. IN NO EVENT SHALL
+SILICON GRAPHICS, INC. 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
+Except as contained in this notice, the name of Silicon Graphics, Inc.
+shall not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization from
+Silicon Graphics, Inc.
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/glproto-1.4.11/glcore.h new/glproto-1.4.12/glcore.h
--- old/glproto-1.4.11/glcore.h 2010-01-08 17:42:43.000000000 +0100
+++ new/glproto-1.4.12/glcore.h 2010-08-10 16:00:33.000000000 +0200
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/include/GL/internal/glcore.h,v 1.7 2001/03/25 05:32:00 tsi Exp $ */
#ifndef __gl_core_h_
#define __gl_core_h_
@@ -32,22 +31,16 @@
* Silicon Graphics, Inc.
*/
-#ifndef XFree86LOADER
+#if !defined(_WIN32_WCE)
#include
#endif
-#ifdef CAPI
-#undef CAPI
-#endif
-#define CAPI
-
#define GL_CORE_SGI 1
#define GL_CORE_MESA 2
#define GL_CORE_APPLE 4
#define GL_CORE_WINDOWS 8
typedef struct __GLcontextRec __GLcontext;
-typedef struct __GLinterfaceRec __GLinterface;
/*
** This file defines the interface between the GL core and the surrounding
@@ -60,12 +53,18 @@
** and used by the "operating system".
*/
-/*
-** Mode and limit information for a context. This information is
-** kept around in the context so that values can be used during
-** command execution, and for returning information about the
-** context to the application.
-*/
+/**
+ * Mode and limit information for a context. This information is
+ * kept around in the context so that values can be used during
+ * command execution, and for returning information about the
+ * context to the application.
+ *
+ * Instances of this structure are shared by the driver and the loader. To
+ * maintain binary compatability, new fields \b must be added only to the
+ * end of the structure.
+ *
+ * \sa _gl_context_modes_create
+ */
typedef struct __GLcontextModesRec {
struct __GLcontextModesRec * next;
@@ -133,6 +132,13 @@
GLint swapMethod;
GLint screen;
+
+ /* EXT_texture_from_pixmap */
+ GLint bindToTextureRgb;
+ GLint bindToTextureRgba;
+ GLint bindToMipmapTexture;
+ GLint bindToTextureTargets;
+ GLint yInverted;
} __GLcontextModes;
/* Several fields of __GLcontextModes can take these as values. Since
@@ -162,333 +168,14 @@
#define GLX_PIXMAP_BIT 0x00000002
#define GLX_PBUFFER_BIT 0x00000004
-/************************************************************************/
-
-/*
-** Structure used for allocating and freeing drawable private memory.
-** (like software buffers, for example).
-**
-** The memory allocation routines are provided by the surrounding
-** "operating system" code, and they are to be used for allocating
-** software buffers and things which are associated with the drawable,
-** and used by any context which draws to that drawable. There are
-** separate memory allocation functions for drawables and contexts
-** since drawables and contexts can be created and destroyed independently
-** of one another, and the "operating system" may want to use separate
-** allocation arenas for each.
-**
-** The freePrivate function is filled in by the core routines when they
-** allocates software buffers, and stick them in "private". The freePrivate
-** function will destroy anything allocated to this drawable (to be called
-** when the drawable is destroyed).
-*/
-typedef struct __GLdrawableRegionRec __GLdrawableRegion;
-typedef struct __GLdrawableBufferRec __GLdrawableBuffer;
-typedef struct __GLdrawablePrivateRec __GLdrawablePrivate;
-
-typedef struct __GLregionRectRec {
- /* lower left (inside the rectangle) */
- GLint x0, y0;
- /* upper right (outside the rectangle) */
- GLint x1, y1;
-} __GLregionRect;
-
-struct __GLdrawableRegionRec {
- GLint numRects;
- __GLregionRect *rects;
- __GLregionRect boundingRect;
-};
-
-/************************************************************************/
-
-/* masks for the buffers */
-#define __GL_FRONT_BUFFER_MASK 0x00000001
-#define __GL_FRONT_LEFT_BUFFER_MASK 0x00000001
-#define __GL_FRONT_RIGHT_BUFFER_MASK 0x00000002
-#define __GL_BACK_BUFFER_MASK 0x00000004
-#define __GL_BACK_LEFT_BUFFER_MASK 0x00000004
-#define __GL_BACK_RIGHT_BUFFER_MASK 0x00000008
-#define __GL_ACCUM_BUFFER_MASK 0x00000010
-#define __GL_DEPTH_BUFFER_MASK 0x00000020
-#define __GL_STENCIL_BUFFER_MASK 0x00000040
-#define __GL_AUX_BUFFER_MASK(i) (0x0000080 << (i))
-
-#define __GL_ALL_BUFFER_MASK 0xffffffff
-
-/* what Resize routines return if resize resorted to fallback case */
-#define __GL_BUFFER_FALLBACK 0x10
-
-typedef void (*__GLbufFallbackInitFn)(__GLdrawableBuffer *buf,
- __GLdrawablePrivate *glPriv, GLint bits);
-typedef void (*__GLbufMainInitFn)(__GLdrawableBuffer *buf,
- __GLdrawablePrivate *glPriv, GLint bits,
- __GLbufFallbackInitFn back);
-
-/*
-** A drawable buffer
-**
-** This data structure describes the context side of a drawable.
-**
-** According to the spec there could be multiple contexts bound to the same
-** drawable at the same time (from different threads). In order to avoid
-** multiple-access conflicts, locks are used to serialize access. When a
-** thread needs to access (read or write) a member of the drawable, it takes
-** a lock first. Some of the entries in the drawable are treated "mostly
-** constant", so we take the freedom of allowing access to them without
-** taking a lock (for optimization reasons).
-**
-** For more details regarding locking, see buffers.h in the GL core
-*/
-struct __GLdrawableBufferRec {
- /*
- ** Buffer dimensions
- */
- GLint width, height, depth;
-
- /*
- ** Framebuffer base address
- */
- void *base;
-
- /*
- ** Framebuffer size (in bytes)
- */
- GLuint size;
-
- /*
- ** Size (in bytes) of each element in the framebuffer
- */
- GLuint elementSize;
- GLuint elementSizeLog2;
-
- /*
- ** Element skip from one scanline to the next.
- ** If the buffer is part of another buffer (for example, fullscreen
- ** front buffer), outerWidth is the width of that buffer.
- */
- GLint outerWidth;
-
- /*
- ** outerWidth * elementSize
- */
- GLint byteWidth;
-
- /*
- ** Allocation/deallocation is done based on this handle. A handle
- ** is conceptually different from the framebuffer 'base'.
- */
- void *handle;
-
- /* imported */
- GLboolean (*resize)(__GLdrawableBuffer *buf,
- GLint x, GLint y, GLuint width, GLuint height,
- __GLdrawablePrivate *glPriv, GLuint bufferMask);
- void (*lock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
- void (*unlock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
- void (*fill)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
- GLuint val, GLint x, GLint y, GLint w, GLint h);
- void (*free)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-
- /* exported */
- void (*freePrivate)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-#ifdef __cplusplus
- void *privatePtr;
-#else
- void *private;
-#endif
-
- /* private */
- void *other; /* implementation private data */
- __GLbufMainInitFn mainInit;
- __GLbufFallbackInitFn fallbackInit;
-};
-
-/*
-** The context side of the drawable private
-*/
-struct __GLdrawablePrivateRec {
- /*
- ** Drawable Modes
- */
- __GLcontextModes *modes;
-
- /*
- ** Drawable size
- */
- GLuint width, height;
-
- /*
- ** Origin in screen coordinates of the drawable
- */
- GLint xOrigin, yOrigin;
-#ifdef __GL_ALIGNED_BUFFERS
- /*
- ** Drawable offset from screen origin
- */
- GLint xOffset, yOffset;
-
- /*
- ** Alignment restriction
- */
- GLint xAlignment, yAlignment;
-#endif
- /*
- ** Should we invert the y axis?
- */
- GLint yInverted;
-
- /*
- ** Mask specifying which buffers are renderable by the hw
- */
- GLuint accelBufferMask;
-
- /*
- ** the buffers themselves
- */
- __GLdrawableBuffer frontBuffer;
- __GLdrawableBuffer backBuffer;
- __GLdrawableBuffer accumBuffer;
- __GLdrawableBuffer depthBuffer;
- __GLdrawableBuffer stencilBuffer;
-#if defined(__GL_NUMBER_OF_AUX_BUFFERS) && (__GL_NUMBER_OF_AUX_BUFFERS > 0)
- __GLdrawableBuffer *auxBuffer;
-#endif
-
- __GLdrawableRegion ownershipRegion;
-
- /*
- ** Lock for the drawable private structure
- */
- void *lock;
-#ifdef DEBUG
- /* lock debugging info */
- int lockRefCount;
- int lockLine[10];
- char *lockFile[10];
-#endif
-
- /* imported */
- void *(*malloc)(size_t size);
- void *(*calloc)(size_t numElem, size_t elemSize);
- void *(*realloc)(void *oldAddr, size_t newSize);
- void (*free)(void *addr);
-
- GLboolean (*addSwapRect)(__GLdrawablePrivate *glPriv,
- GLint x, GLint y, GLsizei width, GLsizei height);
- void (*setClipRect)(__GLdrawablePrivate *glPriv,
- GLint x, GLint y, GLsizei width, GLsizei height);
- void (*updateClipRegion)(__GLdrawablePrivate *glPriv);
- GLboolean (*resize)(__GLdrawablePrivate *glPriv);
- void (*getDrawableSize)(__GLdrawablePrivate *glPriv,
- GLint *x, GLint *y, GLuint *width, GLuint *height);
-
- void (*lockDP)(__GLdrawablePrivate *glPriv, __GLcontext *gc);
- void (*unlockDP)(__GLdrawablePrivate *glPriv);
-
- /* exported */
-#ifdef __cplusplus
- void *privatePtr;
-#else
- void *private;
-#endif
- void (*freePrivate)(__GLdrawablePrivate *);
-
- /* client data */
- void *other;
-};
-
-/*
-** Macros to lock/unlock the drawable private
-*/
-#if defined(DEBUG)
-#define __GL_LOCK_DP(glPriv,gc) \
- (*(glPriv)->lockDP)(glPriv,gc); \
- (glPriv)->lockLine[(glPriv)->lockRefCount] = __LINE__; \
- (glPriv)->lockFile[(glPriv)->lockRefCount] = __FILE__; \
- (glPriv)->lockRefCount++
-#define __GL_UNLOCK_DP(glPriv) \
- (glPriv)->lockRefCount--; \
- (glPriv)->lockLine[(glPriv)->lockRefCount] = 0; \
- (glPriv)->lockFile[(glPriv)->lockRefCount] = NULL; \
- (*(glPriv)->unlockDP)(glPriv)
-#else /* DEBUG */
-#define __GL_LOCK_DP(glPriv,gc) (*(glPriv)->lockDP)(glPriv,gc)
-#define __GL_UNLOCK_DP(glPriv) (*(glPriv)->unlockDP)(glPriv)
-#endif /* DEBUG */
-
-
-/*
-** Procedures which are imported by the GL from the surrounding
-** "operating system". Math functions are not considered part of the
-** "operating system".
-*/
-typedef struct __GLimportsRec {
- /* Memory management */
- void * (*malloc)(__GLcontext *gc, size_t size);
- void *(*calloc)(__GLcontext *gc, size_t numElem, size_t elemSize);
- void *(*realloc)(__GLcontext *gc, void *oldAddr, size_t newSize);
- void (*free)(__GLcontext *gc, void *addr);
-
- /* Error handling */
- void (*warning)(__GLcontext *gc, char *fmt);
- void (*fatal)(__GLcontext *gc, char *fmt);
-
- /* other system calls */
- char *(CAPI *getenv)(__GLcontext *gc, const char *var);
- int (CAPI *atoi)(__GLcontext *gc, const char *str);
- int (CAPI *sprintf)(__GLcontext *gc, char *str, const char *fmt, ...);
- void *(CAPI *fopen)(__GLcontext *gc, const char *path, const char *mode);
- int (CAPI *fclose)(__GLcontext *gc, void *stream);
- int (CAPI *fprintf)(__GLcontext *gc, void *stream, const char *fmt, ...);
-
- /* Drawing surface management */
- __GLdrawablePrivate *(*getDrawablePrivate)(__GLcontext *gc);
- __GLdrawablePrivate *(*getReadablePrivate)(__GLcontext *gc);
-
- /* Operating system dependent data goes here */
- void *other;
-} __GLimports;
-
-/************************************************************************/
-
-/*
-** Procedures which are exported by the GL to the surrounding "operating
-** system" so that it can manage multiple GL context's.
-*/
-typedef struct __GLexportsRec {
- /* Context management (return GL_FALSE on failure) */
- GLboolean (*destroyContext)(__GLcontext *gc);
- GLboolean (*loseCurrent)(__GLcontext *gc);
- /* oldglPriv isn't used anymore, kept for backwards compatibility */
- GLboolean (*makeCurrent)(__GLcontext *gc);
- GLboolean (*shareContext)(__GLcontext *gc, __GLcontext *gcShare);
- GLboolean (*copyContext)(__GLcontext *dst, const __GLcontext *src, GLuint mask);
- GLboolean (*forceCurrent)(__GLcontext *gc);
-
- /* Drawing surface notification callbacks */
- GLboolean (*notifyResize)(__GLcontext *gc);
- void (*notifyDestroy)(__GLcontext *gc);
- void (*notifySwapBuffers)(__GLcontext *gc);
-
- /* Dispatch table override control for external agents like libGLS */
- struct __GLdispatchStateRec* (*dispatchExec)(__GLcontext *gc);
- void (*beginDispatchOverride)(__GLcontext *gc);
- void (*endDispatchOverride)(__GLcontext *gc);
-} __GLexports;
-
-/************************************************************************/
-
-/*
-** This must be the first member of a __GLcontext structure. This is the
-** only part of a context that is exposed to the outside world; everything
-** else is opaque.
-*/
-struct __GLinterfaceRec {
- __GLimports imports;
- __GLexports exports;
-};
-
-extern __GLcontext *__glCoreCreateContext(__GLimports *, __GLcontextModes *);
-extern void __glCoreNopDispatch(void);
+#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
+#define GLX_Y_INVERTED_EXT 0x20D4
+
+#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
#endif /* __gl_core_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/glproto-1.4.11/glxproto.h new/glproto-1.4.12/glxproto.h
--- old/glproto-1.4.11/glxproto.h 2010-01-08 17:43:07.000000000 +0100
+++ new/glproto-1.4.12/glxproto.h 2010-08-10 16:00:33.000000000 +0200
@@ -1255,7 +1255,7 @@
/*
** glXHyperpipeConfigSGIX request
*/
-typedef struct GLXHyperpipeConfigSGIX {
+typedef struct {
CARD8 reqType;
CARD8 glxCode;
CARD16 length B16;
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/glproto-1.4.11/glxtokens.h new/glproto-1.4.12/glxtokens.h
--- old/glproto-1.4.11/glxtokens.h 2010-01-08 17:43:07.000000000 +0100
+++ new/glproto-1.4.12/glxtokens.h 2010-08-10 16:00:33.000000000 +0200
@@ -153,14 +153,14 @@
/* glXSelectEvent event mask bits */
#define GLX_PBUFFER_CLOBBER_MASK 0x08000000
-#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK 0x10000000
+#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK 0x04000000
/* GLXPbufferClobberEvent event_type values */
#define GLX_DAMAGED 0x8020
#define GLX_SAVED 0x8021
-#define GLX_EXCHANGE_COMPLETE_INTEL 0x8024
-#define GLX_BLIT_COMPLETE_INTEL 0x8025
-#define GLX_FLIP_COMPLETE_INTEL 0x8026
+#define GLX_EXCHANGE_COMPLETE_INTEL 0x8180
+#define GLX_BLIT_COMPLETE_INTEL 0x8181
+#define GLX_FLIP_COMPLETE_INTEL 0x8182
/* GLXPbufferClobberEvent draw_type values */
#define GLX_WINDOW 0x8022
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/glproto-1.4.11/INSTALL new/glproto-1.4.12/INSTALL
--- old/glproto-1.4.11/INSTALL 2010-01-08 21:15:02.000000000 +0100
+++ new/glproto-1.4.12/INSTALL 2010-08-10 16:01:16.000000000 +0200
@@ -1,291 +0,0 @@
-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/glproto-1.4.11/Makefile.am new/glproto-1.4.12/Makefile.am
--- old/glproto-1.4.11/Makefile.am 2010-01-08 17:42:43.000000000 +0100
+++ new/glproto-1.4.12/Makefile.am 2010-08-10 16:00:33.000000000 +0200
@@ -12,7 +12,6 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = glproto.pc
-EXTRA_DIST = glproto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
++++++ kbproto-1.0.4.tar.bz2 -> kbproto-1.0.5.tar.bz2 ++++++
++++ 5420 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/kbproto-1.0.4/ChangeLog new/kbproto-1.0.5/ChangeLog
--- old/kbproto-1.0.4/ChangeLog 2009-10-13 07:41:20.000000000 +0200
+++ new/kbproto-1.0.5/ChangeLog 2010-08-10 16:04:03.000000000 +0200
@@ -1,3 +1,101 @@
+commit 2306fcd4c511d41ae4b31b9cbd9f79cf69287730
+Author: Dirk Wallenstein
+Date: Fri Feb 5 20:42:43 2010 +0100
+
+ Use the correct value for XkbAllAccessXEventsMask
+
+ Signed-off-by: Dirk Wallenstein
+ Signed-off-by: Alan Coopersmith
+
+commit 875e6f80e9ddcac010f6871214a92e4d50e8ee5e
+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 f6b32127be4c800f73bf68c6ac7d79c630cae1fa
+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 cb489d131adb1d454e9f6196d7d766c0acde12e6
+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 9a83b903ba2586f16e770d4911c4d7e42957abb7
+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 0a358e01f7fcb903077137c4d3ab51ce9eeabcce
+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 c8078878abaa2d2489a3778c89af043901582eac
+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 ab57a912460acb83302152bd91c6336d500bb9cd
+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 4ddefc3a86050e06056d79b78ae0a1be119c4131
+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 eb3d96018f4c2e20c23b837aa42f71ebb36661b1
+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 4e3ccd5b2144005af1d5d2f9b96275a01156aec5
Author: Alan Coopersmith
Date: Mon Oct 12 22:39:05 2009 -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/kbproto-1.0.4/configure.ac new/kbproto-1.0.5/configure.ac
--- old/kbproto-1.0.4/configure.ac 2009-10-13 07:38:44.000000000 +0200
+++ new/kbproto-1.0.5/configure.ac 2010-08-10 16:03:50.000000000 +0200
@@ -1,10 +1,11 @@
-AC_PREREQ([2.57])
-AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([KBProto], [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# 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])])
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
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/kbproto-1.0.4/Makefile.am new/kbproto-1.0.5/Makefile.am
--- old/kbproto-1.0.4/Makefile.am 2009-01-28 03:27:57.000000000 +0100
+++ new/kbproto-1.0.5/Makefile.am 2010-08-10 16:03:09.000000000 +0200
@@ -9,14 +9,15 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = kbproto.pc
-EXTRA_DIST = kbproto.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/kbproto-1.0.4/README new/kbproto-1.0.5/README
--- old/kbproto-1.0.4/README 1970-01-01 01:00:00.000000000 +0100
+++ new/kbproto-1.0.5/README 2010-08-10 16:03:09.000000000 +0200
@@ -0,0 +1,30 @@
+ X Keyboard Extension
+
+This extension defines a protcol to provide a number of new capabilities
+and controls for text keyboards.
+
+Extension name: XKEYBOARD
+
+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/kbproto
+
+ http://cgit.freedesktop.org/xorg/proto/kbproto
+
+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/kbproto-1.0.4/XKB.h new/kbproto-1.0.5/XKB.h
--- old/kbproto-1.0.4/XKB.h 2006-07-21 02:47:25.000000000 +0200
+++ new/kbproto-1.0.5/XKB.h 2010-08-10 16:03:09.000000000 +0200
@@ -139,7 +139,7 @@
#define XkbAXN_BKAcceptMask (1L << 4)
#define XkbAXN_BKRejectMask (1L << 5)
#define XkbAXN_AXKWarningMask (1L << 6)
-#define XkbAllAccessXEventsMask (0xf)
+#define XkbAllAccessXEventsMask (0x7f)
/*
* Miscellaneous event details:
++++++ renderproto-0.11.tar.bz2 -> renderproto-0.11.1.tar.bz2 ++++++
++++ 9613 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/renderproto-0.11/ChangeLog new/renderproto-0.11.1/ChangeLog
--- old/renderproto-0.11/ChangeLog 2009-07-15 04:42:44.000000000 +0200
+++ new/renderproto-0.11.1/ChangeLog 2010-08-10 16:12:10.000000000 +0200
@@ -1,3 +1,124 @@
+commit 89289190032cb7f17a392ef0fe8237bdb54edcf6
+Author: Adam Jackson
+Date: Tue Aug 10 10:10:48 2010 -0400
+
+ Make recursive alpha maps undefined
+
+ Signed-off-by: Adam Jackson
+
+commit 6122aa1ed38adbdf65e3ac11cff60bf075e85c0d
+Author: Sami Farin
+Date: Wed Sep 26 11:31:00 2007 -0700
+
+ Bug 12578 - renderproto-0.9.3: render.h does not compile
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=12578
+
+commit e44c308a0a268de2be2110c38a0a29d5b4101d10
+Author: Adam Jackson
+Date: Tue May 11 10:45:09 2010 -0400
+
+ Clarify alpha-map loop prevention (#23581)
+
+ Signed-off-by: Adam Jackson
+
+commit 724feb119aa1906f6a7a2f62fccb1b76bb56857c
+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 2c7bf7d8481706d208bdebf93568cb478762f080
+Author: Rémi Cardona
+Date: Thu Dec 17 08:41:27 2009 +0100
+
+ Use $(docdir) for renderproto.txt install path
+
+ Signed-off-by: Rémi Cardona
+ Reviewed-by: Gaetan Nadon
+ Reviewed-by: Alan Coopersmith
+ Reviewed-by: Dan Nicholson
+
+commit 958987e56a304ff96cb1b4904c3b9b61015f985c
+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 8dd4c99017d64f66e7540501e165fc8738af7a7c
+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 9dca7ab976c7f003f18c839a4fd9b095e1d4fcd9
+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 f3bdf8ad3179fd2e7e75bf7c6a8aa5023a2ac356
+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 149cf98b2b9fb52c47742846509b2c08141c43b8
+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 253a7fb4c4a88437ca31285bf6448d73013d0d74
+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 3396f4ca2df61e330dbcabd8e584e103f86449e5
+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 2a336d0528e2f88a940d003edc6655a1d65e6bd7
+Author: Peter Hutterer
+Date: Mon Aug 24 11:42:17 2009 +1000
+
+ Update date/version on Render protocol spec to match last update (0.11)
+
+ 533e22db3088bb75e58b6d977ec82a13c4680b54 added blend modes and the bump to
+ 0.11.
+
+ Signed-off-by: Peter Hutterer
+
commit d889aa6c766e2691e1a6a8189c730661023e4de4
Author: Fredrik Höglund
Date: Wed Jul 15 00:16:32 2009 +0200
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/renderproto-0.11/configure.ac new/renderproto-0.11.1/configure.ac
--- old/renderproto-0.11/configure.ac 2009-07-15 02:38:48.000000000 +0200
+++ new/renderproto-0.11.1/configure.ac 2010-08-10 16:11:47.000000000 +0200
@@ -1,12 +1,13 @@
-AC_PREREQ([2.57])
-AC_INIT([RenderProto], [0.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([RenderProto], [0.11.1], [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
renderproto.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/renderproto-0.11/Makefile.am new/renderproto-0.11.1/Makefile.am
--- old/renderproto-0.11/Makefile.am 2009-03-10 00:29:26.000000000 +0100
+++ new/renderproto-0.11.1/Makefile.am 2010-05-11 16:40:07.000000000 +0200
@@ -6,17 +6,17 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = renderproto.pc
-renderdocdir = $(datadir)/doc/$(PACKAGE)
-renderdoc_DATA = renderproto.txt
+dist_doc_DATA = renderproto.txt
-EXTRA_DIST = renderproto.pc.in $(renderdoc_DATA)
-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/renderproto-0.11/missing new/renderproto-0.11.1/missing
--- old/renderproto-0.11/missing 2009-03-10 00:36:24.000000000 +0100
+++ new/renderproto-0.11.1/missing 2010-08-10 16:11:53.000000000 +0200
@@ -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:
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/renderproto-0.11/README new/renderproto-0.11.1/README
--- old/renderproto-0.11/README 1970-01-01 01:00:00.000000000 +0100
+++ new/renderproto-0.11.1/README 2010-05-11 16:40:07.000000000 +0200
@@ -0,0 +1,30 @@
+ X Rendering Extension
+
+This extension defines the protcol for a digital image composition as
+the foundation of a new rendering model within the X Window System.
+
+Extension name: RENDER
+
+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/renderproto
+
+ http://cgit.freedesktop.org/xorg/proto/renderproto
+
+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/renderproto-0.11/render.h new/renderproto-0.11.1/render.h
--- old/renderproto-0.11/render.h 2009-07-15 02:38:48.000000000 +0200
+++ new/renderproto-0.11.1/render.h 2010-08-10 16:04:55.000000000 +0200
@@ -26,6 +26,8 @@
#ifndef _RENDER_H_
#define _RENDER_H_
+#include
+
typedef XID Glyph;
typedef XID GlyphSet;
typedef XID Picture;
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/renderproto-0.11/renderproto.txt new/renderproto-0.11.1/renderproto.txt
--- old/renderproto-0.11/renderproto.txt 2009-07-15 02:38:48.000000000 +0200
+++ new/renderproto-0.11.1/renderproto.txt 2010-08-10 16:10:33.000000000 +0200
@@ -1,6 +1,6 @@
The X Rendering Extension
- Version 0.10
- 2005-07-01
+ Version 0.11
+ 2009-07-15
Keith Packard
keithp@keithp.com
@@ -615,7 +615,8 @@
Rendering is additionally clipped by the geometry and clip mask of
alpha-map. Exposures to the window do not affect the contents of
alpha-map. Alpha-map must refer to a picture containing a Pixmap,
- not a Window (or a Match error results).
+ not a Window (or a Match error results). If the alpha-map picture
+ itself already has an alpha-map, the result is undefined.
The clip-mask restricts reads and writes to drawable. Only pixels
where the clip-mask has bits set to 1 are read or written. Pixels
++++++ videoproto-2.3.0.tar.bz2 -> videoproto-2.3.1.tar.bz2 ++++++
++++ 9614 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/videoproto-2.3.0/ChangeLog new/videoproto-2.3.1/ChangeLog
--- old/videoproto-2.3.0/ChangeLog 2009-08-27 07:31:28.000000000 +0200
+++ new/videoproto-2.3.1/ChangeLog 2010-08-10 16:16:09.000000000 +0200
@@ -1,3 +1,111 @@
+commit 56a94402e9252879771ba42ee76990f132b56fca
+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 72a31b1b758c42faef518081a1a1c436c26add4f
+Author: Rémi Cardona
+Date: Thu Dec 17 08:42:27 2009 +0100
+
+ require autoconf 2.60 because of $(docdir) use
+
+ Signed-off-by: Rémi Cardona
+ Reviewed-by: Gaetan Nadon
+ Reviewed-by: Alan Coopersmith
+ Reviewed-by: Dan Nicholson
+
+commit 38602c56dcf24bf7dbddfbac89a35c15e3d3f885
+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 35734855fd913c7b743280346fc19471a39d88d4
+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 86b3515e9ea8dc6252db0ed31642ef314656c9bf
+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 ad23568d0d5d0c1cdfc54bfdb752e398ab881639
+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 40310f285cdac70865ff342f874e2bd21d36ef8d
+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 69311c693daf6797646bce9b1c62bba54fed9343
+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 a9fc831a64cab7c70aecee4f0f86ac01360e3d8f
+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 9190399907610486001f3676945958dbab4b837a
+Author: Luc Verhaegen
+Date: Mon Oct 19 23:59:20 2009 +0200
+
+ vldXvMC.h: stop uselessly including XvMClib.h.
+
+ Protocol header depending on client library header?
+
+ Only clients which depend on this header but which did not bother to
+ include it directly will run into trouble, but the fix is trivial,
+ general and backwards compatible.
+
+ Signed-off-by: Luc Verhaegen
+
+commit 56ea4c0c10bb23ae4b115b13c0052d1e808d2e75
+Author: Alan Coopersmith
+Date: Sat Oct 10 16:35:12 2009 -0700
+
+ Move xv-protocol-v2.txt from xorg-docs to videoproto
+
+ Signed-off-by: Alan Coopersmith
+
commit 20dc47bfb9e6627e8335c870a808fdab72e82061
Author: Peter Hutterer
Date: Thu Aug 27 11:59:40 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/videoproto-2.3.0/configure.ac new/videoproto-2.3.1/configure.ac
--- old/videoproto-2.3.0/configure.ac 2009-08-27 07:29:44.000000000 +0200
+++ new/videoproto-2.3.1/configure.ac 2010-08-10 16:15:43.000000000 +0200
@@ -1,12 +1,13 @@
-AC_PREREQ([2.57])
-AC_INIT([VideoProto], [2.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([VideoProto], [2.3.1], [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
videoproto.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/videoproto-2.3.0/Makefile.am new/videoproto-2.3.1/Makefile.am
--- old/videoproto-2.3.0/Makefile.am 2009-08-27 06:42:47.000000000 +0200
+++ new/videoproto-2.3.1/Makefile.am 2010-08-10 16:15:20.000000000 +0200
@@ -9,14 +9,17 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = videoproto.pc
-EXTRA_DIST = videoproto.pc.in
+dist_doc_DATA = xv-protocol-v2.txt
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.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/videoproto-2.3.0/missing new/videoproto-2.3.1/missing
--- old/videoproto-2.3.0/missing 2009-03-10 00:36:41.000000000 +0100
+++ new/videoproto-2.3.1/missing 2010-08-10 16:16:06.000000000 +0200
@@ -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:
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/videoproto-2.3.0/README new/videoproto-2.3.1/README
--- old/videoproto-2.3.0/README 1970-01-01 01:00:00.000000000 +0100
+++ new/videoproto-2.3.1/README 2010-08-10 16:15:20.000000000 +0200
@@ -0,0 +1,30 @@
+ X Video Extension
+
+This extension provides a protocol for a video output mechanism,
+mainly to rescale video playback in the video controller hardware.
+
+Extension name: XVideo
+
+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/videoproto
+
+ http://cgit.freedesktop.org/xorg/proto/videoproto
+
+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/videoproto-2.3.0/vldXvMC.h new/videoproto-2.3.1/vldXvMC.h
--- old/videoproto-2.3.0/vldXvMC.h 2009-08-27 07:17:15.000000000 +0200
+++ new/videoproto-2.3.1/vldXvMC.h 2010-08-10 16:15:20.000000000 +0200
@@ -30,7 +30,6 @@
#include
#include
-#include
/*
* New "Motion compensation type".
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/videoproto-2.3.0/xv-protocol-v2.txt new/videoproto-2.3.1/xv-protocol-v2.txt
--- old/videoproto-2.3.0/xv-protocol-v2.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/videoproto-2.3.1/xv-protocol-v2.txt 2010-08-10 16:15:20.000000000 +0200
@@ -0,0 +1,654 @@
+
+
+
+
+
+
+
+
+
+ X Video Extension
+ Protocol Description
+
+ Version 2
+
+ 25-JUL-91
+
+ David Carver
+
+ Digital Equipment Corporation
+ Workstation Engineering/Project Athena
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
+ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+ All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the names of Digital or MIT not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.
+
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR 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.
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
+
+ Preface
+ -------
+
+ The following is an outline for an X video extension protocol. It
+ is preliminary and subject to change. My goal in writing this was
+ to fix some the shortcomings of existing overly simplistic
+ extensions while avoiding pitfalls in an overly complex extension.
+
+ Your feedback is desired, and since the major design directions
+ have been stable for some time, feel free to hammer on the details
+ of the protocol.
+
+ When you receive a revision of the document, refer to the changes
+ and issues sections to guide your review and analysis.
+
+
+ Acknowledgements
+ ---------------
+
+ The following people have made major contributions to the design of
+ the Xv protocol:
+
+ Branko Gerovac (DEC/Corporate Research)
+ Russ Sasnett (GTE/Project Athena)
+ Ralph Swick (DEC/Project Athena)
+
+ Many ideas and approaches in Xv were the product of discussions
+ with several groups, including
+
+ Project Athena's Visual Computing Group
+ The MIT X Consortium
+ The MIT Media Lab's Interactive Cinema Group
+
+
+
+ Changes
+ -------
+
+ From version 1.3 to 2.0
+
+ -- Changed SetPortControl and GetPortControl to GetPortAttribute
+ and SetPortAttribute.
+
+ -- Changed QueryBestSize
+
+ -- Simplified SelectVideoNotify and SelectPortNotify requests.
+
+ -- Changed the way SetPortControl and GetPortControl works.
+
+ -- Added a QueryExtension request to return the version and
+ revision information of the extension.
+
+ -- Changed the name of the QueryVideo request to QueryAdaptors;
+ Removed the list of encodings from QueryVideo and added a
+ QueryEncodings request.
+
+ -- Added a PortNotify event that notifies interested clients that
+ a port control has been changed.
+
+ -- Added SelectPortNotify request to select for PortNotify events.
+
+ -- The XvInterruped reason has been replaced by two new reasons:
+ one for when video is preempted by another video request and
+ one for when video is terminated because of hard transmission
+ or reception errors.
+
+ -- Changed the wording of the QueryBestSize request. Added issue
+ about whether or not returned sizes should maintain the
+ requested aspect ratio.
+
+
+
+ Introduction
+ ------------
+
+ Video technology is moving very quickly. Standards for processing
+ high resolution video are currently a hot topic of discussion
+ internationally, and it will soon be possible to process video
+ entirely within the digital domain. The Xv extension, however,
+ does not attempt to address issues of digital video. Its purpose
+ is to provide a mechanism for support of current and near term
+ interactive video technology.
+
+ It is somewhat ironic that Xv contains nothing particularly
+ innovative. It takes a minimalistic approach, and without a doubt
+ it could have been defined years ago, and with several revisions.
+ So, the life expectancy of Xv is not long. Nevertheless, it may
+ undergo further revision and experimentation that will help our
+ progress towards digital video systems.
+
+ One premise of the Xv extension is that the X server is not alone.
+ A separate video server is often used to manage other aspects of
+ video processing, though the partition between what the X server
+ does and what a video server does is a matter of great debate.
+
+
+ Model
+ -----
+
+ This extension models video monitor capabilities in the X Window
+ System. Some advanced monitors support the simultaneous display
+ of multiple video signals (into separate windows), and that is
+ prepresented here through the ability to display video from
+ multiple video input adaptors into X drawables.
+
+ Some monitors support multiple video encodings (mostly for
+ internationalization purposes) either through switches or
+ automatic detection, thus each video adaptor specifies the set of
+ encodings it supports.
+
+ The requests to display video from an adaptor into a drawable are
+ modeled after the core PutImage request, though extended to
+ support scaling and source clipping.
+
+ Video output is also supported and is symmetric with the video
+ input function, though fewer GC components are used.
+
+
+ Mechanism
+ ---------
+
+ The Xv extension does the following:
+
+ -- lists available video adaptors
+ -- identifies the number of ports each adaptor supports
+ -- describes what drawable formats each adaptor supports
+ -- describes what video encodings each adaptor supports
+ -- displays video from a port to a drawable
+ -- captures video from a drawable to a port
+ -- grabs and ungrabs ports
+ -- sets and gets port attributes
+ -- delivers event notification
+
+
+
+ Adaptors
+ --------
+
+ A display may have multiple video input and output adaptors. An
+ adaptor may support multiple simultaneously active ports, and in
+ some cases the number of ports has no fixed limit.
+
+ An input port receives encoded video data and converts it to a
+ stream of data used to update a drawable. An output port samples
+ data from a drawable and produces a stream of encoded video data.
+
+ The ADAPTORINFO structure is used to describe a video adaptor.
+
+ ADAPTORINFO:
+ [base-id: PORT
+ num-ports: CARD16
+ type: SETofADAPTORTYPE
+ formats: LISTofFORMAT
+ name: STRING]
+
+ ADAPTORTYPE: {Input, Output}
+
+ FORMAT:
+ [depth: CARD8
+ visual: VISUALID]
+
+ The base-id field specifies the XID of the first port of the
+ adaptor. The `num-ports' field specifies how many ports the
+ adaptor supports. The ports of the adaptor have XIDs in the range
+ [base-id..base-id + num-ports - 1]
+
+ The type attribute determines if the adaptor can process video
+ input, output, or input and output. The if the adaptor can
+ process input then Input is asserted, if the adaptor can process
+ output then Output is asserted.
+
+ The drawable depths and visual types supported by the adaptor are
+ listed in `formats'. Note: that when video is being processed for
+ pixmaps the visual format is taken to be the visual of the first
+ pair that matches the depth of the pixmap.
+
+ The name field contains an a vendor specific string that
+ identifies the adaptor.
+
+ It should be noted that the existence of separate adaptors doesn't
+ necessarily imply that simultaneous operation is supported.
+
+
+
+ Errors
+ ------
+
+ Port
+
+ A Port error is returned if any request names a PORT that does not
+ exist.
+
+
+ Encoding
+
+ An Encoding error is returned if any request names an ENCODINGID
+ that does not exist.
+
+
+
+
+ Query Requests
+ -------------------
+
+ QueryExtension
+ ==>
+ version: CARD16
+ revision: CARD16
+
+ The QueryExtension request returns the extension version and
+ revision numbers.
+
+
+ QueryAdaptors
+ win: WINDOW
+ ==>
+ adaptors: LISTofADAPTORINFO
+
+ The QueryAdaptors request returns the video adaptor information for
+ the screen of the specified window.
+
+ Errors: {Window}
+
+
+ QueryEncodings
+ port: PORT
+ ==>
+ encodings: LISTofENCODINGINFO
+
+ The QueryEncodings request returns the list of encodings supported
+ by the port adaptor. Use the SetPortAttribute request to set
+ which encoding a port is to process. The ENCODINGINFO record
+ describes an encoding:
+
+ ENCODINGINFO:
+ [encoding: ENCODINGID
+ name: STRING
+ width, height: CARD16
+ rate: FRACTION]
+
+ The `encoding' field identifies an encoding supported by a port.
+ Its value is unique for a screen. Width and height specify the
+ size of the video image and rate specifies the rate at which
+ fields of image information are encoded.
+
+ An encoding is identified by a string that names the encoding.
+ Encoding naming conventions need to be established (i.e.,
+ something along the lines of font naming, but simpler)
+
+ FRACTION
+ [numerator, denominator: INT32]
+
+ The FRACTION structure is used to specify a fractional number.
+
+ Errors: {Port}
+
+
+
+ Put Video Requests
+ ------------------
+
+ PutVideo
+ port: PORT
+ drawable: DRAWABLE
+ gc: GCONTEXT
+ vid-x, vid-y: INT16
+ vid-w, vid-h: CARD16
+ drw-x, drw-y: INT16
+ drw-w, drw-h: CARD16
+
+ The PutVideo request writes video into a drawable. The position
+ and size of the source rectangle is specified by vid-x, vid-y,
+ vid-w, and vid-h. The position and size of the destination
+ rectangle is specified by drw-x, drw-y, drw-w, drw-h.
+
+ Video data is clipped to the bounds of the video encoding, scaled
+ to the requested drawable region size (or the closest size
+ supported), and clipped to the bounds of the drawable.
+
+ If video is successfully initiated, a VideoNotify event with
+ detail Started is generated for the drawable. If the port is
+ already in use, its video is preempted, and if the new drawable is
+ different than the old, a VideoNotify event with detail Preempted
+ is generated for the old drawable. If the port is grabbed by
+ another client, this request is ignored, and a VideoNotify event
+ with detail Busy is generated for the drawable. If the port is
+ not receiving a valid video signal or if the video signal is
+ interrupted while video is active a VideoNotify event with detail
+ HardError is generated for the drawable.
+
+ GC components: subwindow-mode, clip-x-origin, clip-y-origin, clip-mask.
+
+ Errors: {Match, Value, GContext, Port, Alloc}
+
+
+ PutStill
+ port: PORT
+ drawable: DRAWABLE
+ gc: GCONTEXT
+ vid-x, vid-y: INT16
+ vid-w, vid-h: CARD16
+ drw-x, drw-y: INT16
+ drw-w, drw-h: CARD16
+
+ The PutStill request writes a single frame of video into a
+ drawable. The position and size of the source rectangle is
+ specified by vid-x, vid-y, vid-w, and vid-h. The position and
+ size of the destination rectangle is specified by drw-x, drw-y,
+ drw-w, drw-h.
+
+ Video data is clipped to the bounds of the video encoding, scaled
+ to the requested drawable region size (or the closest size
+ supported) and clipped to the bounds of the drawable.
+
+ If the port is grabbed by another client, this request is ignored,
+ and a VideoNotify event with detail Busy is generated for the
+ drawable. If the port is not receiving a valid video signal a
+ VideoNotify event with detail HardError is generated for the
+ drawable.
+
+ GC components: subwindow-mode, clip-x-origin, clip-y-origin, clip-mask.
+
+ Errors: {Match, Value, GContext, Port, Alloc}
+
+
+
+ Get Video Requests
+ ------------------
+
+ GetVideo
+ port: PORT
+ drawable: DRAWABLE
+ gc: GCONTEXT
+ vid-x, vid-y: INT16
+ vid-w, vid-h: CARD16
+ drw-x, drw-y: INT16
+ drw-w, drw-h: CARD16
+
+ The GetVideo request outputs video from a drawable. The position
+ and size of the destination rectangle is specified by vid-x,
+ vid-y, vid-w, and vid-h. The position and size of the source
+ rectangle is specified by drw-x, drw-y, drw-w, and drw-h.
+
+ Drawable data is clipped to the bounds of the drawable, scaled to
+ the requested video region size (or the closest size supported)
+ and clipped to the bounds of the video encoding. The contents of
+ any region not updated with drawable data is undefined.
+
+ If video is successfully initiated, a VideoNotify event with
+ detail Started is generated for the drawable. If the port is
+ already in use, its video is preempted, and if the new drawable is
+ different than the old, a VideoNotify event with detail Preempted
+ is generated for the old drawable. If the port is grabbed by
+ another client, this request is ignored, and a VideoNotify event
+ with detail Busy is generated for the drawable.
+
+ GC components: subwindow-mode, clip-x-origin, clip-y-origin,
+ clip-mask.
+
+ Errors: {Match, Value, GContext, Port, Alloc}
+
+
+ GetStill
+ port: PORT
+ drawable: DRAWABLE
+ gc: GCONTEXT
+ vid-x, vid-y: INT16
+ vid-w, vid-h: CARD16
+ drw-x, drw-y: INT16
+ drw-w, drw-h: CARD16
+
+ The GetStill request outputs video from a drawable. The position
+ and size of the destination rectangle is specified by vid-x,
+ vid-y, vid-w, and vid-h. The position and size of the source
+ rectangle is specified by drw-x, drw-y, drw-w, and drw-h.
+
+ Drawable data is clipped to the bounds of the drawable, scaled to
+ the requested video region size (or the closest size supported)
+ and clipped to the bounds of the video encoding. The contents of
+ any region not updated with drawable data is undefined.
+
+ If the still is successfully captured a VideoNotify event with
+ detail Still is generated for the drawable. If the port is
+ grabbed by another client, this request is ignored, and a
+ VideoNotify event with detail Busy is generated for the drawable.
+
+ GC components: subwindow-mode, clip-x-origin, clip-y-origin,
+ clip-mask.
+
+ Errors: {Match, Value, GContext, Port, Alloc}
+
+
+
+
+ Grab Requests
+ -------------
+
+ GrabPort
+ port: PORT
+ timestamp: {TIMESTAMP, CurrentTime}
+ ==>
+ status: {Success, AlreadyGrabbed, InvalidTime}
+
+ The GrabPort request grabs a port. While a port is grabbed, only
+ video requests from the grabbing client are permitted.
+
+ If timestamp specifies a time older than the current port time, a
+ status of InvalidTime is returned. If the port is already grabbed
+ by another client, a status of AlreadyGrabbed is returned.
+ Otherwise a status of Success is returned. The port time is
+ updated when the following requests are processed: GrabPort,
+ UngrabPort, PutVideo, PutStill, GetVideo, GetStill
+
+ If the port is actively processing video for another client, the
+ video is preempted, and an VideoNotify event with detail Preempted
+ is generated for its drawable.
+
+ Errors: {Port}
+
+
+ UngrabPort
+ port: PORT
+ timestamp: {TIMESTAMP, CurrentTime}
+
+ The UngrabPort request ungrabs a port. If timestamp specifies a
+ time before the last connection request time of this port, the
+ request is ignored.
+
+ Errors: {Port}
+
+
+
+ Other Requests
+ --------------
+
+ StopVideo
+ port: PORT
+ drawable: DRAWABLE
+
+ The StopVideo request stops active video for the specified port
+ and drawable. If the port isn't processing video, or if it is
+ processing video in a different drawable, the request is ignored.
+ When video is stopped a VideoNotify event with detail Stopped is
+ generated for the associated drawable.
+
+ Errors: {Drawable, Port}
+
+
+ SelectVideoNotify
+ drawable: DRAWABLE
+ onoff: BOOL
+
+ The SelectVideoNotify request enables or disables VideoNotify
+ event delivery to the requesting client. VideoNotify events are
+ generated when video starts and stops.
+
+ Errors: {Drawable}
+
+
+ SelectPortNotify
+ port: PORT
+ onoff: BOOL
+
+ The SelectPortNotify request enables or disables PortNotify event
+ delivery to the requesting client. PortNotify events are
+ generated when port attributes are changed using SetPortAttribute.
+
+ Errors: {Port}
+
+
+ QueryBestSize
+ port: PORT
+ motion: BOOL
+ vid-w, vid-h: CARD16
+ drw-w, drw-h: CARD16
+ ==>
+ actual-width, actual-height: CARD16
+
+ The QueryBestSize request returns, for the given source size and
+ desired destination size, the closest destination size that the
+ port adaptor supports. The returned size will be equal
+ or smaller than the requested size if one is supported. If motion
+ is True then the requested size is intended for use with full
+ motion video. If motion is False, the requested size is intended
+ for use with stills only.
+
+ The retuned size is also chosen to maintain the requested aspect ratio
+ if possible.
+
+ Errors: {Port}
+
+
+
+ SetPortAttribute
+ port: PORT
+ attribute: ATOM
+ value: INT32
+
+ The SetPortAttribute request sets the value of a port attribute.
+ The port attribute is identified by the attribute atom. The
+ following strings are guaranteed to generate valid atoms using the
+ InternAtom request.
+
+ String Type
+ -----------------------------------------------------------------
+
+ "XV_ENCODING" ENCODINGID
+ "XV_HUE" [-1000..1000]
+ "XV_SATURATION" [-1000..1000]
+ "XV_BRIGHTNESS" [-1000..1000]
+ "XV_CONTRAST" [-1000..1000]
+
+
+ If the given attribute doesn't match an attribute supported by the
+ port adaptor a Match error is generated. The supplied encoding
+ must be one of the encodings listed for the adaptor, otherwise an
+ Encoding error is generated.
+
+ If the adaptor doesn't support the exact hue, saturation,
+ brightness, and contrast levels supplied, the closest levels
+ supported are assumed. The GetPortAttribute request can be used
+ to query the resulting levels.
+
+ When a SetPortAttribute request is processed a PortNotify event is
+ generated for all clients that have requested port change
+ notification using SelectPortNotify.
+
+ Errors: {Port, Match, Value}
+
+
+ GetPortAttribute
+ port: PORT
+ attribute: ATOM
+ ==>
+ value: INT32
+
+
+ The GetPortAttribute request returns the current value of the
+ attribute identified by the given atom. If the given atom
+ doesn't match an attribute supported by the adaptor a Match
+ error is generated.
+
+ Errors: {Port, Match}
+
+
+
+ Events
+ ------
+
+ VideoNotify
+ drawable: DRAWABLE
+ port: PORT
+ reason: REASON
+ time: TIMESTAMP
+
+ REASON: {Started, Still, Stopped, Busy, Preempted, HardError}
+
+ A VideoNotify event is generated when video activity is started,
+ stopped, or unable to proceed in a drawable.
+
+ A Started reason is generated when video starts in a drawable.
+
+ A Stopped reason is generated when video is stopped in a
+ drawable upon request.
+
+ A Busy reason is generated when a put or get request cannot
+ proceed because the port is grabbed by another client.
+
+ A Preempted reason is generated when video is stopped by a
+ conflicting request.
+
+ A HardError reason is generated when the video port cannot
+ initiate or continue processing a video request because of an
+ underlying transmission or reception error.
+
+
+ PortNotify
+ port: PORT
+ attribute: ATOM
+ value: INT32
+ time: TIMESTAMP
+
+ The PortNotify event is generated when a SetPortAttribute request
+ is processed. The event is delivered to all clients that have
+ performed a SelectPortNotify request for the port. The event
+ contains the atom identifying the attribute that changed, and the
+ new value of that attribute.
++++++ xextproto-7.1.1.tar.bz2 -> xextproto-7.1.2.tar.bz2 ++++++
++++ 20463 lines of diff (skipped)
++++++ xf86miscproto-X11R7.0-0.9.2.tar.bz2 -> xf86miscproto-0.9.3.tar.bz2 ++++++
++++ 14416 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/xf86miscproto-X11R7.0-0.9.2/autogen.sh new/xf86miscproto-0.9.3/autogen.sh
--- old/xf86miscproto-X11R7.0-0.9.2/autogen.sh 2005-05-06 03:46:32.000000000 +0200
+++ new/xf86miscproto-0.9.3/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /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/xf86miscproto-X11R7.0-0.9.2/ChangeLog new/xf86miscproto-0.9.3/ChangeLog
--- old/xf86miscproto-X11R7.0-0.9.2/ChangeLog 2005-12-15 01:24:39.000000000 +0100
+++ new/xf86miscproto-0.9.3/ChangeLog 2009-10-11 01:07:03.000000000 +0200
@@ -1,4 +1,171 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 92eba87e3783665e7de9867a3787bb7a07ac14ee
+Author: Alan Coopersmith
+Date: Sat Oct 10 16:06:04 2009 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ xf86miscproto 0.9.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit ae859017a1bf5842c9f3f861f7d47ff464e4c2f1
+Author: Alan Coopersmith
+Date: Sat Oct 10 16:04:01 2009 -0700
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith
+
+commit 2e7a5733e310c18381ce7a7ec664fab9215cc8b4
+Author: Alan Coopersmith
+Date: Sat Oct 10 15:57:20 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit e31076f71177062f481b9f83f925e68b608b2ff9
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit caee025000e3e9ea5ca0eb47411ebef9dea8481d
+Author: James Cloos
+Date: Thu Dec 6 16:39:13 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 0c4674418127e206486464decf11d6ac4bf0400a
+Author: James Cloos
+Date: Mon Sep 3 05:54:30 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 21a60a7b9347fa77680893219a4e69353377fae7
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:47 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 00d954080f86c9ccdfa03935e668d181db8d603c
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:39 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 5944d8aafbd7081ab6638c736f81cd87162d090c
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:16 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit c33f553594d98492604f78272901a22d7e709f86
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:40 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit b3d547ee35269da703bb212deb755e24dc230c62
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:57 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit e7aaf0f2b8324cd0b8e0c117b37e923ca52a8f89
+Author: Daniel Stone
+Date: Sat May 21 04:56:11 2005 +0000
+
+ Set version to 0.9.
+
+commit e075aa9aff1861b0275f5800d9de0d6ae4c870f7
+Author: Adam Jackson
+Date: Thu May 19 00:22:41 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit cfd303bbaa90ea4348707ceb0e06a2463855750a
+Author: Adam Jackson
+Date: Thu May 19 00:10:20 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 0c18b93340024fccb0f113635b53e5ecf95e7964
+Author: Josh Triplett
+Date: Wed May 18 07:39:06 2005 +0000
+
+ Add COPYING file for XF86Misc; assumed to be under the XFree86 catch-all
+ license.
+
+commit 1008673c584d1e24b2805e8a046a659ada625acf
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:07 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 872ca18bd982ae1771244ed5bc2c75aa88c89ce7
+Author: Kevin E Martin
+Date: Fri May 6 01:46:32 2005 +0000
+
+ Initial build system files for proto module.
+
+commit a7b4efb5eaba1f8d5220622b721120cb37984442
+Author: Thomas Winischhofer
+Date: Wed Dec 15 00:34:34 2004 +0000
+
+ Make MISC extension's PassMessage() actually work and fix memory leaks
+ (Increase minor version to 9 to indicate that PassMessage() is usable)
+
+commit 495c71ddaaeeebab3efe7d3d73d7c5168e3803c5
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 186ca3a9e37a23c639a0661f06d014b6dbb82eea
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d37bdeb7fa2ad258478041f908be29aa177d5378
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 5ab4fef0fdf25f5abcb8093ba9636d0dc11b9dec
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:14 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit e015688e22b1040093cefc3f595d7b460e543c4d
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 020b11346dd9664f3f592ad1dce16394e27a703d
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 8f8aad59b81bb63f00cba371b952115725757d4f
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit e89404f8dc67932eab7fbc163e8b6c645943cc05
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ Initial revision
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/xf86miscproto-X11R7.0-0.9.2/configure.ac new/xf86miscproto-0.9.3/configure.ac
--- old/xf86miscproto-X11R7.0-0.9.2/configure.ac 2005-12-15 01:24:39.000000000 +0100
+++ new/xf86miscproto-0.9.3/configure.ac 2009-10-11 01:05:13.000000000 +0200
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([XF86MiscProto], [0.9.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86MiscProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-XORG_RELEASE_VERSION
+# Require xorg-macros 1.3 or later: 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
xf86miscproto.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/xf86miscproto-X11R7.0-0.9.2/Makefile.am new/xf86miscproto-0.9.3/Makefile.am
--- old/xf86miscproto-X11R7.0-0.9.2/Makefile.am 2005-05-09 20:20:07.000000000 +0200
+++ new/xf86miscproto-0.9.3/Makefile.am 2009-01-28 03:28:27.000000000 +0100
@@ -6,4 +6,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xf86miscproto.pc
-EXTRA_DIST = autogen.sh xf86miscproto.pc.in
+EXTRA_DIST = xf86miscproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
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/xf86miscproto-X11R7.0-0.9.2/missing new/xf86miscproto-0.9.3/missing
--- old/xf86miscproto-X11R7.0-0.9.2/missing 2005-12-21 07:57:24.000000000 +0100
+++ new/xf86miscproto-0.9.3/missing 2009-10-11 01:06:38.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# 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
@@ -14,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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, 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
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
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]"
+ 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 $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,42 +105,69 @@
exit 1
;;
- aclocal*)
+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). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # 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.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
- tar)
+ tar*)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
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/xf86miscproto-X11R7.0-0.9.2/README new/xf86miscproto-0.9.3/README
--- old/xf86miscproto-X11R7.0-0.9.2/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86miscproto-0.9.3/README 2009-10-11 01:02:54.000000000 +0200
@@ -0,0 +1,28 @@
+This package includes the protocol definitions of the "XFree86-Misc"
+extension to the X11 protocol. The "XFree86-Misc" extension is
+supported by the XFree86 X server and versions of the Xorg X server
+prior to Xorg 1.6.
+
+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/xf86miscproto
+
+ http://cgit.freedesktop.org/xorg/proto/xf86miscproto
+
+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
+
++++++ xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2 -> xproxymanagementprotocol-1.0.3.tar.bz2 ++++++
++++ 14525 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/xproxymanagementprotocol-X11R7.0-1.0.2/autogen.sh new/xproxymanagementprotocol-1.0.3/autogen.sh
--- old/xproxymanagementprotocol-X11R7.0-1.0.2/autogen.sh 2005-07-16 08:06:02.000000000 +0200
+++ new/xproxymanagementprotocol-1.0.3/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /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/xproxymanagementprotocol-X11R7.0-1.0.2/ChangeLog new/xproxymanagementprotocol-1.0.3/ChangeLog
--- old/xproxymanagementprotocol-X11R7.0-1.0.2/ChangeLog 2005-12-15 01:24:38.000000000 +0100
+++ new/xproxymanagementprotocol-1.0.3/ChangeLog 2009-10-13 07:57:39.000000000 +0200
@@ -1,4 +1,97 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e4917e1b3f52b0ec5279fc46d568b9fa5e6b5025
+Author: Alan Coopersmith
+Date: Mon Oct 12 22:56:29 2009 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ xproxymanagementprotocol 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit b9346af1897b8ad9f7abb7009aa8e0ae54e161ee
+Author: Alan Coopersmith
+Date: Mon Oct 12 22:53:46 2009 -0700
+
+ Move documentation from xorg-docs module
+
+ Signed-off-by: Alan Coopersmith
+
+commit 0ce100547bdf2323426266b8579ca632dd030f68
+Author: Alan Coopersmith
+Date: Mon Oct 12 22:45:32 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit adffd159042b249934beb277192dad06f6bc2cdc
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit c946a646248e2b70ae84ffbec722c7bb4d75c925
+Author: James Cloos
+Date: Thu Dec 6 16:39:03 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 219aee23ca6755af1d3d44d7000a07fe25120dcb
+Author: James Cloos
+Date: Mon Sep 3 05:54:10 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit b0a4d0b41e3b7db93ba44844ebb55e85cbec212f
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:21 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 44aba869900c927c7e4421bc5a998de61d997d25
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit f247c61837cb843e5d0687a0da7de904caec6922
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 37f0ab9a5e9d1fb27fb60e5e22699e5c23d6fbf3
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 7ed7b38188d7f04e5cb3c14b4a9f16449eb67174
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:55 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit e118d7e6d6457d28dbd4fae1ffd239c69b2a97db
+Author: Alan Coopersmith
+Date: Sat Jul 16 06:06:02 2005 +0000
+
+ Modularize ProxyManager (PM) protocol headers used by lbxproxy & xproxymngr
+
+commit 6f93207c9248b243fba35554421b7bedd09fe77e
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:57 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit b47a612b323d66eb5efb4fc832efc5a162fa6d8e
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:53 2003 +0000
+
+ R6.6 is the Xorg base-line
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/xproxymanagementprotocol-X11R7.0-1.0.2/configure.ac new/xproxymanagementprotocol-1.0.3/configure.ac
--- old/xproxymanagementprotocol-X11R7.0-1.0.2/configure.ac 2005-12-15 01:24:38.000000000 +0100
+++ new/xproxymanagementprotocol-1.0.3/configure.ac 2009-10-13 07:56:23.000000000 +0200
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([XProxyManagementProtocol], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XProxyManagementProtocol], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-XORG_RELEASE_VERSION
+# Require xorg-macros 1.3 or later: 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
xproxymngproto.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/xproxymanagementprotocol-X11R7.0-1.0.2/Makefile.am new/xproxymanagementprotocol-1.0.3/Makefile.am
--- old/xproxymanagementprotocol-X11R7.0-1.0.2/Makefile.am 2005-07-16 08:06:02.000000000 +0200
+++ new/xproxymanagementprotocol-1.0.3/Makefile.am 2009-10-13 07:56:07.000000000 +0200
@@ -6,4 +6,16 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xproxymngproto.pc
-EXTRA_DIST = autogen.sh xproxymngproto.pc.in
+dist_doc_DATA = PM_spec
+
+EXTRA_DIST = xproxymngproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
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/xproxymanagementprotocol-X11R7.0-1.0.2/missing new/xproxymanagementprotocol-1.0.3/missing
--- old/xproxymanagementprotocol-X11R7.0-1.0.2/missing 2005-12-21 07:55:50.000000000 +0100
+++ new/xproxymanagementprotocol-1.0.3/missing 2009-10-13 07:56:40.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# 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
@@ -14,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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, 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
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
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]"
+ 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 $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,42 +105,69 @@
exit 1
;;
- aclocal*)
+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). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # 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.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
- tar)
+ tar*)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
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/xproxymanagementprotocol-X11R7.0-1.0.2/PM_spec new/xproxymanagementprotocol-1.0.3/PM_spec
--- old/xproxymanagementprotocol-X11R7.0-1.0.2/PM_spec 1970-01-01 01:00:00.000000000 +0100
+++ new/xproxymanagementprotocol-1.0.3/PM_spec 2009-10-13 07:56:07.000000000 +0200
@@ -0,0 +1,153 @@
+ Proxy Management Protocol
+ Draft Version 1.0
+ Ralph Mor, X Consortium
+
+
+The Proxy Management Protocol is an ICE based protocol that provides a way
+for application servers to easily locate proxy services available to them.
+
+Typically, a service called a "proxy manager" is responsible for resolving
+requests for proxy services, starting new proxies when appropriate, and
+keeping track of all of the available proxy services. The proxy manager
+strives to reuse existing proxies whenever possible.
+
+In order to request a proxy service, the GET_PROXY_ADDR message is sent to
+the proxy manager. The proxy manager will in turn forward this message to
+a proxy that it thinks can satisfy the request.
+
+GET_PROXY_ADDR
+ proxy-service : STRING
+ server-address : STRING
+ host-address : STRING
+ options : STRING
+ auth-data-len : CARD16
+ auth-name : STRING or None
+ auth-data : LISTofCARD8 or None
+
+ -->
+
+ status : CARD8
+ proxy-address : STRING
+ failure-reason : STRING
+
+
+proxy-service is the name of the proxy service to be requested, for example
+"LBX". proxy-service is a case insensitive string.
+
+server-address is the network address of the target server. The format of
+the address is specific to proxy-service. For example, for a proxy service
+of "LBX", the address would be an X display address (e.g, "wkstn.x.org:0").
+
+host-address is the network address of the host on which the proxied
+application will run. This information might be used by the proxy to
+restrict access to a specific host.
+
+options are proxy specific options that will be passed to the proxy. The
+details of these options are not specified here. Their syntax and
+semantics are defined by each proxy service.
+
+If auth-data-len is nonzero, then auth-name and auth-data contain
+authentication or authorization information that should be passed to
+the proxy. The proxy will typically use this to authenticate and
+authorize itself to the target server. The details of how the
+auth fields are used are specific to each proxy service.
+
+
+After sending GET_PROXY_ADDR the proxy manager expects a reply from
+the proxy. The status field of the reply indicates if the request can
+be satisfied.
+
+If status is Success, proxy-address will contain the network address of the
+proxy willing to handle this request. The format of the proxy address is
+specific to the proxy service being used. For example, for a proxy service
+of "LBX", the proxy address would be the X display address of the proxy
+(e.g, "gateway.x.org:63"). The proxy manager will forward the successful
+GET_PROXY_ADDR reply to whomever requested the proxy service.
+
+If status is Unable, the proxy is not able to satisfy the request but
+it believes some other proxy might be able to do so. Proxy-address is
+the empty string and failure-reason indicates the reason for failure.
+The proxy manager may choose to forward the original GET_PROXY_ADDR to
+another already running proxy, or it may choose to start up a new
+proxy. In the event that the proxy manager can not find or start a
+proxy, it will send a GET_PROXY_ADDR reply (with status Failure and an
+appropriate failure-reason) to whomever requested the proxy service.
+
+If status is Failure, the proxy is not able to satisfy the request and
+in addition is informing the requester that the request is invalid in
+some way and should not be retried.
+
+
+If the proxy manager starts up a new proxy, the proxy manager will
+need an indication from the proxy that it is ready to accept
+requests. The proxy is required to send a START_PROXY message to the
+proxy manager to identify itself and signal its readiness to receive
+requests.
+
+START_PROXY
+ proxy-service : STRING (name of proxy service, e.g. "LBX")
+
+
+When the proxy manager receives the START_PROXY message from the
+proxy it checks that the proxy-service is the one that it's expecting.
+If the proxy-service is incorrect, an IceBadValue error will be sent
+to the proxy. Otherwise, the proxy manager will forward the original
+GET_PROXY_ADDR request to the proxy and the proxy will respond to the
+GET_PROXY_ADDR request in the same way as discussed above.
+
+
+Protocol
+--------
+
+ICE protocol name is "PROXY_MANAGEMENT".
+The major opcode is assigned at run-time by ICE.
+
+
+Types
+-----
+
+STRING
+ 2 CARD16 length
+ n LISTofCARD8 the string
+ p p = pad(2+n,8)
+
+
+
+Encoding
+--------
+
+GET_PROXY_ADDR
+
+ 1 ? PROXY_MANAGEMENT
+ 1 1 opcode
+ 2 n auth-data-len (in bytes)
+ 4 (a+b+c+d+e+n+p)/8 length of remaining data in 8-byte units
+ a STRING proxy-service
+ b STRING server-address
+ c STRING host-address
+ d STRING options
+ e STRING auth-name (if auth-data-len > 0)
+ n LISTofCARD8 auth-data (if auth-data-len > 0)
+ p unused, p=pad(n,8)
+
+GET_PROXY_ADDR_REPLY
+
+ 1 ? PROXY_MANAGEMENT
+ 1 2 opcode
+ 1 CARD8 status
+ 0 Unable
+ 1 Success
+ 2 Failure
+ 1 unused
+ 4 (a+b)/8 length of remaining data in 8-byte units
+ a STRING proxy-address
+ b STRING failure-reason
+
+
+START_PROXY
+
+ 1 ? PROXY_MANAGEMENT
+ 1 3 opcode
+ 2 unused
+ 4 a/8 length of remaining data in 8-byte units
+ a STRING proxy-service
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/xproxymanagementprotocol-X11R7.0-1.0.2/README new/xproxymanagementprotocol-1.0.3/README
--- old/xproxymanagementprotocol-X11R7.0-1.0.2/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xproxymanagementprotocol-1.0.3/README 2009-10-13 07:56:07.000000000 +0200
@@ -0,0 +1,26 @@
+The Proxy Management Protocol is an ICE based protocol that provides a way
+for application servers to easily locate proxy services available to them.
+
+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/pmproto
+
+ http://cgit.freedesktop.org/xorg/proto/pmproto
+
+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
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org