CVS commit: pkgsrc/x11/xf86-input-joystick

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 27 14:13:55 UTC 2017

Modified Files:
        pkgsrc/x11/xf86-input-joystick: Makefile distinfo
Added Files:
        pkgsrc/x11/xf86-input-joystick/patches: patch-config.h.in
            patch-configure patch-src_backend_bsd.c

Log Message:
xf86-input-joystick: update to 1.6.3nb1.

Adapt to NetBSD current changes regarding USB HID.
>From bouyer.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xf86-input-joystick/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-input-joystick/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-input-joystick/patches/patch-config.h.in \
    pkgsrc/x11/xf86-input-joystick/patches/patch-configure \
    pkgsrc/x11/xf86-input-joystick/patches/patch-src_backend_bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-input-joystick/Makefile
diff -u pkgsrc/x11/xf86-input-joystick/Makefile:1.6 pkgsrc/x11/xf86-input-joystick/Makefile:1.7
--- pkgsrc/x11/xf86-input-joystick/Makefile:1.6 Sat Sep 16 19:27:28 2017
+++ pkgsrc/x11/xf86-input-joystick/Makefile     Wed Dec 27 14:13:55 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2017/09/16 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/12/27 14:13:55 wiz Exp $
 
 DISTNAME=      xf86-input-joystick-1.6.3
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/xf86-input-joystick/distinfo
diff -u pkgsrc/x11/xf86-input-joystick/distinfo:1.4 pkgsrc/x11/xf86-input-joystick/distinfo:1.5
--- pkgsrc/x11/xf86-input-joystick/distinfo:1.4 Fri Nov 18 08:10:24 2016
+++ pkgsrc/x11/xf86-input-joystick/distinfo     Wed Dec 27 14:13:55 2017
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.4 2016/11/18 08:10:24 wiz Exp $
+$NetBSD: distinfo,v 1.5 2017/12/27 14:13:55 wiz Exp $
 
 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
+SHA1 (patch-config.h.in) = d1586bb4db52a4498ddad3fc77551a583126fcba
+SHA1 (patch-configure) = 698f6a5611e300dcce385b7d54c34e6fc7178eb5
+SHA1 (patch-src_backend_bsd.c) = 09135fbb638328b77fdf6e1f2a6a5d55ab9a064d

Added files:

Index: pkgsrc/x11/xf86-input-joystick/patches/patch-config.h.in
diff -u /dev/null pkgsrc/x11/xf86-input-joystick/patches/patch-config.h.in:1.1
--- /dev/null   Wed Dec 27 14:13:55 2017
+++ pkgsrc/x11/xf86-input-joystick/patches/patch-config.h.in    Wed Dec 27 14:13:55 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.h.in,v 1.1 2017/12/27 14:13:55 wiz Exp $
+
+Adapt for NetBSD-8.99.9.
+
+--- config.h.in.orig   2017-12-27 12:38:30.274552468 +0100
++++ config.h.in        2017-12-27 12:42:21.573673909 +0100
+@@ -12,6 +12,9 @@
+ /* Define to 1 if you have the <dev/usb/usbhid.h> header file. */
+ #undef HAVE_DEV_USB_USBHID_H
+ 
++/* Define to 1 if you have the <dev/hid/hid.h> header file. */
++#undef HAVE_DEV_HID_HID_H
++
+ /* Define to 1 if you have the <dev/usb/usb.h> header file. */
+ #undef HAVE_DEV_USB_USB_H
+ 
Index: pkgsrc/x11/xf86-input-joystick/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xf86-input-joystick/patches/patch-configure:1.1
--- /dev/null   Wed Dec 27 14:13:55 2017
+++ pkgsrc/x11/xf86-input-joystick/patches/patch-configure      Wed Dec 27 14:13:55 2017
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.1 2017/12/27 14:13:55 wiz Exp $
+
+Adapt for NetBSD-8.99.9.
+
+--- configure.orig     2017-12-27 12:38:30.273523326 +0100
++++ configure  2017-12-27 12:48:39.451130924 +0100
+@@ -18680,6 +18680,18 @@
+ 
+ done
+ 
++for ac_header in dev/hid/hid.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "dev/hid/hid.h" "ac_cv_header_dev_hid_hid_h" "$ac_includes_default"
++if test "x$ac_cv_header_dev_hid_hid_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DEV_HID_HID_H 1
++_ACEOF
++
++fi
++
++done
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hid_get_item in -lusbhid" >&5
+ $as_echo_n "checking for hid_get_item in -lusbhid... " >&6; }
+ if ${ac_cv_lib_usbhid_hid_get_item+:} false; then :
Index: pkgsrc/x11/xf86-input-joystick/patches/patch-src_backend_bsd.c
diff -u /dev/null pkgsrc/x11/xf86-input-joystick/patches/patch-src_backend_bsd.c:1.1
--- /dev/null   Wed Dec 27 14:13:55 2017
+++ pkgsrc/x11/xf86-input-joystick/patches/patch-src_backend_bsd.c      Wed Dec 27 14:13:55 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_backend_bsd.c,v 1.1 2017/12/27 14:13:55 wiz Exp $
+
+Adapt for NetBSD-8.99.9.
+
+--- src/backend_bsd.c.orig     2017-12-27 12:38:30.270838738 +0100
++++ src/backend_bsd.c  2017-12-27 12:39:31.650117455 +0100
+@@ -44,6 +44,9 @@
+ #include <usbhid.h>
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
++#ifdef HAVE_DEV_HID_HID_H
++    #include <dev/hid/hid.h>
++#endif
+ #ifdef HAVE_DEV_USB_USB_IOCTL_H
+     #include <dev/usb/usb_ioctl.h>
+ #endif