OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re, openpkg-web, openpkg-src Date: 09-Aug-2002 10:58:56
Branch: HEAD Handle: 2002080909585501
Added files:
openpkg-src/sdl sdl.patch
Modified files:
openpkg-re/vcheck vc.sdl
openpkg-src/sdl sdl.spec
openpkg-web news.txt
Log:
finally fix this package upgrade, too.
Summary:
Revision Changes Path
1.4 +1 -2 openpkg-re/vcheck/vc.sdl
1.1 +77 -0 openpkg-src/sdl/sdl.patch
1.6 +4 -2 openpkg-src/sdl/sdl.spec
1.1131 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.sdl
============================================================
$ cvs diff -u -r1.3 -r1.4 vc.sdl
--- openpkg-re/vcheck/vc.sdl 15 Apr 2002 09:42:26 -0000 1.3
+++ openpkg-re/vcheck/vc.sdl 9 Aug 2002 08:58:55 -0000 1.4
@@ -2,8 +2,7 @@
}
prog sdl = {
- version = 1.2.3
- comment = "ms: vendor sources 1.2.4 are busted, so wait on this one."
+ version = 1.2.4
url = http://www.libsdl.org/release/
regex = SDL-(__VER__)\.tar\.gz
}
Index: openpkg-src/sdl/sdl.patch
============================================================
$ cvs update -p -r1.1 sdl.patch
$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 <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
-#include <usbhid.h>
+#if !defined(HAVE_LIBUSBHID_H)
+#include <libusb.h>
+#else
+#include <libusbhid.h>
+#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();
Index: openpkg-src/sdl/sdl.spec
============================================================
$ cvs diff -u -r1.5 -r1.6 sdl.spec
--- openpkg-src/sdl/sdl.spec 6 Aug 2002 12:41:52 -0000 1.5
+++ openpkg-src/sdl/sdl.spec 9 Aug 2002 08:58:56 -0000 1.6
@@ -32,11 +32,12 @@
Distribution: OpenPKG [EXP]
Group: XWindow
License: LGPL
-Version: 1.2.3
-Release: 20020224
+Version: 1.2.4
+Release: 20020809
# list of sources
Source0: http://www.libsdl.org/release/SDL-%{version}.tar.gz
+Patch0: sdl.patch
# build information
Prefix: %{l_prefix}
@@ -54,6 +55,7 @@
%prep
%setup -q -n SDL-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1130 -r1.1131 news.txt
--- openpkg-web/news.txt 9 Aug 2002 08:47:16 -0000 1.1130
+++ openpkg-web/news.txt 9 Aug 2002 08:58:55 -0000 1.1131
@@ -1,3 +1,4 @@
+09-Aug-2002: Upgraded package: P<sdl-1.2.4-20020809>
09-Aug-2002: Upgraded package: P<cvsd-0.9.10-20020809>
09-Aug-2002: Upgraded package: P<whois-4.5.29-20020809>
09-Aug-2002: Upgraded package: P<shellutils-2.0.15-20020809>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
