Attachment #94085 for bug #132150

View | Details | Raw Unified | Return to bug 132150
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-1 / +6 lines)
7		7
8	PORTNAME= sdl	8	PORTNAME= sdl
9	PORTVERSION= 1.2.13	9	PORTVERSION= 1.2.13
10	PORTREVISION= 2	10	PORTREVISION= 3
11	PORTEPOCH= 2	11	PORTEPOCH= 2
12	CATEGORIES= devel	12	CATEGORIES= devel
13	MASTER_SITES= http://www.libsdl.org/release/	13	MASTER_SITES= http://www.libsdl.org/release/
Lines 62-67 Link Here
62		62
63	.include <bsd.port.pre.mk>	63	.include <bsd.port.pre.mk>
64		64
		65	.if ${OSVERSION} >= 800064
		66	CFLAGS+= -DUSBHID_UCR_DATA
		67	EXTRA_PATCHES+= ${FILESDIR}/usb2
		68	.endif
		69
65	MAN3!= ${CAT} ${FILESDIR}/man3	70	MAN3!= ${CAT} ${FILESDIR}/man3
66		71
67	.if defined(WITHOUT_AALIB)	72	.if defined(WITHOUT_AALIB)




--- src/joystick/bsd/SDL_sysjoystick.c.orig	2007-12-31 07:47:55.000000000 +0300
+++ src/joystick/bsd/SDL_sysjoystick.c	2009-02-27 06:12:54.503954886 +0300
@@ -45,6 +45,7 @@
 #else
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
+#include <dev/usb/usb_ioctl.h>
 #endif
 
 #if defined(HAVE_USBHID_H)
@@ -74,6 +75,11 @@
 #define MAX_JOY_JOYS	2
 #define MAX_JOYS	(MAX_UHID_JOYS + MAX_JOY_JOYS)
 
+struct usb_ctl_report {
+        int     ucr_report;
+        u_char  ucr_data[1024]; /* filled data size will vary */
+};
+
 struct report {
 	struct	usb_ctl_report *buf;	/* Buffer */
 	size_t	size;			/* Buffer size */

Return to bug 132150

Added Link Here

(-)files/usb2 (+22 lines)
1	--- src/joystick/bsd/SDL_sysjoystick.c.orig 2007-12-31 07:47:55.000000000 +0300
2	+++ src/joystick/bsd/SDL_sysjoystick.c 2009-02-27 06:12:54.503954886 +0300
3	@@ -45,6 +45,7 @@
4	#else
5	#include <dev/usb/usb.h>
6	#include <dev/usb/usbhid.h>
7	+#include <dev/usb/usb_ioctl.h>
8	#endif
9
10	#if defined(HAVE_USBHID_H)
11	@@ -74,6 +75,11 @@
12	#define MAX_JOY_JOYS 2
13	#define MAX_JOYS (MAX_UHID_JOYS + MAX_JOY_JOYS)
14
15	+struct usb_ctl_report {
16	+ int ucr_report;
17	+ u_char ucr_data[1024]; /* filled data size will vary */
18	+};
19	+
20	struct report {
21	struct usb_ctl_report buf; / Buffer */
22	size_t size; /* Buffer size */