Fix package to work with uts(4)

3 files changed, 59 insertions, 10 deletions

diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index 3f0ec780a26..29fb721b2c6 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/05/08 11:20:13 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/26 14:11:26 liamjfoy Exp $
 
 DISTNAME=	xf86-input-mouse-1.7.2
-PKGREVISION=	1
+PKGREVISION=	2
 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 befd67c76c1..b73678ebc7d 100644
--- a/x11/xf86-input-mouse/distinfo
+++ b/x11/xf86-input-mouse/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2012/05/08 11:20:13 drochner Exp $
+$NetBSD: distinfo,v 1.11 2012/09/26 14:11:26 liamjfoy 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) = eea2c36d6b652448996a52cf413a46cfe3accd7e
+SHA1 (patch-ac) = 4c68210e716c7578f8d85a42131c2ac4ffdf72ef
 SHA1 (patch-src_mouse.h) = 7df93c8f7ef6e054ffd252246480051490c79d7b
diff --git a/x11/xf86-input-mouse/patches/patch-ac b/x11/xf86-input-mouse/patches/patch-ac
index 3f9c919657e..e6df59cdb3d 100644
--- a/x11/xf86-input-mouse/patches/patch-ac
+++ b/x11/xf86-input-mouse/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2012/05/08 11:20:13 drochner Exp $
+$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
@@ -23,8 +23,17 @@ 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
++++ src/bsd_mouse.c	2012-09-26 13:26:54.000000000 +0000
 @@ -53,12 +53,15 @@
  
  #define HUP_GENERIC_DESKTOP     0x0001
@@ -74,7 +83,47 @@ unless I add this).
  #if (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
  
  /* Only support wsmouse configuration for now */
-@@ -473,7 +493,7 @@ typedef struct _UsbMseRec {
+@@ -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 */
@@ -83,7 +132,7 @@ unless I add this).
      hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */
     unsigned char *buffer;
  } UsbMseRec, *UsbMsePtr;
-@@ -688,6 +708,9 @@ usbPreInit(InputInfoPtr pInfo, const cha
+@@ -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) {
      }
@@ -93,7 +142,7 @@ unless I add this).
  #else
      if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
  		   hid_input, &pUsbMse->loc_x) < 0) {
-@@ -700,6 +723,9 @@ usbPreInit(InputInfoPtr pInfo, const cha
+@@ -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) {
      }
@@ -103,7 +152,7 @@ unless I add this).
  #endif
      /* Probe for number of buttons */
      for (i = 1; i <= MSE_MAXBUTTONS; i++) {
-@@ -772,6 +798,9 @@ OSMouseInit(int flags)
+@@ -772,6 +822,9 @@ OSMouseInit(int flags)
      p->SetupAuto = SetupAuto;
      p->SetMiscRes = SetMouseRes;
  #endif