update to xf86-input-mouse-1.8.1 for modular-xorg-server-1.12.4

6 files changed, 9 insertions, 238 deletions

diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index d86601ccfd2..e6f766a08f0 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2012/10/29 05:07:02 asau Exp $
+# $NetBSD: Makefile,v 1.18 2013/05/16 05:53:59 richard Exp $
 
-DISTNAME=	xf86-input-mouse-1.7.2
-PKGREVISION=	2
+DISTNAME=	xf86-input-mouse-1.8.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-input-mouse/PLIST b/x11/xf86-input-mouse/PLIST
index 980d1274e99..f41ae1c7905 100644
--- a/x11/xf86-input-mouse/PLIST
+++ b/x11/xf86-input-mouse/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/05/16 05:53:59 richard Exp $
+include/xorg/xf86-mouse-properties.h
+lib/pkgconfig/xorg-mouse.pc
 lib/xorg/modules/input/mouse_drv.la
 man/man4/mousedrv.4
diff --git a/x11/xf86-input-mouse/distinfo b/x11/xf86-input-mouse/distinfo
index 03b6075858c..57578746c01 100644
--- a/x11/xf86-input-mouse/distinfo
+++ b/x11/xf86-input-mouse/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.12 2012/09/27 09:12:07 sborrill Exp $
+$NetBSD: distinfo,v 1.13 2013/05/16 05:53:59 richard Exp $
 
