Update to 1.9.1:

This release delivers several fixes & enhancements for the driver on
Solaris & NetBSD, including absolute positioning improvements for both.

Alan Coopersmith (4):
      Wrap some overly long lines
      Use asprintf (or Xprintf on old servers) instead of strdup+sprintf
      Update some outdated language in a comment on obsolete hardware
      xf86-input-mouse 1.9.1

Michael Thayer (2):
      Do not drop the result of protocol detection
      Make absolute input reporting in Solaris aware of resolution changes

Patrik Jakobsson (1):
      Add AC_SYSTEM_EXTENSIONS to expose asprintf with GNU libc

Thomas Klausner (4):
      Enable MSE_MISC on NetBSD as well.
      Make wsmouse (re-)init the version.
      For wsmouse, keep 3-button emulation status.
      Add support for absolute positioning (tablets).

4 files changed, 6 insertions, 117 deletions

diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index a7e0e64867a..4df6d91c386 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2014/05/05 00:48:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2014/08/12 20:29:26 wiz Exp $
 
-DISTNAME=	xf86-input-mouse-1.9.0
-PKGREVISION=	2
+DISTNAME=	xf86-input-mouse-1.9.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-input-mouse/distinfo b/x11/xf86-input-mouse/distinfo
index 17e5fda6ad5..121b3b721c3 100644
--- a/x11/xf86-input-mouse/distinfo
+++ b/x11/xf86-input-mouse/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.15 2013/08/19 09:19:27 wiz Exp $
+$NetBSD: distinfo,v 1.16 2014/08/12 20:29:26 wiz Exp $
 
