pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/SDL Fix capitalization and make it build on Free...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cdd66245ea1
branches:  trunk
changeset: 632326:6cdd66245ea1
user:      asau <asau%pkgsrc.org@localhost>
date:      Mon Mar 24 20:29:01 2014 +0000

description:
Fix capitalization and make it build on FreeBSD 9-10.

diffstat:

 devel/SDL/distinfo                                          |   3 +-
 devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c |  18 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 07cc479ffed9 -r 6cdd66245ea1 devel/SDL/distinfo
--- a/devel/SDL/distinfo        Mon Mar 24 17:44:47 2014 +0000
+++ b/devel/SDL/distinfo        Mon Mar 24 20:29:01 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2012/09/14 13:20:20 wiz Exp $
+$NetBSD: distinfo,v 1.64 2014/03/24 20:29:01 asau Exp $
 
 SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
 RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
@@ -6,6 +6,7 @@
 SHA1 (patch-aa) = 759e3e439671a0edda5d5bbd5e9fc0d0a8e15a19
 SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
+SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 4ea0136f231729129b82e5f7ee4b9eaf68a13876
 SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = e1595611542f3ffaebfe32ee611596c18c06be5e
 SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 356a8817cc41dde5e24cb23f032215931f85a84b
 SHA1 (patch-src_video_x11_SDL_x11video.c) = 624fbb7e701d6de6ec93096beea7c085125934aa
diff -r 07cc479ffed9 -r 6cdd66245ea1 devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SDL/patches/patch-src_joystick_bsd_SDL__sysjoystick.c       Mon Mar 24 20:29:01 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_joystick_bsd_SDL__sysjoystick.c,v 1.1 2014/03/24 20:29:01 asau Exp $
+
+--- src/joystick/bsd/SDL_sysjoystick.c.orig    2012-01-19 06:30:06.000000000 +0000
++++ src/joystick/bsd/SDL_sysjoystick.c
+@@ -148,9 +148,11 @@ static char *joydevnames[MAX_JOYS];
+ static int    report_alloc(struct report *, struct report_desc *, int);
+ static void   report_free(struct report *);
+ 
+-#if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) && (__FreeBSD_kernel_version >= 900000)
++#define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
++#elif defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__)
+ #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
+-#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
++#elif (defined(__FreeBSD__) && (__FreeBSD_kernel_version > 800063))
+ #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
+ #else
+ #define REP_BUF_DATA(rep) ((rep)->buf->data)



Home | Main Index | Thread Index | Old Index