head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.8 OPENPKG_E1_MP:1.8 OPENPKG_E1_MP_2_STABLE:1.6.8.1 OPENPKG_E1_FP:1.6.8.1 OPENPKG_2_STABLE_MP:1.8 OPENPKG_2_STABLE_20061018:1.6.8.1 OPENPKG_2_STABLE_20060622:1.6 OPENPKG_2_STABLE:1.6.0.8 OPENPKG_2_STABLE_BP:1.6 OPENPKG_2_5_RELEASE:1.6 OPENPKG_2_5_SOLID:1.6.0.6 OPENPKG_2_5_SOLID_BP:1.6 OPENPKG_2_4_RELEASE:1.6 OPENPKG_2_4_SOLID:1.6.0.4 OPENPKG_2_4_SOLID_BP:1.6 OPENPKG_CW_FP:1.6 OPENPKG_2_3_RELEASE:1.6 OPENPKG_2_3_SOLID:1.6.0.2 OPENPKG_2_3_SOLID_BP:1.6 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.6 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.5 OPENPKG_2_1_SOLID:1.5.0.4 OPENPKG_2_1_SOLID_BP:1.5 OPENPKG_2_0_RELEASE:1.5 OPENPKG_2_0_SOLID:1.5.0.2 OPENPKG_2_0_SOLID_BP:1.5 OPENPKG_1_3_RELEASE:1.2.2.1 OPENPKG_1_3_SOLID:1.2.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.2.2.1 OPENPKG_1_STABLE_MP:1.3 OPENPKG_1_2_SOLID:1.2.0.4 OPENPKG_1_2_SOLID_BP:1.2 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_BP:1.2; locks; strict; comment @# @; 1.8 date 2006.08.27.10.25.37; author rse; state Exp; branches; next 1.7; commitid d6Gt5Ng0UCHF9tKr; 1.7 date 2006.08.27.10.07.23; author rse; state Exp; branches; next 1.6; commitid 5rSa67WURh5q3tKr; 1.6 date 2004.12.16.11.54.04; author ms; state Exp; branches 1.6.8.1; next 1.5; 1.5 date 2003.09.17.12.07.05; author ms; state Exp; branches; next 1.4; 1.4 date 2003.08.31.07.29.03; author rse; state dead; branches; next 1.3; 1.3 date 2003.06.13.11.14.03; author rse; state Exp; branches; next 1.2; 1.2 date 2003.01.13.08.20.13; author rse; state dead; branches 1.2.2.1; next 1.1; 1.1 date 2002.08.09.08.58.56; author rse; state Exp; branches; next ; 1.6.8.1 date 2006.10.16.14.56.08; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; 1.2.2.1 date 2003.07.24.20.50.35; author rse; state Exp; branches; next ; desc @@ 1.8 log @once again fix SDL under FreeBSD/Linux where it finds libusbhid @ text @Index: configure --- configure.orig 2006-06-27 06:48:54 +0200 +++ configure 2006-08-27 12:23:15 +0200 @@@@ -28420,6 +28420,7 @@@@ SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" + SDL_LIBS="$SDL_LIBS -lvgl" have_video=yes fi fi @@@@ -31600,6 +31601,7 @@@@ USB_LIBS="$USB_LIBS -lusbhid" + SDL_LIBS="$SDL_LIBS -lusbhid" else if test "${ac_cv_header_usb_h+set}" = set; then echo "$as_me:$LINENO: checking for usb.h" >&5 Index: src/joystick/bsd/SDL_sysjoystick.c --- src/joystick/bsd/SDL_sysjoystick.c.orig 2006-05-01 10:02:40 +0200 +++ src/joystick/bsd/SDL_sysjoystick.c 2006-08-27 12:22:24 +0200 @@@@ -49,10 +49,10 @@@@ #if defined(HAVE_USBHID_H) #include -#elif defined(HAVE_LIBUSB_H) -#include #elif defined(HAVE_LIBUSBHID_H) #include +#elif defined(HAVE_LIBUSB_H) +#include #endif #ifdef __FREEBSD__ @ 1.7 log @fix generation of sdl.pc under FreeBSD and Linux (where vgl(3) API exists) @ text @d3 1 a3 1 +++ configure 2006-08-27 12:02:21 +0200 d12 8 d22 1 a22 1 +++ src/joystick/bsd/SDL_sysjoystick.c 2006-08-27 11:57:25 +0200 @ 1.6 log @upgrading package: sdl 1.2.7 -> 1.2.8 @ text @d1 14 a14 3 diff -Naur src/joystick/bsd/SDL_sysjoystick.c.orig src/joystick/bsd/SDL_sysjoystick.c --- src/joystick/bsd/SDL_sysjoystick.c.orig 2003-08-30 21:13:05.000000000 +0200 +++ src/joystick/bsd/SDL_sysjoystick.c 2003-09-17 13:52:47.000000000 +0200 d27 1 a27 1 #ifdef __FreeBSD__ @ 1.6.8.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d1 3 a3 22 Index: configure --- configure.orig 2006-06-27 06:48:54 +0200 +++ configure 2006-08-27 12:23:15 +0200 @@@@ -28420,6 +28420,7 @@@@ SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" + SDL_LIBS="$SDL_LIBS -lvgl" have_video=yes fi fi @@@@ -31600,6 +31601,7 @@@@ USB_LIBS="$USB_LIBS -lusbhid" + SDL_LIBS="$SDL_LIBS -lusbhid" else if test "${ac_cv_header_usb_h+set}" = set; then echo "$as_me:$LINENO: checking for usb.h" >&5 Index: src/joystick/bsd/SDL_sysjoystick.c --- src/joystick/bsd/SDL_sysjoystick.c.orig 2006-05-01 10:02:40 +0200 +++ src/joystick/bsd/SDL_sysjoystick.c 2006-08-27 12:22:24 +0200 d16 1 a16 1 #ifdef __FREEBSD__ @ 1.5 log @An unstudied hack, but at least works to fix the current build problems on BSD @ text @d1 3 a3 3 diff -Naur SDL-1.2.6.orig/src/joystick/bsd/SDL_sysjoystick.c SDL-1.2.6/src/joystick/bsd/SDL_sysjoystick.c --- SDL-1.2.6.orig/src/joystick/bsd/SDL_sysjoystick.c 2003-08-30 21:13:05.000000000 +0200 +++ SDL-1.2.6/src/joystick/bsd/SDL_sysjoystick.c 2003-09-17 13:52:47.000000000 +0200 @ 1.4 log @upgrading package: sdl 1.2.5 -> 1.2.6 @ text @d1 16 a16 14 --- src/video/SDL_stretch.c.orig Wed Mar 6 12:23:03 2002 +++ src/video/SDL_stretch.c Fri Jun 13 13:08:28 2003 @@@@ -261,9 +261,8 @@@@ break; default: #ifdef __GNUC__ - __asm__ __volatile__ (" - call _copy_row - " + __asm__ __volatile__ ( + " call _copy_row " : "=&D" (u1), "=&S" (u2) : "0" (dstp), "1" (srcp) : "memory" ); @ 1.3 log @fix gcc 3.3 incompatibility @ text @@ 1.2 log @remove obsoleted patch @ text @d1 14 a14 77 $FreeBSD: ports/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c,v 1.2 2002/04/18 08:10:01 sobomax Exp $ --- src/joystick/bsd/SDL_sysjoystick.c.orig Sun Mar 10 05:49:25 2002 +++ src/joystick/bsd/SDL_sysjoystick.c Thu Apr 18 10:48:00 2002 @@@@ -41,7 +41,11 @@@@ #include #include -#include +#if !defined(HAVE_LIBUSBHID_H) +#include +#else +#include +#endif #include "SDL_error.h" #include "SDL_joystick.h" @@@@ -205,7 +209,8 @@@@ joy->nballs = 0; while (hid_get_item(hdata, &hitem) > 0) { - char *s, *sp; + const char *s; + char *sp; switch (hitem.kind) { case hid_collection: @@@@ -275,7 +280,7 @@@@ Sint32 v; rep = &joy->hwdata->inreport; - if (read(joy->hwdata->fd, rep->buf->data, rep->size) != rep->size) { + if (read(joy->hwdata->fd, rep->buf->ucr_data, rep->size) != rep->size) { return; } hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input); @@@@ -310,7 +315,7 @@@@ goto scaleaxe; } scaleaxe: - v = (Sint32)hid_get_data(rep->buf->data, &hitem); + v = (Sint32)hid_get_data(rep->buf->ucr_data, &hitem); if (v != 127) { if (v < 127) { v = -(256 - v); @@@@ -329,7 +334,7 @@@@ } break; case HUP_BUTTON: - v = (Sint32)hid_get_data(rep->buf->data, + v = (Sint32)hid_get_data(rep->buf->ucr_data, &hitem); if (joy->buttons[nbutton] != v) { SDL_PrivateJoystickButton(joy, @@@@ -381,7 +386,12 @@@@ { int len; +#if !defined(HAVE_LIBUSBHID_H) len = hid_report_size(rd, repinfo[repind].kind, &r->rid); +#else + len = hid_report_size(rd, r->rid, repinfo[repind].kind); +#endif + if (len < 0) { SDL_SetError("Negative HID report size"); return (-1); @@@@ -389,7 +399,7 @@@@ r->size = len; if (r->size > 0) { - r->buf = malloc(sizeof(*r->buf) - sizeof(r->buf->data) + + r->buf = malloc(sizeof(*r->buf) - sizeof(r->buf->ucr_data) + r->size); if (r->buf == NULL) { SDL_OutOfMemory(); @ 1.2.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @d1 77 a77 14 --- src/video/SDL_stretch.c.orig Wed Mar 6 12:23:03 2002 +++ src/video/SDL_stretch.c Fri Jun 13 13:08:28 2003 @@@@ -261,9 +261,8 @@@@ break; default: #ifdef __GNUC__ - __asm__ __volatile__ (" - call _copy_row - " + __asm__ __volatile__ ( + " call _copy_row " : "=&D" (u1), "=&S" (u2) : "0" (dstp), "1" (srcp) : "memory" ); @ 1.1 log @finally fix this package upgrade, too. @ text @@