-SHA1 (xf86-input-mouse-1.9.0.tar.bz2) = 5f9e5f450100252efa4f8b074fbb262c42811d46
-RMD160 (xf86-input-mouse-1.9.0.tar.bz2) = 710d721f91018a25068396248315c1f933ee31db
-Size (xf86-input-mouse-1.9.0.tar.bz2) = 353339 bytes
-SHA1 (patch-src_bsd__mouse.c) = 1714bf37f1c89097c341a7c1749cadfebec94411
-SHA1 (patch-src_mouse.c) = ff5353e64f815e796461c067d98538167be4de34
+SHA1 (xf86-input-mouse-1.9.1.tar.bz2) = edde3e0201ec18fbbbcf3c157f912dbae3b5a3cd
+RMD160 (xf86-input-mouse-1.9.1.tar.bz2) = 8d9807362b6be0b552e2fef605665dc30ce379ed
+Size (xf86-input-mouse-1.9.1.tar.bz2) = 348244 bytes
diff --git a/x11/xf86-input-mouse/patches/patch-src_bsd__mouse.c b/x11/xf86-input-mouse/patches/patch-src_bsd__mouse.c
deleted file mode 100644
index edfd51e6fb9..00000000000
--- a/x11/xf86-input-mouse/patches/patch-src_bsd__mouse.c
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-src_bsd__mouse.c,v 1.2 2013/08/19 09:19:27 wiz Exp $
-
-Add MSE_MISC on NetBSD as well, so mouse is found correctly.
-Add absolute positioning support.
-
---- src/bsd_mouse.c.orig	2012-10-08 01:40:07.000000000 +0000
-+++ src/bsd_mouse.c
-@@ -97,9 +97,7 @@ static const char *mouseDevs[] = {
- static int
- SupportedInterfaces(void)
- {
--#if defined(__NetBSD__)
--    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__)
-     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
- #else
-     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
-@@ -409,7 +407,7 @@ wsconsReadInput(InputInfoPtr pInfo)
-     n /= sizeof(struct wscons_event);
-     while( n-- ) {
-         int buttons = pMse->lastButtons;
--        int dx = 0, dy = 0, dz = 0, dw = 0;
-+        int dx = 0, dy = 0, dz = 0, dw = 0, x, y;
-         switch (event->type) {
-         case WSCONS_EVENT_MOUSE_UP:
- #define BUTBIT (1 << (event->value <= 2 ? 2 - event->value : event->value))
-@@ -434,6 +432,30 @@ wsconsReadInput(InputInfoPtr pInfo)
-             dw = event->value;
-             break;
- #endif
-+	case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
-+	    miPointerGetPosition (pInfo->dev, &x, &y);
-+	    x = event->value;
-+	    miPointerSetPosition (pInfo->dev, Absolute, (double *)&x, (double *)&y);
-+	    xf86PostMotionEvent(pInfo->dev, TRUE, 0, 2, x, y);
-+	    ++event;
-+	    continue;
-+	case WSCONS_EVENT_MOUSE_ABSOLUTE_Y:
-+	    miPointerGetPosition (pInfo->dev, &x, &y);
-+	    y = event->value;
-+	    miPointerSetPosition (pInfo->dev, Absolute, (double *)&x, (double *)&y);
-+	    xf86PostMotionEvent(pInfo->dev, TRUE, 0, 2, x, y);
-+	    ++event;
-+	    continue;
-+#ifdef WSCONS_EVENT_MOUSE_ABSOLUTE_Z
-+	case WSCONS_EVENT_MOUSE_ABSOLUTE_Z:
-+	    ++event;
-+	    continue;
-+#endif
-+#ifdef WSCONS_EVENT_MOUSE_ABSOLUTE_W
-+	case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
-+	    ++event;
-+	    continue;
-+#endif
-         default:
-             LogMessageVerbSigSafe(X_WARNING, -1,
-                                   "%s: bad wsmouse event type=%d\n", pInfo->name,
diff --git a/x11/xf86-input-mouse/patches/patch-src_mouse.c b/x11/xf86-input-mouse/patches/patch-src_mouse.c
deleted file mode 100644
index 6ca95bfdac8..00000000000
--- a/x11/xf86-input-mouse/patches/patch-src_mouse.c
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-src_mouse.c,v 1.1 2013/08/19 09:19:27 wiz Exp $
-
-Set mouse protocol version, so xserver knows how to talk to us.
-Do not lose emulate3buttons setting for multiplexed mouse.
-
---- src/mouse.c.orig	2012-10-08 01:40:07.000000000 +0000
-+++ src/mouse.c
-@@ -67,6 +67,12 @@
- #include "xserver-properties.h"
- #include "xf86-mouse-properties.h"
- 
-+#ifdef __NetBSD__
-+#include <time.h>
-+#include <dev/wscons/wsconsio.h>
-+#include <sys/ioctl.h>
-+#endif
-+
- #include "compiler.h"
- 
- #include "xisb.h"
-@@ -1733,6 +1739,11 @@ MouseProc(DeviceIntPtr device, int what)
-         if (pInfo->fd == -1)
-             xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
-         else {
-+#if defined(__NetBSD__) && defined(WSCONS_SUPPORT) && defined(WSMOUSEIO_SETVERSION)
-+            int version = WSMOUSE_EVENT_VERSION;
-+            if (ioctl(pInfo->fd, WSMOUSEIO_SETVERSION, &version) == -1)
-+                xf86Msg(X_WARNING, "%s: cannot set version\n", pInfo->name);
-+#endif
-             if (pMse->xisbscale)
-                 pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);
-             else
-@@ -2046,6 +2057,17 @@ Emulate3ButtonsSoft(InputInfoPtr pInfo)
-     if (!pMse->emulate3ButtonsSoft)
-         return TRUE;
- 
-+#if defined(__NetBSD__) && defined(WSCONS_SUPPORT)
-+   /*
-+    * On NetBSD a wsmouse is a multiplexed device. Imagine a notebook
-+    * with two-button mousepad, and an external USB mouse plugged in
-+    * temporarily. After using button 3 on the external mouse and
-+    * unplugging it again, the mousepad will still need to emulate
-+    * 3 buttons.
-+    */
-+   return TRUE;
-+#endif
-+
-     LogMessageVerbSigSafe(X_INFO, 4, "mouse: 3rd Button detected: disabling emulate3Button\n");
- 
-     Emulate3ButtonsSetEnabled(pInfo, FALSE);