/[pkgs]/devel/ClanLib06/ClanLib-0.6.5-debian.patch
ViewVC logotype

Contents of /devel/ClanLib06/ClanLib-0.6.5-debian.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Mon Jul 24 14:03:00 2006 UTC (3 years, 4 months ago) by jwrdegoede
Branch: MAIN
CVS Tags: F-12-split, ClanLib06-0_6_5-5_fc6, ClanLib06-0_6_5-7_fc6, F-7-split, F-8-split, FC-5-split, ClanLib06-0_6_5-4_fc6, F-10-split, ClanLib06-0_6_5-8_fc8, F-11-split, F-9-split, FC-6-split, ClanLib06-0_6_5-9_fc8, ClanLib06-0_6_5-9_fc9, ClanLib06-0_6_5-6_fc6, ClanLib06-0_6_5-14_fc11, ClanLib06-0_6_5-15_fc12, ClanLib06-0_6_5-3_fc6, ClanLib06-0_6_5-10_fc9, ClanLib06-0_6_5-12_fc9, ClanLib06-0_6_5-13_fc10, ClanLib06-0_6_5-11_fc9, ClanLib06-0_6_5-3, HEAD
File MIME type: text/x-patch 
auto-import ClanLib06-0.6.5-3 on branch devel from ClanLib06-0.6.5-3.src.rpm
1 diff -ur ClanLib-0.6.5.orig/Makefile.in ClanLib-0.6.5/Makefile.in
2 --- ClanLib-0.6.5.orig/Makefile.in 2002-03-29 01:45:30.000000000 +0100
3 +++ ClanLib-0.6.5/Makefile.in 2006-07-19 20:19:36.000000000 +0200
4 @@ -118,8 +118,8 @@
5 clean:
6 @echo "Cleaning project..."
7 @if [ -d "Libs" ]; then rm -rf Libs; fi
8 - @find . -name '*.3' -exec rm "{}" \;
9 - @find . -name '*.1' -exec rm "{}" \;
10 + @#find . -name '*.3' -exec rm "{}" \;
11 + @#find . -name '*.1' -exec rm "{}" \;
12
13 distclean: clean
14 @echo "Cleaning configure output, etc..."
15 diff -ur ClanLib-0.6.5.orig/Setup/Tests/lua.cpp ClanLib-0.6.5/Setup/Tests/lua.cpp
16 --- ClanLib-0.6.5.orig/Setup/Tests/lua.cpp 2001-12-05 13:57:18.000000000 +0100
17 +++ ClanLib-0.6.5/Setup/Tests/lua.cpp 2006-07-19 20:19:36.000000000 +0200
18 @@ -17,7 +17,8 @@
19
20 #include <lua.h>
21 #include <stdio.h>
22 -#include <tolua.h>
23 +#include <tolua++.h>
24 +#include <string.h>
25 #undef class
26
27 int main(int, char**)
28 diff -ur ClanLib-0.6.5.orig/Setup/Tests/ttf.cpp ClanLib-0.6.5/Setup/Tests/ttf.cpp
29 --- ClanLib-0.6.5.orig/Setup/Tests/ttf.cpp 2001-09-08 21:24:17.000000000 +0200
30 +++ ClanLib-0.6.5/Setup/Tests/ttf.cpp 2006-07-19 20:19:36.000000000 +0200
31 @@ -11,7 +11,9 @@
32
33 ------------------------------------------------------------------------
34 */
35 -#include <freetype2/freetype/freetype.h>
36 +#include <ft2build.h>
37 +#include FT_FREETYPE_H
38 +
39
40 int main() {
41 return 0;
42 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.app.in ClanLib-0.6.5/Setup/Unix/Makefile.app.in
43 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.app.in 2001-12-24 17:12:59.000000000 +0100
44 +++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in 2006-07-19 20:19:36.000000000 +0200
45 @@ -19,6 +19,7 @@
46
47 Libs/libclanApp.so: Libs/libclanCore.so $(OBJF_LIB_App)
48 @echo "Building Libs/libclanApp.so"
49 + @echo $(LINK_COMMAND) -Wl,-soname=libclanApp.so.$(D_VERSION_MAJOR) -o Libs/libclanApp.so.$(D_VERSION_MINOR) $(OBJF_LIB_App) -L Libs -lclanCore
50 @$(LINK_COMMAND) -Wl,-soname=libclanApp.so.$(D_VERSION_MAJOR) -o Libs/libclanApp.so.$(D_VERSION_MINOR) $(OBJF_LIB_App) -L Libs -lclanCore
51 @ln -s -f libclanApp.so.$(D_VERSION_MINOR) Libs/libclanApp.so.$(D_VERSION_MAJOR)
52 @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) Libs/libclanApp.so
53 @@ -26,4 +27,5 @@
54 Libs/libclanApp.a: $(OBJF_LIB_App)
55 @echo "Building Libs/libclanApp.a"
56 -@if [ -e Libs/libclanApp.a ]; then rm -f Libs/libclanApp.a; fi
57 + @echo ar qc Libs/libclanApp.a $(OBJF_LIB_App)
58 @ar qc Libs/libclanApp.a $(OBJF_LIB_App)
59 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.conf.in ClanLib-0.6.5/Setup/Unix/Makefile.conf.in
60 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.conf.in 2002-04-06 14:54:58.000000000 +0200
61 +++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in 2006-07-19 20:19:36.000000000 +0200
62 @@ -12,6 +12,7 @@
63 INC_PREFIX = @includedir@
64 BIN_PREFIX = @bindir@
65 TARGET_PREFIX = @libdir@/ClanLib
66 +MAN_PREFIX = @mandir@
67
68 INCLUDE_DIRS = -I Sources @x_includes@ @extra_includes@
69
70 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.core.in ClanLib-0.6.5/Setup/Unix/Makefile.core.in
71 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.core.in 2002-01-08 22:58:35.000000000 +0100
72 +++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in 2006-07-19 20:19:36.000000000 +0200
73 @@ -17,8 +17,9 @@
74 @install Libs/libclanCore.a $(LIB_PREFIX)
75 @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
76 @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
77 - @install -d $(BIN_PREFIX)
78 + @install -d $(BIN_PREFIX) $(MAN_PREFIX)/man1/
79 @install Setup/Unix/clanlib-config $(BIN_PREFIX)
80 + @install Setup/Unix/clanlib-config.1 $(MAN_PREFIX)/man1/
81
82 OBJF_CORE_GENERIC = \
83 Libs/Intermediate/cl_assert.o \
84 @@ -92,6 +93,7 @@
85
86 Libs/libclanCore.so: $(OBJF_CORE_ALL)
87 @echo "Building Libs/libclanCore.so"
88 + @echo $(LINK_COMMAND) -Wl,-soname=libclanCore.so.$(D_VERSION_MAJOR) -o Libs/libclanCore.so.$(D_VERSION_MINOR) $(OBJF_CORE_ALL) $(LINK_CORE)
89 @$(LINK_COMMAND) -Wl,-soname=libclanCore.so.$(D_VERSION_MAJOR) -o Libs/libclanCore.so.$(D_VERSION_MINOR) $(OBJF_CORE_ALL) $(LINK_CORE)
90 @ln -s -f libclanCore.so.$(D_VERSION_MINOR) Libs/libclanCore.so.$(D_VERSION_MAJOR)
91 @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) Libs/libclanCore.so
92 @@ -99,5 +101,6 @@
93 Libs/libclanCore.a: $(OBJF_CORE_ALL)
94 @echo "Building Libs/libclanCore.a"
95 -@if [ -e Libs/libclanCore.a ]; then rm -f Libs/libclanCore.a; fi
96 + @echo ar qc Libs/libclanCore.a $(OBJF_CORE_ALL)
97 @ar qc Libs/libclanCore.a $(OBJF_CORE_ALL)
98
99 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.display.in ClanLib-0.6.5/Setup/Unix/Makefile.display.in
100 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.display.in 2001-12-24 17:12:59.000000000 +0100
101 +++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in 2006-07-19 20:19:36.000000000 +0200
102 @@ -114,10 +114,11 @@
103
104 # $(OBJF_DISP_X11) $(OBJF_DISP_FBDEV)
105
106 -LINK_DISP = -L Libs -lclanCore @x_libraries@ -lHermes @directfb_libs@
107 +LINK_DISP = -L Libs -lclanCore -lclanApp @x_libraries@ -lHermes @directfb_libs@
108
109 Libs/libclanDisplay.so: Libs/libclanCore.so $(OBJF_DISP_ALL)
110 @echo "Building Libs/libclanDisplay.so"
111 + @echo $(LINK_COMMAND) -Wl,-soname=libclanDisplay.so.$(D_VERSION_MAJOR) -o Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(OBJF_DISP_ALL) $(LINK_DISP)
112 @$(LINK_COMMAND) -Wl,-soname=libclanDisplay.so.$(D_VERSION_MAJOR) -o Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(OBJF_DISP_ALL) $(LINK_DISP)
113 @ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) Libs/libclanDisplay.so.$(D_VERSION_MAJOR)
114 @ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) Libs/libclanDisplay.so
115 @@ -125,4 +126,5 @@
116 Libs/libclanDisplay.a: $(OBJF_DISP_ALL)
117 @echo "Building Libs/libclanDisplay.a"
118 -@if [ -e Libs/libclanDisplay.a ]; then rm -f Libs/libclanDisplay.a; fi
119 + @echo ar qc Libs/libclanDisplay.a $(OBJF_DISP_ALL)
120 @ar qc Libs/libclanDisplay.a $(OBJF_DISP_ALL)
121 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.gl.in ClanLib-0.6.5/Setup/Unix/Makefile.gl.in
122 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.gl.in 2001-12-24 17:12:59.000000000 +0100
123 +++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in 2006-07-19 20:19:36.000000000 +0200
124 @@ -25,11 +25,13 @@
125
126 Libs/libclanGL.so: Libs/libclanCore.so $(OBJF_LIB_GL)
127 @echo "Building Libs/libclanGL.so"
128 - @$(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lGL -lGLU @x_libraries@
129 + @echo $(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lclanApp -lGL -lGLU @x_libraries@
130 + @$(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lclanApp -lGL -lGLU @x_libraries@
131 @ln -s -f libclanGL.so.$(D_VERSION_MINOR) Libs/libclanGL.so.$(D_VERSION_MAJOR)
132 @ln -s -f libclanGL.so.$(D_VERSION_MAJOR) Libs/libclanGL.so
133
134 Libs/libclanGL.a: Libs/libclanCore.a $(OBJF_LIB_GL)
135 @echo "Building Libs/libclanGL.a"
136 -@if [ -e Libs/libclanGL.a ]; then rm -f Libs/libclanGL.a; fi
137 + @echo ar qc Libs/libclanGL.a $(OBJF_LIB_GL)
138 @ar qc Libs/libclanGL.a $(OBJF_LIB_GL)
139 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.gui.in ClanLib-0.6.5/Setup/Unix/Makefile.gui.in
140 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.gui.in 2002-03-16 18:28:44.000000000 +0100
141 +++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in 2006-07-19 20:19:36.000000000 +0200
142 @@ -84,10 +84,12 @@
143
144 Libs/libclanGUI.so: Libs/libclanCore.so $(OBJF_LIB_GUI)
145 @echo "Building Libs/libclanGUI.so"
146 - @$(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore
147 + @echo $(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore -lclanDisplay
148 + @$(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore -lclanDisplay
149 @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) Libs/libclanGUI.so.$(D_VERSION_MAJOR)
150 @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) Libs/libclanGUI.so
151
152 Libs/libclanGUI.a: $(OBJF_LIB_GUI)
153 @echo "Building Libs/libclanGUI.a"
154 + @echo ar qc Libs/libclanGUI.a $(OBJF_LIB_GUI)
155 @ar qc Libs/libclanGUI.a $(OBJF_LIB_GUI)
156 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.jpeg.in ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in
157 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.jpeg.in 2001-12-24 17:12:59.000000000 +0100
158 +++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in 2006-07-19 20:19:36.000000000 +0200
159 @@ -21,11 +21,13 @@
160
161 Libs/libclanJPEG.so: Libs/libclanCore.so $(OBJF_LIB_JPEG)
162 @echo "Building Libs/libclanJPEG.so"
163 - @$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -ljpeg
164 + @echo $(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -lclanDisplay -ljpeg
165 + @$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -lclanDisplay -ljpeg
166 @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) Libs/libclanJPEG.so.$(D_VERSION_MAJOR)
167 @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) Libs/libclanJPEG.so
168
169 Libs/libclanJPEG.a: $(OBJF_LIB_JPEG)
170 @echo "Building Libs/libclanJPEG.a"
171 -@if [ -e Libs/libclanJPEG.a ]; then rm -f Libs/libclanJPEG.a; fi
172 + @echo ar qc Libs/libclanJPEG.a $(OBJF_LIB_JPEG)
173 @ar qc Libs/libclanJPEG.a $(OBJF_LIB_JPEG)
174 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.lua.in ClanLib-0.6.5/Setup/Unix/Makefile.lua.in
175 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.lua.in 2001-12-24 17:12:59.000000000 +0100
176 +++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in 2006-07-19 20:22:17.000000000 +0200
177 @@ -19,12 +19,14 @@
178
179 Libs/libclanLua.so: Libs/libclanCore.so $(OBJF_LIB_LUA)
180 @echo "Building Libs/libclanLua.so"
181 - @$(LINK_COMMAND) -Wl,-soname=libclanLua.so.$(D_VERSION_MAJOR) -o Libs/libclanLua.so.$(D_VERSION_MINOR) $(OBJF_LIB_LUA) -L Libs -lclanCore -llua -llualib -ltolua
182 + @echo $(LINK_COMMAND) -Wl,-soname=libclanLua.so.$(D_VERSION_MAJOR) -o Libs/libclanLua.so.$(D_VERSION_MINOR) $(OBJF_LIB_LUA) -L Libs -lclanCore -lclanDisplay -llua -ltolua++
183 + @$(LINK_COMMAND) -Wl,-soname=libclanLua.so.$(D_VERSION_MAJOR) -o Libs/libclanLua.so.$(D_VERSION_MINOR) $(OBJF_LIB_LUA) -L Libs -lclanCore -lclanDisplay -llua -ltolua++
184 @ln -s -f libclanLua.so.$(D_VERSION_MINOR) Libs/libclanLua.so.$(D_VERSION_MAJOR)
185 @ln -s -f libclanLua.so.$(D_VERSION_MAJOR) Libs/libclanLua.so
186
187 Libs/libclanLua.a: $(OBJF_LIB_LUA)
188 @echo "Building Libs/libclanLua.a"
189 -@if [ -e Libs/libclanLua.a ]; then rm -f Libs/libclanLua.a; fi
190 + @echo ar qc Libs/libclanLua.a $(OBJF_LIB_LUA)
191 @ar qc Libs/libclanLua.a $(OBJF_LIB_LUA)
192
193 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.mikmod.in ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in
194 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.mikmod.in 2001-12-24 17:12:59.000000000 +0100
195 +++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in 2006-07-19 20:19:36.000000000 +0200
196 @@ -22,11 +22,13 @@
197
198 Libs/libclanMikMod.so: Libs/libclanCore.so $(OBJF_LIB_MIKMOD)
199 @echo "Building Libs/libclanMikMod.so"
200 - @$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lmikmod
201 + @echo $(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lclanSound -lmikmod
202 + @$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lclanSound -lmikmod
203 @ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) Libs/libclanMikMod.so.$(D_VERSION_MAJOR)
204 @ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) Libs/libclanMikMod.so
205
206 Libs/libclanMikMod.a: $(OBJF_LIB_MIKMOD)
207 @echo "Building Libs/libclanMikMod.a"
208 -@if [ -e Libs/libclanMikMod.a ]; then rm -f Libs/libclanMikMod.a; fi
209 + @echo ar qc Libs/libclanMikMod.a $(OBJF_LIB_MIKMOD)
210 @ar qc Libs/libclanMikMod.a $(OBJF_LIB_MIKMOD)
211 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.mpeg.in ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in
212 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.mpeg.in 2001-12-24 17:12:59.000000000 +0100
213 +++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in 2006-07-19 20:19:36.000000000 +0200
214 @@ -19,6 +19,7 @@
215
216 Libs/libclanMPEG.so: Libs/libclanCore.so $(OBJF_LIB_MPEG)
217 @echo "Building Libs/libclanMPEG.so"
218 + @echo $(LINK_COMMAND) -Wl,-soname=libclanMPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_MPEG) -L Libs -lclanCore
219 @$(LINK_COMMAND) -Wl,-soname=libclanMPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_MPEG) -L Libs -lclanCore
220 @ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) Libs/libclanMPEG.so.$(D_VERSION_MAJOR)
221 @ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) Libs/libclanMPEG.so
222 @@ -26,4 +27,5 @@
223 Libs/libclanMPEG.a: $(OBJF_LIB_MPEG)
224 @echo "Building Libs/libclanMPEG.a"
225 -@if [ -e Libs/libclanMPEG.a ]; then rm -f Libs/libclanMPEG.a; fi
226 + @echo ar qc Libs/libclanMPEG.a $(OBJF_LIB_MPEG)
227 @ar qc Libs/libclanMPEG.a $(OBJF_LIB_MPEG)
228 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.network.in ClanLib-0.6.5/Setup/Unix/Makefile.network.in
229 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.network.in 2001-12-24 17:12:59.000000000 +0100
230 +++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in 2006-07-19 20:19:36.000000000 +0200
231 @@ -52,6 +52,7 @@
232
233 Libs/libclanNetwork.so: Libs/libclanCore.so $(OBJF_LIB_NETWORK)
234 @echo "Building Libs/libclanNetwork.so"
235 + @echo $(LINK_COMMAND) -Wl,-soname=libclanNetwork.so.$(D_VERSION_MAJOR) -o Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(OBJF_LIB_NETWORK) -L Libs -lclanCore
236 @$(LINK_COMMAND) -Wl,-soname=libclanNetwork.so.$(D_VERSION_MAJOR) -o Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(OBJF_LIB_NETWORK) -L Libs -lclanCore
237 @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) Libs/libclanNetwork.so.$(D_VERSION_MAJOR)
238 @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) Libs/libclanNetwork.so
239 @@ -59,4 +60,5 @@
240 Libs/libclanNetwork.a: $(OBJF_LIB_NETWORK)
241 @echo "Building Libs/libclanNetwork.a"
242 -@if [ -e Libs/libclanNetwork.a ]; then rm -f Libs/libclanNetwork.a; fi
243 + @echo ar qc Libs/libclanNetwork.a $(OBJF_LIB_NETWORK)
244 @ar qc Libs/libclanNetwork.a $(OBJF_LIB_NETWORK)
245 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.png.in ClanLib-0.6.5/Setup/Unix/Makefile.png.in
246 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.png.in 2002-01-10 21:17:13.000000000 +0100
247 +++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in 2006-07-19 20:19:36.000000000 +0200
248 @@ -20,11 +20,13 @@
249
250 Libs/libclanPNG.so: Libs/libclanCore.so $(OBJF_LIB_PNG)
251 @echo "Building Libs/libclanPNG.so"
252 - @$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lpng
253 + @echo $(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lclanDisplay -lpng
254 + @$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lclanDisplay -lpng
255 @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) Libs/libclanPNG.so.$(D_VERSION_MAJOR)
256 @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) Libs/libclanPNG.so
257
258 Libs/libclanPNG.a: $(OBJF_LIB_PNG)
259 @echo "Building Libs/libclanPNG.a"
260 -@if [ -e Libs/libclanPNG.a ]; then rm -f Libs/libclanPNG.a; fi
261 + @echo ar qc Libs/libclanPNG.a $(OBJF_LIB_PNG)
262 @ar qc Libs/libclanPNG.a $(OBJF_LIB_PNG)
263 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.smalljpeg.in ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in
264 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.smalljpeg.in 2002-02-14 06:54:15.000000000 +0100
265 +++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in 2006-07-19 20:19:36.000000000 +0200
266 @@ -27,6 +27,7 @@
267
268 Libs/libclanSmallJPEG.so: Libs/libclanCore.so Libs/libclanDisplay.so $(OBJF_LIB_SMALLJPEG) @small_jpeg_assembly@
269 @echo "Building Libs/libclanSmallJPEG.so"
270 + @echo $(LINK_COMMAND) -Wl,-soname=libclanSmallJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_SMALLJPEG) -L Libs -lclanCore -lclanDisplay
271 @$(LINK_COMMAND) -Wl,-soname=libclanSmallJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_SMALLJPEG) -L Libs -lclanCore -lclanDisplay
272 @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) Libs/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
273 @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) Libs/libclanSmallJPEG.so
274 @@ -34,4 +35,5 @@
275 Libs/libclanSmallJPEG.a: $(OBJF_LIB_SMALLJPEG)
276 @echo "Building Libs/libclanSmallJPEG.a"
277 -@if [ -e Libs/libclanSmallJPEG.a ]; then rm -f Libs/libclanSmallJPEG.a; fi
278 + @echo ar qc Libs/libclanSmallJPEG.a $(OBJF_LIB_SMALLJPEG)
279 @ar qc Libs/libclanSmallJPEG.a $(OBJF_LIB_SMALLJPEG)
280 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.sound.in ClanLib-0.6.5/Setup/Unix/Makefile.sound.in
281 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.sound.in 2001-12-24 17:12:59.000000000 +0100
282 +++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in 2006-07-19 20:19:36.000000000 +0200
283 @@ -51,6 +51,7 @@
284
285 Libs/libclanSound.so: Libs/libclanCore.so $(OBJF_SOUND_ALL)
286 @echo "Building Libs/libclanSound.so"
287 + @echo $(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore
288 @$(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore
289 @ln -s -f libclanSound.so.$(D_VERSION_MINOR) Libs/libclanSound.so.$(D_VERSION_MAJOR)
290 @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) Libs/libclanSound.so
291 @@ -58,4 +59,5 @@
292 Libs/libclanSound.a: $(OBJF_SOUND_ALL)
293 @echo "Building Libs/libclanSound.a"
294 -@if [ -e Libs/libclanSound.a ]; then rm -f Libs/libclanSound.a; fi
295 + @echo ar qc Libs/libclanSound.a $(OBJF_SOUND_ALL)
296 @ar qc Libs/libclanSound.a $(OBJF_SOUND_ALL)
297 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.ttf.in ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in
298 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.ttf.in 2001-12-24 17:12:59.000000000 +0100
299 +++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in 2006-07-19 20:19:36.000000000 +0200
300 @@ -22,11 +22,13 @@
301
302 Libs/libclanTTF.so: Libs/libclanCore.so $(OBJF_LIB_TTF)
303 @echo "Building Libs/libclanTTF.so"
304 - @$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lfreetype
305 + @echo $(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lclanDisplay -lfreetype
306 + @$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lclanDisplay -lfreetype
307 @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) Libs/libclanTTF.so.$(D_VERSION_MAJOR)
308 @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) Libs/libclanTTF.so
309
310 Libs/libclanTTF.a: $(OBJF_LIB_TTF)
311 @echo "Building Libs/libclanTTF.a"
312 -@if [ -e Libs/libclanTTF.a ]; then rm -f Libs/libclanTTF.a; fi
313 + @echo ar qc Libs/libclanTTF.a $(OBJF_LIB_TTF)
314 @ar qc Libs/libclanTTF.a $(OBJF_LIB_TTF)
315 diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.vorbis.in ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in
316 --- ClanLib-0.6.5.orig/Setup/Unix/Makefile.vorbis.in 2001-12-24 17:12:59.000000000 +0100
317 +++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in 2006-07-19 20:19:36.000000000 +0200
318 @@ -20,6 +20,7 @@
319
320 Libs/libclanVorbis.so: Libs/libclanCore.so $(OBJF_LIB_VORBIS)
321 @echo "Building Libs/libclanVorbis.so"
322 + @echo $(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) -L Libs -lclanCore -lvorbis
323 @$(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) -L Libs -lclanCore -lvorbis
324 @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) Libs/libclanVorbis.so.$(D_VERSION_MAJOR)
325 @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) Libs/libclanVorbis.so
326 @@ -27,4 +28,5 @@
327 Libs/libclanVorbis.a: $(OBJF_LIB_VORBIS)
328 @echo "Building Libs/libclanVorbis.a"
329 -@if [ -e Libs/libclanVorbis.a ]; then rm -f Libs/libclanVorbis.a; fi
330 + @echo ar qc Libs/libclanVorbis.a $(OBJF_LIB_VORBIS)
331 @ar qc Libs/libclanVorbis.a $(OBJF_LIB_VORBIS)
332 diff -ur ClanLib-0.6.5.orig/Sources/Core/DatafileCompiler/datafile_writer.cpp ClanLib-0.6.5/Sources/Core/DatafileCompiler/datafile_writer.cpp
333 --- ClanLib-0.6.5.orig/Sources/Core/DatafileCompiler/datafile_writer.cpp 2002-04-06 21:50:45.000000000 +0200
334 +++ ClanLib-0.6.5/Sources/Core/DatafileCompiler/datafile_writer.cpp 2006-07-19 20:19:36.000000000 +0200
335 @@ -34,6 +34,7 @@
336 #endif
337
338 #include "datafile_writer.h"
339 +#include "API/Core/IOData/cl_endian.h"
340
341 #ifndef WIN32
342 #define OPEN_FLAGS O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
343 @@ -53,6 +54,7 @@
344
345 int index_pos = -1;
346 write(datafile_fd, datafile_id, strlen(datafile_id));
347 + SWAP_IF_BIG(index_pos);
348 write(datafile_fd, &index_pos, sizeof(int));
349 }
350
351 @@ -60,7 +62,9 @@
352 {
353 int index_pos = lseek(datafile_fd, 0, SEEK_CUR);
354 int num_indexes = indexes.size();
355 + int sh, in;
356
357 + SWAP_IF_BIG(num_indexes);
358 write(datafile_fd, &num_indexes, sizeof(int));
359
360 for (
361 @@ -69,14 +73,21 @@
362 it++)
363 {
364 short name_len = (*it)->name.get_length()+1;
365 - write(datafile_fd, &name_len, sizeof(short));
366 + sh = name_len;
367 + SWAP_IF_BIG(sh);
368 + write(datafile_fd, &sh, sizeof(short));
369 write(datafile_fd, (*it)->name, name_len);
370 - write(datafile_fd, &(*it)->pos, sizeof(int));
371 - write(datafile_fd, &(*it)->size, sizeof(int));
372 + in=(*it)->pos;
373 + SWAP_IF_BIG(in);
374 + write(datafile_fd, &in, sizeof(int));
375 + in=(*it)->size;
376 + SWAP_IF_BIG(in);
377 + write(datafile_fd, &in, sizeof(int));
378 delete *it;
379 }
380
381 lseek(datafile_fd, strlen(datafile_id), SEEK_SET);
382 + SWAP_IF_BIG(index_pos);
383 write(datafile_fd, &index_pos, sizeof(int));
384
385 close(datafile_fd);
386 diff -ur ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/datafile_inputprovider.cpp ClanLib-0.6.5/Sources/Core/IOData/Generic/datafile_inputprovider.cpp
387 --- ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/datafile_inputprovider.cpp 2002-02-28 23:12:56.000000000 +0100
388 +++ ClanLib-0.6.5/Sources/Core/IOData/Generic/datafile_inputprovider.cpp 2006-07-19 20:19:36.000000000 +0200
389 @@ -15,6 +15,7 @@
390 #include "Core/precomp.h"
391 #include "datafile_inputprovider.h"
392 #include "API/Core/System/cl_assert.h"
393 +#include "API/Core/IOData/cl_endian.h"
394
395 #ifndef WIN32
396 #include <unistd.h>
397 @@ -111,6 +112,7 @@
398 lseek(datafile_handle, strlen(datafile_id), SEEK_SET); // Skip file ID
399 int index_pos;
400 ::read(datafile_handle, &index_pos, sizeof(int));
401 + SWAP_IF_BIG(index_pos);
402 lseek(datafile_handle, index_pos, SEEK_SET);
403
404 int num_indexes = 0;
405 @@ -119,6 +121,7 @@
406 {
407 short length;
408 ::read(datafile_handle, &length,sizeof(short));
409 + SWAP_IF_BIG(length);
410
411 char *objname = new char[length];
412 int objpos;
413 @@ -126,7 +129,9 @@
414
415 ::read(datafile_handle, objname, length);
416 ::read(datafile_handle, &objpos, sizeof(int));
417 + SWAP_IF_BIG(objpos);
418 ::read(datafile_handle, &objsize, sizeof(int));
419 + SWAP_IF_BIG(objsize);
420
421 resource_cache->insert(objname, objpos, objsize);
422
423 diff -ur ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/inputsource.cpp ClanLib-0.6.5/Sources/Core/IOData/Generic/inputsource.cpp
424 --- ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/inputsource.cpp 2001-09-10 05:40:32.000000000 +0200
425 +++ ClanLib-0.6.5/Sources/Core/IOData/Generic/inputsource.cpp 2006-07-19 20:19:36.000000000 +0200
426 @@ -21,7 +21,7 @@
427
428 void CL_InputSource::set_system_mode()
429 {
430 - little_endian_mode = true; // fix me: should use whatever endianess the system uses.
431 + little_endian_mode = ! CL_Endian::is_system_big();
432 }
433
434 void CL_InputSource::set_big_endian_mode()
435 @@ -105,6 +105,7 @@
436 {
437 bool answer;
438 if (read(&answer, sizeof(bool)) != sizeof(bool)) throw CL_Error("CL_InputSource_Datafile::read_bool8() failed");
439 + SWAP_IF_BIG(answer);
440 // todo: do endianess converting here, if needed.
441 return answer;
442 }
443 diff -ur ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/outputsource.cpp ClanLib-0.6.5/Sources/Core/IOData/Generic/outputsource.cpp
444 --- ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/outputsource.cpp 2001-09-08 21:12:44.000000000 +0200
445 +++ ClanLib-0.6.5/Sources/Core/IOData/Generic/outputsource.cpp 2006-07-19 20:19:36.000000000 +0200
446 @@ -14,13 +14,14 @@
447
448 #include "Core/precomp.h"
449 #include "API/Core/IOData/outputsource.h"
450 +#include "API/Core/IOData/cl_endian.h"
451
452 /////////////////////////////////////////////////////////////////////////////
453 // CL_OutputSource operations:
454
455 void CL_OutputSource::set_system_mode()
456 {
457 - little_endian_mode = true;
458 + little_endian_mode = ! CL_Endian::is_system_big();
459 }
460
461 void CL_OutputSource::set_big_endian_mode()
462 @@ -35,21 +36,25 @@
463
464 void CL_OutputSource::write_int32(int data)
465 {
466 + SWAP_IF_BIG(data);
467 write(&data, sizeof(int));
468 }
469
470 void CL_OutputSource::write_uint32(unsigned int data)
471 {
472 + SWAP_IF_BIG(data);
473 write(&data, sizeof(unsigned int));
474 }
475
476 void CL_OutputSource::write_short16(short data)
477 {
478 + SWAP_IF_BIG(data);
479 write(&data, sizeof(short));
480 }
481
482 void CL_OutputSource::write_ushort16(unsigned short data)
483 {
484 + SWAP_IF_BIG(data);
485 write(&data, sizeof(unsigned short));
486 }
487
488 @@ -65,11 +70,13 @@
489
490 void CL_OutputSource::write_float32(float data)
491 {
492 + SWAP_IF_BIG(data);
493 write(&data, sizeof(float));
494 }
495
496 void CL_OutputSource::write_bool8(bool data)
497 {
498 + SWAP_IF_BIG(data);
499 write(&data, sizeof(bool));
500 }
501
502 diff -ur ClanLib-0.6.5.orig/Sources/Display/SurfaceProviders/provider_targa.cpp ClanLib-0.6.5/Sources/Display/SurfaceProviders/provider_targa.cpp
503 --- ClanLib-0.6.5.orig/Sources/Display/SurfaceProviders/provider_targa.cpp 2001-05-13 18:48:58.000000000 +0200
504 +++ ClanLib-0.6.5/Sources/Display/SurfaceProviders/provider_targa.cpp 2006-07-19 20:19:36.000000000 +0200
505 @@ -191,8 +191,7 @@
506 // read or skip the colormap (rgb-palette)
507 if (colormaptype == 1)
508 {
509 - map_length = *((unsigned short *) &file[5]);
510 - SWAP_IF_BIG(map_length);
511 + map_length = file[6] << 8 | file[5];
512 unsigned char map_size = file[7]>>3;
513
514 if (!read_colormap)
515 @@ -240,13 +239,11 @@
516 }
517
518 // read pitch, height and bits-pr-pixel
519 - pitch = *((unsigned short *) &file[12]);
520 - SWAP_IF_BIG(pitch);
521 + pitch = file[13] << 8 | file[12];
522 bounding_left = pitch;
523 bounding_right = 0;
524
525 - height = *((unsigned short *) &file[14]);
526 - SWAP_IF_BIG(height);
527 + height = file[15] << 8 | file[14];
528 bounding_top = height;
529 bounding_bottom = 0;
530
531 @@ -542,8 +539,7 @@
532 }
533 else
534 {
535 - entry = *((unsigned short *) &file[pos]);
536 - SWAP_IF_BIG(entry);
537 + entry = file[pos+1] << 8 | file[pos];
538 pos += 2;
539 }
540
541 diff -ur ClanLib-0.6.5.orig/Sources/GL/GLX/displaycard_glx.h ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.h
542 --- ClanLib-0.6.5.orig/Sources/GL/GLX/displaycard_glx.h 2002-02-16 17:10:41.000000000 +0100
543 +++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.h 2006-07-19 20:19:36.000000000 +0200
544 @@ -20,6 +20,7 @@
545 #include "Display/Display/X11/display_xwindow.h"
546 #include "Display/Display/X11/x11_resolution.h"
547 #include "GL/Generic/displaycard_gl_generic.h"
548 +#define GLX_GLXEXT_PROTOTYPES
549 #include <GL/glx.h>
550 #include <iostream>
551
552 diff -ur ClanLib-0.6.5.orig/Sources/GUI/messagebox_generic.h ClanLib-0.6.5/Sources/GUI/messagebox_generic.h
553 --- ClanLib-0.6.5.orig/Sources/GUI/messagebox_generic.h 2002-01-16 20:16:51.000000000 +0100
554 +++ ClanLib-0.6.5/Sources/GUI/messagebox_generic.h 2006-07-19 20:19:36.000000000 +0200
555 @@ -26,7 +26,7 @@
556 const std::string &button2,
557 const std::string &button3);
558
559 - CL_MessageBox_Generic::~CL_MessageBox_Generic();
560 + ~CL_MessageBox_Generic();
561
562 void set_text(const std::string &text);
563
564 diff -ur ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg.cpp ClanLib-0.6.5/Sources/JPEG/provider_jpeg.cpp
565 --- ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg.cpp 2002-01-22 11:29:33.000000000 +0100
566 +++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg.cpp 2006-07-19 20:19:36.000000000 +0200
567 @@ -17,6 +17,7 @@
568 #include "API/JPEG/provider_jpeg.h"
569 #include "provider_jpeg_generic.h"
570 #include "API/Display/Display/surface.h"
571 +#include "API/Core/IOData/cl_endian.h"
572 #include "API/Display/Display/res_surface.h"
573
574 CL_Surface *CL_JPEGProvider::create(
575 diff -ur ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg_generic.cpp ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.cpp
576 --- ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg_generic.cpp 2001-11-01 14:56:51.000000000 +0100
577 +++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.cpp 2006-07-19 20:19:36.000000000 +0200
578 @@ -120,12 +120,24 @@
579 {
580 jpeg_read_scanlines(&cinfo, buffer, 1);
581
582 - for(unsigned int i=0; i < get_pitch(); i += 3)
583 - {
584 - image[pitch * (cinfo.output_scanline - 1) + i + 0] = buffer[0][i + 2];
585 - image[pitch * (cinfo.output_scanline - 1) + i + 1] = buffer[0][i + 1];
586 - image[pitch * (cinfo.output_scanline - 1) + i + 2] = buffer[0][i + 0];
587 - }
588 + if (CL_Endian::is_system_big())
589 + {
590 + for(unsigned int i=0; i < get_pitch(); i += 3)
591 + {
592 + image[pitch * (cinfo.output_scanline - 1) + i + 2] = buffer[0][i + 2];
593 + image[pitch * (cinfo.output_scanline - 1) + i + 1] = buffer[0][i + 1];
594 + image[pitch * (cinfo.output_scanline - 1) + i + 0] = buffer[0][i + 0];
595 + }
596 + }
597 + else
598 + {
599 + for(unsigned int i=0; i < get_pitch(); i += 3)
600 + {
601 + image[pitch * (cinfo.output_scanline - 1) + i + 0] = buffer[0][i + 2];
602 + image[pitch * (cinfo.output_scanline - 1) + i + 1] = buffer[0][i + 1];
603 + image[pitch * (cinfo.output_scanline - 1) + i + 2] = buffer[0][i + 0];
604 + }
605 + }
606 }
607 }
608 // Greyscale Image
609 @@ -135,12 +147,24 @@
610 {
611 jpeg_read_scanlines(&cinfo, buffer, 1);
612
613 - for(int i=0; i < width; i += 1)
614 - {
615 - image[pitch * (cinfo.output_scanline - 1) + 3*i + 0] = buffer[0][i];
616 - image[pitch * (cinfo.output_scanline - 1) + 3*i + 1] = buffer[0][i];
617 - image[pitch * (cinfo.output_scanline - 1) + 3*i + 2] = buffer[0][i];
618 - }
619 + if (CL_Endian::is_system_big())
620 + {
621 + for(int i=0; i < width; i += 1)
622 + {
623 + image[pitch * (cinfo.output_scanline - 1) + 3*i + 2] = buffer[0][i];
624 + image[pitch * (cinfo.output_scanline - 1) + 3*i + 1] = buffer[0][i];
625 + image[pitch * (cinfo.output_scanline - 1) + 3*i + 0] = buffer[0][i];
626 + }
627 + }
628 + else
629 + {
630 + for(int i=0; i < width; i += 1)
631 + {
632 + image[pitch * (cinfo.output_scanline - 1) + 3*i + 0] = buffer[0][i];
633 + image[pitch * (cinfo.output_scanline - 1) + 3*i + 1] = buffer[0][i];
634 + image[pitch * (cinfo.output_scanline - 1) + 3*i + 2] = buffer[0][i];
635 + }
636 + }
637 }
638 }
639 else
640 diff -ur ClanLib-0.6.5.orig/Sources/PNG/provider_png.cpp ClanLib-0.6.5/Sources/PNG/provider_png.cpp
641 --- ClanLib-0.6.5.orig/Sources/PNG/provider_png.cpp 2002-03-23 08:09:26.000000000 +0100
642 +++ ClanLib-0.6.5/Sources/PNG/provider_png.cpp 2006-07-19 20:19:36.000000000 +0200
643 @@ -26,6 +26,7 @@
644 #include "API/Display/Display/res_surface.h"
645 #include "API/Core/Resources/resourceoptions.h"
646 #include "API/Core/System/error.h"
647 +#include "API/Core/IOData/cl_endian.h"
648 #include "API/PNG/provider_png.h"
649
650 // Workaround for a VC bug
651 @@ -220,23 +221,49 @@
652
653 if (!ignore_alphachannel)
654 {
655 - for (int i = 0; i < pitch * height; i += 4)
656 - {
657 - image[i + 0] = tmp_image[i + 3];
658 - image[i + 1] = tmp_image[i + 2];
659 - image[i + 2] = tmp_image[i + 1];
660 - image[i + 3] = tmp_image[i + 0];
661 - }
662 + if (CL_Endian::is_system_big())
663 + {
664 + for (int i = 0; i < pitch * height; i += 4)
665 + {
666 + image[i + 3] = tmp_image[i + 3];
667 + image[i + 2] = tmp_image[i + 2];
668 + image[i + 1] = tmp_image[i + 1];
669 + image[i + 0] = tmp_image[i + 0];
670 + }
671 + }
672 + else
673 + {
674 + for (int i = 0; i < pitch * height; i += 4)
675 + {
676 + image[i + 0] = tmp_image[i + 3];
677 + image[i + 1] = tmp_image[i + 2];
678 + image[i + 2] = tmp_image[i + 1];
679 + image[i + 3] = tmp_image[i + 0];
680 + }
681 + }
682 }
683 else
684 {
685 - for (int i = 0; i < pitch * height; i += 4)
686 - {
687 - image[i + 0] = 255;
688 - image[i + 1] = tmp_image[i + 2];
689 - image[i + 2] = tmp_image[i + 1];
690 - image[i + 3] = tmp_image[i + 0];
691 - }
692 + if (CL_Endian::is_system_big())
693 + {
694 + for (int i = 0; i < pitch * height; i += 4)
695 + {
696 + image[i + 3] = 255;
697 + image[i + 2] = tmp_image[i + 2];
698 + image[i + 1] = tmp_image[i + 1];
699 + image[i + 0] = tmp_image[i + 0];
700 + }
701 + }
702 + else
703 + {
704 + for (int i = 0; i < pitch * height; i += 4)
705 + {
706 + image[i + 0] = 255;
707 + image[i + 1] = tmp_image[i + 2];
708 + image[i + 2] = tmp_image[i + 1];
709 + image[i + 3] = tmp_image[i + 0];
710 + }
711 + }
712 }
713
714 delete[] tmp_image;
715 @@ -265,13 +292,26 @@
716 delete[] row_pointers;
717
718 image = new unsigned char[height * pitch];
719 - // Coverting the data in the tmp buffer to our final data
720 - for (int i = 0; i < rowbytes * height; i++)
721 - {
722 - image[3*i + 0] = tmp_image[i];
723 - image[3*i + 1] = tmp_image[i];
724 - image[3*i + 2] = tmp_image[i];
725 - }
726 +
727 + if (CL_Endian::is_system_big())
728 + {
729 + // Coverting the data in the tmp buffer to our final data
730 + for (int i = 0; i < rowbytes * height; i++)
731 + {
732 + image[3*i + 2] = tmp_image[i];
733 + image[3*i + 1] = tmp_image[i];
734 + image[3*i + 0] = tmp_image[i];
735 + }
736 + }
737 + else
738 + {
739 + for (int i = 0; i < rowbytes * height; i++)
740 + {
741 + image[3*i + 0] = tmp_image[i];
742 + image[3*i + 1] = tmp_image[i];
743 + image[3*i + 2] = tmp_image[i];
744 + }
745 + }
746 delete[] tmp_image;
747 }
748
749 @@ -298,25 +338,52 @@
750
751 // Creating the final image out of tmp_image
752 image = new unsigned char[width * pitch];
753 +
754 if (!ignore_alphachannel)
755 {
756 - for (int i = 0; i < rowbytes * height; i += 2)
757 - {
758 - image[2*i + 0] = tmp_image[i + 1];
759 - image[2*i + 1] = tmp_image[i + 0];
760 - image[2*i + 2] = tmp_image[i + 0];
761 - image[2*i + 3] = tmp_image[i + 0];
762 - }
763 + if (CL_Endian::is_system_big())
764 + {
765 + for (int i = 0; i < rowbytes * height; i += 2)
766 + {
767 + image[2*i + 3] = tmp_image[i + 1];
768 + image[2*i + 2] = tmp_image[i + 0];
769 + image[2*i + 1] = tmp_image[i + 0];
770 + image[2*i + 0] = tmp_image[i + 0];
771 + }
772 + }
773 + else
774 + {
775 + for (int i = 0; i < rowbytes * height; i += 2)
776 + {
777 + image[2*i + 0] = tmp_image[i + 1];
778 + image[2*i + 1] = tmp_image[i + 0];
779 + image[2*i + 2] = tmp_image[i + 0];
780 + image[2*i + 3] = tmp_image[i + 0];
781 + }
782 + }
783 }
784 else
785 {
786 - for (int i = 0; i < rowbytes * height; i += 2)
787 - {
788 - image[2*i + 0] = 255;
789 - image[2*i + 1] = tmp_image[i + 0];
790 - image[2*i + 2] = tmp_image[i + 0];
791 - image[2*i + 3] = tmp_image[i + 0];
792 - }
793 + if (CL_Endian::is_system_big())
794 + {
795 + for (int i = 0; i < rowbytes * height; i += 2)
796 + {
797 + image[2*i + 3] = 255;
798 + image[2*i + 2] = tmp_image[i + 0];
799 + image[2*i + 1] = tmp_image[i + 0];
800 + image[2*i + 0] = tmp_image[i + 0];
801 + }
802 + }
803 + else
804 + {
805 + for (int i = 0; i < rowbytes * height; i += 2)
806 + {
807 + image[2*i + 0] = 255;
808 + image[2*i + 1] = tmp_image[i + 0];
809 + image[2*i + 2] = tmp_image[i + 0];
810 + image[2*i + 3] = tmp_image[i + 0];
811 + }
812 + }
813 }
814
815 delete[] tmp_image;
816 diff -ur ClanLib-0.6.5.orig/Sources/TTF/font_ttf.cpp ClanLib-0.6.5/Sources/TTF/font_ttf.cpp
817 --- ClanLib-0.6.5.orig/Sources/TTF/font_ttf.cpp 2002-01-15 17:18:48.000000000 +0100
818 +++ ClanLib-0.6.5/Sources/TTF/font_ttf.cpp 2006-07-19 20:19:36.000000000 +0200
819 @@ -21,7 +21,8 @@
820 #include <malloc.h>
821 #include "Display/Font/font_generic.h"
822
823 -#include <freetype/freetype.h>
824 +#include <ft2build.h>
825 +#include FT_FREETYPE_H
826
827 #include "font_ttf.h"
828
829 diff -ur ClanLib-0.6.5.orig/configure.in ClanLib-0.6.5/configure.in
830 --- ClanLib-0.6.5.orig/configure.in 2002-08-05 20:00:03.000000000 +0200
831 +++ ClanLib-0.6.5/configure.in 2006-07-19 20:19:36.000000000 +0200
832 @@ -72,8 +72,8 @@
833 dnl Check system endianess: (note: ClanLib is _not_ endian clean right now)
834 dnl -----------------------------------------------------------------------
835
836 -dnl AC_C_BIGENDIAN
837 -dnl AC_CHECK_SIZEOF(int, 4)
838 +AC_C_BIGENDIAN
839 +AC_CHECK_SIZEOF(int, 4)
840
841 if test "$ac_cv_sizeof_int" = "8"; then
842 AC_DEFINE(USE_64BIT)
843 --- ClanLib-0.6.2/Setup/Unix/clanlib-config.1.orig
844 +++ ClanLib-0.6.2/Setup/Unix/clanlib-config.1
845 @@ -0,0 +1,33 @@
846 +.\" Hey, Emacs! This is an -*- nroff -*- source file.
847 +.\"
848 +.\" This manpage is in the public domain.
849 +.\"
850 +
851 +.TH clanlib-config 1 "12 Aug 2001" "" "ClanLib Game SDK"
852 +
853 +.SH NAME
854 +clanlib\-config \- clanlib development helper script
855 +
856 +.SH SYNOPSIS
857 +clanlib-config
858 +[ \fB--cflags\fP ]
859 +[ \fB--libs\fP ]
860 +[ \fB--version\fP ]
861 +
862 +.SH DESCRIPTION
863 +.I clanlib\-config
864 +is a script to help in building applications using the ClanLib Game SDK.
865 +It can be used to automatically set build flags such as directory where
866 +ClanLib headers are located or the exact name of the ClanLib library your
867 +application should link with.
868 +
869 +.SH AUTHOR
870 +Filip Van Raemdonck (mechanix@debian.org) wrote this manpage for the Debian
871 +prepackaged version of ClanLib, but it may be used by others.
872 +
873 +.SH SEE ALSO
874 +.BR libmikmod-config
875 +(1),
876 +.BR trophy
877 +(6)
878 +
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2