[Midnightbsd-cvs] mports [23937] trunk/x11-drivers/xf86-input-mouse: update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Aug 26 17:48:28 EDT 2018
Revision: 23937
http://svnweb.midnightbsd.org/mports/?rev=23937
Author: laffer1
Date: 2018-08-26 17:48:27 -0400 (Sun, 26 Aug 2018)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/x11-drivers/xf86-input-mouse/Makefile
trunk/x11-drivers/xf86-input-mouse/distinfo
trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
trunk/x11-drivers/xf86-input-mouse/pkg-descr
Modified: trunk/x11-drivers/xf86-input-mouse/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/Makefile 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/Makefile 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= xf86-input-mouse
-PORTVERSION= 1.9.1
+PORTVERSION= 1.9.3
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -8,6 +8,7 @@
COMMENT= X.Org mouse input driver
LICENSE= mit
+LICENSE_FILE= ${WRKSRC}/COPYING
XORG_CAT= driver
USES= pathfix
Modified: trunk/x11-drivers/xf86-input-mouse/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/distinfo 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/distinfo 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,2 +1,3 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.9.1.tar.bz2) = 3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce
-SIZE (xorg/driver/xf86-input-mouse-1.9.1.tar.bz2) = 348244
+TIMESTAMP = 1529521635
+SHA256 (xorg/driver/xf86-input-mouse-1.9.3.tar.bz2) = 93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5
+SIZE (xorg/driver/xf86-input-mouse-1.9.3.tar.bz2) = 382013
Modified: trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,4 +1,4 @@
---- src/bsd_mouse.c.orig 2014-08-12 06:36:34 UTC
+--- src/bsd_mouse.c.orig 2018-06-19 04:36:21 UTC
+++ src/bsd_mouse.c
@@ -26,6 +26,24 @@
* authorization from the copyright holder(s) and author(s).
@@ -59,7 +59,7 @@
#define HUP_GENERIC_DESKTOP 0x0001
#define HUP_BUTTON 0x0009
-@@ -75,11 +104,13 @@ static const char *FindDevice(InputInfoP
+@@ -75,11 +104,13 @@ static const char *FindDevice(InputInfoPtr, const char
#define DEFAULT_MOUSE_DEV "/dev/mouse"
#define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
#define DEFAULT_PS2_DEV "/dev/psm0"
@@ -113,7 +113,7 @@
int i;
mousehw_t hw;
mousemode_t mode;
-@@ -188,7 +240,13 @@ SetupAuto(InputInfoPtr pInfo, int *proto
+@@ -188,7 +240,13 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara)
if (pInfo->fd == -1)
return NULL;
@@ -127,7 +127,7 @@
i = 1;
ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
-@@ -207,9 +265,18 @@ SetupAuto(InputInfoPtr pInfo, int *proto
+@@ -207,9 +265,18 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara)
protoPara[0] = mode.syncmask[0];
protoPara[1] = mode.syncmask[1];
}
@@ -148,7 +148,7 @@
}
}
}
-@@ -232,41 +299,41 @@ SetSysMouseRes(InputInfoPtr pInfo, const
+@@ -232,41 +299,41 @@ SetSysMouseRes(InputInfoPtr pInfo, const char *protoco
(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
/*
* As the FreeBSD sysmouse driver defaults to protocol level 0
@@ -229,7 +229,7 @@
#endif
} else {
/*
-@@ -293,28 +360,32 @@ FindDevice(InputInfoPtr pInfo, const cha
+@@ -293,28 +360,32 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, i
* the test for whether /dev/sysmouse is usable can be made.
*/
if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
@@ -275,7 +275,7 @@
break;
}
}
-@@ -486,30 +557,78 @@ wsconsPreInit(InputInfoPtr pInfo, const
+@@ -486,30 +557,78 @@ wsconsPreInit(InputInfoPtr pInfo, const char *protocol
#if defined(USBMOUSE_SUPPORT)
@@ -362,7 +362,7 @@
switch (what) {
case DEVICE_INIT:
-@@ -518,38 +637,96 @@ usbMouseProc(DeviceIntPtr pPointer, int
+@@ -518,40 +637,96 @@ usbMouseProc(DeviceIntPtr pPointer, int what)
for (nbuttons = 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons)
map[nbuttons + 1] = nbuttons + 1;
@@ -382,7 +382,7 @@
+ ? AXIS_LABEL_PROP_ABS_Y : AXIS_LABEL_PROP_REL_Y);
+ axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+#endif
-+
+
+ InitButtonClassDeviceStruct(pPointer, min(pMse->buttons, MSE_MAXBUTTONS),
+#ifdef HAVE_LABELS
+ btn_labels,
@@ -401,7 +401,7 @@
+ (acol->xmin != acol->xmax || acol->ymin != acol->ymax) ?
+ Absolute : Relative);
+ InitPtrFeedbackClassDeviceStruct(pPointer, pMse->Ctrl);
-
++
/* X valuator */
- xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(pPointer, 0,
@@ -458,8 +458,10 @@
- pInfo->fd = -1;
- } else {
- xf86FlushInput(pInfo->fd);
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 23
- if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
- pInfo))
+-#endif
- AddEnabledDevice(pInfo->fd);
- }
+ if (pUsbMse->opened++ == 0) {
@@ -476,13 +478,22 @@
+ xf86FlushInput(pInfo->fd);
+ if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
+ pInfo))
-+ AddEnabledDevice(pInfo->fd);
++ xf86AddEnabledDevice(pInfo);
+ }
+ }
}
pMse->lastButtons = 0;
pMse->lastMappedButtons = 0;
-@@ -571,6 +748,7 @@ usbMouseProc(DeviceIntPtr pPointer, int
+@@ -562,7 +737,7 @@ usbMouseProc(DeviceIntPtr pPointer, int what)
+ case DEVICE_OFF:
+ case DEVICE_CLOSE:
+ if (pInfo->fd != -1) {
+- RemoveEnabledDevice(pInfo->fd);
++ xf86RemoveEnabledDevice(pInfo);
+ if (pUsbMse->packetSize > 8 && pUsbMse->buffer) {
+ free(pUsbMse->buffer);
+ }
+@@ -573,6 +748,7 @@ usbMouseProc(DeviceIntPtr pPointer, int what)
xf86CloseSerial(pInfo->fd);
pInfo->fd = -1;
}
@@ -490,7 +501,7 @@
pPointer->public.on = FALSE;
usleep(300000);
break;
-@@ -586,45 +764,154 @@ usbReadInput(InputInfoPtr pInfo)
+@@ -588,45 +764,154 @@ usbReadInput(InputInfoPtr pInfo)
{
MouseDevPtr pMse;
UsbMsePtr pUsbMse;
@@ -666,7 +677,7 @@
}
static void
-@@ -633,14 +920,17 @@ usbSigioReadInput (int fd, void *closure
+@@ -635,14 +920,17 @@ usbSigioReadInput (int fd, void *closure)
usbReadInput ((InputInfoPtr) closure);
}
@@ -687,21 +698,22 @@
pUsbMse = malloc(sizeof(UsbMseRec));
if (pUsbMse == NULL) {
-@@ -649,12 +939,7 @@ usbPreInit(InputInfoPtr pInfo, const cha
+@@ -651,13 +939,8 @@ usbPreInit(InputInfoPtr pInfo, const char *protocol, i
return FALSE;
}
- pMse->protocol = protocol;
- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
--
++ bzero(pUsbMse, sizeof(UsbMseRec));
+
- /* Collect the options, and process the common options. */
- COLLECT_INPUT_OPTIONS(pInfo, NULL);
- xf86ProcessCommonOptions(pInfo, pInfo->options);
-+ bzero(pUsbMse, sizeof(UsbMseRec));
-
+-
/* Check if the device can be opened. */
pInfo->fd = xf86OpenSerial(pInfo->options);
-@@ -670,19 +955,134 @@ usbPreInit(InputInfoPtr pInfo, const cha
+ if (pInfo->fd == -1) {
+@@ -672,19 +955,134 @@ usbPreInit(InputInfoPtr pInfo, const char *protocol, i
}
/* Get USB informations */
reportDesc = hid_get_report_desc(pInfo->fd);
@@ -848,7 +860,7 @@
/* Allocate buffer */
if (pUsbMse->packetSize <= 8) {
pUsbMse->buffer = pMse->protoBuf;
-@@ -692,56 +1092,129 @@ usbPreInit(InputInfoPtr pInfo, const cha
+@@ -694,56 +1092,129 @@ usbPreInit(InputInfoPtr pInfo, const char *protocol, i
if (pUsbMse->buffer == NULL) {
xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name);
free(pUsbMse);
@@ -900,7 +912,7 @@
pMse->mousePriv = pUsbMse;
+ return TRUE;
+}
-+
+
+/* This function is called when the protocol is "usb". */
+static Bool
+usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
@@ -976,7 +988,7 @@
+ pMse->disableXY = TRUE;
+ pMse->hasZ = acol->hasZ;
+ pMse->hasW = acol->hasW;
-
++
/* Process common mouse options (like Emulate3Buttons, etc). */
pMse->CommonOptions(pInfo);
@@ -1015,7 +1027,7 @@
/* Setup the local procs. */
pInfo->device_control = usbMouseProc;
pInfo->read_input = usbReadInput;
-@@ -784,7 +1257,9 @@ OSMouseInit(int flags)
+@@ -786,7 +1257,9 @@ OSMouseInit(int flags)
p->CheckProtocol = CheckProtocol;
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
p->SetupAuto = SetupAuto;
Modified: trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig 2015-03-03 05:17:45 UTC
+--- src/Makefile.in.orig 2018-06-21 20:18:48 UTC
+++ src/Makefile.in
-@@ -344,7 +344,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(
+@@ -357,7 +357,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS)
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
@DRIVER_NAME at _drv_la_LTLIBRARIES = @DRIVER_NAME at _drv.la
Modified: trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,6 +1,6 @@
---- src/mouse.c.orig 2014-08-12 06:36:34 UTC
+--- src/mouse.c.orig 2018-06-19 04:36:21 UTC
+++ src/mouse.c
-@@ -293,13 +293,39 @@ MouseCommonOptions(InputInfoPtr pInfo)
+@@ -304,13 +304,39 @@ MouseCommonOptions(InputInfoPtr pInfo)
pMse = pInfo->private;
@@ -41,7 +41,7 @@
pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
"Emulate3Buttons", FALSE);
if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
-@@ -311,6 +337,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
+@@ -322,6 +348,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
"Emulate3Timeout", 50);
if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
MessageType from = X_CONFIG;
@@ -50,7 +50,7 @@
if (pMse->emulate3ButtonsSoft)
from = X_DEFAULT;
xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
-@@ -318,6 +346,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
+@@ -329,6 +357,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
}
pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
@@ -59,16 +59,17 @@
pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
pMse->invX = -1;
-@@ -328,7 +358,7 @@ MouseCommonOptions(InputInfoPtr pInfo)
+@@ -339,8 +369,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
} else
pMse->invY = 1;
pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
--
+ pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
+-
if (pMse->pDragLock)
free(pMse->pDragLock);
-@@ -438,14 +468,17 @@ MouseCommonOptions(InputInfoPtr pInfo)
+ pMse->pDragLock = NULL;
+@@ -449,14 +479,17 @@ MouseCommonOptions(InputInfoPtr pInfo)
free(s);
}
@@ -88,7 +89,7 @@
pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
msg = xstrdup("X axis");
} else if (!xf86NameCmp(s, "y")) {
-@@ -594,29 +627,6 @@ MouseCommonOptions(InputInfoPtr pInfo)
+@@ -605,29 +638,6 @@ MouseCommonOptions(InputInfoPtr pInfo)
pInfo->name, wheelButton, pMse->wheelInertia,
pMse->wheelButtonTimeout);
}
@@ -118,7 +119,7 @@
if (origButtons != pMse->buttons)
buttons_from = X_CONFIG;
xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
-@@ -698,7 +708,6 @@ MouseHWOptions(InputInfoPtr pInfo)
+@@ -709,7 +719,6 @@ MouseHWOptions(InputInfoPtr pInfo)
}
pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
@@ -126,7 +127,7 @@
}
static void
-@@ -986,6 +995,8 @@ MousePreInit(InputDriverPtr drv, InputIn
+@@ -996,6 +1005,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, i
/* Default Mapping: 1 2 3 8 9 10 11 ... */
for (i = 0; i < MSE_MAXBUTTONS; i++)
pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
@@ -135,7 +136,7 @@
protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
-@@ -2181,7 +2192,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int
+@@ -2197,7 +2208,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int buttons, int
if (pMse->emulateWheel) {
/* Emulate wheel button handling */
@@ -144,7 +145,7 @@
wheelButtonMask = 0;
else
wheelButtonMask = 1 << (pMse->wheelButton - 1);
-@@ -2271,6 +2282,9 @@ MouseDoPostEvent(InputInfoPtr pInfo, int
+@@ -2287,6 +2298,9 @@ MouseDoPostEvent(InputInfoPtr pInfo, int buttons, int
}
}
}
@@ -154,7 +155,7 @@
}
/* Absorb the mouse movement while the wheel button is pressed. */
-@@ -2288,7 +2302,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int
+@@ -2304,7 +2318,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int buttons, int
if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
buttonTimer(pInfo);
@@ -163,7 +164,7 @@
xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
if (change) {
-@@ -2401,12 +2415,10 @@ MousePostEvent(InputInfoPtr pInfo, int t
+@@ -2417,12 +2431,10 @@ MousePostEvent(InputInfoPtr pInfo, int truebuttons,
int dx, int dy, int dz, int dw)
{
MouseDevPtr pMse;
@@ -176,7 +177,7 @@
if (pMse->protocolID == PROT_MMHIT)
b = reverseBits(hitachMap, truebuttons);
-@@ -2499,11 +2511,11 @@ MousePostEvent(InputInfoPtr pInfo, int t
+@@ -2515,11 +2527,11 @@ MousePostEvent(InputInfoPtr pInfo, int truebuttons,
/* Accumulate the scaled dx, dy in the private variables
fracdx,fracdy and return the integer number part */
Modified: trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,4 +1,4 @@
---- src/mouse.h.orig 2014-08-12 06:36:34 UTC
+--- src/mouse.h.orig 2012-10-08 01:40:07 UTC
+++ src/mouse.h
@@ -220,10 +220,13 @@ typedef struct _MouseDevRec {
Bool emulate3ButtonsSoft;
Modified: trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,4 +1,4 @@
---- src/mousePriv.h.orig 2014-08-12 06:36:34 UTC
+--- src/mousePriv.h.orig 2012-05-28 00:01:45 UTC
+++ src/mousePriv.h
@@ -63,8 +63,6 @@ typedef struct {
int acc;
Modified: trunk/x11-drivers/xf86-input-mouse/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/pkg-descr 2018-08-26 21:47:41 UTC (rev 23936)
+++ trunk/x11-drivers/xf86-input-mouse/pkg-descr 2018-08-26 21:48:27 UTC (rev 23937)
@@ -1,3 +1,3 @@
This package contains the X.Org xf86-input-mouse driver.
-WWW: http://www.x.org
+WWW: https://www.x.org/
More information about the Midnightbsd-cvs
mailing list