CVS commit: pkgsrc/devel

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Dec 25 00:18:40 UTC 2017

Modified Files:
        pkgsrc/devel/SDL: distinfo
        pkgsrc/devel/SDL/patches: patch-src_joystick_bsd_SDL__sysjoystick.c
        pkgsrc/devel/SDL2: distinfo
        pkgsrc/devel/SDL2/patches: patch-src_joystick_bsd_SDL__sysjoystick.c

Log Message:
Include dev/hid/hid.h for recent NetBSD-current to fix build


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/devel/SDL/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c

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

Modified files:

Index: pkgsrc/devel/SDL/distinfo
diff -u pkgsrc/devel/SDL/distinfo:1.79 pkgsrc/devel/SDL/distinfo:1.80
--- pkgsrc/devel/SDL/distinfo:1.79      Fri Oct 27 01:28:53 2017
+++ pkgsrc/devel/SDL/distinfo   Mon Dec 25 00:18:39 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2017/10/27 01:28:53 nat Exp $
+$NetBSD: distinfo,v 1.80 2017/12/25 00:18:39 ryoon Exp $
 
 SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
 RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef
 SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = 7f5fbf4d839e52fce028810dc807b404fcd51442
 SHA1 (patch-src_audio_dma_SDL__dmaaudio.c) = cede64d04e8872b11851bfcacbc99059df973881
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
-SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 46029dda8975dcb891a5b14b718c27b034ce5b06
+SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = a20608d6a4cc8f2c8f5fb2d77a572f373178151b
 SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8
 SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1c874c46edb325907eda3bfa7580c788294f6d21
 SHA1 (patch-src_video_wscons_SDL__wsconsevents__c.h) = 97206e2aca0b620005217d9d07ad1177516cac92

Index: pkgsrc/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c
diff -u pkgsrc/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c:1.5 pkgsrc/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c:1.6
--- pkgsrc/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c:1.5      Tue Mar  3 19:14:04 2015
+++ pkgsrc/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c  Mon Dec 25 00:18:39 2017
@@ -1,8 +1,21 @@
-$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.5 2015/03/03 19:14:04 jmcneill Exp $
+$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.6 2017/12/25 00:18:39 ryoon Exp $
 
 --- src/joystick/bsd/SDL_sysjoystick.c.orig    2012-01-19 06:30:06.000000000 +0000
 +++ src/joystick/bsd/SDL_sysjoystick.c
-@@ -77,7 +77,7 @@
+@@ -46,6 +46,12 @@
+ #ifdef __DragonFly__
+ #include <bus/usb/usb.h>
+ #include <bus/usb/usbhid.h>
++#elif defined(__NetBSD__)
++#include <dev/usb/usb.h>
++#include <dev/usb/usbhid.h>
++#if __NetBSD_Version__ >= 899000900
++#include <dev/hid/hid.h>
++#endif
+ #else
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
+@@ -77,7 +83,7 @@
  #include "../SDL_sysjoystick.h"
  #include "../SDL_joystick_c.h"
  
@@ -11,7 +24,7 @@ $NetBSD: patch-src_joystick_bsd_SDL__sys
  #define MAX_JOY_JOYS  2
  #define MAX_JOYS      (MAX_UHID_JOYS + MAX_JOY_JOYS)
  
-@@ -148,9 +148,11 @@ static char *joydevnames[MAX_JOYS];
+@@ -148,9 +154,11 @@ static char *joydevnames[MAX_JOYS];
  static int    report_alloc(struct report *, struct report_desc *, int);
  static void   report_free(struct report *);
  
@@ -25,7 +38,7 @@ $NetBSD: patch-src_joystick_bsd_SDL__sys
  #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
  #else
  #define REP_BUF_DATA(rep) ((rep)->buf->data)
-@@ -314,6 +316,45 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -314,6 +322,45 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
  #endif
                rep->rid = -1; /* XXX */
        }
