149 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult
6d4fef9f33 gitlab CI: add libdrm with freedreno, nouveau, omap
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2024-09-16 15:43:55 +02:00
Enrico Weigelt, metux IT consult
5c6ab458c0 gitlab CI: add debian-i386 build
Add CI jobs for building on debian-i386 (just had amd64 yet), so we can
also test 32bit targets.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2024-09-16 15:43:55 +02:00
Enrico Weigelt, metux IT consult
a12389458a gitlab CI: add pipeline for building against various Xserver releases
Adding a gitlab pipeline building this driver against Xserver major releases
since 1.18, including current master branch, on FreeBSD and Debian.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2024-09-16 15:43:55 +02:00
Enrico Weigelt, metux IT consult
6c4c758029 gitlab CI: common scripts for driver builds
Adding a bunch of common scripts for building xorg drivers on different
platforms (for now Debian and FreeBSD) against different server versions.

Also designed to be executed locally (eg. within a VM), so one doesn't
always have to employ f.d.o gitlab.

For now, these are synced manually across various driver repos, until we've
found a viable solution for a central place.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2024-09-16 15:43:55 +02:00
Enrico Weigelt, metux IT consult
3bbcb6a143 fix FTBS: out-of-tree build
/usr/bin/sed -e 's|__BIN_PREFIX__|/usr/local/bin|g'  -e 's|__HAL_BIN_PREFIX__|/usr/local/bin|g'  <  > hal-probe-vmmouse
  /bin/sh: Syntax error: redirection unexpected (expecting word)
  *** Error code 2

It seems that BSD make doesn't really support VPATH, like GNU make does.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-vmmouse/-/merge_requests/5>
2024-06-05 11:30:41 +02:00
Alan Coopersmith
b74c0a1326 Add X.Org's standard C warning flags to AM_CFLAGS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-05 17:54:12 -08:00
Matt Turner
1ed3ed39fc xf86-input-vmmouse 13.2.0
Signed-off-by: Matt Turner <mattst88@gmail.com>
xf86-input-vmmouse-13.2.0
2022-10-08 19:32:01 -04:00
Matt Turner
fa02334233 tools: Fix declaration of xf86EnableIO()
/usr/include/xorg/xf86_OSproc.h:115:23: error: type of 'xf86EnableIO' does not match original declaration [-Werror=lto-type-mismatch]
  115 | extern _X_EXPORT Bool xf86EnableIO(void);
      |                       ^
vmmouse_iopl.c:125:6: note: return value type mismatch
  125 | bool xf86EnableIO(void)
      |      ^
2022-08-23 15:52:46 +00:00
Alan Coopersmith
2ff6677768 gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-07-18 16:09:53 -07:00
Alan Coopersmith
040f3b48ae Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-16 13:07:26 -08:00
Alan Coopersmith
d5bbd986b4 Update configure.ac bug URL for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-25 13:02:54 -08:00
Alan Coopersmith
8823b14cbc Update "See Also" list in vmmouse_detect man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
2018-03-25 00:38:12 -07:00
Mihail Konev
4b0126a2bd autogen: add default patch prefix
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26 14:00:21 +10:00
Emil Velikov
8e2f2d5389 autogen.sh: use quoted string variables
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26 11:26:20 +10:00
Peter Hutterer
5e712d2fac autogen.sh: use exec instead of waiting for configure to finish
Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-01-26 11:25:39 +10:00
Colin Walters
dd312ea6a8 autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt

Signed-off-by: Adam Jackson <ajax@redhat.com>
2017-01-26 11:25:39 +10:00
Peter Hutterer
54654ce684 Drop maintainer mode from autogen.sh
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26 11:19:23 +10:00
Thomas Klausner
8081bdcaea Add NetBSD/amd64 support for iopl calls.
While here, correct AC_DEFINE usage.

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2015-06-26 14:06:24 +02:00
Thomas Klausner
e57a592d35 Replace unportable test(1) operator.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2015-06-26 14:02:40 +02:00
Thomas Hellstrom
bbe41fae44 Bump version number for release
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Trivial.
xf86-input-vmmouse-13.1.0
2015-06-25 03:20:34 -07:00
Thomas Hellstrom
d2040bd52d vmmouse: Bump version number for release
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
xf86-input-vmmouse-13.0.99
2015-04-08 23:26:34 -07:00
Thomas Hellstrom
5b7d9cf15a vmmouse: Fix vmmouse_detect build on BSD
Tested with FreeBSD, but changes affect also OpenBSD and NetBSD to fix
compiling and linking with the relevant system libraries.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Sinclair Yeh <syeh@vmware.com>
2015-04-08 22:58:47 -07:00
Thomas Hellstrom
c8ec00f537 vmmouse: Add support for the access restrict command
The access restrict command, if implemented, restricts vmmouse port
access to the indicated level.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Michael Banack <banackm@vmware.com>
2015-04-08 07:12:23 -07:00
Thomas Hellstrom
d5c1493b5f vmmouse: Run vmmouse_detect as an io privileged process
Many distros already include patches to do this in various more or less
hackish ways. Since VMware now is about to restrict access to the VMmouse
backdoor, let's try to support it officially.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Acked-by: Sinclair Yeh <syeh@vmware.com>
2015-04-07 02:01:10 -07:00
Stefan Dirsch
1cbbc03c4b vmmouse_client.h: Include xorg-server.h before xf86_OSproc.h
xf86_OSproc.h cannot be included without first including xorg-server.h.

