Mercurial > sdl-ios-xcode
annotate SDL.spec.in @ 1748:5e86e34453d4
------- Comment #1 From Max Horn 2006-04-17 03:08 [reply] -------
Created an attachment (id=106) [edit]
Patch for src/joystick/win32/SDL_mmjoystick.c
I am not even a Windows user, so take the following with a grain of salt:
SDL_mmjoystick.c has a function GetJoystickName which obtains the joystick
name by looking at the registry. The way it does that seems very fishy to me.
Namely, it uses the parameter "index" to construct a registry value name (BTW,
those variables used in the code are really badly named). The value of "index"
in turn equals the current value of "numdevs", as called from
SDL_SYS_JoystickInit.
I read through the MSDN docs at
<http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/dnarinput/html/msdn_extdirect.asp>,
and I believe the simple fix is to replace line 183 of said file
SYS_JoystickName[numdevs] = GetJoystickName(numdevs, joycaps.szRegKey);
by the following:
SYS_JoystickName[numdevs] = GetJoystickName(SYS_JoystickID[i],
joycaps.szRegKey);
However, that is only *hiding* the real issue. Problem is, the list of
joysticks as returned by windows may contains "gaps", and the code deals
incorrectly with that. Namely those gaps occur if joysticks are
removed/(re)added, as the reporter observed.
The attached patch fixes this and another (off-by-one) issue in the code. But
since I have no Windows machine, I can't even test-compile it, so use with
caution.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sat, 29 Apr 2006 20:22:31 +0000 |
parents | e20dcef5647c |
children | 14717b52abc0 |
rev | line source |
---|---|
0 | 1 Summary: Simple DirectMedia Layer |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
2 Name: SDL |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
3 Version: @SDL_VERSION@ |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
4 Release: 1 |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
5 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz |
0 | 6 URL: http://www.libsdl.org/ |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
7 License: LGPL |
0 | 8 Group: System Environment/Libraries |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
9 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot |
0 | 10 Prefix: %{_prefix} |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
11 %ifos linux |
328
dc21fa30faa9
RPM dependency fix courtesy of Edward Rudd
Sam Lantinga <slouken@libsdl.org>
parents:
300
diff
changeset
|
12 Provides: libSDL-1.1.so.0 |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
13 %endif |
0 | 14 |
15 %description | |
16 This is the Simple DirectMedia Layer, a generic API that provides low | |
17 level access to audio, keyboard, mouse, and display framebuffer across | |
18 multiple platforms. | |
19 | |
20 %package devel | |
21 Summary: Libraries, includes and more to develop SDL applications. | |
22 Group: Development/Libraries | |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
23 Requires: %{name} = %{version} |
0 | 24 |
25 %description devel | |
26 This is the Simple DirectMedia Layer, a generic API that provides low | |
27 level access to audio, keyboard, mouse, and display framebuffer across | |
28 multiple platforms. | |
29 | |
30 This is the libraries, include files and other resources you can use | |
31 to develop SDL applications. | |
32 | |
33 | |
34 %prep | |
35 %setup -q | |
36 | |
37 %build | |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
38 %ifos linux |
1588
e20dcef5647c
Improved DirectFB install detection
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
39 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-video-aalib --disable-video-directfb --disable-video-ggi --disable-video-svga |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
40 %else |
1588
e20dcef5647c
Improved DirectFB install detection
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
41 %configure |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
42 %endif |
0 | 43 make |
44 | |
45 %install | |
46 rm -rf $RPM_BUILD_ROOT | |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
47 %ifos linux |
1390 | 48 make install prefix=$RPM_BUILD_ROOT%{prefix} \ |
49 bindir=$RPM_BUILD_ROOT%{_bindir} \ | |
50 libdir=$RPM_BUILD_ROOT%{_libdir} \ | |
51 includedir=$RPM_BUILD_ROOT%{_includedir} \ | |
52 datadir=$RPM_BUILD_ROOT%{_datadir} \ | |
53 mandir=$RPM_BUILD_ROOT%{_mandir} | |
54 ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT%{prefix}/lib/libSDL-1.1.so.0 | |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
55 %else |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
56 %makeinstall |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
57 %endif |
0 | 58 |
59 %clean | |
60 rm -rf $RPM_BUILD_ROOT | |
61 | |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
62 %ifnos darwin |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
63 %define __defattr %defattr(-,root,root) |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
64 %define __soext so |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
65 %else |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
66 %define __defattr %defattr(-,root,wheel) |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
67 %define __soext dylib |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
68 %endif |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
69 |
0 | 70 %files |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
71 %{__defattr} |
0 | 72 %doc README-SDL.txt COPYING CREDITS BUGS |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
73 %ifnos darwin |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
74 %{_libdir}/lib*.%{__soext}.* |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
75 %else |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
76 %{_libdir}/lib*.*.%{__soext} |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
77 %endif |
0 | 78 |
79 %files devel | |
80 %defattr(-,root,root) | |
81 %doc README README-SDL.txt COPYING CREDITS BUGS WhatsNew docs.html | |
82 %doc docs/index.html docs/html | |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
83 %{_bindir}/*-config |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
84 %{_libdir}/lib*.a |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
85 %{_libdir}/lib*.la |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
86 %{_libdir}/lib*.%{__soext} |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
87 %dir %{_includedir}/SDL |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
88 %{_includedir}/SDL/*.h |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
89 %{_datadir}/aclocal/* |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
90 %{_mandir}/man3/* |
0 | 91 |
92 %changelog | |
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
93 * Mon Jan 03 2004 Anders Bjorklund <afb@algonet.se> |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
94 - Added support for Darwin, updated spec file |
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1008
diff
changeset
|
95 |
0 | 96 * Wed Jan 19 2000 Sam Lantinga <slouken@libsdl.org> |
97 - Re-integrated spec file into SDL distribution | |
98 - 'name' and 'version' come from configure | |
99 - Some of the documentation is devel specific | |
100 - Removed SMP support from %build - it doesn't work with libtool anyway | |
101 | |
102 * Tue Jan 18 2000 Hakan Tandogan <hakan@iconsult.com> | |
103 - Hacked Mandrake sdl spec to build 1.1 | |
104 | |
105 * Sun Dec 19 1999 John Buswell <johnb@mandrakesoft.com> | |
106 - Build Release | |
107 | |
108 * Sat Dec 18 1999 John Buswell <johnb@mandrakesoft.com> | |
109 - Add symlink for libSDL-1.0.so.0 required by sdlbomber | |
110 - Added docs | |
111 | |
112 * Thu Dec 09 1999 Lenny Cartier <lenny@mandrakesoft.com> | |
113 - v 1.0.0 | |
114 | |
115 * Mon Nov 1 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com> | |
116 - First spec file for Mandrake distribution. | |
117 | |
118 # end of file |