diff options
author | wiz <wiz@pkgsrc.org> | 2017-12-27 14:13:55 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-12-27 14:13:55 +0000 |
commit | 6c4e99c7a01cf074ff4777a11e8a96a09e4a88a0 (patch) | |
tree | f84404ecc438323a938533dd132f8570fdfdd4e1 /x11 | |
parent | 73340e8ad5e2101c5a4e44812b73ae995181b68a (diff) | |
download | pkgsrc-6c4e99c7a01cf074ff4777a11e8a96a09e4a88a0.tar.gz |
xf86-input-joystick: update to 1.6.3nb1.
Adapt to NetBSD current changes regarding USB HID.
From bouyer.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xf86-input-joystick/Makefile | 3 | ||||
-rw-r--r-- | x11/xf86-input-joystick/distinfo | 5 | ||||
-rw-r--r-- | x11/xf86-input-joystick/patches/patch-config.h.in | 16 | ||||
-rw-r--r-- | x11/xf86-input-joystick/patches/patch-configure | 25 | ||||
-rw-r--r-- | x11/xf86-input-joystick/patches/patch-src_backend_bsd.c | 16 |
5 files changed, 63 insertions, 2 deletions
diff --git a/x11/xf86-input-joystick/Makefile b/x11/xf86-input-joystick/Makefile index 361fb41949e..84913d40372 100644 --- a/x11/xf86-input-joystick/Makefile +++ b/x11/xf86-input-joystick/Makefile @@ -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 diff --git a/x11/xf86-input-joystick/distinfo b/x11/xf86-input-joystick/distinfo index 50204112085..5755e9efbd1 100644 --- a/x11/xf86-input-joystick/distinfo +++ b/x11/xf86-input-joystick/distinfo @@ -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 diff --git a/x11/xf86-input-joystick/patches/patch-config.h.in b/x11/xf86-input-joystick/patches/patch-config.h.in new file mode 100644 index 00000000000..f2ae7c88f0f --- /dev/null +++ b/x11/xf86-input-joystick/patches/patch-config.h.in @@ -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 + diff --git a/x11/xf86-input-joystick/patches/patch-configure b/x11/xf86-input-joystick/patches/patch-configure new file mode 100644 index 00000000000..321199369b0 --- /dev/null +++ b/x11/xf86-input-joystick/patches/patch-configure @@ -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 : diff --git a/x11/xf86-input-joystick/patches/patch-src_backend_bsd.c b/x11/xf86-input-joystick/patches/patch-src_backend_bsd.c new file mode 100644 index 00000000000..817f2ef281f --- /dev/null +++ b/x11/xf86-input-joystick/patches/patch-src_backend_bsd.c @@ -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 |