Without this the build fails on systems with the latest glibc,
throwing this error:

In file included from /usr/include/string.h:634:0,
                 from /usr/include/xorg/os.h:53,
                 from /usr/include/xorg/misc.h:115,
                 from /usr/include/xorg/window.h:50,
                 from /usr/include/xorg/globals.h:7,
                 from /usr/include/xorg/opaque.h:34,
                 from /usr/include/xorg/xf86_OSproc.h:127,
                 from vmmouse_client.h:42,
                 from vmmouse_client.c:38:
/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
strndup(const char *str, size_t n);

This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
causing os.h to redefine it.

Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
2014-10-08 12:09:05 +02:00
Thomas Hellstrom
576e8123d9 Back off if we detect a vmmouse kernel driver v3
If a vmmouse kernel driver is active, vmmouse input is handled by the Xorg
evdev driver and not by the vmmouse driver, so make sure the vmmouse_detect
utility doesn't detect a vmmouse if a kernel driver is active.

v2: Change the vmmouse kernel device name, fix comment.
v3: Fix up libudev error handling.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
2014-10-08 12:08:58 +02:00
Loïc Yhuel
de58228aaf Fix wheel button labels
Wheel is using buttons 4/5, but btn_labels array is 0-based.
It matches mouse and evdev drivers, and fixes wheel in Qt5.3.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-07-14 08:54:23 +10:00
Jeremy Huddleston Sequoia
336f863383 Always include config.h first
This fixes some build warnings about CSRG_BASED being redefined due to
incorrect header include ordering.

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-11-28 11:59:53 -08:00
Gaetan Nadon
05492b038e tools: make install fails when user has no write permission in /lib
The location of the udevdir is obtained from pkg-config. This is generally
/lib/udev. Most people run their build scripts as non-root and do not want to
overwrite or add files on their workstation system.

This was not the behaviour in release 12.8.0. The code in configure.ac set
udevdir based on common installation prefixes /usr or /usr/local for which
the user would probably have root permission anyway. Other prefixes would
be assigned a udevdir value under the given $prefix.

The patch proposes the default location $libdir/udev/rules.d and no longer
seeking it's value from pkg-config, just like what was done for hal.

The expectation is that the xorg source tree can be built from top to bottom
out of the box without tweaks or workarounds. A developer need to
manually install a rule under development and run an admin command for it to
take effect. Unlike binaries or libraries, there is no "path" style
variable to append a rule in development from a different location.

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
2013-10-21 10:39:55 +02:00
Peter Hutterer
740f2cbcc0 Drop AM_MAINTAINER_MODE
Long writeup:
http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-21 10:39:51 +02:00
Peter Hutterer
9a815289f9 Don't de-reference pMse if it hasn't been initialised yet
If the device fails PreInit, UnInit is still called by pMse may be NULL.
Dereferencing it is a bad idea.

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-21 10:39:45 +02:00
Peter Hutterer
3d5b85d62c Handle DEVICE_ABORT on ABI 19.1
Called on server abort, so let's just do the absolute minimum.

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
2013-10-21 10:38:13 +02:00
Gaetan Nadon
eb23b149c1 "make dist" fails when workstation has no udev package
Unable to create a tar file for the vmmouse package or run distcheck for that
matter. In tools, when the dev package is not installed, the makefile code
under HAS_UDEV_RULES_DIR is commented out. That leaves $(udev_DATA) empty
which causes EXTRA_DIST to be missing a file.

