Date: Thu, 18 Apr 2002 17:08:03 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: Dan Larsson <dl@tyfon.net> Cc: ports@FreeBSD.ORG Subject: Re: devel/sdl12 build problem with patch (SDL-1.2.4) Message-ID: <3CBED343.92ABDAB6@FreeBSD.org> References: <20020417181146.I17116-100000@hq1.tyfon.net>
next in thread | previous in thread | raw e-mail | index | archive | help
I've already committed a fix. Please recvsup and try again.
Thank you for reporting!
-Maxim
Dan Larsson wrote:
>
> Ports tree cvsupped just an hour ago. There seems to be a slight
> glitch[1] in the new (patch-src::joystick...) patch file. Here's
> a patch for the patch :-)
>
> [1] hid_report_size(3) says:
>
> int
> hid_report_size(report_desc_t d, hid_kind_t k, int *idp);
>
> (I have no means of testing this but atleast it compiles now)
>
> -----------------
> --- devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c Wed Apr 17 14:35:50 2002
> +++ patch-src::joystick::bsd::SDL_sysjoystick.c Wed Apr 17 21:21:09 2002
> @@ -1,8 +1,5 @@
> -
> -$FreeBSD: ports/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c,v 1.1 2002/04/17 12:35:50 sobomax Exp $
> -
> ---- src/joystick/bsd/SDL_sysjoystick.c 2002/04/17 11:06:43 1.1
> -+++ src/joystick/bsd/SDL_sysjoystick.c 2002/04/17 11:20:41
> +--- src/joystick/bsd/SDL_sysjoystick.c.orig Sun Mar 10 04:49:25 2002
> ++++ src/joystick/bsd/SDL_sysjoystick.c Wed Apr 17 21:20:28 2002
> @@ -41,7 +41,7 @@
>
> #include <dev/usb/usb.h>
> @@ -49,15 +46,6 @@
> &hitem);
> if (joy->buttons[nbutton] != v) {
> SDL_PrivateJoystickButton(joy,
> -@@ -381,7 +382,7 @@
> - {
> - int len;
> -
> -- len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
> -+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
> - if (len < 0) {
> - SDL_SetError("Negative HID report size");
> - return (-1);
> @@ -389,7 +390,7 @@
> r->size = len;
>
> -----------------
>
> The build error:
> -----------------
> Making all in bsd
> /bin/sh ../../../libtool --mode=compile cc -DPACKAGE=\"SDL\"
> -DVERSION=\"1.2.4\" -DHAVE_ALLOCA=1 -I. -I. -O -pipe
> -D_THREAD_SAFE -Wall -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT -DUSE_ASMBLIT
> -I./hermes -I../../../src/hermes -DOSS_SUPPORT -DESD_SUPPORT
> -I/usr/local/include -I/usr/X11R6/include -DENABLE_X11 -Iinclude
> -Isrc/video -DXFREE86_VM -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE
> -DDEFAULT_DGAMOUSE -DXFREE86_XV -DHAVE_XINERAMA -Isrc/video -DENABLE_DGA
> -DENABLE_SVGALIB -DENABLE_AALIB -DHAVE_OPENGL -D_REENTRANT
> -D_THREAD_SAFE -DSDL_USE_PTHREADS -DHAVE_SEMUN
> -I../../../include -I../../../include/SDL -I../../../src
> -I../../../src/freebsd -I../../../src/main -I../../../src/audio
> -I../../../src/video -I../../../src/video/XFree86/extensions
> -I../../../src/events -I../../../src/joystick -I../../../src/cdrom
> -I../../../src/thread -I../../../src/timer -I../../../src/endian
> -I../../../src/file -c SDL_sysjoystick.c
> mkdir .libs
> cc -DPACKAGE=\"SDL\" -DVERSION=\"1.2.4\" -DHAVE_ALLOCA=1 -I. -I. -O
> -pipe -D_THREAD_SAFE -Wall -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT
> -DUSE_ASMBLIT -I./hermes -I../../../src/hermes -DOSS_SUPPORT
> -DESD_SUPPORT -I/usr/local/include -I/usr/X11R6/include -DENABLE_X11
> -Iinclude -Isrc/video -DXFREE86_VM -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE
> -DDEFAULT_DGAMOUSE -DXFREE86_XV -DHAVE_XINERAMA -Isrc/video -DENABLE_DGA
> -DENABLE_SVGALIB -DENABLE_AALIB -DHAVE_OPENGL -D_REENTRANT -D_THREAD_SAFE
> -DSDL_USE_PTHREADS -DHAVE_SEMUN -I../../../include -I../../../include/SDL
> -I../../../src -I../../../src/freebsd -I../../../src/main
> -I../../../src/audio -I../../../src/video
> -I../../../src/video/XFree86/extensions -I../../../src/events
> -I../../../src/joystick -I../../../src/cdrom -I../../../src/thread
> -I../../../src/timer -I../../../src/endian -I../../../src/file -c
> SDL_sysjoystick.c -fPIC -DPIC -o .libs/SDL_sysjoystick.lo
> SDL_sysjoystick.c: In function `SDL_SYS_JoystickUpdate':
> SDL_sysjoystick.c:275: warning: `naxe' might be used uninitialized in this function
> SDL_sysjoystick.c: In function `report_alloc':
> SDL_sysjoystick.c:385: incompatible type for argument 3 of `hid_report_size'
> *** Error code 1
>
> Stop in /usr/ports/devel/sdl12/work/SDL-1.2.4/src/joystick/bsd.
> *** Error code 1
>
> Stop in /usr/ports/devel/sdl12/work/SDL-1.2.4/src/joystick.
> *** Error code 1
>
> Stop in /usr/ports/devel/sdl12/work/SDL-1.2.4/src.
> *** Error code 1
>
> Stop in /usr/ports/devel/sdl12/work/SDL-1.2.4.
> *** Error code 1
>
> Stop in /usr/ports/devel/sdl12.
>
> Regards
> +------
> Dan Larsson -+- Tyfon Svenska AB -+- DL1999-RIPE
> A9C8 7230 ECFB 5B06 5370 B571 1E88 9C76 ACDE 744C
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-ports" in the body of the message
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3CBED343.92ABDAB6>