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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
14
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
15 %description
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
16 This is the Simple DirectMedia Layer, a generic API that provides low
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
17 level access to audio, keyboard, mouse, and display framebuffer across
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
18 multiple platforms.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
19
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
20 %package devel
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
21 Summary: Libraries, includes and more to develop SDL applications.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
24
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
25 %description devel
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
26 This is the Simple DirectMedia Layer, a generic API that provides low
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
27 level access to audio, keyboard, mouse, and display framebuffer across
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
28 multiple platforms.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
29
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
30 This is the libraries, include files and other resources you can use
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
31 to develop SDL applications.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
32
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
33
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
34 %prep
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
35 %setup -q
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
36
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
43 make
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
44
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
45 %install
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
67781f790694 Added DESTDIR support
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
48 make install prefix=$RPM_BUILD_ROOT%{prefix} \
67781f790694 Added DESTDIR support
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
49 bindir=$RPM_BUILD_ROOT%{_bindir} \
67781f790694 Added DESTDIR support
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
50 libdir=$RPM_BUILD_ROOT%{_libdir} \
67781f790694 Added DESTDIR support
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
51 includedir=$RPM_BUILD_ROOT%{_includedir} \
67781f790694 Added DESTDIR support
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
52 datadir=$RPM_BUILD_ROOT%{_datadir} \
67781f790694 Added DESTDIR support
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
53 mandir=$RPM_BUILD_ROOT%{_mandir}
67781f790694 Added DESTDIR support
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
58
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
59 %clean
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
60 rm -rf $RPM_BUILD_ROOT
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
78
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
79 %files devel
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
80 %defattr(-,root,root)
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
81 %doc README README-SDL.txt COPYING CREDITS BUGS WhatsNew docs.html
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
91
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
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
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
96 * Wed Jan 19 2000 Sam Lantinga <slouken@libsdl.org>
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
97 - Re-integrated spec file into SDL distribution
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
98 - 'name' and 'version' come from configure
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
99 - Some of the documentation is devel specific
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
100 - Removed SMP support from %build - it doesn't work with libtool anyway
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
101
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
102 * Tue Jan 18 2000 Hakan Tandogan <hakan@iconsult.com>
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
103 - Hacked Mandrake sdl spec to build 1.1
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
104
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
105 * Sun Dec 19 1999 John Buswell <johnb@mandrakesoft.com>
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
106 - Build Release
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
107
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
108 * Sat Dec 18 1999 John Buswell <johnb@mandrakesoft.com>
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
109 - Add symlink for libSDL-1.0.so.0 required by sdlbomber
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
110 - Added docs
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
111
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
112 * Thu Dec 09 1999 Lenny Cartier <lenny@mandrakesoft.com>
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
113 - v 1.0.0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
114
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
115 * Mon Nov 1 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
116 - First spec file for Mandrake distribution.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
117
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
118 # end of file