-SHA1 (xf86-input-mouse-1.7.2.tar.bz2) = 0da6390c6f3d7d636110a52f08193739929ae4ae
-RMD160 (xf86-input-mouse-1.7.2.tar.bz2) = 467870d6b65decc832fadf66896d613456f217cd
-Size (xf86-input-mouse-1.7.2.tar.bz2) = 341378 bytes
-SHA1 (patch-ab) = 632ec0e3908ccd16678a480b5ffa00dba7db640f
-SHA1 (patch-ac) = d39afa5db2a99fb00e3b560a0c4e34576e8bcba5
-SHA1 (patch-src_mouse.h) = 7df93c8f7ef6e054ffd252246480051490c79d7b
+SHA1 (xf86-input-mouse-1.8.1.tar.bz2) = e00e825c9506b7b9c31bf4b8a3a609df8ef408c1
+RMD160 (xf86-input-mouse-1.8.1.tar.bz2) = e93735b6fc0d6ca018035c888a50738902843da8
+Size (xf86-input-mouse-1.8.1.tar.bz2) = 352034 bytes
diff --git a/x11/xf86-input-mouse/patches/patch-ab b/x11/xf86-input-mouse/patches/patch-ab
deleted file mode 100644
index f24870991d3..00000000000
--- a/x11/xf86-input-mouse/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/03/14 11:09:37 apb Exp $
-
-Changes from NetBSD xsrc/external/mit/xf86-input-mouse/dist/\
-src/mouse.c
-
-----------------------------
-revision 1.2
-date: 2009/02/02 03:05:35;  author: christos;  state: Exp;  lines: +4 -0
-Call a SetupMouse function to condition the fd.
-----------------------------
-
---- src/mouse.c.orig	2008-03-20 20:55:51.000000000 +0200
-+++ src/mouse.c
-@@ -2538,6 +2538,10 @@ SetupMouse(InputInfoPtr pInfo)
-     Bool automatic = FALSE;
- 
-     pMse = pInfo->private;
-+
-+    if (osInfo->SetupMouse)
-+	if (!osInfo->SetupMouse(pInfo))
-+	    return FALSE;
-     
-     /* Handle the "Auto" protocol. */
-     if (pMse->protocolID == PROT_AUTO) {
diff --git a/x11/xf86-input-mouse/patches/patch-ac b/x11/xf86-input-mouse/patches/patch-ac
deleted file mode 100644
index e6df59cdb3d..00000000000
--- a/x11/xf86-input-mouse/patches/patch-ac
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2012/09/26 14:11:26 liamjfoy Exp $
-
-Changes from NetBSD xsrc/external/mit/xorg-server/dist/\
-hw/xfree86/os-support/bsd/bsd_mouse.c
-
-----------------------------
-revision 1.5
-date: 2009/02/09 09:49:39;  author: plunky;  state: Exp;  lines: +16 -0
-add horizontal mouse-wheel functionality to USB and WSMOUSE drivers
-----------------------------
-revision 1.4
-date: 2009/02/02 03:06:37;  author: christos;  state: Exp;  lines: +7 -11
-add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to
-SetupMouse.
-----------------------------
-revision 1.3
-date: 2009/01/19 00:54:29;  author: christos;  state: Exp;  lines: +2 -1
-fix ioctl.
-----------------------------
-revision 1.2
-date: 2009/01/13 18:43:46;  author: christos;  state: Exp;  lines: +25 -0
-Set the mouse event protocol version. (untested, but head will be broken
-unless I add this).
-----------------------------
-
-Changes from NetBSD xsrc/external/mit/xf86-input-mouse/dist/\
-src/bsd_mouse.c
-
-----------------------------
-revision 1.3
-date: 2012/01/26 23:43:06;  author: christos;  state: Exp;  lines: +25 -1
-PR/45853: Pierre Pronchery: Add support for absolute positioning (tablets)
-----------------------------
-
---- src/bsd_mouse.c.orig	2012-03-16 06:34:27.000000000 +0000
-+++ src/bsd_mouse.c	2012-09-26 13:26:54.000000000 +0000
-@@ -53,12 +53,15 @@
- 
- #define HUP_GENERIC_DESKTOP     0x0001
- #define HUP_BUTTON              0x0009
-+#define HUP_CONSUMER            0x000c
- 
- #define HUG_X                   0x0030
- #define HUG_Y                   0x0031
- #define HUG_Z                   0x0032
- #define HUG_WHEEL               0x0038
- 
-+#define HUC_AC_PAN              0x0238
-+
- #define HID_USAGE2(p,u) (((p) << 16) | u)
- 
- /* The UMS mices have middle button as number 3 */
-@@ -98,7 +101,7 @@ static int
- SupportedInterfaces(void)
- {
- #if defined(__NetBSD__)
--    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
-+    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
- #else
-@@ -339,6 +342,23 @@ FindDevice(InputInfoPtr pInfo, const cha
- }
- #endif
- 
-+#if defined(__NetBSD__)
-+static Bool
-+SetupMouse(InputInfoPtr pInfo)
-+{
-+#ifdef WSCONS_SUPPORT
-+#ifdef 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);
-+            return FALSE;
-+        }
-+#endif
-+#endif
-+        return TRUE;
-+}
-+#endif
-+
- #if (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
- 
- /* Only support wsmouse configuration for now */
-@@ -409,7 +429,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 +454,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, &x, &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, &x, &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:
- 	    xf86Msg(X_WARNING, "%s: bad wsmouse event type=%d\n", pInfo->name,
- 		    event->type);
-@@ -473,7 +517,7 @@ typedef struct _UsbMseRec {
-     hid_item_t loc_x;		/* x locator item */
-     hid_item_t loc_y;		/* y locator item */
-     hid_item_t loc_z;		/* z (wheel) locator item */
--    hid_item_t loc_w;		/* z (wheel) locator item */
-+    hid_item_t loc_w;		/* w (pan) locator item */
-     hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */
-    unsigned char *buffer;
- } UsbMseRec, *UsbMsePtr;
-@@ -688,6 +732,9 @@ usbPreInit(InputInfoPtr pInfo, const cha
-     if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL),
- 		   hid_input, &pUsbMse->loc_z, pUsbMse->iid) < 0) {
-     }
-+    if (hid_locate(reportDesc, HID_USAGE2(HUP_CONSUMER, HUC_AC_PAN),
-+		   hid_input, &pUsbMse->loc_w, pUsbMse->iid) < 0) {
-+    }
- #else
-     if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
- 		   hid_input, &pUsbMse->loc_x) < 0) {
-@@ -700,6 +747,9 @@ usbPreInit(InputInfoPtr pInfo, const cha
-     if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL),
- 		   hid_input, &pUsbMse->loc_z) < 0) {
-     }
-+    if (hid_locate(reportDesc, HID_USAGE2(HUP_CONSUMER, HUC_AC_PAN),
-+		   hid_input, &pUsbMse->loc_w) < 0) {
-+    }
- #endif
-     /* Probe for number of buttons */
-     for (i = 1; i <= MSE_MAXBUTTONS; i++) {
-@@ -772,6 +822,9 @@ OSMouseInit(int flags)
-     p->SetupAuto = SetupAuto;
-     p->SetMiscRes = SetMouseRes;
- #endif
-+#if defined(__NetBSD__)
-+    p->SetupMouse = SetupMouse;
-+#endif
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
-     p->FindDevice = FindDevice;
- #endif
diff --git a/x11/xf86-input-mouse/patches/patch-src_mouse.h b/x11/xf86-input-mouse/patches/patch-src_mouse.h
deleted file mode 100644
index 2e870f52efa..00000000000
--- a/x11/xf86-input-mouse/patches/patch-src_mouse.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_mouse.h,v 1.1 2012/05/06 20:51:24 wiz Exp $
-
-Changes from NetBSD xsrc/external/mit/xorg-server/dist/\
-hw/xfree86/os-support/xf86OSmouse.h
-
-----------------------------
-revision 1.2
-date: 2009/02/02 03:06:37;  author: christos;  state: Exp;  lines: +4 -0
-add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to
-SetupMouse.
-----------------------------
-
---- src/mouse.h.orig	2012-05-05 07:22:19.910022000 +0000
-+++ src/mouse.h
-@@ -91,6 +91,7 @@ typedef Bool (*BuiltinPreInitProc)(Input
- 				   int flags);
- typedef const char *(*DefaultProtocolProc)(void);
- typedef const char *(*SetupAutoProc)(InputInfoPtr pInfo, int *protoPara);
-+typedef Bool (*SetupMouseProc)(InputInfoPtr pInfo);
- typedef void (*SetResProc)(InputInfoPtr pInfo, const char* protocol, int rate,
- 			   int res);
- typedef const char *(*FindDeviceProc)(InputInfoPtr pInfo, const char *protocol,
-@@ -108,6 +109,7 @@ typedef struct {
- 	BuiltinPreInitProc	PreInit;
- 	DefaultProtocolProc	DefaultProtocol;
- 	SetupAutoProc		SetupAuto;
-+	SetupMouseProc		SetupMouse;
- 	SetResProc		SetPS2Res;
- 	SetResProc		SetBMRes;
- 	SetResProc		SetMiscRes;
-@@ -150,6 +152,8 @@ typedef struct {
-  *
-  * SetBMRes:	Set the resolution and sample rate for MSE_BM protocol types.
-  *
-+ * SetupMouse:	Called once after open to condition the file descriptor.
-+ *
-  * SetMiscRes:	Set the resolution and sample rate for MSE_MISC protocol types.
-  *
-  * FindDevice:	This function gets called when no Device has been specified