Date: Tue, 7 May 2002 15:19:28 +0200 (CEST) From: Stijn Hoop <stijn@pcwin002.win.tue.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/37830: [MAINTAINER UPDATE]: emulators/zsnes Message-ID: <200205071319.g47DJS0X073903@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 37830
>Category: ports
>Synopsis: [MAINTAINER UPDATE]: emulators/zsnes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue May 07 06:20:03 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD 4.5-STABLE #0: Wed May 1 04:32:43 CEST 2002
>Description:
- Unbreak zsnes with the latest SDL update: disable joystick code for now.
Hopefully the joystick code can be reenabled when devel/sdl12 gets updated.
>How-To-Repeat:
N/A
>Fix:
- Apply the following patch
- cvs add files/patch-src::linux::sdllink.c
- commit
diff -urN --exclude=CVS /usr/ports/emulators/zsnes/files/patch-src::linux::sdllink.c zsnes/files/patch-src::linux::sdllink.c
--- /usr/ports/emulators/zsnes/files/patch-src::linux::sdllink.c Thu Jan 1 01:00:00 1970
+++ zsnes/files/patch-src::linux::sdllink.c Tue May 7 13:29:56 2002
@@ -0,0 +1,35 @@
+--- linux/sdllink.c.orig Sun Sep 23 17:42:52 2001
++++ linux/sdllink.c Tue May 7 13:16:21 2002
+@@ -536,6 +536,11 @@
+
+ for (i = 0; i < 5; i++)
+ JoystickInput[i] = NULL;
++#if 1
++ printf("ZSNES could not find any joysticks.\n");
++ SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
++ return FALSE;
++#else
+ // If it is possible to use SDL_NumJoysticks
+ // before initialising SDL_INIT_JOYSTICK then
+ // this call can be replaced with SDL_InitSubSystem
+@@ -557,6 +562,7 @@
+ }
+
+ return TRUE;
++#endif
+ }
+
+ BOOL InitInput()
+@@ -572,7 +578,11 @@
+ if (!sdl_inited)
+ {
+ if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_TIMER |
+- SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0)
++ SDL_INIT_VIDEO
++#if 0
++| SDL_INIT_JOYSTICK
++#endif
++ ) < 0)
+ {
+ fprintf(stderr, "Could not initialize SDL!\n");
+ return FALSE;
>Release-Note:
>Audit-Trail:
>Unformatted:
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?200205071319.g47DJS0X073903>