The solution is to spell out the file name. The name can never change as the
content of the tarball must be the same for everyone creating a tar file from
git, regardless of their workstation configuration.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24 15:56:28 -04:00
Gaetan Nadon
60a6e4ec60 Autoconf: Fix deprecated use of AC_OUTPUT
Use AC_CONFIG_FILES (once or more) and then AC_OUTPUT.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24 09:02:57 -04:00
Gaetan Nadon
64df5e5fde Autoconf: minimum level required is 2.60
The minimum for all X.Org modules.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24 09:02:57 -04:00
Gaetan Nadon
c37d1dcf76 Autoconf: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Just a macro name change.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24 09:02:57 -04:00
Gaetan Nadon
d695372a7f Autoconf: remove AC_PROG_CC which overrides AC_PROG_CC_C99 from util-macros
All other X.Org modules and mainly the server are using C99 compiler.
Currently the compiler gets initialized twice, once to C99 from
util-macros and once to C89 from configure.ac.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24 09:02:57 -04:00
Peter Hutterer
8cb6254ad3 Free the vmmouse data on UnInit
xf86DeleteInput() will free pInfo->private, but not the one hanging off
that.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Zack Rusin <zackr@vmware.com>
2013-02-07 18:50:34 -08:00
Zack Rusin
a2e4aa9d20 vmmouse release 13.0.0
Signed-off-by: Zack Rusin <zackr@vmware.com>
xf86-input-vmmouse-13.0.0
2013-01-15 12:03:28 -08:00
Zack Rusin
1b40f1e1f6 vmmouse 12.9.99.901
Internal release for QE testing

Signed-off-by: Zack Rusin <zackr@vmware.com>
2012-12-06 16:38:21 -05:00
Peter Hutterer
cabf4cb7c0 Fix compiler warnings about unused variables
vmmouse.c: In function 'MouseCommonOptions':
vmmouse.c:732:16: warning: variable 'from' set but not used
[-Wunused-but-set-variable]

vmmouse.c: In function 'MouseCommonOptions':
vmmouse.c:733:8: warning: variable 'origButtons' set but not used
[-Wunused-but-set-variable]

vmmouse.c: In function 'VMMouseDeviceControl':
vmmouse.c:838:19: warning: variable 'mPriv' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2012-11-23 10:19:19 +01:00
Peter Hutterer
393880d2e6 Use sigsafe logging in ReadInput path
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2012-11-23 10:17:56 +01:00
Peter Hutterer
dba73cebb5 Fetch the udev dir from udev.pc instead of guessing based on prefix
Reviewed-by: Gaetan Nadon<memsize@videotron.ca>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
2012-08-07 00:55:01 +02:00
Stephen Brooks
3c8ccf5eec Reset ps2buttons to avoid button messages from being discarded.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Stephen Brooks <nightbikeman@gmail.com>
2012-08-07 00:36:19 +02:00
Jakob Bornecrantz
3a828d8767 vmmouse 12.8.0
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
xf86-input-vmmouse-12.9.0
2012-05-22 20:14:25 +02:00
Zack Rusin
2a321a3935 Revert "Adjust the kernel name in the udev file."
This reverts commit 189dc266a6.

It seems that for some reason the device routing is breaking with this.
Possibly related to Win7 x64 hosts because it's not reproducible on
GNU/Linux hosts. Semantially we'd still like to match only on mouse
kernel but for the time being this seems to cause more problems
than it solves. Hence the revert.
2012-05-10 19:55:01 -04:00
Gaetan Nadon
55efac85ca config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Moved up in the autoconf init section.
It has been removed from Automake 1.12.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Zack Rusin <zackr@vmware.com>
2012-05-03 13:16:38 -04:00
Michal Srb
840dcbf947 Enable hardware access during vmmouse preinit.
Vmmouse driver uses outl calls but never requests hardware access.
In case there are no other drivers that requests it, vmmouse
initialization will fail. (Found on KVM virtual machine with fbdev
graphics driver and vmmouse input driver.)

Request hardware access in same way xf86-input-keyboard does.

Signed-off-by: Zack Rusin <zackr@vmware.com>
2012-05-03 13:11:42 -04:00
Zack Rusin
e925b2e6e9 vmmouse 12.8.0
bump the version number for the new release

Signed-off-by: Zack Rusin <zackr@vmware.com>
xf86-input-vmmouse-12.8.0
2012-03-08 09:51:48 -05:00
Zack Rusin
189dc266a6 Adjust the kernel name in the udev file.
Some distros (most notable OpenSuSE) are unable to match on the
'event' devices, since we should be using 'mouse' kernel anyway
(because that's what the 'udevadm info' reports) switch to it in the
rules file.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
2012-03-08 09:46:31 -05:00