From 5a4c543c2b0f538631aea8379ce384d5defee89d Mon Sep 17 00:00:00 2001
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Sun, 29 Sep 2013 17:01:41 +0000
Subject: The FreeBSD graphics/x11 team proudly presents a kwm, zeising
 production:

MESA 9.1.6

Starring:
Mesa 9.1.6, including libGL, libGLU and dri (new xorg only)
Addition of libEGL and libglesv2
KMS support for ATI graphics cards in 10-current (new xorg only)
Improved sparc64 support for new xorg. [1]
pixman 0.30.2, including shlib bump and portrevision bumps
libX11 1.6.2
Make absolute pointing devices work with x11-drivers/xf86-input-mouse
x11-drivers/xf86-video-ati 7.2.0 for 10-current (KMS aware ati driver)

Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
When updating MESA related ports (libGL, dri) you need to remove old versions
first.  See UPDATING for details.

PR:		ports/181962 [2]
Submitted by:	marius [1]
		zeising [2]
Exp-run by:	bdrewery
Approved by:	portmgr (bdrewery)

Thanks to all who helped testing!
---
 .../xf86-input-mouse/files/patch-src_mouse.c       | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'x11-drivers/xf86-input-mouse/files/patch-src_mouse.c')

diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
index 2d363d50c7b2..27118de48943 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
@@ -1,5 +1,5 @@
---- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
-+++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
+--- src/mouse.c.orig	2012-10-08 03:40:07.000000000 +0200
++++ src/mouse.c	2013-07-03 01:04:45.398343993 +0200
 @@ -280,13 +280,39 @@
  
      pMse = pInfo->private;
@@ -135,7 +135,7 @@
  
      protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
  
-@@ -2137,7 +2148,7 @@
+@@ -2136,7 +2147,7 @@
  
      if (pMse->emulateWheel) {
          /* Emulate wheel button handling */
@@ -144,7 +144,7 @@
              wheelButtonMask = 0;
          else
              wheelButtonMask = 1 << (pMse->wheelButton - 1);
-@@ -2221,6 +2232,9 @@
+@@ -2220,6 +2231,9 @@
                          }
                      }
                  }
@@ -154,7 +154,7 @@
              }
  
              /* Absorb the mouse movement while the wheel button is pressed. */
-@@ -2238,7 +2252,7 @@
+@@ -2237,7 +2251,7 @@
      if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
          buttonTimer(pInfo);
  
@@ -163,7 +163,20 @@
          xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
  
      if (change) {
-@@ -2448,11 +2462,11 @@
+@@ -2349,12 +2363,10 @@
+                int dx, int dy, int dz, int dw)
+ {
+     MouseDevPtr pMse;
+-    mousePrivPtr mousepriv;
+     int zbutton = 0, wbutton = 0, zbuttoncount = 0, wbuttoncount = 0;
+     int i, b, buttons = 0;
+ 
+     pMse = pInfo->private;
+-    mousepriv = (mousePrivPtr)pMse->mousePriv;
+ 
+     if (pMse->protocolID == PROT_MMHIT)
+         b = reverseBits(hitachMap, truebuttons);
+@@ -2447,11 +2459,11 @@
  
      /* Accumulate the scaled dx, dy in the private variables
         fracdx,fracdy and return the integer number part */
-- 
cgit v1.2.3