From 392912042685d5aff57dff3ebebb7623df75b8af Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 22 Jan 2011 14:33:54 +0000 Subject: Update to x11perf 1.5.3 --- app/x11perf/ChangeLog | 73 ++++++++++++++++++++++++++++- app/x11perf/aclocal.m4 | 119 +++++++++++++++++++++++++---------------------- app/x11perf/configure | 39 +++++++--------- app/x11perf/configure.ac | 18 +++---- app/x11perf/do_tests.c | 2 +- app/x11perf/do_traps.c | 2 +- app/x11perf/x11perf.c | 11 +++-- app/x11perf/x11perf.h | 2 +- 8 files changed, 167 insertions(+), 99 deletions(-) (limited to 'app/x11perf') diff --git a/app/x11perf/ChangeLog b/app/x11perf/ChangeLog index 331c94e25..6a90fd8f9 100644 --- a/app/x11perf/ChangeLog +++ b/app/x11perf/ChangeLog @@ -1,3 +1,74 @@ +commit c39d831d409537fce2f36c8672f908a7cc810519 +Author: Alan Coopersmith +Date: Wed Jan 5 16:33:36 2011 -0800 + + x11perf 1.5.3 + + Signed-off-by: Alan Coopersmith + +commit e7917bbec06e5c8e17f07b0eb833602b33111f08 +Merge: 5072fb4 cc84118 +Author: Peter Harris +Date: Tue Nov 23 14:41:33 2010 -0500 + + Merge fixes from git://anongit.freedesktop.org/~peterh/x11perf + +commit cc84118bd700745f02c65b2d6900e512e4c333af +Author: Peter Harris +Date: Mon Oct 29 11:35:22 2007 -0400 + + Avoid "rep" calculation overflow. + + On today's fast machines, "treps" can easily overflow a 32-bit number. + Use "long long" to calculate reps. + + Signed-off-by: Peter Harris + Reviewed-by: Adam Jackson + +commit 17a30e7c65c0b03b71b5b1ac54ae3ba33ae3b42a +Author: Peter Harris +Date: Mon Oct 29 11:29:32 2007 -0400 + + Clamp test time to positive values. + + If there is some jitter in the sync time, operations can complete in a + negative amount of time (confusing both humans and x11perfcomp). + + Signed-off-by: Peter Harris + Reviewed-by: Adam Jackson + +commit 5072fb464ffebcd97ec3a33cbff7095c3ec16225 +Author: Alan Coopersmith +Date: Fri Nov 19 22:34:02 2010 -0800 + + Remove unneccessary AC_SUBST of CFLAGS & LIBS vars from PKG_CHECK_MODULES + + Signed-off-by: Alan Coopersmith + +commit 2f6fa453f485739575296da9317243ddda25c4f6 +Author: Alan Coopersmith +Date: Fri Nov 19 22:32:12 2010 -0800 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith + +commit d970d9de1c98bc828365f15fb08aaa8dda214dd6 +Author: Alan Coopersmith +Date: Fri Nov 19 22:28:22 2010 -0800 + + Bug 31640 - x11perf: Doesn't build without libXft + + https://bugs.freedesktop.org/show_bug.cgi?id=31640 + + Fix trapezoid checks to look for both render & xft + + Signed-off-by: Alan Coopersmith + commit 3147d783925bb42c7af78c9f5508c0dc245b942b Author: Alan Coopersmith Date: Tue Sep 21 20:48:33 2010 -0700 @@ -209,7 +280,7 @@ Date: Thu Nov 1 09:13:43 2007 +0100 Fix typos in descriptions of -compwinwin{1,5}00. commit 569a5eaaef9a5c8bf50f1323fe39e81347976875 -Merge: 55aa9c2... e906fe5... +Merge: 55aa9c2 e906fe5 Author: Keith Packard Date: Mon Sep 10 16:56:06 2007 +0100 diff --git a/app/x11perf/aclocal.m4 b/app/x11perf/aclocal.m4 index 553960ece..d24c77a27 100644 --- a/app/x11perf/aclocal.m4 +++ b/app/x11perf/aclocal.m4 @@ -498,18 +498,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 @@ -997,7 +985,7 @@ AC_SUBST([am__untar]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -1034,7 +1022,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.10.0]) +m4_define([vers_have], [1.11.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1185,6 +1173,7 @@ MAN_SUBSTS="\ -e 's|__xservername__|Xorg|g' \ -e 's|__xconfigfile__|xorg.conf|g' \ -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ @@ -1342,15 +1331,17 @@ AC_SUBST(MAKE_PDF) AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK -# XORG_WITH_XMLTO([MIN-VERSION]) +# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-xmlto option, it allows maximum flexibilty in making decisions -# as whether or not to use the xmlto package. +# as whether or not to use the xmlto package. When DEFAULT is not specified, +# --with-xmlto assumes 'auto'. # # Interface to module: # HAVE_XMLTO: used in makefiles to conditionally generate documentation @@ -1367,10 +1358,12 @@ AC_SUBST(MAKE_HTML) # AC_DEFUN([XORG_WITH_XMLTO],[ AC_ARG_VAR([XMLTO], [Path to xmlto command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(xmlto, AS_HELP_STRING([--with-xmlto], - [Use xmlto to regenerate documentation (default: yes, if installed)]), - [use_xmlto=$withval], [use_xmlto=auto]) + [Use xmlto to regenerate documentation (default: ]_defopt[)]), + [use_xmlto=$withval], [use_xmlto=]_defopt) +m4_undefine([_defopt]) if test "x$use_xmlto" = x"auto"; then AC_PATH_PROG([XMLTO], [xmlto]) @@ -1424,15 +1417,17 @@ AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ]) # XORG_WITH_XMLTO -# XORG_WITH_ASCIIDOC([MIN-VERSION]) +# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-asciidoc option, it allows maximum flexibilty in making decisions -# as whether or not to use the asciidoc package. +# as whether or not to use the asciidoc package. When DEFAULT is not specified, +# --with-asciidoc assumes 'auto'. # # Interface to module: # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation @@ -1445,10 +1440,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) # AC_DEFUN([XORG_WITH_ASCIIDOC],[ AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(asciidoc, AS_HELP_STRING([--with-asciidoc], - [Use asciidoc to regenerate documentation (default: yes, if installed)]), - [use_asciidoc=$withval], [use_asciidoc=auto]) + [Use asciidoc to regenerate documentation (default: ]_defopt[)]), + [use_asciidoc=$withval], [use_asciidoc=]_defopt) +m4_undefine([_defopt]) if test "x$use_asciidoc" = x"auto"; then AC_PATH_PROG([ASCIIDOC], [asciidoc]) @@ -1489,15 +1486,17 @@ fi]) AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) ]) # XORG_WITH_ASCIIDOC -# XORG_WITH_DOXYGEN([MIN-VERSION]) +# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT]) # -------------------------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-doxygen option, it allows maximum flexibilty in making decisions -# as whether or not to use the doxygen package. +# as whether or not to use the doxygen package. When DEFAULT is not specified, +# --with-doxygen assumes 'auto'. # # Interface to module: # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation @@ -1510,10 +1509,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) # AC_DEFUN([XORG_WITH_DOXYGEN],[ AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(doxygen, AS_HELP_STRING([--with-doxygen], - [Use doxygen to regenerate documentation (default: yes, if installed)]), - [use_doxygen=$withval], [use_doxygen=auto]) + [Use doxygen to regenerate documentation (default: ]_defopt[)]), + [use_doxygen=$withval], [use_doxygen=]_defopt) +m4_undefine([_defopt]) if test "x$use_doxygen" = x"auto"; then AC_PATH_PROG([DOXYGEN], [doxygen]) @@ -1554,15 +1555,17 @@ fi]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) ]) # XORG_WITH_DOXYGEN -# XORG_WITH_GROFF +# XORG_WITH_GROFF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-groff option, it allows maximum flexibilty in making decisions -# as whether or not to use the groff package. +# as whether or not to use the groff package. When DEFAULT is not specified, +# --with-groff assumes 'auto'. # # Interface to module: # HAVE_GROFF: used in makefiles to conditionally generate documentation @@ -1591,10 +1594,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # AC_DEFUN([XORG_WITH_GROFF],[ AC_ARG_VAR([GROFF], [Path to groff command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(groff, AS_HELP_STRING([--with-groff], - [Use groff to regenerate documentation (default: yes, if installed)]), - [use_groff=$withval], [use_groff=auto]) + [Use groff to regenerate documentation (default: ]_defopt[)]), + [use_groff=$withval], [use_groff=]_defopt) +m4_undefine([_defopt]) if test "x$use_groff" = x"auto"; then AC_PATH_PROG([GROFF], [groff]) @@ -1657,15 +1662,17 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP +# XORG_WITH_FOP([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-fop option, it allows maximum flexibilty in making decisions -# as whether or not to use the fop package. +# as whether or not to use the fop package. When DEFAULT is not specified, +# --with-fop assumes 'auto'. # # Interface to module: # HAVE_FOP: used in makefiles to conditionally generate documentation @@ -1678,10 +1685,12 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], - [Use fop to regenerate documentation (default: yes, if installed)]), - [use_fop=$withval], [use_fop=auto]) + [Use fop to regenerate documentation (default: ]_defopt[)]), + [use_fop=$withval], [use_fop=]_defopt) +m4_undefine([_defopt]) if test "x$use_fop" = x"auto"; then AC_PATH_PROG([FOP], [fop]) @@ -1708,15 +1717,17 @@ fi AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP -# XORG_WITH_PS2PDF +# XORG_WITH_PS2PDF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-ps2pdf option, it allows maximum flexibilty in making decisions -# as whether or not to use the ps2pdf package. +# as whether or not to use the ps2pdf package. When DEFAULT is not specified, +# --with-ps2pdf assumes 'auto'. # # Interface to module: # HAVE_PS2PDF: used in makefiles to conditionally generate documentation @@ -1729,10 +1740,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) # AC_DEFUN([XORG_WITH_PS2PDF],[ AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(ps2pdf, AS_HELP_STRING([--with-ps2pdf], - [Use ps2pdf to regenerate documentation (default: yes, if installed)]), - [use_ps2pdf=$withval], [use_ps2pdf=auto]) + [Use ps2pdf to regenerate documentation (default: ]_defopt[)]), + [use_ps2pdf=$withval], [use_ps2pdf=]_defopt) +m4_undefine([_defopt]) if test "x$use_ps2pdf" = x"auto"; then AC_PATH_PROG([PS2PDF], [ps2pdf]) @@ -1783,14 +1796,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DOCS],[ -default=$1 -if test "x$default" = x ; then - default="yes" -fi +m4_define([default], m4_default([$1], [yes])) AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs], - [Enable building the documentation (default: yes)]), - [build_docs=$enableval], [build_docs=$default]) + [Enable building the documentation (default: ]default[)]), + [build_docs=$enableval], [build_docs=]default) +m4_undefine([default]) AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) AC_MSG_CHECKING([whether to build documentation]) AC_MSG_RESULT([$build_docs]) @@ -1818,14 +1829,12 @@ AC_MSG_RESULT([$build_docs]) # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ -devel_default=$1 -if test "x$devel_default" = x ; then - devel_default="yes" -fi +m4_define([devel_default], m4_default([$1], [yes])) AC_ARG_ENABLE(devel-docs, AS_HELP_STRING([--enable-devel-docs], - [Enable building the developer documentation (default: yes)]), - [build_devel_docs=$enableval], [build_devel_docs=$devel_default]) + [Enable building the developer documentation (default: ]devel_default[)]), + [build_devel_docs=$enableval], [build_devel_docs=]devel_default) +m4_undefine([devel_default]) AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) AC_MSG_CHECKING([whether to build developer documentation]) AC_MSG_RESULT([$build_devel_docs]) @@ -1853,14 +1862,12 @@ AC_MSG_RESULT([$build_devel_docs]) # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_SPECS],[ -spec_default=$1 -if test "x$spec_default" = x ; then - spec_default="yes" -fi +m4_define([spec_default], m4_default([$1], [yes])) AC_ARG_ENABLE(specs, AS_HELP_STRING([--enable-specs], - [Enable building the specs (default: yes)]), - [build_specs=$enableval], [build_specs=$spec_default]) + [Enable building the specs (default: ]spec_default[)]), + [build_specs=$enableval], [build_specs=]spec_default) +m4_undefine([spec_default]) AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) AC_MSG_CHECKING([whether to build functional specifications]) AC_MSG_RESULT([$build_specs]) diff --git a/app/x11perf/configure b/app/x11perf/configure index cb97339aa..db11338fa 100644 --- a/app/x11perf/configure +++ b/app/x11perf/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for x11perf 1.5.2. +# Generated by GNU Autoconf 2.62 for x11perf 1.5.3. # # Report bugs to . # @@ -596,10 +596,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='x11perf' PACKAGE_TARNAME='x11perf' -PACKAGE_VERSION='1.5.2' -PACKAGE_STRING='x11perf 1.5.2' +PACKAGE_VERSION='1.5.3' +PACKAGE_STRING='x11perf 1.5.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +ac_unique_file="Makefile.am" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -1331,7 +1332,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures x11perf 1.5.2 to adapt to many kinds of systems. +\`configure' configures x11perf 1.5.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1401,7 +1402,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of x11perf 1.5.2:";; + short | recursive ) echo "Configuration of x11perf 1.5.3:";; esac cat <<\_ACEOF @@ -1506,7 +1507,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -x11perf configure 1.5.2 +x11perf configure 1.5.3 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1520,7 +1521,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by x11perf $as_me 1.5.2, which was +It was created by x11perf $as_me 1.5.3, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -1886,6 +1887,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_config_headers="$ac_config_headers config.h" + + +# Initialize Automake am__api_version="1.9" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2169,7 +2175,7 @@ fi # Define the identity of the package. PACKAGE='x11perf' - VERSION='1.5.2' + VERSION='1.5.3' cat >>confdefs.h <<_ACEOF @@ -2352,10 +2358,6 @@ fi - -ac_config_headers="$ac_config_headers config.h" - - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4899,6 +4901,7 @@ MAN_SUBSTS="\ -e 's|__xservername__|Xorg|g' \ -e 's|__xconfigfile__|xorg.conf|g' \ -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ @@ -5084,8 +5087,6 @@ $as_echo "yes" >&6; } : fi - - # Check for Xrender library pkg_failed=no @@ -5158,8 +5159,6 @@ else $as_echo "yes" >&6; } xrender_found=yes fi - - case "$xrender_found" in yes) @@ -5242,8 +5241,6 @@ else $as_echo "yes" >&6; } xft_found=yes fi - - case "$xft_found" in yes) @@ -5326,8 +5323,6 @@ else $as_echo "yes" >&6; } xext_found=yes fi - - case "$xext_found" in yes) save_LIBS="$LIBS" @@ -5882,7 +5877,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by x11perf $as_me 1.5.2, which was +This file was extended by x11perf $as_me 1.5.3, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5935,7 +5930,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -x11perf config.status 1.5.2 +x11perf config.status 1.5.3 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/app/x11perf/configure.ac b/app/x11perf/configure.ac index 7e2640f2d..552ea8d4d 100644 --- a/app/x11perf/configure.ac +++ b/app/x11perf/configure.ac @@ -20,11 +20,16 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([x11perf], - [1.5.2], + [1.5.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [x11perf]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -32,22 +37,15 @@ AM_MAINTAINER_MODE m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) - -AM_CONFIG_HEADER(config.h) - XORG_DEFAULT_OPTIONS AC_TYPE_SIGNAL # Checks for pkg-config packages PKG_CHECK_MODULES(X11PERF, x11 xmuu) -AC_SUBST(X11PERF_CFLAGS) -AC_SUBST(X11PERF_LIBS) # Check for Xrender library PKG_CHECK_MODULES(XRENDER, xrender, [xrender_found=yes], [xrender_found=no]) -AC_SUBST(XRENDER_CFLAGS) -AC_SUBST(XRENDER_LIBS) case "$xrender_found" in yes) AC_DEFINE(XRENDER,1,[Xrender library available]) @@ -56,8 +54,6 @@ esac # Check for Xft library PKG_CHECK_MODULES(XFT, xft, [xft_found=yes], [xft_found=no]) -AC_SUBST(XFT_CFLAGS) -AC_SUBST(XFT_LIBS) case "$xft_found" in yes) AC_DEFINE(XFT,1,[Xft library available]) @@ -66,8 +62,6 @@ esac # Check for MIT-SHM extension PKG_CHECK_MODULES(XEXT, xext, [xext_found=yes], [xext_found=no]) -AC_SUBST(XEXT_CFLAGS) -AC_SUBST(XEXT_LIBS) case "$xext_found" in yes) save_LIBS="$LIBS" diff --git a/app/x11perf/do_tests.c b/app/x11perf/do_tests.c index ce3026b43..e4f3cb1c1 100644 --- a/app/x11perf/do_tests.c +++ b/app/x11perf/do_tests.c @@ -788,7 +788,7 @@ Test test[] = { InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids, V1_4FEATURE, ROP, 0, {2, 300, "escherknot", NULL, FillTiled}}, -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) {"-aatrap1", "Fill 1x1 aa trap", NULL, InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps, V1_5FEATURE, NONROP, 0, diff --git a/app/x11perf/do_traps.c b/app/x11perf/do_traps.c index 326b56e35..05f43c2a3 100644 --- a/app/x11perf/do_traps.c +++ b/app/x11perf/do_traps.c @@ -104,7 +104,7 @@ EndTrapezoids(XParms xp, Parms p) free(points); } -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) #include #include diff --git a/app/x11perf/x11perf.c b/app/x11perf/x11perf.c index 15eb04d59..c5129d7fb 100644 --- a/app/x11perf/x11perf.c +++ b/app/x11perf/x11perf.c @@ -282,7 +282,7 @@ RoundTo3Digits(double d) static void -ReportTimes(double usecs, int n, char *str, int average) +ReportTimes(double usecs, long long n, char *str, int average) { double msecsperobj, objspersec; @@ -296,14 +296,14 @@ ReportTimes(double usecs, int n, char *str, int average) objspersec = RoundTo3Digits(objspersec); if (average) { - printf("%7d trep @ %8.4f msec (%8.1f/sec): %s\n", + printf("%7lld trep @ %8.4f msec (%8.1f/sec): %s\n", n, msecsperobj, objspersec, str); } else { - printf("%7d reps @ %8.4f msec (%8.1f/sec): %s\n", + printf("%7lld reps @ %8.4f msec (%8.1f/sec): %s\n", n, msecsperobj, objspersec, str); } } else { - printf("%6d %sreps @ 0.0 msec (unmeasurably fast): %s\n", + printf("%6lld %sreps @ 0.0 msec (unmeasurably fast): %s\n", n, average ? "t" : "", str); } @@ -647,6 +647,7 @@ DoTest(XParms xp, Test *test, int reps) HardwareSync(xp); time = ElapsedTime(syncTime); + if (time < 0.0) time = 0.0; CheckAbort (); if (drawToFakeServer) XQueryBestSize(xp->d, TileShape, tileToQuery, @@ -838,7 +839,7 @@ static void ProcessTest(XParms xp, Test *test, int func, unsigned long pm, char *label) { double time, totalTime; - int reps; + long long reps; int j; xp->planemask = pm; diff --git a/app/x11perf/x11perf.h b/app/x11perf/x11perf.h index 597b1f70a..1deb0372b 100644 --- a/app/x11perf/x11perf.h +++ b/app/x11perf/x11perf.h @@ -291,7 +291,7 @@ extern void EndAAText ( XParms xp, Parms p ); extern int InitTrapezoids ( XParms xp, Parms p, int reps ); extern void DoTrapezoids ( XParms xp, Parms p, int reps ); extern void EndTrapezoids ( XParms xp, Parms p ); -#ifdef XRENDER +#if defined(XRENDER) && defined(XFT) extern int InitFixedTraps ( XParms xp, Parms p, int reps ); extern void DoFixedTraps ( XParms xp, Parms p, int reps ); extern void EndFixedTraps ( XParms xp, Parms p ); -- cgit v1.2.3