.gitignore | 73 +++++++++++++++-- ChangeLog | 88 ++++++++++++++++++++ INSTALL | 231 ------------------------------------------------------- Makefile.am | 11 ++ configure.ac | 30 +------ debian/changelog | 10 +- man/.gitignore | 3 man/Makefile.am | 41 ++++----- src/vmmouse.c | 4 tools/.gitignore | 3 10 files changed, 206 insertions(+), 288 deletions(-)
New commits: commit fa7267c2fb6a50be54f8e32cfa91060dbdb24822 Author: Brice Goglin <bgog...@debian.org> Date: Thu Feb 4 19:42:48 2010 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 8569be7..ab5bd84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-vmmouse (1:12.6.5-3) UNRELEASED; urgency=low +xserver-xorg-input-vmmouse (1:12.6.5-3) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -10,7 +10,7 @@ xserver-xorg-input-vmmouse (1:12.6.5-3) UNRELEASED; urgency=low + Stop using xf86LoaderReqSymLists since it was removed from the server, closes: #568403. - -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:30:58 +0100 + -- Brice Goglin <bgog...@debian.org> Thu, 04 Feb 2010 19:39:57 +0100 xserver-xorg-input-vmmouse (1:12.6.5-2) experimental; urgency=low commit bc00ccf5506d9c3889830d5a92e58eb0ed36747a Author: Brice Goglin <bgog...@debian.org> Date: Thu Feb 4 19:39:51 2010 +0100 Pull from upstream master diff --git a/debian/changelog b/debian/changelog index 6282cbc..8569be7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ xserver-xorg-input-vmmouse (1:12.6.5-3) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders + [ Brice Goglin ] + * Pull from upstream master branch up to commit aca67eca. + + Stop using xf86LoaderReqSymLists since it was removed from the + server, closes: #568403. + -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:30:58 +0100 xserver-xorg-input-vmmouse (1:12.6.5-2) experimental; urgency=low commit aca67eca8bbb1368a2f36614b0e78b98947f134f Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri Jan 15 15:15:54 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/man/Makefile.am b/man/Makefile.am index 1f31487..2671512 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,27 +1,24 @@ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation. -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. # man_MANS = @driver_n...@_detect.1 commit b3b9f36deb3fb1fcf66e591fcb075fe295e0cf0e Author: Gaetan Nadon <mems...@videotron.ca> Date: Tue Dec 15 22:01:02 2009 -0500 configure.ac: remove unused sdkdir=$(pkg-config...) statement The sdkdir variable isn't use, so remove the statement. Acked-by: Dan Nicholson <dbn.li...@gmail.com> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 6aaf9db..80248c9 100644 --- a/configure.ac +++ b/configure.ac @@ -90,7 +90,6 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1] xproto $REQUIRED_MODULES) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) PKG_CHECK_EXISTS([xorg-server >= 1.1.0], [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1, commit 4eb807b3e7271f5116daebea9412c72e2faae4a5 Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Nov 23 09:25:05 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index f80d2ee..daf09d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = shared src tools fdi man +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL INSTALL: commit 9bdfaffc1b858737c3fe85bc9b0bb25001f46460 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Nov 20 10:09:24 2009 +1000 Remove unused bits from configure.ac Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 776b454..6aaf9db 100644 --- a/configure.ac +++ b/configure.ac @@ -50,24 +50,6 @@ AC_PROG_CC AH_TOP([#include "xorg-server.h"]) -#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers]) -# -#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput], -# [Build XInput support (default: yes)]), -# [XINPUT=$enableval],[XINPUT=yes]) -#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes") -#if test "x$XINPUT" = "xyes" ; then -# AC_DEFINE(XINPUT,1,[Enable XInput support]) -#fi -# -#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb], -# [Build XKB support (default: yes)]), -# [XKB=$enableval],[XKB=yes]) -#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes") -#if test "x$XKB" = "xyes" ; then -# AC_DEFINE(XKB,1,[Enable XKB support]) -#fi - AC_ARG_WITH(xorg-module-dir, AC_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), commit 1f8df297b4d57e2da58faf26df378548efa47251 Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Oct 28 14:41:41 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Automake 'foreign' option is specified in configure.ac. Remove from Makefile.am diff --git a/Makefile.am b/Makefile.am index dbf2b92..f80d2ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -AUTOMAKE_OPTIONS = foreign SUBDIRS = shared src tools fdi man .PHONY: ChangeLog INSTALL commit c2f77dcc95ecb5e3cfa1235e67b085aa93e4a724 Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Oct 28 14:09:09 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 62ea076..0000000 --- a/INSTALL +++ /dev/null @@ -1,231 +0,0 @@ -Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation, -Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for variables by setting -them in the environment. You can do that on the command line like this: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as 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 `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it cannot guess the host type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the host -platform (i.e., that on which the generated programs will eventually be -run) with `--host=TYPE'. In this case, you should also specify the -build platform with `--build=TYPE', because, in this case, it may not -be possible to guess the build platform (it sometimes involves -compiling and running simple test programs, and this can't be done if -the compiler is a cross compiler). - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am index 6c4d773..dbf2b92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = shared src tools fdi man -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index d4c94e2..776b454 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_INIT([xf86-input-vmmouse], AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit db91ec37ea274f69eb5d07c41bef787d5e9537a5 Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Oct 26 12:54:20 2009 -0400 Several driver modules do not have a ChangeLog target in Makefile.am #23814 The git generated ChangeLog replaces the hand written one. Update configure.ac to xorg-macros level 1.3. Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros Update Makefile.am to add ChangeLog target if missing Remove ChangeLog from EXTRA_DIST or *CLEAN variables This is a pre-req for the INSTALL_CMD diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 467041b..0000000 --- a/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -2006-04-06 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - * src/vmmouse.c: - * src/vmmouse_proto.h: - Unlibcwrap. Bump server version requirement. Bump to 12.4.0. - -2006-03-28 Philip Langdale <plangd...@vmware.com> - - * configure.ac: - * src/vmmouse.c: Bump PATCHLEVEL. - * src/vmmouse_proto.h: Use the right #define - when detecting a 64bit compilation. This fixes - the driver to actually work for 64bit builds. - -2006-01-16 Philip Langdale <plangd...@vmware.com> - - * configure.ac: - * src/vmmouse.c: Bump PATCHLEVEL. - * src/vmmouse_proto.c: push/pop ebx to keep - gcc4 happy when compiling with -fPIC. - -2006-01-06 Philip Langdale <plangd...@vmware.com> - - * Initial release. diff --git a/Makefile.am b/Makefile.am index 2e7b369..6c4d773 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,9 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = shared src tools fdi man +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index a7ecda9..d4c94e2 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,12 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + DRIVER_NAME=vmmouse AC_SUBST([DRIVER_NAME]) @@ -127,7 +133,4 @@ AC_SUBST([CFLAGS]) # Checks for header files. AC_HEADER_STDC -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile shared/Makefile src/Makefile tools/Makefile fdi/Makefile man/Makefile]) commit bb622c56b522d7b6962770b25bbe4e89ea280f16 Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Oct 22 12:34:16 2009 -0400 .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. diff --git a/.gitignore b/.gitignore index 4f978e1..273b53b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,78 @@ -Makefile -Makefile.in -*.la -*.lo -*.o -.deps -.libs +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ libtool +libtool.m4 ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -stamp-h1 +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for xf86-input-vmmouse +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# diff --git a/man/.gitignore b/man/.gitignore new file mode 100644 index 0000000..f2c0616 --- /dev/null +++ b/man/.gitignore @@ -0,0 +1,3 @@ +# Add & Override for this directory and it's subdirectories +# Override default pattern *.[0-9] from top level .gitignore +!vmmouse_detect.1 diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 0000000..96849a3 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,3 @@ +# Add & Override for this directory and it's subdirectories +hal-probe-vmmouse +vmmouse_detect commit 43e123c2f4fadfdf6e7cf5aa864102d82e40fe4b Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Sep 8 22:35:55 2009 -0700 Symbol was removed from the server. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/vmmouse.c b/src/vmmouse.c index d4f0ca6..1f4774a 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -146,6 +146,7 @@ typedef struct { Bool absoluteRequested; } VMMousePrivRec, *VMMousePrivPtr; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7 static const char *reqSymbols[] = { "InitPointerDeviceStruct", "LoaderSymbol", @@ -192,6 +193,7 @@ static const char *reqSymbols[] = { "Xstrdup", NULL }; +#endif InputDriverRec VMMOUSE = { 1, @@ -1175,7 +1177,9 @@ VMMousePlug(pointer module, { static Bool Initialised = FALSE; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7 xf86LoaderReqSymLists(reqSymbols, NULL); +#endif if (!Initialised) Initialised = TRUE; -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org