CVS commit: pkgsrc/games/plib

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Aug  5 20:42:10 UTC 2018

Modified Files:
        pkgsrc/games/plib: distinfo
        pkgsrc/games/plib/patches: patch-ad

Log Message:
games/plib: this needs to include another hid header to build on netbsd now.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/plib/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/plib/patches/patch-ad

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

Modified files:

Index: pkgsrc/games/plib/distinfo
diff -u pkgsrc/games/plib/distinfo:1.14 pkgsrc/games/plib/distinfo:1.15
--- pkgsrc/games/plib/distinfo:1.14     Tue Nov  3 20:57:01 2015
+++ pkgsrc/games/plib/distinfo  Sun Aug  5 20:42:10 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2015/11/03 20:57:01 agc Exp $
+$NetBSD: distinfo,v 1.15 2018/08/05 20:42:10 nia 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) = 17154cc7724
 Size (plib-1.8.5.tar.gz) = 779133 bytes
 SHA1 (patch-aa) = 6a9e3badb63de5b9b100805fa7151ce5db8ced69
 SHA1 (patch-ab) = 1bb0950b08427f8bcef84ee2da1cfd231ca60385
-SHA1 (patch-ad) = bc79c088939d7dffdd2b63610c3cf9d494a92699
+SHA1 (patch-ad) = e158c9d0eed70146a8ee979eb3488c365455259a
 SHA1 (patch-ae) = fe166e1b3b5d150d3d83bad49e2576d9ebaa0fb7
 SHA1 (patch-af) = ea774a54a3cff4d43abae164bbcae745d4642aea
 SHA1 (patch-ag) = d715adee05f8e6973a5883f74573cc39bfd8d72e

Index: pkgsrc/games/plib/patches/patch-ad
diff -u pkgsrc/games/plib/patches/patch-ad:1.7 pkgsrc/games/plib/patches/patch-ad:1.8
--- pkgsrc/games/plib/patches/patch-ad:1.7      Sun Jan  6 00:59:47 2013
+++ pkgsrc/games/plib/patches/patch-ad  Sun Aug  5 20:42:10 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2013/01/06 00:59:47 ryoon Exp $
+$NetBSD: patch-ad,v 1.8 2018/08/05 20:42:10 nia Exp $
 
---- src/js/jsBSD.cxx.orig      Tue Mar 11 02:06:21 2008
+--- src/js/jsBSD.cxx.orig      2008-03-11 02:06:21.000000000 +0000
 +++ src/js/jsBSD.cxx
-@@ -49,16 +49,13 @@
+@@ -49,16 +49,14 @@
  #include <sys/ioctl.h>
  #if defined(__FreeBSD__)
  # include <sys/joystick.h>
@@ -14,6 +14,7 @@ $NetBSD: patch-ad,v 1.7 2013/01/06 00:59
  #if defined(__NetBSD__)
 -#ifdef HAVE_USBHID_H
 +#define HAVE_USBHID_H 1
++#include <dev/hid/hid.h>
  #include <usbhid.h>
 -#else
 -#include <usb.h>
@@ -21,7 +22,7 @@ $NetBSD: patch-ad,v 1.7 2013/01/06 00:59
  #elif defined(__FreeBSD__)
  extern "C" {
  #  if __FreeBSD_version < 500000
-@@ -85,7 +82,9 @@ struct os_specific_s {
+@@ -85,7 +83,9 @@ struct os_specific_s {
    int              fd;
    int              is_analog;
    // The following structure members are specific to analog joysticks
@@ -31,7 +32,7 @@ $NetBSD: patch-ad,v 1.7 2013/01/06 00:59
  #ifdef HAVE_USB_JS
    // The following structure members are specific to USB joysticks
    struct hid_item *hids;
-@@ -437,7 +436,7 @@ void jsJoystick::rawRead ( int *buttons, float *axes )
+@@ -437,7 +437,7 @@ void jsJoystick::rawRead ( int *buttons,
  
      return ;
    }
@@ -40,7 +41,7 @@ $NetBSD: patch-ad,v 1.7 2013/01/06 00:59
    if ( os->is_analog )
    {
      int status = ::read ( os->fd, &os->ajs, sizeof(os->ajs) );
-@@ -462,6 +461,7 @@ void jsJoystick::rawRead ( int *buttons, float *axes )
+@@ -462,6 +462,7 @@ void jsJoystick::rawRead ( int *buttons,
  
      return;
    }