Updated xf86-input-joystick to 1.6.3.

just as you stagger home from the release party for the mouse and keyboard
driver, here's another one for the joystick driver. An accumulated bunch (5)
fixes, some of them almost 4 years old, the hair of the dog looks tempting
now, doesn't it?

On a more serious note, this is the last release for the joystick driver.
I'll put the usual 'discontinued' messages into the repository over the next
couple of days.

To prevent at least some of the ... "encouraging" emails: this driver does
*not* make your joystick work. This driver is solely for making a joystick
behave like a mouse pointer, which is a decidedly niche case to begin with.

Hans de Goede (3):
      Use jstkCloseDevice_* on error in jstkOpenDevice_* backend functions
      Add a generic jstkCloseDevice helper function
      Add support for server managed fds

Matthieu Herrb (1):
      use xf86{Add,Remove}EnabledDevice()

Peter Hutterer (2):
      Handle DEVICE_ABORT for input ABI 19.1
      joystick 1.6.3

4 files changed, 7 insertions, 168 deletions

diff --git a/x11/xf86-input-joystick/Makefile b/x11/xf86-input-joystick/Makefile
index 64bf7e14ed9..34a026ae44c 100644
--- a/x11/xf86-input-joystick/Makefile
+++ b/x11/xf86-input-joystick/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2016/11/18 08:10:24 wiz Exp $
 
-DISTNAME=	xf86-input-joystick-1.6.2
-PKGREVISION=	1
+DISTNAME=	xf86-input-joystick-1.6.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-input-joystick/distinfo b/x11/xf86-input-joystick/distinfo
index e73249a78b8..50204112085 100644
--- a/x11/xf86-input-joystick/distinfo
+++ b/x11/xf86-input-joystick/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/11/16 22:57:33 wiz Exp $
+$NetBSD: distinfo,v 1.4 2016/11/18 08:10:24 wiz Exp $
 
