diff options
| -rw-r--r-- | driver/xf86-input-mouse/ChangeLog | 182 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/Makefile.in | 7 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/README | 2 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/aclocal.m4 | 290 | ||||
| -rwxr-xr-x | driver/xf86-input-mouse/compile | 12 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/config.h.in | 3 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/configure | 191 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/configure.ac | 8 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/include/Makefile.in | 1 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/man/Makefile.in | 1 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/src/Makefile.in | 1 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/src/bsd_mouse.c | 8 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/src/mouse.c | 42 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/src/pnp.c | 6 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/src/sun_mouse.c | 17 |
15 files changed, 597 insertions, 174 deletions
diff --git a/driver/xf86-input-mouse/ChangeLog b/driver/xf86-input-mouse/ChangeLog index 2f9c5480e..da62996c1 100644 --- a/driver/xf86-input-mouse/ChangeLog +++ b/driver/xf86-input-mouse/ChangeLog @@ -1,3 +1,175 @@ +commit ecd043f1de248cc03d240f1ae5850ce4f9f159a4 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Nov 1 19:30:06 2022 -0700 + + xf86-input-mouse 1.9.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 426c8e099fe19d3b495821ed6e7beb67a29a4115 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Nov 1 19:37:49 2022 -0700 + + sun_mouse.c: #include "config.h" + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 29456a2ad33897b0834aa097390cdfe5e92d1364 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Oct 16 12:19:47 2022 -0700 + + configure: check for timingsafe_memcmp + + Not needed by mouse driver, but quiets warnings from xorg server headers: + + In file included from /usr/include/xorg/misc.h:117:0, + from /usr/include/xorg/xf86str.h:37, + from /usr/include/xorg/xf86.h:44, + from mouse.c:57: + /usr/include/xorg/os.h:595:1: warning: redundant redeclaration of ‘timingsafe_memcmp’ [-Wredundant-decls] + timingsafe_memcmp(const void *b1, const void *b2, size_t len); + ^~~~~~~~~~~~~~~~~ + In file included from mouse.c:52:0: + /usr/include/string.h:235:12: note: previous declaration of ‘timingsafe_memcmp’ was here + extern int timingsafe_memcmp(const void *s1, const void *s2, size_t n); + ^~~~~~~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit cbb97f4249ac6768e4a68423825ef0394104f5d8 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Oct 16 12:14:57 2022 -0700 + + autoGood: quiet -Wimplicit-fallthrough warning + + mouse.c: In function ‘autoGood’: + mouse.c:3724:12: warning: this statement may fall through [-Wimplicit-fallthrough=] + if (mPriv->goodCount < PROBE_UNCERTAINTY/2) + ^ + mouse.c:3726:5: note: here + default: + ^~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit b888251a032dfff5f7219334d2e8f256251fa98e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Oct 16 12:07:37 2022 -0700 + + InputDriverRec: Fix -Wmissing-field-initializers warning + + mouse.c:185:1: warning: missing initializer for field ‘default_options’ of ‘InputDriverRec {aka struct _InputDriverRec}’ [-Wmissing-field-initializers] + }; + ^ + In file included from mouse.c:63:0: + /usr/include/xorg/xf86Xinput.h:83:18: note: ‘default_options’ declared here + const char **default_options; + ^~~~~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 03fb2ae36be7314416b1c57b391039fb948468eb +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Oct 16 12:02:51 2022 -0700 + + SetupMouse: fix -Wsign-compare warning + + mouse.c: In function ‘SetupMouse’: + mouse.c:2620:27: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] + for (i = 0; i < sizeof(pMse->protoPara); i++) + ^ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit a8ff2170cb89145056d6f30a96219393316f1a96 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Oct 16 11:58:47 2022 -0700 + + checkForErraticMovements: Fix -Wempty-body warnings + + mouse.c: In function ‘checkForErraticMovements’: + mouse.c:3759:52: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body] + AP_DBG(("accDx=%i\n",mPriv->accDx)); + ^ + mouse.c:3772:52: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body] + AP_DBG(("accDy=%i\n",mPriv->accDy)); + ^ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 72323bf07cc74fb03e63898b14136ae30a770580 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Oct 16 11:53:20 2022 -0700 + + sun_mouse: Fix -Wnull-dereference warning + + sun_mouse.c: In function ‘vuidReadInput’: + sun_mouse.c:291:10: warning: potential null pointer dereference [-Wnull-dereference] + pBuf = pVuidMse->buffer; + ~~~~~^~~~~~~~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f62f35747ec65e7f8819fab2c928db1b1b4c56eb +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Oct 16 11:47:18 2022 -0700 + + sun_mouse: Fix -Wsign-compare warnings + + sun_mouse.c: In function ‘vuidReadInput’: + sun_mouse.c:299:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] + } else if (n == -1) { + ^~ + sun_mouse.c: In function ‘vuidMouseProc’: + sun_mouse.c:507:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] + if (vuidMouseGeneration != serverGeneration) { + ^~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 2d963a9f619420834274cedf407b754caecbccb3 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 3bb98d758bfcab4c03d5f3f906a1bab0810e51e2 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Jan 17 16:07:04 2022 -0800 + + gitlab CI: add a basic build test + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 84bca281c4875c7446688fc8ffe76da4c24c7724 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jan 16 12:36:16 2022 -0800 + + Fix spelling/wording issues + + Found by using: + codespell --builtin clear,rare,usage,informal,code,names + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 9255be3c68207929266e920be8461b7669ae4efd +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jan 16 12:30:22 2022 -0800 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 03092c520b0365570df6e30360dacee0f5924ca0 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Nov 25 12:48:28 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + commit cfde5e9f348db6e6b2639dd7e592520dff028452 Author: Matt Turner <mattst88@gmail.com> Date: Mon Jun 18 21:35:56 2018 -0700 @@ -1360,7 +1532,7 @@ Date: Tue Apr 27 13:50:20 2010 -0400 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> commit 3ee9b720856efa240b70d38172706485f6420289 -Author: Márton Németh <nm127@freemail.hu> +Author: Márton Németh < <nm127@freemail.hu> Date: Tue Apr 13 00:35:57 2010 -0700 Bug 10866 - serial Genius NetScroll+ autodetection @@ -1993,7 +2165,7 @@ Date: Thu Jun 14 00:24:07 2007 +1000 Update version using PACKAGE_VERSION_* commit e567cb0792ea3dc2cd68c46628332c1f8bbb173d -Author: Jürgen Appel <jappel@linux01.gwdg.de> +Author: Jürgen Appel <jappel@linux01.gwdg.de> Date: Mon Apr 23 15:54:08 2007 +0200 Added "Sensitivity" option. Use for slowing down high resolution mice. @@ -2298,13 +2470,13 @@ Date: Mon Oct 17 00:08:59 2005 +0000 Use sed & cpp to substitute variables in driver man pages commit 34856ca1f73108ca19c20d9223457be328890dc1 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Tue Oct 4 20:01:02 2005 +0000 Check in generated README files commit 55e29446456e51ccdca57f348ed4660f65ab7dee -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Mon Oct 3 21:22:06 2005 +0000 - For all drivers that have a <driver>.sgml file, add code in their build @@ -2343,7 +2515,7 @@ Date: Mon Aug 15 23:48:35 2005 +0000 Set ZAxisMapping default to "4 5 6 7". commit f355ef63c60adc7a72517ca71fdc9983f3881db9 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Wed Aug 10 14:07:23 2005 +0000 Don\'t lose existing CFLAGS in all the input drivers and some of the video diff --git a/driver/xf86-input-mouse/Makefile.in b/driver/xf86-input-mouse/Makefile.in index 4099a7aa7..240607ce3 100644 --- a/driver/xf86-input-mouse/Makefile.in +++ b/driver/xf86-input-mouse/Makefile.in @@ -185,9 +185,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -328,6 +328,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -636,6 +637,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -643,7 +645,6 @@ dist-bzip2: distdir dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) diff --git a/driver/xf86-input-mouse/README b/driver/xf86-input-mouse/README index 3c1c17583..02a0478b2 100644 --- a/driver/xf86-input-mouse/README +++ b/driver/xf86-input-mouse/README @@ -248,7 +248,7 @@ console driver is supported. You need to run binaries compiled on NetBSD 1.4 to have support for it though. Use "/dev/wsmouse0" for the device. Refer to the wsmouse(4) manual page for kernel configuration - informations. + information. This driver also provides support for USB mice. See the ums(4) manual page for details. diff --git a/driver/xf86-input-mouse/aclocal.m4 b/driver/xf86-input-mouse/aclocal.m4 index fbfdcb44e..0b2bd60c4 100644 --- a/driver/xf86-input-mouse/aclocal.m4 +++ b/driver/xf86-input-mouse/aclocal.m4 @@ -8606,32 +8606,63 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <scott@netsplit.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -8653,18 +8684,19 @@ if test -n "$PKG_CONFIG"; then PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -8674,8 +8706,10 @@ m4_ifvaln([$3], [else $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -8687,10 +8721,11 @@ m4_define([_PKG_CONFIG], else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -8698,26 +8733,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -8727,11 +8760,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -8748,7 +8781,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -8764,16 +8797,40 @@ else AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -8784,16 +8841,18 @@ AC_ARG_WITH([pkgconfigdir], AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -8804,7 +8863,24 @@ AC_ARG_WITH([noarch-pkgconfigdir], AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2012 Free Software Foundation, Inc. # @@ -9829,7 +9905,7 @@ AC_SUBST([am__untar]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates. 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"), @@ -9866,7 +9942,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.19.2]) +m4_define([vers_have], [1.20.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,, @@ -9887,7 +9963,7 @@ AM_MAINTAINER_MODE # such as man pages and config files AC_DEFUN([XORG_PROG_RAWCPP],[ AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], +AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) # Check for flag to avoid builtin definitions - assumes unix is predefined, @@ -10197,7 +10273,7 @@ AC_SUBST(MAKE_HTML) # 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 +# the --with-xmlto option, it allows maximum flexibility in making decisions # as whether or not to use the xmlto package. When DEFAULT is not specified, # --with-xmlto assumes 'auto'. # @@ -10411,7 +10487,7 @@ AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) # 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 +# the --with-asciidoc option, it allows maximum flexibility in making decisions # as whether or not to use the asciidoc package. When DEFAULT is not specified, # --with-asciidoc assumes 'auto'. # @@ -10481,7 +10557,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) # 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 +# the --with-doxygen option, it allows maximum flexibility in making decisions # as whether or not to use the doxygen package. When DEFAULT is not specified, # --with-doxygen assumes 'auto'. # @@ -10565,7 +10641,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # 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 +# the --with-groff option, it allows maximum flexibility in making decisions # as whether or not to use the groff package. When DEFAULT is not specified, # --with-groff assumes 'auto'. # @@ -10673,7 +10749,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # 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 +# the --with-fop option, it allows maximum flexibility in making decisions # as whether or not to use the fop package. When DEFAULT is not specified, # --with-fop assumes 'auto'. # @@ -10767,7 +10843,7 @@ AC_SUBST([M4], [$ac_cv_path_M4]) # 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 +# the --with-ps2pdf option, it allows maximum flexibility in making decisions # as whether or not to use the ps2pdf package. When DEFAULT is not specified, # --with-ps2pdf assumes 'auto'. # @@ -10822,7 +10898,7 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) # not at the appropriate level. This macro enables a builder to skip all # documentation targets except traditional man pages. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -10855,7 +10931,7 @@ AC_MSG_RESULT([$build_docs]) # # This macro enables a builder to skip all developer documentation. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -10888,7 +10964,7 @@ AC_MSG_RESULT([$build_devel_docs]) # # This macro enables a builder to skip all functional specification targets. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -11363,7 +11439,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) AC_DEFUN([XORG_COMPILER_BRAND], [ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) ], [C++], [ AC_REQUIRE([AC_PROG_CXX]) @@ -11379,7 +11459,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) # Minimum version: 1.16.0 # # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -11395,7 +11475,11 @@ AC_LANG_COMPILER_REQUIRE AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) define([PREFIX], [C]) define([CACHE_PREFIX], [cc]) define([COMPILER], [$CC]) @@ -11526,7 +11610,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) -# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # These are currently disabled because they are noisy. They will be enabled @@ -11536,7 +11620,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -11645,23 +11729,35 @@ AC_SUBST([BASE_]PREFIX[FLAGS]) AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) ]) # XORG_STRICT_OPTION +# XORG_DEFAULT_NOCODE_OPTIONS +# --------------------------- +# Minimum version: 1.20.0 +# +# Defines default options for X.Org modules which don't compile code, +# such as fonts, bitmaps, cursors, and docs. +# +AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) +XORG_RELEASE_VERSION +XORG_CHANGELOG +XORG_INSTALL +XORG_MANPAGE_SECTIONS +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +]) # XORG_DEFAULT_NOCODE_OPTIONS + # XORG_DEFAULT_OPTIONS # -------------------- # Minimum version: 1.3.0 # -# Defines default options for X.Org modules. +# Defines default options for X.Org modules which compile code. # AC_DEFUN([XORG_DEFAULT_OPTIONS], [ AC_REQUIRE([AC_PROG_INSTALL]) XORG_COMPILER_FLAGS XORG_CWARNFLAGS XORG_STRICT_OPTION -XORG_RELEASE_VERSION -XORG_CHANGELOG -XORG_INSTALL -XORG_MANPAGE_SECTIONS -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +XORG_DEFAULT_NOCODE_OPTIONS ]) # XORG_DEFAULT_OPTIONS # XORG_INSTALL() diff --git a/driver/xf86-input-mouse/compile b/driver/xf86-input-mouse/compile index 2ab71e4ea..df363c8fb 100755 --- a/driver/xf86-input-mouse/compile +++ b/driver/xf86-input-mouse/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # 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, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -340,7 +340,7 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/driver/xf86-input-mouse/config.h.in b/driver/xf86-input-mouse/config.h.in index fbd5e8507..037a61bf0 100644 --- a/driver/xf86-input-mouse/config.h.in +++ b/driver/xf86-input-mouse/config.h.in @@ -30,6 +30,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the `timingsafe_memcmp' function. */ +#undef HAVE_TIMINGSAFE_MEMCMP + /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H diff --git a/driver/xf86-input-mouse/configure b/driver/xf86-input-mouse/configure index 571c0818d..128ee98e9 100644 --- a/driver/xf86-input-mouse/configure +++ b/driver/xf86-input-mouse/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-input-mouse 1.9.3. +# Generated by GNU Autoconf 2.69 for xf86-input-mouse 1.9.4. # -# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/issues>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -591,9 +591,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xf86-input-mouse' PACKAGE_TARNAME='xf86-input-mouse' -PACKAGE_VERSION='1.9.3' -PACKAGE_STRING='xf86-input-mouse 1.9.3' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='1.9.4' +PACKAGE_STRING='xf86-input-mouse 1.9.4' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -765,6 +765,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -857,6 +858,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1109,6 +1111,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1246,7 +1257,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1359,7 +1370,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 xf86-input-mouse 1.9.3 to adapt to many kinds of systems. +\`configure' configures xf86-input-mouse 1.9.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1399,6 +1410,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1430,7 +1442,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-mouse 1.9.3:";; + short | recursive ) echo "Configuration of xf86-input-mouse 1.9.4:";; esac cat <<\_ACEOF @@ -1496,7 +1508,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/issues>. _ACEOF ac_status=$? fi @@ -1559,7 +1571,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-mouse configure 1.9.3 +xf86-input-mouse configure 1.9.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1718,9 +1730,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ##" +( $as_echo "## ----------------------------------------------------------------------------------- ## +## Report this to https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/issues ## +## ----------------------------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1974,7 +1986,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 xf86-input-mouse $as_me 1.9.3, which was +It was created by xf86-input-mouse $as_me 1.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4114,7 +4126,7 @@ fi # Define the identity of the package. PACKAGE='xf86-input-mouse' - VERSION='1.9.3' + VERSION='1.9.4' cat >>confdefs.h <<_ACEOF @@ -13728,7 +13740,124 @@ $as_echo "$supported" >&6; } fi -# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wredundant-decls" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5 +$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; } + cacheid=xorg_cv_cc_flag__Wredundant_decls + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls" + found="yes" + fi + fi + + @@ -13855,7 +13984,7 @@ $as_echo "$supported" >&6; } # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -17527,6 +17656,8 @@ fi + + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -17733,6 +17864,7 @@ AM_BACKSLASH='\' + # Check whether --with-lint was given. if test "${with_lint+set}" = set; then : withval=$with_lint; use_lint=$withval @@ -17831,12 +17963,13 @@ fi # Checks for library functions -for ac_func in asprintf +for ac_func in asprintf timingsafe_memcmp do : - ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" -if test "x$ac_cv_func_asprintf" = xyes; then : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_ASPRINTF 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -17846,8 +17979,8 @@ done # Obtain compiler/linker options from server and required extensions pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5 -$as_echo_n "checking for XORG... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xorg-server >= 1.7 xproto inputproto" >&5 +$as_echo_n "checking for xorg-server >= 1.7 xproto inputproto... " >&6; } if test -n "$XORG_CFLAGS"; then pkg_cv_XORG_CFLAGS="$XORG_CFLAGS" @@ -17887,7 +18020,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -17914,7 +18047,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS and XORG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18523,7 +18656,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-mouse $as_me 1.9.3, which was +This file was extended by xf86-input-mouse $as_me 1.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18583,13 +18716,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." +Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/issues>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-input-mouse config.status 1.9.3 +xf86-input-mouse config.status 1.9.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/driver/xf86-input-mouse/configure.ac b/driver/xf86-input-mouse/configure.ac index 98686701f..6c453cd0d 100644 --- a/driver/xf86-input-mouse/configure.ac +++ b/driver/xf86-input-mouse/configure.ac @@ -23,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-mouse], - [1.9.3], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [1.9.4], + [https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/issues], [xf86-input-mouse]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -32,7 +32,7 @@ AC_CONFIG_AUX_DIR(.) AC_USE_SYSTEM_EXTENSIONS # Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-xz]) # Initialize libtool AC_DISABLE_STATIC @@ -46,7 +46,7 @@ XORG_DEFAULT_OPTIONS XORG_WITH_LINT # Checks for library functions -AC_CHECK_FUNCS([asprintf]) +AC_CHECK_FUNCS([asprintf timingsafe_memcmp]) # Obtain compiler/linker options from server and required extensions PKG_CHECK_MODULES(XORG, [xorg-server >= 1.7] xproto inputproto) diff --git a/driver/xf86-input-mouse/include/Makefile.in b/driver/xf86-input-mouse/include/Makefile.in index b7ceecf92..1d29277fb 100644 --- a/driver/xf86-input-mouse/include/Makefile.in +++ b/driver/xf86-input-mouse/include/Makefile.in @@ -248,6 +248,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff --git a/driver/xf86-input-mouse/man/Makefile.in b/driver/xf86-input-mouse/man/Makefile.in index e48e7fd19..3e460adb4 100644 --- a/driver/xf86-input-mouse/man/Makefile.in +++ b/driver/xf86-input-mouse/man/Makefile.in @@ -268,6 +268,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff --git a/driver/xf86-input-mouse/src/Makefile.in b/driver/xf86-input-mouse/src/Makefile.in index 873566330..edc1476eb 100644 --- a/driver/xf86-input-mouse/src/Makefile.in +++ b/driver/xf86-input-mouse/src/Makefile.in @@ -302,6 +302,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff --git a/driver/xf86-input-mouse/src/bsd_mouse.c b/driver/xf86-input-mouse/src/bsd_mouse.c index 5419182dc..fbe954db6 100644 --- a/driver/xf86-input-mouse/src/bsd_mouse.c +++ b/driver/xf86-input-mouse/src/bsd_mouse.c @@ -61,7 +61,7 @@ #define HID_USAGE2(p,u) (((p) << 16) | u) -/* The UMS mices have middle button as number 3 */ +/* The UMS mice have middle button as number 3 */ #define UMS_BUT(i) ((i) == 0 ? 2 : (i) == 1 ? 0 : (i) == 2 ? 1 : (i)) #endif /* USBMOUSE_SUPPORT */ @@ -87,7 +87,7 @@ static const char *mouseDevs[] = { NULL }; #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) -/* Only wsmouse mices are autoconfigured for now on OpenBSD */ +/* Only wsmouse mice are autoconfigured for now on OpenBSD */ #define DEFAULT_WSMOUSE_DEV "/dev/wsmouse" #define DEFAULT_WSMOUSE0_DEV "/dev/wsmouse0" @@ -236,7 +236,7 @@ SetSysMouseRes(InputInfoPtr pInfo, const char *protocol, int rate, int res) (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { /* * As the FreeBSD sysmouse driver defaults to protocol level 0 - * everytime it is opened we enforce protocol level 1 again at + * every time it is opened we enforce protocol level 1 again at * this point. */ mode.level = 1; @@ -687,7 +687,7 @@ usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) return FALSE; } } - /* Get USB informations */ + /* Get USB information */ reportDesc = hid_get_report_desc(pInfo->fd); /* Get packet size & iid */ #ifdef USB_NEW_HID diff --git a/driver/xf86-input-mouse/src/mouse.c b/driver/xf86-input-mouse/src/mouse.c index 40d97a9e6..157955514 100644 --- a/driver/xf86-input-mouse/src/mouse.c +++ b/driver/xf86-input-mouse/src/mouse.c @@ -38,7 +38,7 @@ */ /* - * [PME-02/08/11] Added suport for drag lock buttons + * [PME-02/08/11] Added support for drag lock buttons * for use with 4 button trackballs for convenience * and to help limited dexterity persons */ @@ -176,12 +176,18 @@ static Bool autoGood(MouseDevPtr pMse); #undef MOUSE _X_EXPORT InputDriverRec MOUSE = { - 1, - "mouse", - NULL, - MousePreInit, - NULL, - NULL, + .driverVersion = 1, + .driverName = "mouse", + .Identify = NULL, + .PreInit = MousePreInit, + .UnInit = NULL, + .module = NULL, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + .default_options = NULL, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 21 + .capabilities = 0 +#endif +#endif }; #define RETRY_COUNT 4 @@ -1195,7 +1201,7 @@ MouseReadInput(InputInfoPtr pInfo) /* * Set blocking to -1 on the first call because we know there is data to * read. Xisb automatically clears it after one successful read so that - * succeeding reads are preceeded by a select with a 0 timeout to prevent + * succeeding reads are preceded by a select with a 0 timeout to prevent * read from blocking indefinitely. */ XisbBlockDuration(pMse->buffer, -1); @@ -1255,11 +1261,11 @@ MouseReadInput(InputInfoPtr pInfo) */ /* * [KAZU-030897] - * Receive the fourth byte only when preceeding three bytes + * Receive the fourth byte only when preceding three bytes * have been detected (pBufP >= pMse->protoPara[4]). In the * previous versions, the test was pBufP == 0; we may have * mistakingly received a byte even if we didn't see anything - * preceeding the byte. + * preceding the byte. */ #ifdef EXTMOUSEDEBUG LogMessageVerbSigSafe(X_INFO, -1, "mouse 4th byte %x\n",u); @@ -1908,7 +1914,7 @@ FlushButtons(MouseDevPtr pMse) * action = 0: nothing * action < 0: ButtonRelease * - * The comment preceeding each section is the current emulation state. + * The comment preceding each section is the current emulation state. * The comments to the right are of the form * <button state> (<events>) -> <new emulation state> * which should be read as @@ -2586,7 +2592,6 @@ static Bool SetupMouse(InputInfoPtr pInfo) { MouseDevPtr pMse; - int i; int protoPara[8] = {-1, -1, -1, -1, -1, -1, -1, -1}; const char *name = NULL; Bool automatic = FALSE; @@ -2597,7 +2602,7 @@ SetupMouse(InputInfoPtr pInfo) if (pMse->protocolID == PROT_AUTO) { /* * We come here when user specifies protocol "auto" in - * the configuration file or thru the xf86misc extensions. + * the configuration file or through the xf86misc extensions. * So we initialize autoprobing here. * Probe for PnP/OS mouse first. If unsuccessful * try to guess protocol from incoming data. @@ -2617,7 +2622,7 @@ SetupMouse(InputInfoPtr pInfo) if (automatic) { if (name) { /* Possible protoPara overrides from SetupAuto. */ - for (i = 0; i < sizeof(pMse->protoPara); i++) + for (size_t i = 0; i < sizeof(pMse->protoPara); i++) if (protoPara[i] != -1) pMse->protoPara[i] = protoPara[i]; /* if we come here PnP/OS mouse probing was successful */ @@ -3243,7 +3248,7 @@ autoOSProtocol(InputInfoPtr pInfo, int *protoPara) /* Check for a builtin OS-specific protocol. */ if (osInfo->CheckProtocol && osInfo->CheckProtocol(name)) { /* We can only come here if the protocol has been - * changed to auto thru the xf86misc extension + * changed to auto through the xf86misc extension * and we have detected an OS specific builtin * protocol. Currently we cannot handle this */ name = NULL; @@ -3722,6 +3727,7 @@ autoGood(MouseDevPtr pMse) case AUTOPROBE_H_VALIDATE2: if (mPriv->goodCount < PROBE_UNCERTAINTY/2) return TRUE; + /* FALLTHROUGH */ default: return FALSE; } @@ -3755,8 +3761,9 @@ checkForErraticMovements(InputInfoPtr pInfo, int dx, int dy) mPriv->acc = abs(mPriv->accDx); AP_DBG(("acc=%i\n",mPriv->acc)); } - else + else { AP_DBG(("accDx=%i\n",mPriv->accDx)); + } } else { mPriv->accDx = 0; } @@ -3768,8 +3775,9 @@ checkForErraticMovements(InputInfoPtr pInfo, int dx, int dy) if (abs(mPriv->accDy) > mPriv->acc) { mPriv->acc = abs(mPriv->accDy); AP_DBG(("acc: %i\n",mPriv->acc)); - } else + } else { AP_DBG(("accDy=%i\n",mPriv->accDy)); + } } else { mPriv->accDy = 0; } diff --git a/driver/xf86-input-mouse/src/pnp.c b/driver/xf86-input-mouse/src/pnp.c index e5c4bc785..baa106bdd 100644 --- a/driver/xf86-input-mouse/src/pnp.c +++ b/driver/xf86-input-mouse/src/pnp.c @@ -411,7 +411,7 @@ pnpparse(InputInfoPtr pInfo, pnpid_t *id, char *buf, int len) xf86MsgVerb(X_INFO, 2, "%s: PnP rev %d.%02d\n", pInfo->name, id->revision / 100, id->revision % 100); - /* EISA vender and product ID */ + /* EISA vendor and product ID */ id->eisaid = &buf[3]; id->neisaid = 7; @@ -601,7 +601,7 @@ ps2SendPacket(InputInfoPtr pInfo, unsigned char *bytes, int len) return FALSE; } #ifdef DEBUG - xf86ErrorF("Recieved: 0x%x\n",c); + xf86ErrorF("Received: 0x%x\n",c); #endif if (c == 0xFA) /* ACK */ break; @@ -613,7 +613,7 @@ ps2SendPacket(InputInfoPtr pInfo, unsigned char *bytes, int len) if (c == 0xFC) /* error */ return FALSE; - /* Some mice accidently enter wrap mode during init */ + /* Some mice accidentally enter wrap mode during init */ if (c == *(bytes + i) /* wrap mode */ && (*(bytes + i) != 0xEC)) /* avoid recursion */ ps2DisableWrapMode(pInfo); diff --git a/driver/xf86-input-mouse/src/sun_mouse.c b/driver/xf86-input-mouse/src/sun_mouse.c index b092374ee..646c33a32 100644 --- a/driver/xf86-input-mouse/src/sun_mouse.c +++ b/driver/xf86-input-mouse/src/sun_mouse.c @@ -47,6 +47,10 @@ * XFree86 Project. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif @@ -118,7 +122,7 @@ static void vuidReadInput(InputInfoPtr pInfo); static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse); static void vuidMouseAdjustFrame(ADJUST_FRAME_ARGS_DECL); -static int vuidMouseGeneration = 0; +static unsigned long vuidMouseGeneration = 0; #if HAS_DEVPRIVATEKEYREC static DevPrivateKeyRec vuidMouseScreenIndex; @@ -280,16 +284,19 @@ vuidReadInput(InputInfoPtr pInfo) VuidMsePtr pVuidMse; int buttons; int dx = 0, dy = 0, dz = 0, dw = 0; - unsigned int n; + ssize_t n; unsigned char *pBuf; int absX = 0, absY = 0; Bool absXset = FALSE, absYset = FALSE; pMse = pInfo->private; - pVuidMse = getVuidMsePriv(pInfo); buttons = pMse->lastButtons; + pVuidMse = getVuidMsePriv(pInfo); + if (pVuidMse == NULL) { + xf86Msg(X_ERROR, "%s: cannot locate VuidMsePtr\n", pInfo->name); + return; + } pBuf = pVuidMse->buffer; - n = 0; do { n = read(pInfo->fd, pBuf, sizeof(Firm_event)); @@ -324,7 +331,7 @@ vuidReadInput(InputInfoPtr pInfo) return; } } else if (n != sizeof(Firm_event)) { - xf86Msg(X_WARNING, "%s: incomplete packet, size %d\n", + xf86Msg(X_WARNING, "%s: incomplete packet, size %zd\n", pInfo->name, n); } |