Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id BB0CE7A2F3 for ; Wed, 16 Nov 2016 22:57:34 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 68526855AC; Wed, 16 Nov 2016 22:57:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ECCDF8557F for ; Wed, 16 Nov 2016 22:57:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 7Spyz52bLYJd for ; Wed, 16 Nov 2016 22:57:33 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 487E984CED for ; Wed, 16 Nov 2016 22:57:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3F3B8FBA6; Wed, 16 Nov 2016 22:57:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_14793370535670" MIME-Version: 1.0 Date: Wed, 16 Nov 2016 22:57:33 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/xf86-input-joystick To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161116225733.3F3B8FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_14793370535670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Nov 16 22:57:33 UTC 2016 Modified Files: pkgsrc/x11/xf86-input-joystick: distinfo Added Files: pkgsrc/x11/xf86-input-joystick/patches: patch-src_jstk.c patch-src_jstk.c.orig patch-src_jstk.h patch-src_jstk.h.orig Log Message: Fix build with xorg-server-1.19. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xf86-input-joystick/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.c \ pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.c.orig \ pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.h \ pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.h.orig Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_14793370535670 Content-Disposition: inline Content-Length: 6399 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xf86-input-joystick/distinfo diff -u pkgsrc/x11/xf86-input-joystick/distinfo:1.2 pkgsrc/x11/xf86-input-joystick/distinfo:1.3 --- pkgsrc/x11/xf86-input-joystick/distinfo:1.2 Wed Nov 4 03:29:00 2015 +++ pkgsrc/x11/xf86-input-joystick/distinfo Wed Nov 16 22:57:33 2016 @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 03:29:00 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/11/16 22:57:33 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 Added files: Index: pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.c diff -u /dev/null pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.c:1.1 --- /dev/null Wed Nov 16 22:57:33 2016 +++ pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.c Wed Nov 16 22:57:33 2016 @@ -0,0 +1,126 @@ +$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 + #include /* Needed for InitValuator/Proximity stuff */ + #include ++#include + + #include + #include +@@ -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: */ +- Index: pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.h diff -u /dev/null pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.h:1.1 --- /dev/null Wed Nov 16 22:57:33 2016 +++ pkgsrc/x11/xf86-input-joystick/patches/patch-src_jstk.h Wed Nov 16 22:57:33 2016 @@ -0,0 +1,32 @@ +$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 --_----------=_14793370535670--