/[pkgs]/devel/Hermes/Hermes-1.3.3-debian.patch
ViewVC logotype

Contents of /devel/Hermes/Hermes-1.3.3-debian.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Sun Jul 23 20:55:24 2006 UTC (3 years, 4 months ago) by jwrdegoede
Branch: MAIN
CVS Tags: Hermes-1_3_3-16_fc11, F-7-split, F-12-split, Hermes-1_3_3-11_fc6, Hermes-1_3_3-14_fc9, FC-6-split, Hermes-1_3_3-13_fc8, F-10-split, Hermes-1_3_3-17_fc12, F-11-split, Hermes-1_3_3-15_fc11, F-8-split, F-9-split, Hermes-1_3_3-12_fc6, HEAD
File MIME type: text/x-patch 
* Sun Jul 23 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 1.3.3-11
- Taking over as new maintainer
- Add a patch from Debian fixing some 64 bit issues and more importantly
  fix building with a recent toolchain.
- Fix some further 64 bit issues
- Remove static lib
- Add --disable-dependency-tracking, touch config.h.in to fix the timestamp
  instead of BR: automake, autoconf
- Mark asm files as NOT needing execstack, making us OK with new default
  SELinux targeted policy settings.
1 --- Hermes-1.3.3/src/c_cpy.c.deb 1999-12-05 01:09:06.000000000 +0100
2 +++ Hermes-1.3.3/src/c_cpy.c 2006-07-23 21:06:56.000000000 +0200
3 @@ -76,7 +76,7 @@
4 { unsigned int x=0, c;
5
6 /* Alignment mod 4 */
7 - if ((int)dest&3) {
8 + if ((unsigned long)dest&3) {
9 *((short16*)dest)=*((short16*)source+(x>>16)); x+=inc_source;
10 dest+=2;
11 count--;
12 @@ -103,7 +103,7 @@
13 { unsigned int x=0, c;
14
15 /* Alignment mod 4 */
16 - while ((int)dest&3) {
17 + while ((unsigned long)dest&3) {
18 *dest=*(source+(x>>16));
19 x+=inc_source;
20 dest++; count--;
21 --- Hermes-1.3.3/src/c_clr.c.deb 1999-12-05 01:09:05.000000000 +0100
22 +++ Hermes-1.3.3/src/c_clr.c 2006-07-23 21:06:56.000000000 +0200
23 @@ -69,7 +69,7 @@
24 { count=iface->width;
25
26 /* Align destination */
27 - if((int)dest&0x3)
28 + if((unsigned long)dest&0x3)
29 { *((short16 *)dest)=(short16)iface->value;
30 dest+=2;
31 count--;
32 @@ -105,7 +105,7 @@
33 do
34 { count=iface->width;
35
36 - while(((int)dest&0x3)) /* Align to dword boundary */
37 + while(((unsigned long)dest&0x3)) /* Align to dword boundary */
38 { *dest++=(char8)value;
39 count--;
40 if(!count) goto yloop; /* GOTO's are nice ;) */
41 --- Hermes-1.3.3/src/c_32.c.deb 2000-03-08 20:26:24.000000000 +0100
42 +++ Hermes-1.3.3/src/c_32.c 2006-07-23 21:06:56.000000000 +0200
43 @@ -92,7 +92,7 @@
44
45 /* Align mod 4 (quite important in this case.. ) */
46
47 - while (((int)dest&0x3)!=0)
48 + while (((unsigned long)dest&0x3)!=0)
49 { s_pixel=READ32(source);
50
51 *(dest+R_24)=*(s_point+R_32);
52 @@ -197,7 +197,7 @@
53
54 /* If the current pixel isn't dword aligned, try write one pixel first */
55
56 - if((int)dest_32&0x3)
57 + if((unsigned long)dest_32&0x3)
58 { s_pixel=((*source_32>>8)&0xf800)|
59 ((*source_32>>5)&0x7e0)|
60 ((*source_32>>3)&0x1f);
61 @@ -255,7 +255,7 @@
62
63 /* If the current pixel isn't dword aligned, try write one pixel first */
64
65 - if(((int)dest&0x3)!=0)
66 + if(((unsigned long)dest&0x3)!=0)
67 { s_pixel=READ32(source);
68
69 r=(s_pixel>>19)&0x1f;
70 @@ -315,7 +315,7 @@
71 short16 d_pixel;
72 unsigned int i;
73
74 - if(((int)dest&0x3)!=0)
75 + if(((unsigned long)dest&0x3)!=0)
76 { s_pixel=READ32(source);
77
78 r=(s_pixel>>9)&0x7c00;
79 @@ -372,7 +372,7 @@
80 unsigned int i;
81
82
83 - if(((int)dest&0x3)!=0)
84 + if(((unsigned long)dest&0x3)!=0)
85 { s_pixel=READ32(source);
86
87 r=(s_pixel>>19)&0x1f;
88 @@ -428,7 +428,7 @@
89
90 /* Process single pixels until we are dword aligned */
91
92 - while(((int)dest&0x3)!=0)
93 + while(((unsigned long)dest&0x3)!=0)
94 { s_pixel=READ32(source);
95
96 d_pixel=(char8)(((s_pixel>>16)&0xe0)|
97 @@ -557,7 +557,7 @@
98 int32 p;
99
100 /* Align mod 4 */
101 - if ((int)dest&3) {
102 + if ((unsigned long)dest&3) {
103 *((short16*)dest)=(short16)(((*((int32*)source+(x>>16))>>8)&0xf800)|
104 ((*((int32*)source+(x>>16))>>5)&0x7e0)|
105 ((*((int32*)source+(x>>16))>>3)&0x1f));
106 @@ -602,7 +602,7 @@
107 int32 p;
108
109 /* Align mod 4 */
110 - if ((int)dest&3) {
111 + if ((unsigned long)dest&3) {
112 *((short16*)dest)=(short16)(((*((int32*)source+(x>>16))>>19)&0x1f)|
113 ((*((int32*)source+(x>>16))>>5)&0x7e0)|
114 ((*((int32*)source+(x>>16))<<8)&0xf800));
115 @@ -722,7 +722,7 @@
116
117 /* Write single pixels until the destination address is aligned mod 4 */
118
119 - while (((int)dest&0x3)!=0) {
120 + while (((unsigned long)dest&0x3)!=0) {
121 *dest=(char8)(((*((int32*)source+(x>>16))>>16)&0xe0)|
122 ((*((int32*)source+(x>>16))>>11)&0x1c)|
123 ((*((int32*)source+(x>>16))>>6)&0x3));
124 --- Hermes-1.3.3/src/c_i8.c.deb 1999-12-05 01:09:08.000000000 +0100
125 +++ Hermes-1.3.3/src/c_i8.c 2006-07-23 21:06:56.000000000 +0200
126 @@ -123,7 +123,7 @@
127
128 count=iface->s_width;
129
130 - if(((int)dest&0x3)!=0)
131 + if(((unsigned long)dest&0x3)!=0)
132 { WRITE16(dest++,(short16)iface->lookup[*source++]);
133 dest++;
134 count--;
135 --- Hermes-1.3.3/src/c_muhmu.c.deb 1999-12-05 01:09:10.000000000 +0100
136 +++ Hermes-1.3.3/src/c_muhmu.c 2006-07-23 21:06:56.000000000 +0200
137 @@ -145,7 +145,7 @@
138
139 /* If the current pixel isn't dword aligned, try write one pixel first */
140
141 - if(((int)dest&0x3)!=0)
142 + if(((unsigned long)dest&0x3)!=0)
143 { s_pixel=READ32(source);
144
145 r=(s_pixel>>12)&0xf800;
146 @@ -207,7 +207,7 @@
147
148 /* If the current pixel isn't dword aligned, try write one pixel first */
149
150 - if(((int)dest&0x3)!=0)
151 + if(((unsigned long)dest&0x3)!=0)
152 { s_pixel=READ32(source);
153
154 r=(s_pixel>>23)&0x1f;
155 @@ -269,7 +269,7 @@
156 unsigned int i;
157
158
159 - if(((int)dest&0x3)!=0)
160 + if(((unsigned long)dest&0x3)!=0)
161 { s_pixel=READ32(source);
162
163 r=(s_pixel>>13)&0x7c00;
164 @@ -326,7 +326,7 @@
165 unsigned int i;
166
167
168 - if(((int)dest&0x3)!=0)
169 + if(((unsigned long)dest&0x3)!=0)
170 { s_pixel=READ32(source);
171
172 r=(s_pixel>>23)&0x1f;
173 @@ -383,7 +383,7 @@
174
175 /* Process single pixels until we are dword aligned */
176
177 - while(((int)dest&0x3)!=0)
178 + while(((unsigned long)dest&0x3)!=0)
179 { s_pixel=READ32(source);
180
181 d_pixel=(char8)(((s_pixel>>20)&0xe0)|
182 @@ -599,7 +599,7 @@
183
184 /* Write single pixels until the destination address is aligned mod 4 */
185
186 - while (((int)dest&0x3)!=0) {
187 + while (((unsigned long)dest&0x3)!=0) {
188 *dest=(char8)(((*((int32*)source+(x>>16))>>20)&0xe0)|
189 ((*((int32*)source+(x>>16))>>13)&0x1c)|
190 ((*((int32*)source+(x>>16))>>6)&0x3));
191 --- Hermes-1.3.3/src/c_16.c.deb 1999-12-05 01:09:02.000000000 +0100
192 +++ Hermes-1.3.3/src/c_16.c 2006-07-23 21:06:56.000000000 +0200
193 @@ -151,7 +151,7 @@
194 int32 s_pixel;
195
196 /* If we are not aligned to a dword, try and convert a single pixel */
197 - if(((int)dest&0x3)!=0)
198 + if(((unsigned long)dest&0x3)!=0)
199 { s_pixel=(int32)READ16(source);
200
201 /* Swap around R and B, leave G unchanged */
202 @@ -194,7 +194,7 @@
203 int32 s_pixel;
204
205 /* If we are not aligned to a dword, try and convert a single pixel */
206 - if(((int)dest&0x3)!=0)
207 + if(((unsigned long)dest&0x3)!=0)
208 { s_pixel=(int32)READ16(source);
209
210 /* Leave blue untouched, mask red and shift by one, mask green and shift
211 @@ -240,7 +240,7 @@
212 int32 s_pixel;
213
214 /* If we are not aligned to a dword, try and convert a single pixel */
215 - if(((int)dest&0x3)!=0)
216 + if(((unsigned long)dest&0x3)!=0)
217 { s_pixel=(int32)READ16(source);
218
219 /* Shift red right by 11, mask green and shift right one, shift blue
220 @@ -285,7 +285,7 @@
221 unsigned int i;
222
223 /* Align to dword first */
224 - while(((int)dest&0x3)!=0)
225 + while(((unsigned long)dest&0x3)!=0)
226 { s_block=(int32)READ16(source);
227
228 s_block=((s_block&0xe000)>>8)|((s_block&0x0700)>>6)|
229 @@ -440,7 +440,7 @@
230 int32 p;
231
232 /* If we are not aligned to a dword, try and convert a single pixel */
233 - if(((int)dest&0x3)!=0) {
234 + if(((unsigned long)dest&0x3)!=0) {
235
236 /* Swap r and b, leave g untouched */
237 *((short16*)dest)=(short16)(*((short16*)source+(x>>16))>>11)|
238 @@ -487,7 +487,7 @@
239 int32 p;
240
241 /* If we are not aligned to a dword, try and convert a single pixel */
242 - if(((int)dest&0x3)!=0) {
243 + if(((unsigned long)dest&0x3)!=0) {
244 *((short16*)dest)=(short16)((*((short16*)source+(x>>16))&0xf800)>>1)|
245 ((*((short16*)source+(x>>16))&0x7c0)>>1)|
246 (*((short16*)source+(x>>16))&0x1f);
247 @@ -531,7 +531,7 @@
248 int32 p;
249
250 /* If we are not aligned to a dword, try and convert a single pixel */
251 - if(((int)dest&0x3)!=0) {
252 + if(((unsigned long)dest&0x3)!=0) {
253
254 *((short16*)dest)=(short16)((*((short16*)source+(x>>16))&0xf800)>>11)|
255 ((*((short16*)source+(x>>16))&0x7c0)>>1)|
256 @@ -577,7 +577,7 @@
257
258 /* Write single pixels until the destination address is aligned mod 4 */
259
260 - while (((int)dest&0x3)!=0) {
261 + while (((unsigned long)dest&0x3)!=0) {
262 *dest=((*((short16*)source+(x>>16))>>8)&0xe0)|
263 ((*((short16*)source+(x>>16))>>6)&0x1c)|
264 ((*((short16*)source+(x>>16))>>3)&0x3);
265 --- Hermes-1.3.3/src/HeadMMX.h.deb 2000-12-06 05:55:28.000000000 +0100
266 +++ Hermes-1.3.3/src/HeadMMX.h 2006-07-23 21:06:56.000000000 +0200
267 @@ -27,21 +27,21 @@
268 extern "C" {
269 #endif
270
271 -void STACKCALL ConvertMMX(HermesConverterInterface *);
272 +void STACKCALL _ConvertMMX(HermesConverterInterface *);
273
274 -void STACKCALL ClearMMX_32(HermesClearInterface *);
275 -void STACKCALL ClearMMX_24(HermesClearInterface *);
276 -void STACKCALL ClearMMX_16(HermesClearInterface *);
277 -void STACKCALL ClearMMX_8(HermesClearInterface *);
278 -
279 -void ConvertMMXpII32_24RGB888();
280 -void ConvertMMXpII32_16RGB565();
281 -void ConvertMMXpII32_16BGR565();
282 -void ConvertMMXpII32_16RGB555();
283 -void ConvertMMXpII32_16BGR565();
284 -void ConvertMMXpII32_16BGR555();
285 +void STACKCALL _ClearMMX_32(HermesClearInterface *);
286 +void STACKCALL _ClearMMX_24(HermesClearInterface *);
287 +void STACKCALL _ClearMMX_16(HermesClearInterface *);
288 +void STACKCALL _ClearMMX_8(HermesClearInterface *);
289 +
290 +void _ConvertMMXpII32_24RGB888();
291 +void _ConvertMMXpII32_16RGB565();
292 +void _ConvertMMXpII32_16BGR565();
293 +void _ConvertMMXpII32_16RGB555();
294 +void _ConvertMMXpII32_16BGR565();
295 +void _ConvertMMXpII32_16BGR555();
296
297 -void ConvertMMXp32_16RGB555();
298 +void _ConvertMMXp32_16RGB555();
299
300 #ifdef __cplusplus
301 }
302 @@ -51,6 +51,7 @@
303
304 /* Fix the underscore business with ELF compilers */
305
306 +#if 0
307 #if defined(__ELF__) && defined(__GNUC__)
308 #ifdef __cplusplus
309 extern "C" {
310 @@ -75,6 +76,7 @@
311 #endif
312
313 #endif /* ELF and GNUC */
314 +#endif
315
316
317
318 --- Hermes-1.3.3/src/FactConv.c.deb 2000-12-06 05:55:28.000000000 +0100
319 +++ Hermes-1.3.3/src/FactConv.c 2006-07-23 21:06:56.000000000 +0200
320 @@ -47,99 +47,99 @@
321 #pragma error
322
323 /* ------ From 32 RGB 888 - MMX PENTIUM II ---- */
324 - {32,0,0xff0000,0xff00,0xff,0,24,0,0xff0000,0xff00,0xff,0,ConvertMMX,0,
325 - ConvertMMXpII32_24RGB888,0,0,0,PROC_MMX_PENTIUM},
326 + {32,0,0xff0000,0xff00,0xff,0,24,0,0xff0000,0xff00,0xff,0,_ConvertMMX,0,
327 + _ConvertMMXpII32_24RGB888,0,0,0,PROC_MMX_PENTIUM},
328
329 - {32,0,0xff0000,0xff00,0xff,0,16,0,0xf800,0x7e0,0x1f,0,ConvertMMX,0,
330 - ConvertMMXpII32_16RGB565,0,0,0,PROC_MMX_PENTIUM},
331 + {32,0,0xff0000,0xff00,0xff,0,16,0,0xf800,0x7e0,0x1f,0,_ConvertMMX,0,
332 + _ConvertMMXpII32_16RGB565,0,0,0,PROC_MMX_PENTIUM},
333
334 - {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x7e0,0xf800,0,ConvertMMX,0,
335 - ConvertMMXpII32_16BGR565,0,0,0,PROC_MMX_PENTIUM},
336 + {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x7e0,0xf800,0,_ConvertMMX,0,
337 + _ConvertMMXpII32_16BGR565,0,0,0,PROC_MMX_PENTIUM},
338
339 - {32,0,0xff0000,0xff00,0xff,0,16,0,0x7c00,0x3e0,0x1f,0,ConvertMMX,0,
340 - ConvertMMXpII32_16RGB555,0,0,0,PROC_MMX_PENTIUM},
341 + {32,0,0xff0000,0xff00,0xff,0,16,0,0x7c00,0x3e0,0x1f,0,_ConvertMMX,0,
342 + _ConvertMMXpII32_16RGB555,0,0,0,PROC_MMX_PENTIUM},
343
344 - {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x3e0,0x7c00,0,ConvertMMX,0,
345 - ConvertMMXpII32_16BGR555,0,0,0,PROC_MMX_PENTIUM},
346 + {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x3e0,0x7c00,0,_ConvertMMX,0,
347 + _ConvertMMXpII32_16BGR555,0,0,0,PROC_MMX_PENTIUM},
348
349 /* ------ From 32 RGB 888 - MMX PENTIUM ------- */
350
351 - {32,0,0xff0000,0xff00,0xff,0,16,0,0x7c00,0x3e0,0x1f,0,ConvertMMX,0,
352 - ConvertMMXp32_16RGB555,0,0,0,PROC_MMX_PENTIUM},
353 + {32,0,0xff0000,0xff00,0xff,0,16,0,0x7c00,0x3e0,0x1f,0,_ConvertMMX,0,
354 + _ConvertMMXp32_16RGB555,0,0,0,PROC_MMX_PENTIUM},
355
356
357 /* ------ From 32 RGB 888 - X86 PENTIUM ------- */
358
359 - {32,0,0xff0000,0xff00,0xff,0,32,0,0xff,0xff00,0xff0000,0,ConvertX86,0,
360 - ConvertX86p32_32BGR888,0,0,0,PROC_X86_PENTIUM},
361 + {32,0,0xff0000,0xff00,0xff,0,32,0,0xff,0xff00,0xff0000,0,_ConvertX86,0,
362 + _ConvertX86p32_32BGR888,0,0,0,PROC_X86_PENTIUM},
363
364 {32,0,0xff0000,0xff00,0xff,0,32,0,0xff000000,0xff0000,0xff00,0xff,
365 - ConvertX86,0,
366 - ConvertX86p32_32RGBA888,0,0,0,PROC_X86_PENTIUM},
367 + _ConvertX86,0,
368 + _ConvertX86p32_32RGBA888,0,0,0,PROC_X86_PENTIUM},
369
370 {32,0,0xff0000,0xff00,0xff,0,32,0,0xff00,0xff0000,0xff000000,0xff,
371 - ConvertX86,0,
372 - ConvertX86p32_32BGRA888,0,0,0,PROC_X86_PENTIUM},
373 + _ConvertX86,0,
374 + _ConvertX86p32_32BGRA888,0,0,0,PROC_X86_PENTIUM},
375
376 - {32,0,0xff0000,0xff00,0xff,0,24,0,0xff0000,0xff00,0xff,0,ConvertX86,0,
377 - ConvertX86p32_24RGB888,0,0,0,PROC_X86_PENTIUM},
378 + {32,0,0xff0000,0xff00,0xff,0,24,0,0xff0000,0xff00,0xff,0,_ConvertX86,0,
379 + _ConvertX86p32_24RGB888,0,0,0,PROC_X86_PENTIUM},
380
381 - {32,0,0xff0000,0xff00,0xff,0,24,0,0xff,0xff00,0xff0000,0,ConvertX86,0,
382 - ConvertX86p32_24BGR888,0,0,0,PROC_X86_PENTIUM},
383 + {32,0,0xff0000,0xff00,0xff,0,24,0,0xff,0xff00,0xff0000,0,_ConvertX86,0,
384 + _ConvertX86p32_24BGR888,0,0,0,PROC_X86_PENTIUM},
385
386 {32,0,0xff0000,0xff00,0xff,0,16,0,0xf800,0x7e0,0x1f,0,
387 - ConvertX86,ConvertX86Stretch,
388 - ConvertX86p32_16RGB565,ConvertX86p32_16RGB565_S,
389 + _ConvertX86,_ConvertX86Stretch,
390 + _ConvertX86p32_16RGB565,_ConvertX86p32_16RGB565_S,
391 0,0,PROC_X86_PENTIUM},
392
393 - {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x7e0,0xf800,0,ConvertX86,0,
394 - ConvertX86p32_16BGR565,0,0,0,PROC_X86_PENTIUM},
395 + {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x7e0,0xf800,0,_ConvertX86,0,
396 + _ConvertX86p32_16BGR565,0,0,0,PROC_X86_PENTIUM},
397
398 - {32,0,0xff0000,0xff00,0xff,0,16,0,0x7c00,0x3e0,0x1f,0,ConvertX86,0,
399 - ConvertX86p32_16RGB555,0,0,0,PROC_X86_PENTIUM},
400 + {32,0,0xff0000,0xff00,0xff,0,16,0,0x7c00,0x3e0,0x1f,0,_ConvertX86,0,
401 + _ConvertX86p32_16RGB555,0,0,0,PROC_X86_PENTIUM},
402
403 - {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x3e0,0x7c00,0,ConvertX86,0,
404 - ConvertX86p32_16BGR555,0,0,0,PROC_X86_PENTIUM},
405 + {32,0,0xff0000,0xff00,0xff,0,16,0,0x1f,0x3e0,0x7c00,0,_ConvertX86,0,
406 + _ConvertX86p32_16BGR555,0,0,0,PROC_X86_PENTIUM},
407
408 - {32,0,0xff0000,0xff00,0xff,0,8,0,0xe0,0x1c,0x3,0,ConvertX86,0,
409 - ConvertX86p32_8RGB332,0,0,0,PROC_X86_PENTIUM},
410 + {32,0,0xff0000,0xff00,0xff,0,8,0,0xe0,0x1c,0x3,0,_ConvertX86,0,
411 + _ConvertX86p32_8RGB332,0,0,0,PROC_X86_PENTIUM},
412
413
414
415 /* ------ From 16 RGB 565 - X86 PENTIUM ------- */
416
417 - {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff0000,0xff00,0xff,0,ConvertX86,0,
418 - ConvertX86p16_32RGB888,0,0,0,PROC_X86_PENTIUM},
419 + {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff0000,0xff00,0xff,0,_ConvertX86,0,
420 + _ConvertX86p16_32RGB888,0,0,0,PROC_X86_PENTIUM},
421
422 - {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff,0xff00,0xff0000,0,ConvertX86,0,
423 - ConvertX86p16_32BGR888,0,0,0,PROC_X86_PENTIUM},
424 + {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff,0xff00,0xff0000,0,_ConvertX86,0,
425 + _ConvertX86p16_32BGR888,0,0,0,PROC_X86_PENTIUM},
426
427 - {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff000000,0xff0000,0xff00,0xff,ConvertX86,0,
428 - ConvertX86p16_32RGBA888,0,0,0,PROC_X86_PENTIUM},
429 + {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff000000,0xff0000,0xff00,0xff,_ConvertX86,0,
430 + _ConvertX86p16_32RGBA888,0,0,0,PROC_X86_PENTIUM},
431
432 - {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff00,0xff0000,0xff000000,0xff,ConvertX86,0,
433 - ConvertX86p16_32BGRA888,0,0,0,PROC_X86_PENTIUM},
434 + {16,0,0xf800,0x7e0,0x1f,0,32,0,0xff00,0xff0000,0xff000000,0xff,_ConvertX86,0,
435 + _ConvertX86p16_32BGRA888,0,0,0,PROC_X86_PENTIUM},
436
437 - {16,0,0xf800,0x7e0,0x1f,0,24,0,0xff0000,0xff00,0xff,0,ConvertX86,0,
438 - ConvertX86p16_24RGB888,0,0,0,PROC_X86_PENTIUM},
439 + {16,0,0xf800,0x7e0,0x1f,0,24,0,0xff0000,0xff00,0xff,0,_ConvertX86,0,
440 + _ConvertX86p16_24RGB888,0,0,0,PROC_X86_PENTIUM},
441
442 - {16,0,0xf800,0x7e0,0x1f,0,24,0,0xff,0xff00,0xff0000,0,ConvertX86,0,
443 - ConvertX86p16_24BGR888,0,0,0,PROC_X86_PENTIUM},
444 + {16,0,0xf800,0x7e0,0x1f,0,24,0,0xff,0xff00,0xff0000,0,_ConvertX86,0,
445 + _ConvertX86p16_24BGR888,0,0,0,PROC_X86_PENTIUM},
446
447 - {16,0,0xf800,0x7e0,0x1f,0,16,0,0x1f,0x7e0,0xf800,0,ConvertX86,0,
448 - ConvertX86p16_16BGR565,0,0,0,PROC_X86_PENTIUM},
449 + {16,0,0xf800,0x7e0,0x1f,0,16,0,0x1f,0x7e0,0xf800,0,_ConvertX86,0,
450 + _ConvertX86p16_16BGR565,0,0,0,PROC_X86_PENTIUM},
451
452 - {16,0,0xf800,0x7e0,0x1f,0,16,0,0x7c00,0x3e0,0x1f,0,ConvertX86,0,
453 - ConvertX86p16_16RGB555,0,0,0,PROC_X86_PENTIUM},
454 + {16,0,0xf800,0x7e0,0x1f,0,16,0,0x7c00,0x3e0,0x1f,0,_ConvertX86,0,
455 + _ConvertX86p16_16RGB555,0,0,0,PROC_X86_PENTIUM},
456
457 - {16,0,0xf800,0x7e0,0x1f,0,16,0,0x1f,0x3e0,0x7c00,0,ConvertX86,0,
458 - ConvertX86p16_16BGR555,0,0,0,PROC_X86_PENTIUM},
459 + {16,0,0xf800,0x7e0,0x1f,0,16,0,0x1f,0x3e0,0x7c00,0,_ConvertX86,0,
460 + _ConvertX86p16_16BGR555,0,0,0,PROC_X86_PENTIUM},
461
462 - {16,0,0xf800,0x7e0,0x1f,0,8,0,0xe0,0x1c,0x3,0,ConvertX86,0,
463 - ConvertX86p16_8RGB332,0,0,0,PROC_X86_PENTIUM},
464 + {16,0,0xf800,0x7e0,0x1f,0,8,0,0xe0,0x1c,0x3,0,_ConvertX86,0,
465 + _ConvertX86p16_8RGB332,0,0,0,PROC_X86_PENTIUM},
466
467 - {8,1,0,0,0,0,16,0,0,0,0,0,ConvertX86,0,
468 - ConvertX86pI8_16,0,0,0,PROC_X86_PENTIUM},
469 + {8,1,0,0,0,0,16,0,0,0,0,0,_ConvertX86,0,
470 + _ConvertX86pI8_16,0,0,0,PROC_X86_PENTIUM},
471
472
473 #endif
474 --- Hermes-1.3.3/src/c_genrc_ao_blit.c.deb 2001-08-09 18:13:50.000000000 +0200
475 +++ Hermes-1.3.3/src/c_genrc_ao_blit.c 2006-07-23 21:06:56.000000000 +0200
476 @@ -104,7 +104,7 @@
477 { unsigned long s_pixel, d_pixel, r, g, b, a;
478 long sr, sg, sb, dr, dg, db, da;
479 float sa;
480 - char8 *d_ptr=(char8 *)((int)&s_pixel);
481 + char8 *d_ptr=(char8 *)(&s_pixel);
482 unsigned int count;
483 char8 *source=iface->s_pixels,*dest=iface->d_pixels;
484 DEBUG_PRINT("ConvertC_Generic32_A_Generic24_O_Blit called\n","");
485 --- Hermes-1.3.3/src/Factory.c.deb 2000-12-06 05:55:28.000000000 +0100
486 +++ Hermes-1.3.3/src/Factory.c 2006-07-23 21:06:56.000000000 +0200
487 @@ -39,7 +39,7 @@
488 #ifdef X86_ASSEMBLER
489 processor|=PROC_X86_PENTIUM; /* There are no others at the moment */
490
491 - res=Hermes_X86_CPU();
492 + res=_Hermes_X86_CPU();
493
494 DEBUG_PRINT("CPUID: %x\n",res)
495
496 @@ -70,20 +70,20 @@
497
498 if (processor & PROC_MMX_PENTIUM) {
499 switch(bits) {
500 - case 32: tmp->func=ClearMMX_32; return tmp;
501 + case 32: tmp->func=_ClearMMX_32; return tmp;
502 case 24: break;
503 - case 16: tmp->func=ClearMMX_16; return tmp;
504 - case 8: tmp->func=ClearMMX_8; return tmp;
505 + case 16: tmp->func=_ClearMMX_16; return tmp;
506 + case 8: tmp->func=_ClearMMX_8; return tmp;
507 }
508
509 }
510
511 if (processor & PROC_X86_PENTIUM) {
512 switch(bits) {
513 - case 32: tmp->func=ClearX86_32; return tmp;
514 + case 32: tmp->func=_ClearX86_32; return tmp;
515 case 24: break;
516 - case 16: tmp->func=ClearX86_16; return tmp;
517 - case 8: tmp->func=ClearX86_8; return tmp;
518 + case 16: tmp->func=_ClearX86_16; return tmp;
519 + case 8: tmp->func=_ClearX86_8; return tmp;
520 }
521 }
522
523 @@ -251,13 +251,13 @@
524 int asm_found=0;
525
526 switch (bits) {
527 - case 32: { tmp->normal=CopyX86p_4byte; asm_found=1; } break;
528 + case 32: { tmp->normal=_CopyX86p_4byte; asm_found=1; } break;
529 case 24: break;
530 - case 16: { tmp->normal=CopyX86p_2byte; asm_found=1; } break;
531 - case 8: { tmp->normal=CopyX86p_1byte; asm_found=1; } break;
532 + case 16: { tmp->normal=_CopyX86p_2byte; asm_found=1; } break;
533 + case 8: { tmp->normal=_CopyX86p_1byte; asm_found=1; } break;
534 }
535
536 - if (asm_found&1) { tmp->loopnormal=ConvertX86; found=1; }
537 + if (asm_found&1) { tmp->loopnormal=_ConvertX86; found=1; }
538 }
539
540 #endif /* X86_ASSEMBLER */
541 --- Hermes-1.3.3/src/HeadX86.h.deb 2000-12-06 05:55:28.000000000 +0100
542 +++ Hermes-1.3.3/src/HeadX86.h 2006-07-23 21:06:56.000000000 +0200
543 @@ -27,52 +27,52 @@
544 #endif
545
546
547 -void STACKCALL ConvertX86(HermesConverterInterface *);
548 -void STACKCALL ConvertX86Stretch(HermesConverterInterface *);
549 -void STACKCALL ClearX86_32(HermesClearInterface *);
550 -void STACKCALL ClearX86_24(HermesClearInterface *);
551 -void STACKCALL ClearX86_16(HermesClearInterface *);
552 -void STACKCALL ClearX86_8(HermesClearInterface *);
553 -
554 -int STACKCALL Hermes_X86_CPU();
555 -
556 -void ConvertX86p32_32BGR888();
557 -void ConvertX86p32_32RGBA888();
558 -void ConvertX86p32_32BGRA888();
559 -void ConvertX86p32_24RGB888();
560 -void ConvertX86p32_24BGR888();
561 -void ConvertX86p32_16RGB565();
562 -void ConvertX86p32_16BGR565();
563 -void ConvertX86p32_16RGB555();
564 -void ConvertX86p32_16BGR555();
565 -void ConvertX86p32_8RGB332();
566 -
567 -void ConvertX86p32_16RGB565_S();
568 -
569 -void ConvertX86p16_32RGB888();
570 -void ConvertX86p16_32BGR888();
571 -void ConvertX86p16_32RGBA888();
572 -void ConvertX86p16_32BGRA888();
573 -void ConvertX86p16_24RGB888();
574 -void ConvertX86p16_24BGR888();
575 -void ConvertX86p16_16BGR565();
576 -void ConvertX86p16_16RGB555();
577 -void ConvertX86p16_16BGR555();
578 -void ConvertX86p16_8RGB332();
579 -
580 -void CopyX86p_4byte();
581 -void CopyX86p_3byte();
582 -void CopyX86p_2byte();
583 -void CopyX86p_1byte();
584 -
585 -void ConvertX86pI8_32();
586 -void ConvertX86pI8_24();
587 -void ConvertX86pI8_16();
588 -
589 -extern int32 ConvertX86p16_32RGB888_LUT_X86[512];
590 -extern int32 ConvertX86p16_32BGR888_LUT_X86[512];
591 -extern int32 ConvertX86p16_32RGBA888_LUT_X86[512];
592 -extern int32 ConvertX86p16_32BGRA888_LUT_X86[512];
593 +void STACKCALL _ConvertX86(HermesConverterInterface *);
594 +void STACKCALL _ConvertX86Stretch(HermesConverterInterface *);
595 +void STACKCALL _ClearX86_32(HermesClearInterface *);
596 +void STACKCALL _ClearX86_24(HermesClearInterface *);
597 +void STACKCALL _ClearX86_16(HermesClearInterface *);
598 +void STACKCALL _ClearX86_8(HermesClearInterface *);
599 +
600 +int STACKCALL _Hermes_X86_CPU();
601 +
602 +void _ConvertX86p32_32BGR888();
603 +void _ConvertX86p32_32RGBA888();
604 +void _ConvertX86p32_32BGRA888();
605 +void _ConvertX86p32_24RGB888();
606 +void _ConvertX86p32_24BGR888();
607 +void _ConvertX86p32_16RGB565();
608 +void _ConvertX86p32_16BGR565();
609 +void _ConvertX86p32_16RGB555();
610 +void _ConvertX86p32_16BGR555();
611 +void _ConvertX86p32_8RGB332();
612 +
613 +void _ConvertX86p32_16RGB565_S();
614 +
615 +void _ConvertX86p16_32RGB888();
616 +void _ConvertX86p16_32BGR888();
617 +void _ConvertX86p16_32RGBA888();
618 +void _ConvertX86p16_32BGRA888();
619 +void _ConvertX86p16_24RGB888();
620 +void _ConvertX86p16_24BGR888();
621 +void _ConvertX86p16_16BGR565();
622 +void _ConvertX86p16_16RGB555();
623 +void _ConvertX86p16_16BGR555();
624 +void _ConvertX86p16_8RGB332();
625 +
626 +void _CopyX86p_4byte();
627 +void _CopyX86p_3byte();
628 +void _CopyX86p_2byte();
629 +void _CopyX86p_1byte();
630 +
631 +void _ConvertX86pI8_32();
632 +void _ConvertX86pI8_24();
633 +void _ConvertX86pI8_16();
634 +
635 +extern int32 _ConvertX86p16_32RGB888_LUT_X86[512];
636 +extern int32 _ConvertX86p16_32BGR888_LUT_X86[512];
637 +extern int32 _ConvertX86p16_32RGBA888_LUT_X86[512];
638 +extern int32 _ConvertX86p16_32BGRA888_LUT_X86[512];
639
640 #ifdef __cplusplus
641 }
642 @@ -83,6 +83,7 @@
643
644 /* Now fix up the ELF underscore problem */
645
646 +#if 0
647 #if defined(__ELF__) && defined(__GNUC__)
648 #ifdef __cplusplus
649 extern "C" {
650 @@ -142,6 +143,7 @@
651 #endif
652
653 #endif /* ELF & GNU */
654 +#endif
655
656
657
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2