CVS commit: pkgsrc/x11/xf86-input-ws

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri May 27 02:35:43 UTC 2022

Modified Files:
        pkgsrc/x11/xf86-input-ws: MESSAGE Makefile distinfo
        pkgsrc/x11/xf86-input-ws/patches: patch-src_ws.c
Removed Files:
        pkgsrc/x11/xf86-input-ws/patches: patch-src_emumb.c
            patch-src_emuwheel.c

Log Message:
xf86-input-ws: update to 1.3.0.20220511

Fix typo: ususally -> usually.
Ignore WSMOUSEIO_GTYPE ioctl failure when checking /dev/wsmouse
Use C99 designated structure initializers.
replace obsoleted xf86{,Un}BlockSIGIO() calls by input_{,un}lock()
Adapt Block and Wakeup handlers prototypes to X server 1.20.
Add support for precision scrolling.
Improve the wheel emulation logic
If read() returns EIO, detach the xserver driver
Remove zaurus, zts, and ztsscale references
Explicitely include <sys/time.h> where needed.
Read multiple events at once.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xf86-input-ws/MESSAGE
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xf86-input-ws/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xf86-input-ws/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xf86-input-ws/patches/patch-src_emumb.c \
    pkgsrc/x11/xf86-input-ws/patches/patch-src_emuwheel.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-input-ws/MESSAGE
diff -u pkgsrc/x11/xf86-input-ws/MESSAGE:1.1 pkgsrc/x11/xf86-input-ws/MESSAGE:1.2
--- pkgsrc/x11/xf86-input-ws/MESSAGE:1.1        Sat Oct 10 20:02:52 2015
+++ pkgsrc/x11/xf86-input-ws/MESSAGE    Fri May 27 02:35:43 2022
@@ -1,11 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/10/10 20:02:52 tnn Exp $
+$NetBSD: MESSAGE,v 1.2 2022/05/27 02:35:43 tnn Exp $
 
 To use this driver, your xorg.conf file should have an entry like this:
 
+Section "Device"
        Identifier      "Mouse0"
        Driver          "ws"
        Option          "Device"        "/dev/wsmouse"
+EndSection
 
 This should work with many wscons pointing devices, especially the zaurus.
 Please see the ws(4) manual page for more information.

Index: pkgsrc/x11/xf86-input-ws/Makefile
diff -u pkgsrc/x11/xf86-input-ws/Makefile:1.7 pkgsrc/x11/xf86-input-ws/Makefile:1.8
--- pkgsrc/x11/xf86-input-ws/Makefile:1.7       Sun Apr 10 08:53:19 2022
+++ pkgsrc/x11/xf86-input-ws/Makefile   Fri May 27 02:35:43 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/04/10 08:53:19 nia Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/27 02:35:43 tnn Exp $
 
-DISTNAME=      xf86-input-ws-1.3.0.20151010
-PKGREVISION=   2
+DISTNAME=      xf86-input-ws-1.3.0.20220511
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 

Index: pkgsrc/x11/xf86-input-ws/distinfo
diff -u pkgsrc/x11/xf86-input-ws/distinfo:1.5 pkgsrc/x11/xf86-input-ws/distinfo:1.6
--- pkgsrc/x11/xf86-input-ws/distinfo:1.5       Tue Oct 26 11:34:40 2021
+++ pkgsrc/x11/xf86-input-ws/distinfo   Fri May 27 02:35:43 2022
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:34:40 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/05/27 02:35:43 tnn Exp $
 
-BLAKE2s (xf86-input-ws-1.3.0.20151010.tar.gz) = 6505a4f8ce3c78a88fb88f9a84b06b7d38734d103c61dca35839fab8099fc3a1
-SHA512 (xf86-input-ws-1.3.0.20151010.tar.gz) = de347b98cb508c363ffb422ad1249ad069eae77222da03a875b15b0367ffee580f580a7f671adfb9e621c6b49f2d4772e85887ebbd851c2317630ea3780b497b
-Size (xf86-input-ws-1.3.0.20151010.tar.gz) = 323648 bytes
-SHA1 (patch-src_emumb.c) = 6e24f30272373f07eacfc86288e6513bc04b9abc
-SHA1 (patch-src_emuwheel.c) = 71898121faa75af02dc46dd597f87afb00ad2bc5
-SHA1 (patch-src_ws.c) = 66cdc536a6a931d117f2e22111b1b95bf1d63b84
+BLAKE2s (xf86-input-ws-1.3.0.20220511.tar.gz) = 2c84b8878160554e2a58c3ca086ca032bc9bf7be1dc8ed90413fb175ecfff53b
+SHA512 (xf86-input-ws-1.3.0.20220511.tar.gz) = 10581eb9ce9d5824c0a08530d0f6dde29abb7eb6e6a3865cdebb1156f79bcee249623cbf7f23679523003e7919773df9c6a3c4a35df8aeddc44a57fc83859e89
+Size (xf86-input-ws-1.3.0.20220511.tar.gz) = 347971 bytes
+SHA1 (patch-src_ws.c) = c30e0560dfb467b9a35fa67b1ef4b712d2f92d74

Index: pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c
diff -u pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c:1.1 pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c:1.2
--- pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c:1.1 Sat Oct 10 20:02:52 2015
+++ pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c     Fri May 27 02:35:43 2022
@@ -1,8 +1,19 @@
-$NetBSD: patch-src_ws.c,v 1.1 2015/10/10 20:02:52 tnn Exp $
+$NetBSD: patch-src_ws.c,v 1.2 2022/05/27 02:35:43 tnn Exp $
 
---- src/ws.c.orig      2015-08-29 08:48:29.000000000 +0000
+ws.c:407:3: warning: attempt to free a non-heap object
+Reported to upstream maintainers.
+
+--- src/ws.c.orig      2022-05-27 02:04:14.000000000 +0000
 +++ src/ws.c
-@@ -550,9 +550,11 @@ wsReadHwState(InputInfoPtr pInfo, wsHwSt
+@@ -404,7 +404,6 @@ wsDeviceInit(DeviceIntPtr pWS)
+           axes_labels[VSCROLL_AXIS], 0, -1, 0, 0, 0, Relative);
+       priv->scroll_mask = valuator_mask_new(MAX_VALUATORS);
+       if (!priv->scroll_mask) {
+-              free(axes_labels);
+               return !Success;
+       }
+ 
+@@ -611,9 +610,11 @@ wsReadHwState(InputInfoPtr pInfo, wsHwSt
                case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
                        /* ignore those */
                        continue;
@@ -11,10 +22,10 @@ $NetBSD: patch-src_ws.c,v 1.1 2015/10/10
                        DBG(4, ErrorF("Sync\n"));
                        return TRUE;
 +#endif
-               default:
-                       xf86IDrvMsg(pInfo, X_WARNING,
-                           "bad wsmouse event type=%d\n", event->type);
-@@ -793,17 +795,23 @@ wsSetCalibProperty(DeviceIntPtr device, 
+               case WSCONS_EVENT_HSCROLL:
+                       hw->hscroll = event->value;
+                       DBG(4, ErrorF("Horiz. Scrolling %d\n", event->value));
+@@ -876,17 +877,23 @@ wsSetCalibProperty(DeviceIntPtr device, 
                priv->coords.maxx = priv->max_x;
                priv->coords.miny = priv->min_y;
                priv->coords.maxy = priv->max_y;