@@ -71,7 +84,7 @@ $NetBSD: patch-src_joystick_bsd_SDL__sys
        if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
                goto usberr;
        }
-@@ -386,10 +427,21 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -386,10 +433,21 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
                if (hw->axis_map[i] > 0)
                        hw->axis_map[i] = joy->naxes++;
  
@@ -93,7 +106,7 @@ $NetBSD: patch-src_joystick_bsd_SDL__sys
        return (0);
  usberr:
        close(hw->fd);
-@@ -459,63 +511,62 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+@@ -459,63 +517,62 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
        
        rep = &joy->hwdata->inreport;
  

Index: pkgsrc/devel/SDL2/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.27 pkgsrc/devel/SDL2/distinfo:1.28
--- pkgsrc/devel/SDL2/distinfo:1.27     Mon Oct 23 20:48:43 2017
+++ pkgsrc/devel/SDL2/distinfo  Mon Dec 25 00:18:39 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2017/10/23 20:48:43 adam Exp $
+$NetBSD: distinfo,v 1.28 2017/12/25 00:18:39 ryoon Exp $
 
 SHA1 (SDL2-2.0.7.tar.gz) = 0a530ccdab99cbfe906dba912049e26e3c7219d6
 RMD160 (SDL2-2.0.7.tar.gz) = 454b5be25528c43751f4e21d76a1ca18450b8bb4
@@ -6,6 +6,6 @@ SHA512 (SDL2-2.0.7.tar.gz) = eed54778430
 Size (SDL2-2.0.7.tar.gz) = 4432499 bytes
 SHA1 (patch-configure) = 5637a66f8890586026034f5324829e61c94ac5be
 SHA1 (patch-src_audio_netbsd_SDL__netbsdaudio.c) = 7a1f32ea7029f8dc99aecfaead7c68f2fd6cb230
-SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 37f19752cbba8def12a210deafec66965e3ad9ac
+SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 152b5df76a91c7e7acde126b1464fdd464cf1ba2
 SHA1 (patch-src_video_SDL__egl.c) = eea0cb838e34066cd80373c0becc9eecbc8b1570
 SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0

Index: pkgsrc/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c
diff -u pkgsrc/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c:1.5 pkgsrc/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c:1.6
--- pkgsrc/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c:1.5     Sun Oct 30 10:37:17 2016
+++ pkgsrc/devel/SDL2/patches/patch-src_joystick_bsd_SDL__sysjoystick.c Mon Dec 25 00:18:39 2017
@@ -1,10 +1,23 @@
-$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.5 2016/10/30 10:37:17 wiz Exp $
+$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.6 2017/12/25 00:18:39 ryoon Exp $
 
 Move variable declarations to top, for C90.
 
---- src/joystick/bsd/SDL_sysjoystick.c.orig    2016-10-20 03:56:26.000000000 +0000
+--- src/joystick/bsd/SDL_sysjoystick.c.orig    2017-10-23 19:27:46.000000000 +0000
 +++ src/joystick/bsd/SDL_sysjoystick.c
-@@ -289,6 +289,10 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy,
+@@ -45,6 +45,12 @@
+ #ifdef __DragonFly__
+ #include <bus/usb/usb.h>
+ #include <bus/usb/usbhid.h>
++#elif defined(__NetBSD__)
++#include <dev/usb/usb.h>
++#include <dev/usb/usbhid.h>
++#if __NetBSD_Version__ >= 899000900
++#include <dev/hid/hid.h>
++#endif
+ #else
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
+@@ -291,6 +297,10 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy,
      struct report *rep = NULL;
      int fd;
      int i;
@@ -15,7 +28,7 @@ Move variable declarations to top, for C
  
      fd = open(path, O_RDONLY);
      if (fd == -1) {
-@@ -338,8 +342,6 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy,
+@@ -340,8 +350,6 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy,
          rep->rid = -1;          /* XXX */
      }
  #if defined(__NetBSD__)