Hello community,
here is the log from the commit of package xorg-x11-libs for openSUSE:Factory
checked in at Thu Sep 9 15:53:29 CEST 2010.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2010-08-23 12:47:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2010-09-05 04:48:56.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Sep 5 02:38:28 UTC 2010 - sndirsch@novell.com
+
+- libXcomposite 0.4.2
+- libXdamage 1.1.3
+- libXfontcache 1.0.5
+- libXvMC 1.0.6
+- libXxf86misc 1.0.2
+- libpciaccess 0.12.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libpciaccess-0.10.9.tar.bz2
libXcomposite-0.4.1.tar.bz2
libXdamage-1.1.2.tar.bz2
libXfontcache-1.0.4.tar.bz2
libXvMC-1.0.5.tar.bz2
libXxf86misc-X11R7.1-1.0.1.tar.bz2
New:
----
libpciaccess-0.12.0.tar.bz2
libXcomposite-0.4.2.tar.bz2
libXdamage-1.1.3.tar.bz2
libXfontcache-1.0.5.tar.bz2
libXvMC-1.0.6.tar.bz2
libXxf86misc-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.83UAyF/_old 2010-09-09 15:52:41.000000000 +0200
+++ /var/tmp/diff_new_pack.83UAyF/_new 2010-09-09 15:52:41.000000000 +0200
@@ -19,7 +19,7 @@
Name: xorg-x11-libs
-BuildRequires: fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel
+BuildRequires: fdupes fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel
%ifarch ppc64 s390x x86_64
Provides: libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit)
Provides: libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit)
@@ -34,7 +34,7 @@
#
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 6
+Release: 7
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -44,20 +44,20 @@
Source3: libXScrnSaver-1.2.0.tar.bz2
Source4: libXTrap-X11R7.0-1.0.0.tar.bz2
Source5: libXaw-1.0.7.tar.bz2
-Source6: libXcomposite-0.4.1.tar.bz2
+Source6: libXcomposite-0.4.2.tar.bz2
Source7: libXcursor-1.1.10.tar.bz2
-Source8: libXdamage-1.1.2.tar.bz2
+Source8: libXdamage-1.1.3.tar.bz2
Source9: libXevie-1.0.2.tar.bz2
Source10: libXfont-1.4.2.tar.bz2
-Source11: libXfontcache-1.0.4.tar.bz2
+Source11: libXfontcache-1.0.5.tar.bz2
Source12: libXft-2.1.14.tar.bz2
Source14: libXinerama-1.1.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
Source16: libXrandr-1.3.0.tar.bz2
Source17: libXtst-1.1.0.tar.bz2
-Source18: libXvMC-1.0.5.tar.bz2
+Source18: libXvMC-1.0.6.tar.bz2
Source19: libXxf86dga-1.1.1.tar.bz2
-Source20: libXxf86misc-X11R7.1-1.0.1.tar.bz2
+Source20: libXxf86misc-1.0.2.tar.bz2
Source21: libXxf86vm-1.1.0.tar.bz2
Source22: libdmx-1.1.0.tar.bz2
Source23: liblbxutil-1.1.0.tar.bz2
@@ -68,7 +68,7 @@
Source29: libvnc-20070501.tar.bz2
Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.3.6.tar.bz2
-Source33: libpciaccess-0.10.9.tar.bz2
+Source33: libpciaccess-0.12.0.tar.bz2
Source90: baselibs.conf
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch5: libxkbui.diff
@@ -263,6 +263,7 @@
# for compatibility reasons
ln -s libXaw7.so.7 $RPM_BUILD_ROOT/%{_libdir}/libXaw8.so.8
ln -s libXaw.so.7 $RPM_BUILD_ROOT/%{_libdir}/libXaw.so.8
+%fdupes -s $RPM_BUILD_ROOT/%_mandir
%clean
rm -rf "$RPM_BUILD_ROOT"
++++++ libpciaccess-0.10.9.tar.bz2 -> libpciaccess-0.12.0.tar.bz2 ++++++
++++ 62980 lines of diff (skipped)
++++++ libXcomposite-0.4.1.tar.bz2 -> libXcomposite-0.4.2.tar.bz2 ++++++
++++ 59647 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/libXcomposite-0.4.1/ChangeLog new/libXcomposite-0.4.2/ChangeLog
--- old/libXcomposite-0.4.1/ChangeLog 2009-10-08 09:50:32.000000000 +0200
+++ new/libXcomposite-0.4.2/ChangeLog 2010-06-09 02:06:00.000000000 +0200
@@ -1,3 +1,169 @@
+commit 01c4691e18b536de6585a0e93e05e2831cf2be34
+Author: Alan Coopersmith
+Date: Tue Jun 8 17:05:02 2010 -0700
+
+ libXcomposite 0.4.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 657550b7572551225ea2c9c60f42827a5209a205
+Author: Alan Coopersmith
+Date: Tue Jun 8 16:59:52 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7cc9ace428dabaeeabc8bcb8843ee89bec447a9a
+Author: Jamey Sharp
+Date: Fri Apr 9 17:24:57 2010 -0700
+
+ Always call SyncHandle after issuing an X request.
+
+commit e52f8171000f2b67bb1b774ba94acb68a471a91b
+Author: Gaetan Nadon
+Date: Mon Mar 29 16:50:33 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 f361cfd41f36dc60ad9c4832978391f3ce8951e6
+Author: Gaetan Nadon
+Date: Mon Mar 29 14:53:48 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 588e33d6037166da5a02e8ad73438544dca90e1a
+Author: Gaetan Nadon
+Date: Thu Mar 11 10:06:56 2010 -0500
+
+ doc: specify 0.0.20 as the minimum version for xmlto
+
+ Older versions do not have fop backend.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 2002631bd71ba970d77f9b5c8f886c3bf1349e45
+Author: Gaetan Nadon
+Date: Thu Jan 21 20:03:42 2010 -0500
+
+ man: allow installing prebuilt man pages from tarball
+
+ The man pages source may be supplied in the tarball or built
+ from git. The makefile needs to take that into consideration
+ and adjust the targets accordingly.
+
+ This prevents the regular make target to fail when the source
+ is not available and the xmlto is not available.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 213cf861e8a29c6f991828beb6656239206c9947
+Author: Gaetan Nadon
+Date: Mon Jan 18 16:02:41 2010 -0500
+
+ config: replace custom code with reusable macro XORG_WITH_XMLTO
+
+ XORG_WITH_XMLTO provides additional functions like a configure
+ option which allow platform builders to control the usage of
+ the xmlto program.
+
+ This is a requirement from platforms that do not have such doc tool.
+
+ Signed-off-by: Gaetan Nadon
+
+commit fa2155fa64cf7b43ee40064cb53b05388885c1dc
+Author: Alan Coopersmith
+Date: Thu Jan 14 19:15:00 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7c61042d94edc1ecf8276961f28189caffa7b17a
+Author: Gaetan Nadon
+Date: Thu Jan 14 15:52:08 2010 -0500
+
+ COPYING: add missing copyright notices
+
+ Refer to: Xcomposite.c
+ Copyright © 2006 Sun Microsystems
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 0d78a27bf7c644a6e700290c1861a11ff4a1662b
+Author: Gaetan Nadon
+Date: Fri Nov 27 20:56:03 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 92843f46c21c6fd0c5f82727f0d281dcf6debfe4
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit e1d89e11c0f24c6c0d5048e8910091f9b5a997e4
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:42 2009 -0400
+
+ 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 b741fca01ebe60a5b73bcebe237efc4aeff3fa0c
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .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 57cce60b16cfd2fb63c2e045817c2c05a2a603dc
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:24 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston
+
commit 90c243accfb2dc3d4d85dd57d8aca518dab98842
Author: Alan Coopersmith
Date: Thu Oct 8 00:28:45 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/libXcomposite-0.4.1/config.h.in new/libXcomposite-0.4.2/config.h.in
--- old/libXcomposite-0.4.1/config.h.in 2009-10-08 09:29:29.000000000 +0200
+++ new/libXcomposite-0.4.2/config.h.in 2010-06-09 02:05:12.000000000 +0200
@@ -30,6 +30,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -45,6 +49,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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/libXcomposite-0.4.1/configure.ac new/libXcomposite-0.4.2/configure.ac
--- old/libXcomposite-0.4.1/configure.ac 2009-10-08 09:27:26.000000000 +0200
+++ new/libXcomposite-0.4.2/configure.ac 2010-06-09 02:04:49.000000000 +0200
@@ -21,7 +21,7 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
dnl
dnl Version should match the current XComposite version. XCompositeQueryVersion
@@ -32,14 +32,17 @@
dnl that 'revision' number appears in Xcomposite.h and has to be manually
dnl synchronized.
dnl
-AC_INIT(libXcomposite, 0.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT(libXcomposite,
+ 0.4.2,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libXcomposite)
+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])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.6)
AM_CONFIG_HEADER(config.h)
# Check for progs
@@ -47,13 +50,12 @@
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
+XORG_WITH_XMLTO(0.0.20)
-AC_ARG_VAR([XMLTO], [Path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
-if test "x$XMLTO" = "x" -a ! -f $srcdir/man/Xcomposite.man ; then
- AC_MSG_WARN([xmlto not found - cannot create man pages without it])
-fi
+# Determine if the source for man pages is available
+# It may already be present (tarball) or can be generated using xmlto
+AM_CONDITIONAL([INSTALL_MANPAGES],
+ [test -f "$srcdir/man/Xcomposite.man" || test "x$have_xmlto" = xyes])
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
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/libXcomposite-0.4.1/COPYING new/libXcomposite-0.4.2/COPYING
--- old/libXcomposite-0.4.1/COPYING 2008-03-18 00:36:09.000000000 +0100
+++ new/libXcomposite-0.4.2/COPYING 2010-06-09 01:57:33.000000000 +0200
@@ -19,3 +19,23 @@
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
+Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
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/libXcomposite-0.4.1/include/X11/extensions/Xcomposite.h new/libXcomposite-0.4.2/include/X11/extensions/Xcomposite.h
--- old/libXcomposite-0.4.1/include/X11/extensions/Xcomposite.h 2008-05-22 01:32:17.000000000 +0200
+++ new/libXcomposite-0.4.2/include/X11/extensions/Xcomposite.h 2010-06-09 01:58:46.000000000 +0200
@@ -1,24 +1,26 @@
/*
- * Copyright © 2006 Sun Microsystems
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, 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 name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
+ * 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:
*
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXcomposite-0.4.1/INSTALL new/libXcomposite-0.4.2/INSTALL
--- old/libXcomposite-0.4.1/INSTALL 2006-07-11 20:05:02.000000000 +0200
+++ new/libXcomposite-0.4.2/INSTALL 2010-06-09 02:06:00.000000000 +0200
@@ -1,8 +1,291 @@
-Xcomposite is built with the traditional configure script:
+Installation Instructions
+*************************
- $ ./configure --prefix=/usr/X11R6
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
-This should generate valid Makefiles, then:
+ 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.
- $ make
- $ make 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/libXcomposite-0.4.1/Makefile.am new/libXcomposite-0.4.2/Makefile.am
--- old/libXcomposite-0.4.1/Makefile.am 2009-01-30 00:18:52.000000000 +0100
+++ new/libXcomposite-0.4.2/Makefile.am 2010-04-16 19:10:49.000000000 +0200
@@ -24,12 +24,15 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcomposite.pc
-EXTRA_DIST = xcomposite.pc.in 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/libXcomposite-0.4.1/man/Makefile.am new/libXcomposite-0.4.2/man/Makefile.am
--- old/libXcomposite-0.4.1/man/Makefile.am 2009-10-08 09:20:44.000000000 +0200
+++ new/libXcomposite-0.4.2/man/Makefile.am 2010-01-30 08:38:16.000000000 +0100
@@ -21,8 +21,10 @@
Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+if INSTALL_MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(Xcomposite_shadowmen)
+endif
EXTRA_DIST = $(libman_PRE) $(libman_xml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXcomposite-0.4.1/man/Xcomposite.xml new/libXcomposite-0.4.2/man/Xcomposite.xml
--- old/libXcomposite-0.4.1/man/Xcomposite.xml 2008-05-22 01:32:17.000000000 +0200
+++ new/libXcomposite-0.4.2/man/Xcomposite.xml 2010-06-09 01:58:11.000000000 +0200
@@ -7,32 +7,26 @@
Conversion to DocBook/XML API documentation is:
- Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-
+ Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+
Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, and/or sell copies of the Software, and to permit persons
- to whom the Software is furnished to do so, provided that the above
- copyright notice(s) and this permission notice appear in all copies of
- the Software and that both the above copyright notice(s) and this
- permission notice appear in supporting documentation.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder
- shall not be used in advertising or otherwise to promote the sale, use
- or other dealings in this Software without prior written authorization
- of the copyright holder.
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
-->
<title>X Composite Extension Library</title>
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/libXcomposite-0.4.1/src/Xcomposite.c new/libXcomposite-0.4.2/src/Xcomposite.c
--- old/libXcomposite-0.4.1/src/Xcomposite.c 2009-01-30 00:18:52.000000000 +0100
+++ new/libXcomposite-0.4.2/src/Xcomposite.c 2010-06-09 01:59:26.000000000 +0200
@@ -1,26 +1,26 @@
/*
- * $Id$
- *
- * Copyright © 2006 Sun Microsystems
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, 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 name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -138,6 +138,7 @@
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
UnlockDisplay (dpy);
+ SyncHandle ();
} else {
/* The server doesn't have this extension.
* Use a private Xlib-internal extension to hang the close_display
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/libXcomposite-0.4.1/src/xcompositeint.h new/libXcomposite-0.4.2/src/xcompositeint.h
--- old/libXcomposite-0.4.1/src/xcompositeint.h 2008-03-18 00:36:09.000000000 +0100
+++ new/libXcomposite-0.4.2/src/xcompositeint.h 2010-06-09 01:59:12.000000000 +0200
@@ -1,24 +1,26 @@
/*
- * Copyright © 2006 Sun Microsystems
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, 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 name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
+ * 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:
*
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
++++++ libXdamage-1.1.2.tar.bz2 -> libXdamage-1.1.3.tar.bz2 ++++++
++++ 60875 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/libXdamage-1.1.2/ChangeLog new/libXdamage-1.1.3/ChangeLog
--- old/libXdamage-1.1.2/ChangeLog 2009-10-06 20:26:32.000000000 +0200
+++ new/libXdamage-1.1.3/ChangeLog 2010-06-09 03:54:12.000000000 +0200
@@ -1,3 +1,131 @@
+commit 8abc1c8e920821f5ed68e639d3fb71a4ad90a102
+Author: Alan Coopersmith
+Date: Tue Jun 8 18:50:45 2010 -0700
+
+ libXdamage 1.1.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit 0b0b68a2a06f01ad3e185aafb2e9665779bc0084
+Author: Matthieu Herrb
+Date: Sun Mar 9 07:56:45 2008 +0100
+
+ nuke RCS Ids
+
+ Signed-off-by: Matthieu Herrb
+ Reviewed by: Alan Coopersmith
+
+commit 5a77a5e402ab245f2de08886e5fb2934a6c54571
+Author: Jamey Sharp
+Date: Fri Apr 9 17:26:07 2010 -0700
+
+ Always call SyncHandle after issuing an X request.
+
+commit a414d85a9da3f5b23975a64c351ad00138092107
+Author: Gaetan Nadon
+Date: Mon Mar 29 16:50:34 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 f8914c5dba4c6514b83c7d8f5c550a2603e4da66
+Author: Gaetan Nadon
+Date: Mon Mar 29 14:53:48 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 5dd2b14345ba9b8b88d11dc027dc71625fbf15bc
+Author: Gaetan Nadon
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 98333e9afea1c5dfb0f4b90c10f25e6b77e72817
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 62d595bc01c0219254560b72978faa3327959eee
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ 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 6852db03b187cfce5a41cc8addbc734091e6b725
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:42 2009 -0400
+
+ 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 ef9fad1a1f327c1f19009d4206c67762ef0d436a
+Author: Gaetan Nadon
+Date: Thu Oct 22 13:10:20 2009 -0400
+
+ .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 d9ff5ede9989b0312416fd68fc3dd866c551aad9
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .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 8a02e2cfe8cfcaa791b81b47e44304f326a0dcb8
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:24 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston
+
commit 728ae9bda2e536897b630b149df522fa6286a1c5
Author: Alan Coopersmith
Date: Tue Oct 6 11:24:50 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/libXdamage-1.1.2/config.h.in new/libXdamage-1.1.3/config.h.in
--- old/libXdamage-1.1.2/config.h.in 2009-10-06 20:25:35.000000000 +0200
+++ new/libXdamage-1.1.3/config.h.in 2010-06-09 03:53:59.000000000 +0200
@@ -30,6 +30,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -45,6 +49,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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/libXdamage-1.1.2/configure.ac new/libXdamage-1.1.3/configure.ac
--- old/libXdamage-1.1.2/configure.ac 2009-10-06 20:24:23.000000000 +0200
+++ new/libXdamage-1.1.3/configure.ac 2010-06-09 03:50:35.000000000 +0200
@@ -21,7 +21,7 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
dnl
dnl Version should match the current XDamage version. XDamageQueryVersion
@@ -30,19 +30,23 @@
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xdamage version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXdamage, 1.1.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXdamage)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT(libXdamage,
+ 1.1.3,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libXdamage)
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Check damageext configuration, strip extra digits from package version to
# find the required protocol version
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/libXdamage-1.1.2/COPYING new/libXdamage-1.1.3/COPYING
--- old/libXdamage-1.1.2/COPYING 2007-01-12 04:18:56.000000000 +0100
+++ new/libXdamage-1.1.3/COPYING 2010-04-27 07:01:12.000000000 +0200
@@ -1,4 +1,3 @@
-$Id$
Copyright © 2001,2003 Keith Packard
Copyright © 2007 Eric Anholt
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/libXdamage-1.1.2/include/X11/extensions/Xdamage.h new/libXdamage-1.1.3/include/X11/extensions/Xdamage.h
--- old/libXdamage-1.1.2/include/X11/extensions/Xdamage.h 2008-05-22 01:32:28.000000000 +0200
+++ new/libXdamage-1.1.3/include/X11/extensions/Xdamage.h 2010-04-27 07:01:12.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
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/libXdamage-1.1.2/INSTALL new/libXdamage-1.1.3/INSTALL
--- old/libXdamage-1.1.2/INSTALL 2007-01-12 04:18:56.000000000 +0100
+++ new/libXdamage-1.1.3/INSTALL 2010-06-09 03:54:12.000000000 +0200
@@ -1,8 +1,291 @@
-libXdamage is built with the traditional configure script:
+Installation Instructions
+*************************
- $ ./configure --prefix=/usr/X11R6
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
-This should generate valid Makefiles, then:
+ 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.
- $ make
- $ make 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/libXdamage-1.1.2/Makefile.am new/libXdamage-1.1.3/Makefile.am
--- old/libXdamage-1.1.2/Makefile.am 2009-01-30 00:18:56.000000000 +0100
+++ new/libXdamage-1.1.3/Makefile.am 2010-04-27 07:01:12.000000000 +0200
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
@@ -28,14 +26,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xdamage.pc
-EXTRA_DIST = xdamage.pc.in
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL
-.PHONY: ChangeLog
+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/libXdamage-1.1.2/src/Xdamage.c new/libXdamage-1.1.3/src/Xdamage.c
--- old/libXdamage-1.1.2/src/Xdamage.c 2009-01-30 00:18:56.000000000 +0100
+++ new/libXdamage-1.1.3/src/Xdamage.c 2010-04-27 07:01:12.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
* Copyright © 2007 Eric Anholt
*
@@ -94,6 +92,7 @@
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
UnlockDisplay (dpy);
+ SyncHandle ();
} else {
/* The server doesn't have this extension.
* Use a private Xlib-internal extension to hang the close_display
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/libXdamage-1.1.2/src/xdamageint.h new/libXdamage-1.1.3/src/xdamageint.h
--- old/libXdamage-1.1.2/src/xdamageint.h 2006-07-11 20:05:07.000000000 +0200
+++ new/libXdamage-1.1.3/src/xdamageint.h 2010-04-27 07:01:12.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
++++++ libXfontcache-1.0.4.tar.bz2 -> libXfontcache-1.0.5.tar.bz2 ++++++
++++ 34349 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/libXfontcache-1.0.4/autogen.sh new/libXfontcache-1.0.5/autogen.sh
--- old/libXfontcache-1.0.4/autogen.sh 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/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/libXfontcache-1.0.4/ChangeLog new/libXfontcache-1.0.5/ChangeLog
--- old/libXfontcache-1.0.4/ChangeLog 2006-12-16 00:23:25.000000000 +0100
+++ new/libXfontcache-1.0.5/ChangeLog 2009-10-08 22:31:41.000000000 +0200
@@ -1,3 +1,78 @@
+commit efbf3cbbef62179b5a10b6e90da427aa270fa6e0
+Author: Alan Coopersmith
+Date: Thu Oct 8 13:30:43 2009 -0700
+
+ libXfontcache 1.0.5
+
+ Signed-off-by: Alan Coopersmith
+
+commit 1793fd9277ba5d43c5c0d3f7efa1c33b7e7cbf0b
+Author: Alan Coopersmith
+Date: Thu Oct 8 13:29:26 2009 -0700
+
+ Delete empty INSTALL so automake provides the more useful default
+
+ Signed-off-by: Alan Coopersmith
+
+commit 25c8c26aa1890e7fc4cb9a202cbd466f42cce9cc
+Author: Alan Coopersmith
+Date: Thu Oct 8 13:27:21 2009 -0700
+
+ Fill in COPYING with Copyright/License info
+
+ Signed-off-by: Alan Coopersmith
+
+commit d3e85cdf1f3d0a1d9bb7774698730e75a7866107
+Author: Alan Coopersmith
+Date: Thu Oct 8 13:25:17 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4f9150ca6210cabab8c5e46ffcbdd66495acfd8a
+Author: Alan Coopersmith
+Date: Mon Feb 2 20:34:34 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith
+
+commit 9d31e0b8972648fb9edd4a389b784190655b2054
+Author: Paulo Cesar Pereira de Andrade
+Date: Thu Jan 29 18:22:12 2009 -0200
+
+ Janitor: Correct make distcheck.
+
+commit dd8d4c3bf0025d7a79de623d8b6eac192a832e0f
+Author: Peter Hutterer
+Date: Mon May 19 17:48:52 2008 +0930
+
+ Rename parameters to clarify QueryVersion/QueryExtension.
+
+ These parameters are not treated as input. Rename them to make the inner
+ workings slightly more obvious.
+
+ X.Org Bug 14511 http://bugs.freedesktop.org/show_bug.cgi?id=14511
+
+commit 6a87b3473d2694f7a6cd6cf57a5220ded9daf3f2
+Author: Matthieu Herrb
+Date: Sun Mar 9 08:23:35 2008 +0100
+
+ nuke RCS Ids
+
+commit 63e50cd371a9d4d8275fff83572aa97a46932a21
+Author: James Cloos
+Date: Thu Dec 6 15:51:17 2007 -0500
+
+ Add missing PHONY line for automatic ChangeLog generation
+
+commit b01ce2639e79109c31772e82e06a3837d7db399f
+Author: James Cloos
+Date: Mon Sep 3 05:53:38 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
commit 0945a24c0470860f5d9cbc87cb28defd44144710
Author: Daniel Stone
Date: Sat Dec 16 01:22:56 2006 +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/libXfontcache-1.0.4/configure.ac new/libXfontcache-1.0.5/configure.ac
--- old/libXfontcache-1.0.4/configure.ac 2006-12-16 00:22:50.000000000 +0100
+++ new/libXfontcache-1.0.5/configure.ac 2009-10-08 22:30:29.000000000 +0200
@@ -23,25 +23,28 @@
AC_PREREQ([2.57])
-AC_INIT(libXfontcache, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfontcache)
+AC_INIT(libXfontcache, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfontcache)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# 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)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_DEFAULT_OPTIONS
+
# Check for dependencies
PKG_CHECK_MODULES(XFONTCACHE, x11 xext xextproto fontcacheproto)
-
AC_SUBST(XFONTCACHE_CFLAGS)
AC_SUBST(XFONTCACHE_LIBS)
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
src/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfontcache-1.0.4/COPYING new/libXfontcache-1.0.5/COPYING
--- old/libXfontcache-1.0.4/COPYING 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/COPYING 2009-10-08 22:26:44.000000000 +0200
@@ -1,12 +1,53 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1998-1999 Shunsuke Akiyama .
+All rights reserved.
+Copyright (c) 1998-1999 X-TrueType Server Project, All rights
+reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+ ------------------------------------------------------------
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from the XFree86 Project.
diff -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/libXfontcache-1.0.4/INSTALL new/libXfontcache-1.0.5/INSTALL
--- old/libXfontcache-1.0.4/INSTALL 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/INSTALL 2009-10-08 22:31:17.000000000 +0200
@@ -0,0 +1,302 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 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 -D_XOPEN_SOURCE=500"
+
+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"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
+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/libXfontcache-1.0.4/Makefile.am new/libXfontcache-1.0.5/Makefile.am
--- old/libXfontcache-1.0.4/Makefile.am 2006-12-06 17:54:09.000000000 +0100
+++ new/libXfontcache-1.0.5/Makefile.am 2009-01-30 00:19:07.000000000 +0100
@@ -24,11 +24,12 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfontcache.pc
-EXTRA_DIST = xfontcache.pc.in autogen.sh ChangeLog
+EXTRA_DIST = xfontcache.pc.in ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
-CLEANFILES = ChangeLog
+.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(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/libXfontcache-1.0.4/man/Makefile.am new/libXfontcache-1.0.5/man/Makefile.am
--- old/libXfontcache-1.0.4/man/Makefile.am 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/man/Makefile.am 2009-10-08 22:21:56.000000000 +0200
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
@@ -31,14 +30,12 @@
libman_PRE = Xfontcache.man
-BUILT_SOURCES = shadows.DONE
-
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
+ $(Xfontcache_shadowmen)
SED = sed
@@ -57,7 +54,7 @@
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
@@ -68,8 +65,7 @@
FontCacheChangeCacheSettings \
FontCacheGetCacheStatistics
-shadows.DONE:
- -rm -f $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+Xfontcache_shadowmen = $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
+
+$(Xfontcache_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $@
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/libXfontcache-1.0.4/man/Xfontcache.man new/libXfontcache-1.0.5/man/Xfontcache.man
--- old/libXfontcache-1.0.4/man/Xfontcache.man 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/man/Xfontcache.man 2008-05-22 01:33:03.000000000 +0200
@@ -58,10 +58,10 @@
.fi
.HP
Bool FontCacheQueryExtension(Display *\fIdpy\fP,
-int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.HP
-Status FontCacheQueryVersion(Display *\fIdpy\fP, int *\fImajor_versionp\fP,
-int *\fIminor_versionp\fP\^);
+Status FontCacheQueryVersion(Display *\fIdpy\fP, int *\fImajor_version_return\fP,
+int *\fIminor_version_return\fP\^);
.HP
Status FontCacheGetCacheSettings(Display *\fIdpy\fP,
FontCacheSettings *\fIcache info\fP);
@@ -95,9 +95,9 @@
.B True
if the request succeeded; the values of the major and minor protocol
versions supported by the server are returned in
-.I major_versionp
+.I major_version_return
and
-.I minor_versionp .
+.I minor_version_return .
.PP
.B FontCacheGetCacheSettings
should be documented here.
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/libXfontcache-1.0.4/missing new/libXfontcache-1.0.5/missing
--- old/libXfontcache-1.0.4/missing 2006-12-16 00:23:16.000000000 +0100
+++ new/libXfontcache-1.0.5/missing 2009-10-08 22:31:17.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# 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
@@ -33,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.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,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
@@ -86,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 $?
;;
@@ -103,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).
-case "$1" in
- lex|yacc)
+# 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)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,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
@@ -145,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
@@ -154,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
@@ -164,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";;
@@ -184,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
@@ -192,8 +203,8 @@
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
@@ -207,80 +218,78 @@
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
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 $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)
+ 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
\`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)
+ 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
@@ -289,11 +298,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- 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 -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ 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
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,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
@@ -356,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/libXfontcache-1.0.4/README new/libXfontcache-1.0.5/README
--- old/libXfontcache-1.0.4/README 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/README 2009-02-03 04:23:24.000000000 +0100
@@ -0,0 +1,25 @@
+Xfontcache - X-TrueType font cache extension client library
+
+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/lib/libXfontcache
+
+ http://cgit.freedesktop.org/xorg/lib/libXfontcache
+
+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/libXfontcache-1.0.4/src/FontCache.c new/libXfontcache-1.0.5/src/FontCache.c
--- old/libXfontcache-1.0.4/src/FontCache.c 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/src/FontCache.c 2008-05-22 01:33:03.000000000 +0200
@@ -82,13 +82,15 @@
*****************************************************************************/
Bool
-FontCacheQueryExtension(Display *dpy, int *event_basep, int *error_basep)
+FontCacheQueryExtension(Display *dpy,
+ int *event_base_return,
+ int *error_base_return)
{
XExtDisplayInfo *info = find_display (dpy);
if (XextHasExtension(info)) {
- *event_basep = info->codes->first_event;
- *error_basep = info->codes->first_error;
+ *event_base_return = info->codes->first_event;
+ *error_base_return = info->codes->first_error;
return True;
} else {
return False;
@@ -96,7 +98,9 @@
}
Bool
-FontCacheQueryVersion(Display *dpy, int *majorVersion, int *minorVersion)
+FontCacheQueryVersion(Display *dpy,
+ int *major_version_return,
+ int *minor_version_return)
{
XExtDisplayInfo *info = find_display (dpy);
xFontCacheQueryVersionReply rep;
@@ -113,8 +117,8 @@
SyncHandle();
return False;
}
- *majorVersion = rep.majorVersion;
- *minorVersion = rep.minorVersion;
+ *major_version_return = rep.majorVersion;
+ *minor_version_return = rep.minorVersion;
UnlockDisplay(dpy);
SyncHandle();
return True;
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/libXfontcache-1.0.4/src/Makefile.am new/libXfontcache-1.0.5/src/Makefile.am
--- old/libXfontcache-1.0.4/src/Makefile.am 2006-12-06 17:16:37.000000000 +0100
+++ new/libXfontcache-1.0.5/src/Makefile.am 2009-10-08 22:20:03.000000000 +0200
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(XFONTCACHE_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XFONTCACHE_CFLAGS) $(MALLOC_ZERO_CFLAGS)
lib_LTLIBRARIES = libXfontcache.la
libXfontcache_la_SOURCES = \
++++++ libXvMC-1.0.5.tar.bz2 -> libXvMC-1.0.6.tar.bz2 ++++++
++++ 60499 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/libXvMC-1.0.5/ChangeLog new/libXvMC-1.0.6/ChangeLog
--- old/libXvMC-1.0.5/ChangeLog 2009-10-06 22:24:19.000000000 +0200
+++ new/libXvMC-1.0.6/ChangeLog 2010-08-14 07:03:22.000000000 +0200
@@ -1,3 +1,153 @@
+commit 97d0572191368f47854c795e524610e529787c85
+Author: Alan Coopersmith
+Date: Fri Aug 13 22:00:11 2010 -0700
+
+ libXvMC 1.0.6
+
+ Signed-off-by: Alan Coopersmith
+
+commit 9d2e636fa0fe21bfa483c18fa7ca63368a05ef35
+Author: Alan Coopersmith
+Date: Fri Aug 13 22:01:39 2010 -0700
+
+ Remove unnecessary statements from configure.ac
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4d78d748cbf4a393ef12222c44b5f7adb2d3539f
+Author: Jesse Adkins
+Date: Mon Jul 12 20:04:46 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+ Signed-off-by: Alan Coopersmith
+
+commit e003c948a51af2d89a23fb697ec44aab970ce853
+Author: Fernando Carrijo
+Date: Thu Jul 1 07:06:17 2010 -0300
+
+ Purge macro NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo
+ Acked-by: Tiago Vignatti
+ Reviewed-by: Alan Coopersmith
+
+commit bea7d18c45b8d09c27a7e8c181b6efd27c4a36d7
+Author: Gaetan Nadon
+Date: Mon Mar 29 14:53:49 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 92e902daab4eeb0acddd4e0def2d6009459e3220
+Author: Gaetan Nadon
+Date: Thu Jan 14 10:06:05 2010 -0500
+
+ COPYING: replace stub with actual copyright notices
+
+ Refer to: XvMCWrapper.c
+ Copyright (c) 2004 The Unichrome project.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 52c17bfbe2a50c9117ad92843f34e94be4f09c5e
+Author: Alan Coopersmith
+Date: Fri Dec 11 12:54:03 2009 -0800
+
+ Bug 25592: Use $(docdir) for XvMC_API.txt install path
+
+ Bumps minimum autoconf version required to 2.60 for $(docdir)
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Dan Nicholson
+
+commit c53bfd6679f842a5a061904740d86932bbbda6c6
+Author: Gaetan Nadon
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit a75f52662c22048dc80a9f8d310364c458da470c
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 9c441d4a5438caa37dd413ab2acbb4a117125e44
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:26 2009 -0400
+
+ 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 3a75ec2dda5f065e4d3eca15653c652690f4aa38
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:43 2009 -0400
+
+ 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 5eccd90ff407b9f780b4a0d6d1e48e0891f56594
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .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 276759b34432cea1f6c7eda995d65140b72169c0
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:26 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston
+
+commit efaafb5e74c7484f7e1c0f6f0fc34d75a0f7c14d
+Author: Jeremy Huddleston
+Date: Tue Oct 20 14:42:03 2009 -0700
+
+ Include XvMClib.h
+
+ This fixes compilation breakage after 9190399907610486001f3676945958dbab4b837a in videoproto
+
+ Found by tinderbox
+
+ Signed-off-by: Jeremy Huddleston
+
commit 4c41a40c3e4344c67cda020fbc2eb479ba06fc9e
Author: Alan Coopersmith
Date: Tue Oct 6 13:20:36 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/libXvMC-1.0.5/config.h.in new/libXvMC-1.0.6/config.h.in
--- old/libXvMC-1.0.5/config.h.in 2009-10-06 22:21:11.000000000 +0200
+++ new/libXvMC-1.0.6/config.h.in 2010-08-14 07:02:55.000000000 +0200
@@ -33,6 +33,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -48,6 +52,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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/libXvMC-1.0.5/configure.ac new/libXvMC-1.0.6/configure.ac
--- old/libXvMC-1.0.5/configure.ac 2009-10-06 22:20:06.000000000 +0200
+++ new/libXvMC-1.0.6/configure.ac 2010-08-14 07:02:41.000000000 +0200
@@ -20,26 +20,27 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libXvMC, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXvMC)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libXvMC],
+ [1.0.6],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXvMC])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+# 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
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
-AC_SUBST(XVMC_CFLAGS)
-AC_SUBST(XVMC_LIBS)
AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
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/libXvMC-1.0.5/COPYING new/libXvMC-1.0.6/COPYING
--- old/libXvMC-1.0.5/COPYING 2006-07-11 20:06:02.000000000 +0200
+++ new/libXvMC-1.0.6/COPYING 2010-01-30 08:40:31.000000000 +0100
@@ -1,12 +1,20 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2004 The Unichrome project. All rights reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, 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:
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.5/include/X11/extensions/XvMClib.h new/libXvMC-1.0.6/include/X11/extensions/XvMClib.h
--- old/libXvMC-1.0.5/include/X11/extensions/XvMClib.h 2006-07-11 20:06:02.000000000 +0200
+++ new/libXvMC-1.0.6/include/X11/extensions/XvMClib.h 2010-08-14 07:02:41.000000000 +0200
@@ -1,6 +1,3 @@
-/* $XdotOrg: xc/include/extensions/XvMClib.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */
-/* $XFree86: xc/include/extensions/XvMClib.h,v 1.6 2001/11/14 21:54:37 mvojkovi Exp $ */
-
#ifndef _XVMCLIB_H_
#define _XVMCLIB_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/libXvMC-1.0.5/INSTALL new/libXvMC-1.0.6/INSTALL
--- old/libXvMC-1.0.5/INSTALL 2006-07-11 20:06:02.000000000 +0200
+++ new/libXvMC-1.0.6/INSTALL 2010-08-14 07:03:22.000000000 +0200
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.5/Makefile.am new/libXvMC-1.0.6/Makefile.am
--- old/libXvMC-1.0.5/Makefile.am 2009-10-02 08:11:57.000000000 +0200
+++ new/libXvMC-1.0.6/Makefile.am 2010-04-10 02:47:06.000000000 +0200
@@ -24,17 +24,19 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xvmc.pc
-xvmcdocdir = $(datadir)/doc/$(PACKAGE)
-dist_xvmcdoc_DATA = XvMC_API.txt
+dist_doc_DATA = XvMC_API.txt
-EXTRA_DIST = xvmc.pc.in ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
if LINT
lint:
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/libXvMC-1.0.5/src/XvMC.c new/libXvMC-1.0.6/src/XvMC.c
--- old/libXvMC-1.0.5/src/XvMC.c 2006-09-27 03:31:21.000000000 +0200
+++ new/libXvMC-1.0.6/src/XvMC.c 2010-08-14 07:02:41.000000000 +0200
@@ -1,7 +1,3 @@
-/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.4 2001/11/14 21:54:38 mvojkovi Exp $ */
-
-#define NEED_REPLIES
-
#ifdef HAVE_CONFIG_H
#include
#endif
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/libXvMC-1.0.5/src/XvMClibint.h new/libXvMC-1.0.6/src/XvMClibint.h
--- old/libXvMC-1.0.5/src/XvMClibint.h 2009-02-03 05:46:43.000000000 +0100
+++ new/libXvMC-1.0.6/src/XvMClibint.h 2010-08-14 07:02:41.000000000 +0200
@@ -1,8 +1,5 @@
-/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.4 2001/07/25 15:04:54 dawes Exp $ */
-
#ifndef _XVMCLIBINT_H
#define _XVMCLIBINT_H
-#define NEED_REPLIES
#include
#include
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/libXvMC-1.0.5/src/XvMCWrapper.c new/libXvMC-1.0.6/src/XvMCWrapper.c
--- old/libXvMC-1.0.5/src/XvMCWrapper.c 2009-02-03 05:46:43.000000000 +0100
+++ new/libXvMC-1.0.6/src/XvMCWrapper.c 2009-10-22 06:29:56.000000000 +0200
@@ -44,7 +44,9 @@
#include "config.h"
#endif
+#include
#include
+#include
#include
#include
#include
++++++ libXxf86misc-X11R7.1-1.0.1.tar.bz2 -> libXxf86misc-1.0.2.tar.bz2 ++++++
++++ 38433 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/libXxf86misc-X11R7.1-1.0.1/autogen.sh new/libXxf86misc-1.0.2/autogen.sh
--- old/libXxf86misc-X11R7.1-1.0.1/autogen.sh 2005-09-26 22:52:04.000000000 +0200
+++ new/libXxf86misc-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +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/libXxf86misc-X11R7.1-1.0.1/ChangeLog new/libXxf86misc-1.0.2/ChangeLog
--- old/libXxf86misc-X11R7.1-1.0.1/ChangeLog 2006-04-27 02:26:02.000000000 +0200
+++ new/libXxf86misc-1.0.2/ChangeLog 2009-10-09 07:22:46.000000000 +0200
@@ -1,59 +1,240 @@
-2006-04-26 Adam Jackson
+commit 74b475b59fd0da95f91e75d5f32276e87dda6f3f
+Author: Alan Coopersmith
+Date: Thu Oct 8 22:21:41 2009 -0700
- * configure.ac:
- Bump to 1.0.1
+ libXxf86misc 1.0.2
+
+ Signed-off-by: Alan Coopersmith
-2006-02-12 Alan Coopersmith
+commit 6f5d7342b4192db164913106b5630ebb91d067ca
+Author: Alan Coopersmith
+Date: Thu Oct 8 22:21:03 2009 -0700
- * man/Makefile.am:
- Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628
- Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3337b434ffc664d02e763dfba7e56f5942ad9544
+Author: Alan Coopersmith
+Date: Mon Feb 2 20:34:37 2009 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 860ee8b84e4df995ba241d16d9adbf5b7c77e5ae
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Feb 2 14:30:51 2009 -0200
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Janitor: ansification, make distcheck, compiler warnings, .gitignore.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6bc07578f11eecb1c67a6dd28861a0cbc03621c6
+Author: Matthieu Herrb
+Date: Sun Mar 9 08:49:52 2008 +0100
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ nuke RCS Ids
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b3b1c2f578fd68b3cea689876acf68807e2cb03a
+Author: James Cloos
+Date: Thu Dec 6 16:38:46 2007 -0500
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f4ed7977e3bd5a60df0d5df089a613462c04dc3f
+Author: James Cloos
+Date: Mon Sep 3 05:53:51 2007 -0400
- * xxf86misc.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2b2dbf791127a2d8a949546a5e6f5de3d3650b82
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:59:13 2006 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ renamed: .cvsignore -> .gitignore
-2005-10-11 Alan Coopersmith
+commit a2ff41b5721803eda53ef54bc5c7e3593724be1e
+Author: Adam Jackson
+Date: Thu Apr 27 00:26:02 2006 +0000
- * configure.ac:
- * man/Makefile.am:
- Use sed to put version number in man page
- Add shadow man pages for man pages that document multiple functions.
+ Bump to 1.0.1
-2005-07-08 Keith Packard
+commit 22e48fc3d8e8487592f451ae1b7590f2c519a2e3
+Author: Alan Coopersmith
+Date: Sun Feb 12 18:19:23 2006 +0000
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+ Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628 Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
+commit b679b8e1301f8667a326c03eb8c77ad5164f8c65
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:35 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit db2fdde2e48e58bfeace9a377a35b269120dcdd9
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:45 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 19c05a5b4bd42d9705333f528482195386c30f0f
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:45 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 9acf2665b699c19a38e90b3b46f91c950c91c8f3
+Author: Kevin E Martin
+Date: Sat Dec 3 04:41:52 2005 +0000
+
+ Add check and cflags for malloc(0) returning NULL.
+
+commit 23528bbea55e9307fb23f66d64d72d6ed0c68513
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:03:06 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 9115eddd12306b09e25f2f427fcbdb0d3ede4569
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:44 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 1d05751f145f3be2769426fc0df936f72f83dd56
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:12 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 5626a921068992168fd14a57f8d84a182cdca4e1
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:00:09 2005 +0000
+
+ Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit c378ef530457652deaecea308fe4ca71b08163df
+Author: Alan Coopersmith
+Date: Mon Oct 17 21:13:22 2005 +0000
+
+ Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+ suffix rule (reported by Matthieu Herrb)
+
+commit 7a1230b8f5c39faaef4e58035faa1715bc6b4554
+Author: Alan Coopersmith
+Date: Thu Oct 13 04:25:46 2005 +0000
+
+ Add generated man pages to .cvsignores
+
+commit b9ef575c4528a22404336d26a8691f0f1774a02b
+Author: Alan Coopersmith
+Date: Wed Oct 12 02:05:28 2005 +0000
+
+ [lib/Xxf86misc]
+ Use sed to put version number in man page Add shadow man pages for man
+ pages that document multiple functions.
+
+commit aa62bb7d1da83bc18df406df0dff9cc2eff7d826
+Author: Kristian Høgsberg
+Date: Mon Sep 26 20:52:04 2005 +0000
+
+ Simple whitespace change to change ownership of ,v file on server. Needed
+ to change permissions of this file.
+
+commit dee00077229d2bb91c6561587e84e86436346689
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:53 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 1ffe76acba6266c8f47af96d1f9bbc46d4b5dcf4
+Author: Keith Packard
+Date: Sat Jul 9 21:08:53 2005 +0000
+
+ Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+
+commit 69ae5c35260f8f92063a3e6953f51702c4f0b4eb
+Author: Alan Coopersmith
+Date: Fri Jul 1 16:16:15 2005 +0000
+
+ spell freedesktop.org correctly
+
+commit 6303c89f331dc585bf28fd04f8a1018693e89569
+Author: Søren Sandmann Pedersen
+Date: Fri Jun 10 22:38:47 2005 +0000
+
+ Apply patch from Jeff Smith (whydoubt@yahoo.com):
+ - Add file linking for Xxf86misc, Xxf86dga, and Xxf86vm.
+ - Check in build system for Xxf86misc, Xxf86dga, and Xxf86vm.
+
+commit 517aed7ebcd3a71177883b495c86a040483ac623
+Author: Egbert Eich
+Date: Fri Apr 23 19:23:08 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 12bba3408db8460ac2161bacd640aad80214a332
+Author: Egbert Eich
+Date: Sun Mar 14 08:33:12 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit e76d38fc568210a8e51ff91cc1c1108aaf3b4dd9
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 42998231f69e4b9f5e6d942bef5c1c65524937fb
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:46 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 7e6f2a280d503216f40d81f910164a33ab069a69
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 6f8f96c3be3918f62d530115f0577effc2f05367
+Author: Kaleb Keithley
+Date: Thu Dec 4 22:03:15 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit 3798fcf79de232d0c7b0f7056662e1782f9671a0
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:16 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 8e3405356146c0cd8c60327173b92ec1f2c1c5dd
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:54 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4dd2d68ec3d43170070810d8b2a5e18bbdc13079
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ Initial revision
+
+commit 418e916d78dbbc723fc6a5bb0315cf44f30360fa
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:49 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/libXxf86misc-X11R7.1-1.0.1/configure.ac new/libXxf86misc-1.0.2/configure.ac
--- old/libXxf86misc-X11R7.1-1.0.1/configure.ac 2006-04-27 02:26:02.000000000 +0200
+++ new/libXxf86misc-1.0.2/configure.ac 2009-10-09 07:21:26.000000000 +0200
@@ -1,21 +1,26 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc)
+AC_INIT(libXxf86misc, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# 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)
+
AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_DEFAULT_OPTIONS
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
src/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86misc-X11R7.1-1.0.1/Makefile.am new/libXxf86misc-1.0.2/Makefile.am
--- old/libXxf86misc-X11R7.1-1.0.1/Makefile.am 2005-06-11 00:38:47.000000000 +0200
+++ new/libXxf86misc-1.0.2/Makefile.am 2009-02-03 05:46:49.000000000 +0100
@@ -3,4 +3,12 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86misc.pc
-EXTRA_DIST = xxf86misc.pc.in autogen.sh
+EXTRA_DIST = xxf86misc.pc.in 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/libXxf86misc-X11R7.1-1.0.1/man/Makefile.am new/libXxf86misc-1.0.2/man/Makefile.am
--- old/libXxf86misc-X11R7.1-1.0.1/man/Makefile.am 2006-02-12 19:19:23.000000000 +0100
+++ new/libXxf86misc-1.0.2/man/Makefile.am 2009-10-09 07:18:25.000000000 +0200
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.6 2005/12/06 22:48:45 kem Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
@@ -31,14 +30,12 @@
libman_PRE = XF86Misc.man
-BUILT_SOURCES = shadows.DONE
-
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@)
+ $(XF86Misc_shadowmen)
SED = sed
@@ -56,7 +53,7 @@
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
@@ -70,8 +67,7 @@
XF86MiscGetKbdSettings \
XF86MiscSetKbdSettings
-shadows.DONE:
- -rm -f $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+XF86Misc_shadowmen = $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@)
+
+$(XF86Misc_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $@
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/libXxf86misc-X11R7.1-1.0.1/man/XF86Misc.man new/libXxf86misc-1.0.2/man/XF86Misc.man
--- old/libXxf86misc-X11R7.1-1.0.1/man/XF86Misc.man 2004-04-23 21:23:08.000000000 +0200
+++ new/libXxf86misc-1.0.2/man/XF86Misc.man 2006-07-11 20:06:08.000000000 +0200
@@ -1,4 +1,4 @@
-.\" $XdotOrg: lib/Xxf86misc/man/XF86Misc.man,v 1.2 2004/04/23 19:23:08 eich Exp $
+.\" $XdotOrg$
.\" $TOG: XF86Misc.man /main/7 1997/07/19 10:30:32 kaleb $
.\"
.\"
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/libXxf86misc-X11R7.1-1.0.1/missing new/libXxf86misc-1.0.2/missing
--- old/libXxf86misc-X11R7.1-1.0.1/missing 2006-05-22 03:45:27.000000000 +0200
+++ new/libXxf86misc-1.0.2/missing 2009-10-09 07:22:27.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# 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
@@ -33,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.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,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
@@ -86,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 $?
;;
@@ -103,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).
-case "$1" in
- lex|yacc)
+# 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)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,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
@@ -145,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
@@ -154,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
@@ -164,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";;
@@ -184,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
@@ -192,8 +203,8 @@
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
@@ -207,80 +218,78 @@
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
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 $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)
+ 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
\`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)
+ 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
@@ -289,11 +298,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- 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 -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ 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
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,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
@@ -356,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/libXxf86misc-X11R7.1-1.0.1/README new/libXxf86misc-1.0.2/README
--- old/libXxf86misc-X11R7.1-1.0.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86misc-1.0.2/README 2009-02-03 05:46:49.000000000 +0100
@@ -0,0 +1,25 @@
+libXxf86misc - Extension library for the XFree86-Misc X extension.
+
+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/lib/libXxf86misc
+
+ http://cgit.freedesktop.org/xorg/lib/libXxf86misc
+
+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/libXxf86misc-X11R7.1-1.0.1/src/config.h.in new/libXxf86misc-1.0.2/src/config.h.in
--- old/libXxf86misc-X11R7.1-1.0.1/src/config.h.in 2006-05-22 03:45:25.000000000 +0200
+++ new/libXxf86misc-1.0.2/src/config.h.in 2009-10-09 07:22:24.000000000 +0200
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
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/libXxf86misc-X11R7.1-1.0.1/src/Makefile.am new/libXxf86misc-1.0.2/src/Makefile.am
--- old/libXxf86misc-X11R7.1-1.0.1/src/Makefile.am 2005-12-03 05:41:52.000000000 +0100
+++ new/libXxf86misc-1.0.2/src/Makefile.am 2009-10-09 07:15:12.000000000 +0200
@@ -2,6 +2,6 @@
libXxf86misc_la_SOURCES = XF86Misc.c
-AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
libXxf86misc_la_LDFLAGS = -version-number 1:1:0
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/libXxf86misc-X11R7.1-1.0.1/src/XF86Misc.c new/libXxf86misc-1.0.2/src/XF86Misc.c
--- old/libXxf86misc-X11R7.1-1.0.1/src/XF86Misc.c 2004-04-23 20:43:55.000000000 +0200
+++ new/libXxf86misc-1.0.2/src/XF86Misc.c 2009-02-03 05:46:49.000000000 +0100
@@ -56,9 +56,7 @@
* *
*****************************************************************************/
-Bool XF86MiscQueryExtension (dpy, event_basep, error_basep)
- Display *dpy;
- int *event_basep, *error_basep;
+Bool XF86MiscQueryExtension (Display *dpy, int *event_basep, int *error_basep)
{
XExtDisplayInfo *info = find_display (dpy);
@@ -71,10 +69,7 @@
}
}
-Bool XF86MiscQueryVersion(dpy, majorVersion, minorVersion)
- Display* dpy;
- int* majorVersion;
- int* minorVersion;
+Bool XF86MiscQueryVersion(Display* dpy, int* majorVersion, int* minorVersion)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscQueryVersionReply rep;
@@ -119,9 +114,7 @@
return True;
}
-Bool XF86MiscGetMouseSettings(dpy, mouseinfo)
- Display* dpy;
- XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscGetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscGetMouseSettingsReply rep;
@@ -165,9 +158,7 @@
return True;
}
-Bool XF86MiscGetKbdSettings(dpy, kbdinfo)
- Display* dpy;
- XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscGetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscGetKbdSettingsReply rep;
@@ -195,9 +186,7 @@
return True;
}
-Bool XF86MiscSetMouseSettings(dpy, mouseinfo)
- Display* dpy;
- XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscSetMouseSettingsReq *req;
@@ -235,9 +224,7 @@
return True;
}
-Bool XF86MiscSetKbdSettings(dpy, kbdinfo)
- Display* dpy;
- XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscSetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscSetKbdSettingsReq *req;
@@ -258,9 +245,7 @@
return True;
}
-int XF86MiscSetGrabKeysState(dpy, enable)
- Display* dpy;
- Bool enable;
+int XF86MiscSetGrabKeysState(Display* dpy, Bool enable)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscSetGrabKeysStateReply rep;
@@ -284,9 +269,7 @@
return rep.status;
}
-Bool XF86MiscGetFilePaths(dpy, filpaths)
- Display* dpy;
- XF86MiscFilePaths *filpaths;
+Bool XF86MiscGetFilePaths(Display* dpy, XF86MiscFilePaths *filpaths)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscGetFilePathsReply rep;
@@ -354,12 +337,9 @@
return True;
}
-Status XF86MiscPassMessage(dpy, screen, msgtype, msgval, retmsg)
- Display* dpy;
- int screen;
- const char* msgtype;
- const char* msgval;
- char** retmsg;
+Status XF86MiscPassMessage(Display* dpy, int screen,
+ const char* msgtype, const char* msgval,
+ char** retmsg)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscPassMessageReply rep;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org