debian/changelog | 10 debian/control | 6 debian/copyright | 19 debian/upstream/signing-key.asc | 111 rendercheck/COPYING | 19 rendercheck/ChangeLog | 333 + rendercheck/INSTALL | 121 rendercheck/Makefile.am | 3 rendercheck/Makefile.in | 433 +- rendercheck/aclocal.m4 | 5004 ++++++++++++++++------------ rendercheck/config.guess | 561 +-- rendercheck/config.sub | 259 - rendercheck/configure | 6751 ++++++++++++++++++++++++++++++++++++--- rendercheck/configure.ac | 6 rendercheck/depcomp | 531 +-- rendercheck/doc/TODO | 3 rendercheck/install-sh | 35 rendercheck/main.c | 118 rendercheck/man/Makefile.in | 135 rendercheck/missing | 461 -- rendercheck/ops.c | 8 rendercheck/rendercheck.h | 78 rendercheck/t_blend.c | 149 rendercheck/t_bug7366.c | 2 rendercheck/t_composite.c | 201 - rendercheck/t_dstcoords.c | 16 rendercheck/t_fill.c | 16 rendercheck/t_gradient.c | 13 rendercheck/t_gtk_argb_xbgr.c | 150 rendercheck/t_libreoffice_xrgb.c | 165 rendercheck/t_repeat.c | 75 rendercheck/t_srccoords.c | 18 rendercheck/t_triangles.c | 82 rendercheck/t_tsrccoords.c | 63 rendercheck/t_tsrccoords2.c | 23 rendercheck/tests.c | 363 +- 36 files changed, 12226 insertions(+), 4115 deletions(-)
New commits: commit 4b4c1b475a30de706165d8c410645af5ab2e4062 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 13:37:13 2016 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 8fceac5..6b25056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -x11-apps (7.7+6) UNRELEASED; urgency=medium +x11-apps (7.7+6) unstable; urgency=medium + * Team upload. * Add Dave Airlie's key to debian/upstream/signing-key.asc. * rendercheck 1.5. * Update Vcs-* control fields. * Bump Standards-Version to 3.9.8 (no changes needed). - -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 13:03:22 +0200 + -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 13:31:11 +0200 x11-apps (7.7+5+nmu1) unstable; urgency=medium commit 0e14b46cc541591af2e5e8b69650bf0337c0810d Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 13:31:10 2016 +0200 Bump Standards-Version to 3.9.8 (no changes needed). diff --git a/debian/changelog b/debian/changelog index fa2344c..8fceac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x11-apps (7.7+6) UNRELEASED; urgency=medium * Add Dave Airlie's key to debian/upstream/signing-key.asc. * rendercheck 1.5. * Update Vcs-* control fields. + * Bump Standards-Version to 3.9.8 (no changes needed). -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 13:03:22 +0200 diff --git a/debian/control b/debian/control index ffb2842..84dbd6a 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,7 @@ Build-Depends: # xmore: libxaw7-dev, libxt-dev # xwd: libx11-dev, x11proto-core-dev # xwud: libx11-dev -Standards-Version: 3.9.3 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git commit 7f18ec731736f7fbe558a117b56b8be6c4311fe0 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 13:25:46 2016 +0200 Update Vcs-* control fields. diff --git a/debian/changelog b/debian/changelog index 0bcad2a..fa2344c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11-apps (7.7+6) UNRELEASED; urgency=medium * Add Dave Airlie's key to debian/upstream/signing-key.asc. * rendercheck 1.5. + * Update Vcs-* control fields. -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 13:03:22 +0200 diff --git a/debian/control b/debian/control index 9955f04..ffb2842 100644 --- a/debian/control +++ b/debian/control @@ -52,8 +52,8 @@ Build-Depends: # xwd: libx11-dev, x11proto-core-dev # xwud: libx11-dev Standards-Version: 3.9.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git Package: x11-apps Architecture: any commit 69bc2556b8de053bc0cca07a8132120fb1079c05 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 13 13:14:24 2016 +0200 rendercheck 1.5. diff --git a/debian/changelog b/debian/changelog index 1cd1739..0bcad2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11-apps (7.7+6) UNRELEASED; urgency=medium * Add Dave Airlie's key to debian/upstream/signing-key.asc. + * rendercheck 1.5. -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 13:03:22 +0200 diff --git a/debian/copyright b/debian/copyright index dc32bf3..cb8a6a9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -145,6 +145,25 @@ oclock: tium. rendercheck: + Rendercheck is a combination of GPLv2-or-later and MIT-licensed code. + + /* Copyright © 2014 Keith Packard <kei...@keithp.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + Copyright 2004 Eric Anholt Permission to use, copy, modify, distribute, and sell this software and its diff --git a/rendercheck/COPYING b/rendercheck/COPYING index af1d06b..efe8756 100644 --- a/rendercheck/COPYING +++ b/rendercheck/COPYING @@ -1,3 +1,22 @@ +Rendercheck is a combination of GPLv2-or-later and MIT-licensed code. + +/* Copyright © 2014 Keith Packard <kei...@keithp.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + Copyright 2004 Eric Anholt Permission to use, copy, modify, distribute, and sell this software and its diff --git a/rendercheck/ChangeLog b/rendercheck/ChangeLog index cad0f3f..3be2ef9 100644 --- a/rendercheck/ChangeLog +++ b/rendercheck/ChangeLog @@ -1,3 +1,336 @@ +commit 604e3bbe6d8d96bec284a83c08c5cc5f159a243c +Author: Dave Airlie <airl...@redhat.com> +Date: Thu Jun 11 18:23:21 2015 +1000 + + rendercheck 1.5 + + Signed-off-by: Dave Airlie <airl...@redhat.com> + +commit 0f00d5ac7cb0052dbe6357023154fc97759a58f1 +Author: Dave Airlie <airl...@redhat.com> +Date: Thu Jun 4 12:23:55 2015 +1000 + + rendercheck: constrain accuracy + + This fixes a bunch of Dst operator, when the dst color + is r5g5b5. + + Signed-off-by: Dave Airlie <airl...@redhat.com> + +commit 51fed2fd1252eb8165489e918a478083b32ce4bf +Author: Dave Airlie <airl...@redhat.com> +Date: Thu Jun 4 12:21:57 2015 +1000 + + rendercheck: make gradient results align with pixman + + This makes rendercheck at least useful for regression testing, + + 18731 tests passed of 51681 total + to + 49373 tests passed of 51681 total + + Signed-off-by: Dave Airlie <airl...@redhat.com> + +commit e1f078ad514fc10bfa8f9f4f9f005aad91b08b42 +Author: Eric Anholt <e...@anholt.net> +Date: Tue Apr 22 15:24:50 2014 -0700 + + Add test for a rendering bug in libreoffice. + + After changing the get/putimage code in glamor, we found a render + regression that was surprisingly not caught by rendercheck. + + v2: Add a variant with using the GC to invert the bits that were put, + which reproduces the problem on master. + +commit 589bb58df06f6cf3b5e92c05f8cf6f997f31ab12 +Author: Eric Anholt <e...@anholt.net> +Date: Mon Apr 21 09:06:28 2014 -0700 + + Add test for GTK rendering bug in glamor. + + I converted this from a standalone testcase Keith sent me to a + rendercheck test, with a reformat and a minor fixup to make sure we + actually found the PictFormats we wanted. + + Signed-off-by: Eric Anholt <e...@anholt.net> + Acked-by: Keith Packard <kei...@keithp.com> + +commit 03934f1569b9e0a357e016350985b803f7b5572d +Author: Eric Anholt <e...@anholt.net> +Date: Mon Apr 21 10:14:09 2014 -0700 + + Shut up some const assignment warnings. + + Trying to make all the callchain related to these const is too hard, and + it's not like marking things const helps either the developer or the + compiler. + + Signed-off-by: Eric Anholt <e...@anholt.net> + Acked-by: Keith Packard <kei...@keithp.com> + +commit 6d8f7991a7d38f81808499148e047edb0434611e +Author: Eric Anholt <e...@anholt.net> +Date: Mon Apr 21 10:10:24 2014 -0700 + + Disable useless shadow warnings. + + They never find real bugs in my experience. + + Signed-off-by: Eric Anholt <e...@anholt.net> + Acked-by: Keith Packard <kei...@keithp.com> + +commit fee01994a780ba84b37bc814845d5f9948e89f0b +Author: Eric Anholt <e...@anholt.net> +Date: Mon Apr 21 09:42:46 2014 -0700 + + Convert to using asprintf for describe_format. + + This simplifies the manual strcatting mess and avoids potential overflow + issues. + + Signed-off-by: Eric Anholt <e...@anholt.net> + Acked-by: Keith Packard <kei...@keithp.com> + +commit 7f8da66d9ae4ac542970e8e2f5e73e7ab7a7c3c2 +Author: Eric Anholt <e...@anholt.net> +Date: Mon Apr 21 09:35:11 2014 -0700 + + Fix const cast warnings in our ops definitions. + + We only store string literals here. + + Signed-off-by: Eric Anholt <e...@anholt.net> + Acked-by: Keith Packard <kei...@keithp.com> + +commit 2fd815135e7769aa9dd0d3b8cb558350ba7eb70d +Author: Matt Craighead <mcraigh...@nvidia.com> +Date: Mon Jan 20 15:06:06 2014 -0800 + + fix compiler warnings + + Removed redundant declarations. Removed an unused variable. + Fixed the sign of some loop variables. + + Signed-off-by: Matt Craighead <mcraigh...@nvidia.com> + Signed-off-by: Robert Morell <rmor...@nvidia.com> + Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + +commit b015a64ba19fb832af22e79f54b492ae85f6590e +Author: Vikram Fugro <vfu...@nvidia.com> +Date: Tue Apr 30 18:38:16 2013 +0530 + + t_triangles: Fix for triangles(trapezoids) test case + + Since pixman v28, the Src and other operators (in, Out, Clear) + clear the background when drawing trapezoids, fixing the + trapezoid drawing for such operators. Making the necessary change + in rendercheck for the color "expected" in the background. + + Signed-off-by: Vikram Fugro <vfu...@nvidia.com> + Reviewed-by: Søren Sandmann <s...@redhat.com> + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + Tested-by: Aaron Plattner <aplatt...@nvidia.com> + +commit 313a9689db26a2a7c384836b7838cb1d2261f228 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Fri Nov 11 11:00:53 2011 -0800 + + Include strings.h for strcasecmp + + Our minimum requirement for X11 is currently Unix98. Unix98 provides + strcasecmp in <strings.h>. This commit fixes implicit declarations + of this function on systems that closely adhere to the standard. + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit fa0973db6ab2a332c68f07e397771f0018741d6f +Author: Damien Leone <dle...@nvidia.com> +Date: Thu Sep 15 13:10:52 2011 -0700 + + t_tsrccoords: Skip this test when using indexed picture formats + + This test would fail at, for example, depth 8 because indexed color + comparisons are not implemented in rendercheck yet. This commit + workarounds this by passing the test if indexed picture formats are + used. + + Signed-off-by: Damien Leone <dle...@nvidia.com> + Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + +commit 0ab156f5b9d812ad9e94354e4e04490ed119eb1f +Author: Aaron Plattner <aplatt...@nvidia.com> +Date: Mon Aug 1 11:36:56 2011 -0700 + + Use the right screen from $DISPLAY + + RootWindow(dpy, 0) always uses screen 0, even if a different screen is + specified in the $DISPLAY environment variable. Use + DefaultRootWindow(dpy) instead to use the right one. + + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + Reviewed-by: Jeremy Huddleston <jerem...@apple.com> + +commit a30927f9b4279e2404f4deea2e3966364d5f0fd0 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sat May 7 18:18:40 2011 -0700 + + Report which test groups passed successfully + + This was previously computed but never passed on to the caller. + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + Reviewed-by: Eric Anholt <e...@anholt.net> + +commit 73623549b4eae25f0884f11875d95b3b8fa948cf +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 12 16:12:09 2011 -0500 + + config: remove unrequired AC_HEADER_STDC + + Autoconf says: + "This macro is obsolescent, as current systems have conforming + header files. New programs need not use this macro". + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit e7b8457236a7858a7e8d5c22416a8f4a2f621b83 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 22:17:44 2010 +0000 + + blend: Second attempt to handle multiple source pages... + + The first attempt failed to reset the dst_color iter after completing a + page, so we would advance to the end of the dst array before completing + the source array and attempt to render a zero length page. + + [In my defense not even valgrind spotted the mistake on my machine! A + poor craftsman blames his tools :(] + + Reported-again-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 81d988f407ab997e0e43432b3e2a85820bbe2756 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 21:36:31 2010 +0000 + + composite: Handle more sources than available rows in the window + + Group the sources into pages if we cannot fit them all onto a single + window. + + Reported-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit c285306dfaadb388706529623d171cc9fdde1b78 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 21:36:31 2010 +0000 + + blend: Handle more sources than available rows in the window + + Group the sources into pages if we cannot fit them all onto a single + window. + + Reported-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit a038220d4aeb3111d34b45d852b97be85a56459d +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 17:52:01 2010 +0000 + + TODO: Multiple roundtrips for image processing due to get_pixel fixed + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit bf0067692cf961fea6ebbda601f83c1c1960aff4 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 17:50:07 2010 +0000 + + dstcoords: Sample result using a single GetImage + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit e70fb7146dc18adcd38dd58adfb861a2a432ce64 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 17:46:39 2010 +0000 + + tsrcoords2: Sample result using a single GetImage + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 168830dca2e75e67d448039f3f42a0bad6719147 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 17:44:41 2010 +0000 + + tsrcoords: Sample result with just a single GetImage + + ... and whilst we are here make processing the 2D arrays cache friendly. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 6fe8d675216524a68894a28a1c335f0ad29239db +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 17:35:41 2010 +0000 + + triangles: Use a single GetImage call to sample the result + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit ad4da4e62ace7f5bfa0cfb2b82240b9498ce1005 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 14:52:13 2010 +0000 + + repeat: Only call GetImage once for each test. + + Sample the entire result with a single call to GetImage in order to + batch up the transfers when checking the result. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 903b5030826ab6915d354aa95a4e36c3dd684989 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 13:56:07 2010 +0000 + + Split out printing the results from eval_diff() + + Separate the evalation of two colors given a format and the printing of + the result. This allows eval_diff() to be used elsewhere and also means + that we do not need to waste cycles generating unused strings for + eval_diff() [this accounts for as much time as composite_op!]. As part + of this process pass in the expected accuracy of the operation to + eval_diff(). + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 55612909182c253bbfe8278a8867c93c9b09bc01 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 11:58:04 2010 +0000 + + composite: Batch tests + + Process an entire num_mask x num_op in a single GetImage pass. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit dc32549256620a42b6e22a9f3a5ff27a785a827e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 10:38:47 2010 +0000 + + blend: Combine multiple tests into a single XGetImage request + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit a040544669ba71d0eebff3492f21a3b40a1c419c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 1 15:07:25 2010 +0000 + + repeat: Specify test width/height rather than relying on win_width/height + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + commit 16d7e5c3052f8c4e9df77f889f935ed8b8f8b326 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Sun Nov 21 18:55:18 2010 -0800 diff --git a/rendercheck/INSTALL b/rendercheck/INSTALL index 8b82ade..a1e89e1 100644 --- a/rendercheck/INSTALL +++ b/rendercheck/INSTALL @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ 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. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ may remove or edit it. you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + 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. @@ -53,12 +59,22 @@ The simplest way to compile this package is: 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 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 + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. 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 @@ -67,8 +83,15 @@ The simplest way to compile this package is: 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. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ 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 `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. 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 @@ -120,7 +144,8 @@ 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'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ 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. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= 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 @@ -152,6 +208,13 @@ 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. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ Particular systems CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ 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 ========================== @@ -189,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form: where SYSTEM can have one of these forms: - OS KERNEL-OS + 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 @@ -277,7 +356,7 @@ operates. `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff --git a/rendercheck/Makefile.am b/rendercheck/Makefile.am index b19ae4a..852d174 100644 --- a/rendercheck/Makefile.am +++ b/rendercheck/Makefile.am @@ -13,6 +13,8 @@ rendercheck_SOURCES = \ t_dstcoords.c \ t_fill.c \ t_gradient.c \ + t_gtk_argb_xbgr.c \ + t_libreoffice_xrgb.c \ t_repeat.c \ t_srccoords.c \ t_tsrccoords.c \ @@ -20,6 +22,7 @@ rendercheck_SOURCES = \ t_triangles.c AM_CFLAGS = $(RC_CFLAGS) $(CWARNFLAGS) +AM_CPPFLAGS = -D_GNU_SOURCE rendercheck_LDADD = $(RC_LIBS) MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/rendercheck/Makefile.in b/rendercheck/Makefile.in index 0f02cde..1d08f7b 100644 --- a/rendercheck/Makefile.in +++ b/rendercheck/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,9 +80,9 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = rendercheck$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) depcomp AUTHORS \ + COPYING ChangeLog INSTALL NEWS README config.guess config.sub \ install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -54,56 +98,95 @@ PROGRAMS = $(bin_PROGRAMS) am_rendercheck_OBJECTS = main.$(OBJEXT) ops.$(OBJEXT) tests.$(OBJEXT) \ t_blend.$(OBJEXT) t_bug7366.$(OBJEXT) t_composite.$(OBJEXT) \ t_dstcoords.$(OBJEXT) t_fill.$(OBJEXT) t_gradient.$(OBJEXT) \ + t_gtk_argb_xbgr.$(OBJEXT) t_libreoffice_xrgb.$(OBJEXT) \ t_repeat.$(OBJEXT) t_srccoords.$(OBJEXT) \ t_tsrccoords.$(OBJEXT) t_tsrccoords2.$(OBJEXT) \ t_triangles.$(OBJEXT) rendercheck_OBJECTS = $(am_rendercheck_OBJECTS) am__DEPENDENCIES_1 = rendercheck_DEPENDENCIES = $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(rendercheck_SOURCES) DIST_SOURCES = $(rendercheck_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -131,7 +214,10 @@ am__relativize = \ reldir="$$dir2"