diff options
| author | hauke <hauke@pkgsrc.org> | 2019-06-27 14:19:51 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2019-06-27 14:19:51 +0000 |
| commit | b7fb9a01367e8fd4887c44e9b6a7032631625c89 (patch) | |
| tree | edfe02d1f4f7848c33e9f8bad7a6a91dbc9d4dce /games | |
| parent | da8f5b1e29c2d0c82b4f24468e770fa1d8d5c379 (diff) | |
| download | pkgsrc-b7fb9a01367e8fd4887c44e9b6a7032631625c89.tar.gz | |
Unbreak NetBSD release builds: <dev/hid/hid.h> only appeared in 8_99_10.
Diffstat (limited to 'games')
| -rw-r--r-- | games/plib/Makefile | 4 | ||||
| -rw-r--r-- | games/plib/distinfo | 4 | ||||
| -rw-r--r-- | games/plib/patches/patch-ad | 14 |
3 files changed, 12 insertions, 10 deletions
diff --git a/games/plib/Makefile b/games/plib/Makefile index 059c6c402fc..16aa85aecb1 100644 --- a/games/plib/Makefile +++ b/games/plib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2016/04/17 16:39:22 youri Exp $ +# $NetBSD: Makefile,v 1.30 2019/06/27 14:19:51 hauke Exp $ DISTNAME= plib-1.8.5 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= games x11 MASTER_SITES= http://plib.sourceforge.net/dist/ diff --git a/games/plib/distinfo b/games/plib/distinfo index b00c9485d14..541b5de250c 100644 --- a/games/plib/distinfo +++ b/games/plib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2018/08/05 20:42:10 nia Exp $ +$NetBSD: distinfo,v 1.16 2019/06/27 14:19:51 hauke Exp $ SHA1 (plib-1.8.5.tar.gz) = c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc RMD160 (plib-1.8.5.tar.gz) = 55019bf3758ec2542804d8e3994f4bed5a188e60 @@ -6,7 +6,7 @@ SHA512 (plib-1.8.5.tar.gz) = 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95 Size (plib-1.8.5.tar.gz) = 779133 bytes SHA1 (patch-aa) = 6a9e3badb63de5b9b100805fa7151ce5db8ced69 SHA1 (patch-ab) = 1bb0950b08427f8bcef84ee2da1cfd231ca60385 -SHA1 (patch-ad) = e158c9d0eed70146a8ee979eb3488c365455259a +SHA1 (patch-ad) = 97626674d127eeb7f7f6f0390a441dbf6419de0b SHA1 (patch-ae) = fe166e1b3b5d150d3d83bad49e2576d9ebaa0fb7 SHA1 (patch-af) = ea774a54a3cff4d43abae164bbcae745d4642aea SHA1 (patch-ag) = d715adee05f8e6973a5883f74573cc39bfd8d72e diff --git a/games/plib/patches/patch-ad b/games/plib/patches/patch-ad index 763080deb60..60bc6a87f99 100644 --- a/games/plib/patches/patch-ad +++ b/games/plib/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.8 2018/08/05 20:42:10 nia Exp $ +$NetBSD: patch-ad,v 1.9 2019/06/27 14:19:51 hauke Exp $ --- src/js/jsBSD.cxx.orig 2008-03-11 02:06:21.000000000 +0000 +++ src/js/jsBSD.cxx -@@ -49,16 +49,14 @@ +@@ -49,16 +49,16 @@ #include <sys/ioctl.h> #if defined(__FreeBSD__) # include <sys/joystick.h> @@ -14,7 +14,9 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42:10 nia Exp $ #if defined(__NetBSD__) -#ifdef HAVE_USBHID_H +#define HAVE_USBHID_H 1 -+#include <dev/hid/hid.h> ++# if __NetBSD_Version__ > 899000900 ++# include <dev/hid/hid.h> ++# endif #include <usbhid.h> -#else -#include <usb.h> @@ -22,7 +24,7 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42:10 nia Exp $ #elif defined(__FreeBSD__) extern "C" { # if __FreeBSD_version < 500000 -@@ -85,7 +83,9 @@ struct os_specific_s { +@@ -85,7 +85,9 @@ struct os_specific_s { int fd; int is_analog; // The following structure members are specific to analog joysticks @@ -32,7 +34,7 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42:10 nia Exp $ #ifdef HAVE_USB_JS // The following structure members are specific to USB joysticks struct hid_item *hids; -@@ -437,7 +437,7 @@ void jsJoystick::rawRead ( int *buttons, +@@ -437,7 +439,7 @@ void jsJoystick::rawRead ( int *buttons, return ; } @@ -41,7 +43,7 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42:10 nia Exp $ if ( os->is_analog ) { int status = ::read ( os->fd, &os->ajs, sizeof(os->ajs) ); -@@ -462,6 +462,7 @@ void jsJoystick::rawRead ( int *buttons, +@@ -462,6 +464,7 @@ void jsJoystick::rawRead ( int *buttons, return; } |