mr_bones_ 15/02/15 22:58:03 Added: libsdl-1.2.15-bsd-joystick.patch Log: add upstream BSD joystick patch for bug #477730 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.1 media-libs/libsdl/files/libsdl-1.2.15-bsd-joystick.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/files/libsdl-1.2.15-bsd-joystick.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/files/libsdl-1.2.15-bsd-joystick.patch?rev=1.1&content-type=text/plain Index: libsdl-1.2.15-bsd-joystick.patch =================================================================== # HG changeset patch # User Sam Lantinga <slou...@libsdl.org> # Date 1329357968 18000 # Node ID 62ff1c0a103f685774450be2e5338824a22078bd # Parent 8e98c714bb2ab96de4100a335dacf042963d5068 FreeBSD compile fix Robert Millan src/joystick/bsd/SDL_sysjoystick.c makes the invalid assumption that __FreeBSD_kernel__ implies presence of "ucr_data" struct member. This breaks recent versions of FreeBSD 10-CURRENT, FreeBSD 9-STABLE and Debian GNU/kFreeBSD "wheezy/sid". diff -r 8e98c714bb2a -r 62ff1c0a103f src/joystick/bsd/SDL_sysjoystick.c --- a/src/joystick/bsd/SDL_sysjoystick.c Sat Feb 04 18:12:20 2012 -0500 +++ b/src/joystick/bsd/SDL_sysjoystick.c Wed Feb 15 21:06:08 2012 -0500 @@ -148,7 +148,7 @@ 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(USBHID_UCR_DATA) #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data) #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)) #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
