Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Thu Sep 23 23:58:51 CEST 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-09-05 12:57:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-22 09:43:01.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 22 07:16:26 UTC 2010 - sndirsch@novell.com
+
+- x11perf 1.5.2
+ minor maintenance release, which mostly includes build-time
+ improvements, along with one small feature addition, the
+ "-falseprecision" command line flag.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
x11perf-1.5.1.tar.bz2
New:
----
x11perf-1.5.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.S8Ebln/_old 2010-09-23 23:58:26.000000000 +0200
+++ /var/tmp/diff_new_pack.S8Ebln/_new 2010-09-23 23:58:26.000000000 +0200
@@ -22,7 +22,7 @@
BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel 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-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 18
+Release: 19
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -58,7 +58,7 @@
Source24: smproxy-1.0.3.tar.bz2
Source25: twm-1.0.4.tar.bz2
Source26: viewres-1.0.2.tar.bz2
-Source27: x11perf-1.5.1.tar.bz2
+Source27: x11perf-1.5.2.tar.bz2
Source28: xauth-1.0.4.tar.bz2
Source29: xbiff-1.0.2.tar.bz2
Source30: xcalc-1.0.3.tar.bz2
++++++ x11perf-1.5.1.tar.bz2 -> x11perf-1.5.2.tar.bz2 ++++++
++++ 9366 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/x11perf-1.5.1/COPYING new/x11perf-1.5.2/COPYING
--- old/x11perf-1.5.1/COPYING 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/COPYING 2010-08-06 17:33:58.000000000 +0200
@@ -1,12 +1,31 @@
-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 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
-Please submit updated COPYING files to the Xorg bugzilla:
+ All Rights Reserved
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+****************************************************************************
+
+Copyright (c) 1993 by Hewlett-Packard Company
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both the copyright notice and this permission notice appear in
+supporting documentation, and that the name of Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
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/x11perf-1.5.1/ChangeLog new/x11perf-1.5.2/ChangeLog
--- old/x11perf-1.5.1/ChangeLog 2009-10-17 02:20:27.000000000 +0200
+++ new/x11perf-1.5.2/ChangeLog 2010-09-22 05:49:00.000000000 +0200
@@ -1,3 +1,162 @@
+commit 3147d783925bb42c7af78c9f5508c0dc245b942b
+Author: Alan Coopersmith
+Date: Tue Sep 21 20:48:33 2010 -0700
+
+ x11perf 1.5.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 172260eee2180448594def3fcf719ce501528e56
+Author: Alan Coopersmith
+Date: Tue Sep 21 20:46:39 2010 -0700
+
+ 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: Alan Coopersmith
+
+commit c4b59fd280aa0f647f7f889122adf8b92b9e5cf8
+Author: Alan Coopersmith
+Date: Tue Sep 21 20:43:58 2010 -0700
+
+ config: use AC_PROG_CC & AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+
+ The existing statements can now be removed from the configuration file.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4ed4ff8d692293995910da29e4d05ad9191105ea
+Author: Alan Coopersmith
+Date: Tue Sep 21 20:42:54 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 1f990bc605d520f58e0c321a1338da76d76529fa
+Author: Timo Myyra
+Date: Sun Sep 19 10:54:40 2010 -0700
+
+ Remove reference to xbench in x11perf.man (#29830)
+
+ xbench isn't supported by fd.o, and searching for it shows the latest version released in 1995.
+
+ Signed-off-by: Jesse Adkins
+ Signed-off-by: Alan Coopersmith
+
+commit 05759c8550bf994f4ae4e87a658aa7ffdd9dd517
+Author: Alan Coopersmith
+Date: Fri Aug 6 08:34:31 2010 -0700
+
+ Add HP notice to COPYING for Xmark script
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3b427a6c4cc1551ce445abd975f5a128ea53d9be
+Author: Gaetan Nadon
+Date: Thu Jan 7 21:25:09 2010 -0500
+
+ COPYING: replace stub with actual copyright notice
+
+ Refer to x11perf.c
+ Copyright 1988, 1989 by Digital Equipment Corporation
+
+ Signed-off-by: Gaetan Nadon
+
+commit 374bee27ef4d45044f7562ffed162a5b6f095e40
+Author: Adam Jackson
+Date: Sat Jan 2 17:36:17 2010 -0500
+
+ Add -falseprecision flag for ludicrously precise stats
+
+ The normal round-to-three-significant-figures behaviour, while morally
+ correct from a benchmarking perspective, makes it impossible to measure
+ variances between runs of less than 1%. Occasionally you really do need
+ to measure that finely - for example, if tweaking the server's main
+ dispatch loop.
+
+ Signed-off-by: Adam Jackson
+
+commit af29c01b5d41f08053263dfe251d0a2a26c7eb1f
+Author: Adam Jackson
+Date: Sat Jan 2 17:23:50 2010 -0500
+
+ Death to RCS tags.
+
+ Signed-off-by: Adam Jackson
+
+commit f8193c3f472fb0b7357552d10a6033e8ac08b9fa
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:52 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit e6d0de5d8f13ca73753cb70b12b2f9b98f82b39f
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:08 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 5d3fb3c68c681cce10d3625bab85bb39c18e5e3b
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:38 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 6b8182c54689c67fa35ac471fcfc4e7ee73b7b91
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:15 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 1b811f2bf9c3cdef966b18ea802f1f79b5f34ef2
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:20 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 98ca2c35b05a2d248063047c50770a018e35e810
Author: Alan Coopersmith
Date: Fri Oct 16 17:19: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/x11perf-1.5.1/INSTALL new/x11perf-1.5.2/INSTALL
--- old/x11perf-1.5.1/INSTALL 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/INSTALL 2010-09-22 05:49:00.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/x11perf-1.5.1/Makefile.am new/x11perf-1.5.2/Makefile.am
--- old/x11perf-1.5.1/Makefile.am 2009-10-17 01:37:53.000000000 +0200
+++ new/x11perf-1.5.2/Makefile.am 2010-09-22 05:39:00.000000000 +0200
@@ -62,6 +62,7 @@
$(SED) s/XCOMM/\#/ > $@
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(bin_SCRIPTS) x11perfcomp
EXTRA_DIST = x11pcomp.cpp
@@ -73,34 +74,19 @@
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.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/x11perf-1.5.1/Xmark new/x11perf-1.5.2/Xmark
--- old/x11perf-1.5.1/Xmark 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/Xmark 2010-01-07 18:52:19.000000000 +0100
@@ -1,14 +1,10 @@
#! /bin/sh
-#$Xorg: Xmark.sh,v 1.3 2000/08/17 19:54:08 cpqbld Exp $
-#XPC Header: Xmark,v 1.15 93/04/12 10:10:07 hmgr Exp
#
############################################################
-# Xmark version XPC Revision: 1.15
#
# Usage: Xmark datafile
#
############################################################
-# $XFree86: xc/programs/x11perf/Xmark.sh,v 1.2 1997/01/04 12:20:20 dawes Exp $
#
#
# CHANGE HISTORY:
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/x11perf-1.5.1/Xmark.man new/x11perf-1.5.2/Xmark.man
--- old/x11perf-1.5.1/Xmark.man 2007-08-21 22:20:42.000000000 +0200
+++ new/x11perf-1.5.2/Xmark.man 2010-01-07 18:52:19.000000000 +0100
@@ -1,6 +1,5 @@
.\" This manpage was written by Richard Braakman and is licensed under the
.\" XFree86 license.
-.\" $XFree86: xc/programs/x11perf/Xmark.man,v 1.2 2001/01/24 00:06:42 dawes Exp $
.TH Xmark 1 __xorgversion__
.SH NAME
Xmark \- summarize x11perf results
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/x11perf-1.5.1/bitmaps.c new/x11perf-1.5.2/bitmaps.c
--- old/x11perf-1.5.1/bitmaps.c 2009-01-22 16:09:42.000000000 +0100
+++ new/x11perf-1.5.2/bitmaps.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: bitmaps.c,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
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/x11perf-1.5.1/bitmaps.h new/x11perf-1.5.2/bitmaps.h
--- old/x11perf-1.5.1/bitmaps.h 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/bitmaps.h 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: bitmaps.h,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.3 1999/03/02 11:49:28 dawes Exp $ */
/* Set fill style (if any) to a bitmap or tile */
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/x11perf-1.5.1/config.h.in new/x11perf-1.5.2/config.h.in
--- old/x11perf-1.5.1/config.h.in 2009-10-17 02:19:54.000000000 +0200
+++ new/x11perf-1.5.2/config.h.in 2010-09-22 05:48:48.000000000 +0200
@@ -48,6 +48,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/x11perf-1.5.1/configure.ac new/x11perf-1.5.2/configure.ac
--- old/x11perf-1.5.1/configure.ac 2009-10-17 02:17:53.000000000 +0200
+++ new/x11perf-1.5.2/configure.ac 2010-09-22 05:47:22.000000000 +0200
@@ -20,28 +20,23 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(x11perf,[1.5.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x11perf)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([x11perf],
+ [1.5.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [x11perf])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
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.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AC_PROG_INSTALL
-
XORG_DEFAULT_OPTIONS
-AC_PATH_PROG(SED,sed)
-if [[ -z $SED ]] ; then
- AC_MSG_ERROR([sed is needed to build x11perf])
-fi
-
AC_TYPE_SIGNAL
# Checks for pkg-config packages
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/x11perf-1.5.1/do_arcs.c new/x11perf-1.5.2/do_arcs.c
--- old/x11perf-1.5.1/do_arcs.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_arcs.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_arcs.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_arcs.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
#include "x11perf.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/x11perf-1.5.1/do_blt.c new/x11perf-1.5.2/do_blt.c
--- old/x11perf-1.5.1/do_blt.c 2009-01-22 16:09:42.000000000 +0100
+++ new/x11perf-1.5.2/do_blt.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_blt.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_blt.c,v 1.8 2001/05/01 16:19:16 alanh Exp $ */
#include "x11perf.h"
#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/x11perf-1.5.1/do_complex.c new/x11perf-1.5.2/do_complex.c
--- old/x11perf-1.5.1/do_complex.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_complex.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_complex.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.8 2001/07/25 15:05:16 dawes Exp $ */
#include "x11perf.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/x11perf-1.5.1/do_dots.c new/x11perf-1.5.2/do_dots.c
--- old/x11perf-1.5.1/do_dots.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_dots.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_dots.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_dots.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
#include "x11perf.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/x11perf-1.5.1/do_lines.c new/x11perf-1.5.2/do_lines.c
--- old/x11perf-1.5.1/do_lines.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_lines.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_lines.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_lines.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
#include "x11perf.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/x11perf-1.5.1/do_movewin.c new/x11perf-1.5.2/do_movewin.c
--- old/x11perf-1.5.1/do_movewin.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_movewin.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_movewin.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_movewin.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
#include "x11perf.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/x11perf-1.5.1/do_rects.c new/x11perf-1.5.2/do_rects.c
--- old/x11perf-1.5.1/do_rects.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_rects.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_rects.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_rects.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
#include "x11perf.h"
#include "bitmaps.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/x11perf-1.5.1/do_segs.c new/x11perf-1.5.2/do_segs.c
--- old/x11perf-1.5.1/do_segs.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_segs.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_segs.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_segs.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
#include "x11perf.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/x11perf-1.5.1/do_simple.c new/x11perf-1.5.2/do_simple.c
--- old/x11perf-1.5.1/do_simple.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_simple.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_simple.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.6tsi Exp $ */
#ifndef VMS
#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/x11perf-1.5.1/do_tests.c new/x11perf-1.5.2/do_tests.c
--- old/x11perf-1.5.1/do_tests.c 2007-12-08 02:36:54.000000000 +0100
+++ new/x11perf-1.5.2/do_tests.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_tests.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_tests.c,v 1.9 2002/05/13 05:27:37 keithp Exp $ */
#include "x11perf.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/x11perf-1.5.1/do_text.c new/x11perf-1.5.2/do_text.c
--- old/x11perf-1.5.1/do_text.c 2009-01-22 16:09:42.000000000 +0100
+++ new/x11perf-1.5.2/do_text.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_text.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_text.c,v 1.7 2001/01/17 23:45:12 dawes Exp $ */
#include "x11perf.h"
#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/x11perf-1.5.1/do_traps.c new/x11perf-1.5.2/do_traps.c
--- old/x11perf-1.5.1/do_traps.c 2009-01-22 16:09:42.000000000 +0100
+++ new/x11perf-1.5.2/do_traps.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_traps.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.9tsi Exp $ */
#include "x11perf.h"
#include "bitmaps.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/x11perf-1.5.1/do_tris.c new/x11perf-1.5.2/do_tris.c
--- old/x11perf-1.5.1/do_tris.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_tris.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_tris.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_tris.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
#undef POLYTRIANGLE_HACK /* don't use this code */
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/x11perf-1.5.1/do_valgc.c new/x11perf-1.5.2/do_valgc.c
--- old/x11perf-1.5.1/do_valgc.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_valgc.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_valgc.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_valgc.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
#ifndef VMS
#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/x11perf-1.5.1/do_windows.c new/x11perf-1.5.2/do_windows.c
--- old/x11perf-1.5.1/do_windows.c 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/do_windows.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: do_windows.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_windows.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
#include "x11perf.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/x11perf-1.5.1/x11pcomp.cpp new/x11perf-1.5.2/x11pcomp.cpp
--- old/x11perf-1.5.1/x11pcomp.cpp 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/x11pcomp.cpp 2010-01-07 18:52:19.000000000 +0100
@@ -19,7 +19,6 @@
XCOMM Mark Moraes, University of Toronto
XCOMM Joel McCormack, DEC Western Research Lab
XCOMM
-XCOMM $Xorg: x11pcomp.cpp,v 1.3 2000/08/17 19:54:10 cpqbld Exp $
PATH=LIBPATH:.:$PATH
export PATH
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/x11perf-1.5.1/x11perf.c new/x11perf-1.5.2/x11perf.c
--- old/x11perf-1.5.1/x11perf.c 2009-01-22 16:09:42.000000000 +0100
+++ new/x11perf-1.5.2/x11perf.c 2010-01-07 18:52:19.000000000 +0100
@@ -1,5 +1,3 @@
-/* $Xorg: x11perf.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
-/* $XdotOrg: app/x11perf/x11perf.c,v 1.3 2005/07/26 18:55:42 alanc Exp $ */
/****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -22,7 +20,6 @@
SOFTWARE.
****************************************************************************/
-/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.6 2001/11/03 21:59:20 dawes Exp $ */
#include
#include
@@ -43,6 +40,7 @@
/* Only for working on ``fake'' servers, for hardware that doesn't exist */
static Bool drawToFakeServer = False;
+static Bool falsePrecision = False;
static Pixmap tileToQuery = None;
static char *displayName;
int abortTest;
@@ -252,9 +250,11 @@
{
/* It's kind of silly to print out things like ``193658.4/sec'' so just
junk all but 3 most significant digits. */
-
double exponent, sign;
+ if (falsePrecision)
+ return d;
+
exponent = 1.0;
/* the code below won't work if d should happen to be non-positive. */
if (d < 0.0) {
@@ -977,10 +977,12 @@
foundOne = True;
} else if (strcmp (argv[i], "-sync") == 0) {
synchronous = True;
- } else if (strcmp(argv[i], "-pack") == 0) {
+ } else if (strcmp (argv[i], "-pack") == 0) {
xparms.pack = True;
} else if (strcmp (argv[i], "-draw") == 0) {
drawToFakeServer = True;
+ } else if (strcmp (argv[i], "-falseprecision") == 0) {
+ falsePrecision = True;
} else if (strcmp (argv[i], "-repeat") == 0) {
i++;
if (argc <= i)
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/x11perf-1.5.1/x11perf.h new/x11perf-1.5.2/x11perf.h
--- old/x11perf-1.5.1/x11perf.h 2007-09-28 01:52:16.000000000 +0200
+++ new/x11perf-1.5.2/x11perf.h 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: x11perf.h,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@
SOFTWARE.
******************************************************************************/
-/* $XFree86: xc/programs/x11perf/x11perf.h,v 3.4 2001/07/25 15:05:16 dawes Exp $ */
#if HAVE_CONFIG_H
#include "config.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/x11perf-1.5.1/x11perf.man new/x11perf-1.5.2/x11perf.man
--- old/x11perf-1.5.1/x11perf.man 2007-04-12 00:42:32.000000000 +0200
+++ new/x11perf-1.5.2/x11perf.man 2010-09-22 05:16:24.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: x11perf.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
.\" Copyright 1988, 1989 Digital Equipment Corporation.
.\" Copyright 1989, 1994, 1998 The Open Group
.\"
@@ -24,7 +23,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.8 2001/12/14 20:01:14 dawes Exp $
.\"
.TH X11PERF 1 __xorgversion__
.SH NAME
@@ -1003,7 +1001,7 @@
.SH X DEFAULTS
There are no X defaults used by this program.
.SH "SEE ALSO"
-X(__miscmansuffix__), xbench(1), x11perfcomp(1)
+X(__miscmansuffix__), x11perfcomp(1)
.SH AUTHORS
Joel McCormack
.br
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/x11perf-1.5.1/x11perfcomp.man new/x11perf-1.5.2/x11perfcomp.man
--- old/x11perf-1.5.1/x11perfcomp.man 2006-07-11 04:51:54.000000000 +0200
+++ new/x11perf-1.5.2/x11perfcomp.man 2010-01-07 18:52:19.000000000 +0100
@@ -1,4 +1,3 @@
-.\" $Xorg: x11pcomp.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
.\" Copyright 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.7 2001/01/27 18:21:07 dawes Exp $
.\"
.TH X11PERFCOMP 1 __xorgversion__
.SH NAME
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org