-SHA1 (xf86-input-joystick-1.6.2.tar.bz2) = 61658b8d829fdaed6064c7c26232c3884d359187
-RMD160 (xf86-input-joystick-1.6.2.tar.bz2) = c2821f284ba33488032d0dc9fe3300c9dad95d84
-SHA512 (xf86-input-joystick-1.6.2.tar.bz2) = 2c3e9d9fefa8010198a895fea1caa0475c8005480b5db14fc7e547ae9ac4da2dbfa10e8ecbdcf7a6bf31c7590f6414685a11964ef00f6ca99b88e81b404f5ef8
-Size (xf86-input-joystick-1.6.2.tar.bz2) = 327539 bytes
-SHA1 (patch-src_jstk.c) = d49c87500aa95765d92e352f93cb8d8894c30d8c
-SHA1 (patch-src_jstk.h) = 2bd6f7d3ce10b4969a6e61eca5d98ea69f0a6703
+SHA1 (xf86-input-joystick-1.6.3.tar.bz2) = b8664249d50ed266556877e15e3782c40614459c
+RMD160 (xf86-input-joystick-1.6.3.tar.bz2) = 9619dfef02eef577c69fe859ca87fd44e6f0eaa1
+SHA512 (xf86-input-joystick-1.6.3.tar.bz2) = 541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
+Size (xf86-input-joystick-1.6.3.tar.bz2) = 351846 bytes
diff --git a/x11/xf86-input-joystick/patches/patch-src_jstk.c b/x11/xf86-input-joystick/patches/patch-src_jstk.c
deleted file mode 100644
index 6430bd20898..00000000000
--- a/x11/xf86-input-joystick/patches/patch-src_jstk.c
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-src_jstk.c,v 1.1 2016/11/16 22:57:33 wiz Exp $
-
-Fix build with xorg-server-1.19, from upstream git
-60d0e9c451b3f259d524b0ddcc5c1f21a4f82293
-
---- src/jstk.c.orig	2012-10-03 17:17:26.000000000 +0000
-+++ src/jstk.c
-@@ -34,6 +34,7 @@
- #include <xf86Xinput.h>
- #include <exevents.h>		/* Needed for InitValuator/Proximity stuff */
- #include <xf86Opt.h>
-+#include <xf86_OSproc.h>
- 
- #include <math.h>
- #include <xf86Module.h>
-@@ -79,6 +80,9 @@ jstkOpenDevice(JoystickDevPtr priv, BOOL
-     int fd;
-     fd = -1;
- 
-+    if (priv->joystick_device->flags & XI86_SERVER_FD)
-+        priv->fd = priv->joystick_device->fd;
-+
-     if (probe == FALSE && priv->open_proc)
-         return priv->open_proc(priv, probe);
- 
-@@ -98,6 +102,24 @@ jstkOpenDevice(JoystickDevPtr priv, BOOL
-     return fd;
- }
- 
-+/*
-+ ***************************************************************************
-+ *
-+ * jstkCloseDevice --
-+ *
-+ * Called to close the device specified in priv, this is a helper for
-+ * backend proc_close functions
-+ *
-+ ***************************************************************************
-+ */
-+void jstkCloseDevice(JoystickDevPtr priv)
-+{
-+    if ((priv->fd >= 0)) {
-+      if (!(priv->joystick_device->flags & XI86_SERVER_FD))
-+          xf86CloseSerial(priv->fd);
-+      priv->fd = -1;
-+    }
-+}
- 
- /*
-  ***************************************************************************
-@@ -125,7 +147,7 @@ jstkReadProc(InputInfoPtr pInfo)
-             xf86Msg(X_WARNING, "JOYSTICK: Read failed. Deactivating device.\n");
- 
-             if (pInfo->fd >= 0)
--                RemoveEnabledDevice(pInfo->fd);
-+                xf86RemoveEnabledDevice(pInfo);
-             return;
-         }
- 
-@@ -392,7 +414,7 @@ jstkDeviceControlProc(DeviceIntPtr      
-         if (jstkOpenDevice(priv, FALSE) != -1) {
-             pJstk->public.on = TRUE;
-             pInfo->fd = priv->fd;
--            AddEnabledDevice(pInfo->fd);
-+            xf86AddEnabledDevice(pInfo);
-         } else return !Success;
-         break;
- 
-@@ -415,13 +437,19 @@ jstkDeviceControlProc(DeviceIntPtr      
-         }
- 
-         if (pInfo->fd >= 0)
--            RemoveEnabledDevice(pInfo->fd);
--        pInfo->fd = -1;
-+            xf86RemoveEnabledDevice(pInfo);
-+        if (!(pInfo->flags & XI86_SERVER_FD))
-+            pInfo->fd = -1;
-         if (priv->close_proc)
-             priv->close_proc(priv);
-         pJstk->public.on = FALSE;
-         break;
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
-+    case DEVICE_ABORT:
-+        break;
-+#endif
-+
-     default:
-         ErrorF("unsupported mode=%d\n", what);
-         return BadValue;
-@@ -462,7 +490,8 @@ jstkCorePreInit(InputDriverPtr drv, Inpu
-     pInfo->read_input = jstkReadProc;
-     pInfo->control_proc = NULL;
-     pInfo->switch_mode = NULL;
--    pInfo->fd = -1;
-+    if (!(pInfo->flags & XI86_SERVER_FD))
-+        pInfo->fd = -1;
-     pInfo->dev = NULL;
-     pInfo->type_name = XI_JOYSTICK;
- 
-@@ -483,6 +512,7 @@ jstkCorePreInit(InputDriverPtr drv, Inpu
-     priv->mouse_enabled = TRUE;
-     priv->keys_enabled = TRUE;
-     priv->amplify = 1.0f;
-+    priv->joystick_device = pInfo;
-     priv->keyboard_device = keyboard_device;
-     priv->num_axes    = MAXAXES;
-     priv->num_buttons = MAXBUTTONS;
-@@ -659,7 +689,11 @@ _X_EXPORT InputDriverRec JOYSTICK = {
-     NULL,
-     jstkCorePreInit,
-     jstkCoreUnInit,
--    NULL
-+    NULL,
-+    NULL,
-+#ifdef XI86_DRV_CAP_SERVER_FD
-+    XI86_DRV_CAP_SERVER_FD
-+#endif
- };
- 
- /*
-@@ -738,4 +772,3 @@ _X_EXPORT XF86ModuleData joystickModuleD
- };
- 
- /* vim: set filetype=c.doxygen ts=4 et: */
--
diff --git a/x11/xf86-input-joystick/patches/patch-src_jstk.h b/x11/xf86-input-joystick/patches/patch-src_jstk.h
deleted file mode 100644
index 50eedfb1f04..00000000000
--- a/x11/xf86-input-joystick/patches/patch-src_jstk.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-src_jstk.h,v 1.1 2016/11/16 22:57:33 wiz Exp $
-
-Fix build with xorg-server-1.19, from upstream git
-60d0e9c451b3f259d524b0ddcc5c1f21a4f82293
-
---- src/jstk.h.orig	2012-10-06 14:00:57.000000000 +0000
-+++ src/jstk.h
-@@ -55,6 +55,9 @@
- #define XI_JOYSTICK "JOYSTICK"
- #endif
- 
-+#ifndef XI86_SERVER_FD
-+#define XI86_SERVER_FD 0x20
-+#endif
- 
- typedef enum _JOYSTICKEVENT {
-     EVENT_NONE=0,
-@@ -106,6 +109,7 @@ typedef struct _JoystickDevRec {
-     jstkReadDataProc read_proc; /* Callback for reading data from the backend */
-     void         *devicedata; /* Extra platform device dependend data */
-     char         *device;     /* Name of the device */
-+    InputInfoPtr joystick_device; /* Back pointer to the joystick device */
-     InputInfoPtr keyboard_device; /* Slave device for keyboard events */
- 
-     OsTimerPtr   timer;       /* Timer for axis movement */
-@@ -123,4 +127,6 @@ typedef struct _JoystickDevRec {
-     BUTTON button[MAXBUTTONS];    /* Configuration per button */
- } JoystickDevRec;
- 
-+void jstkCloseDevice(JoystickDevPtr priv);
-+
- #endif