scummvm random work
[patches.git] / alsa-lib-shared-fdpic.patch
1 Index: aclocal.m4
2 ===================================================================
3 --- aclocal.m4 (revision 4673)
4 +++ aclocal.m4 (working copy)
5 @@ -1644,7 +1644,7 @@ linux*oldld* | linux*aout* | linux*coff*
6 ;;
7
8 # This must be Linux ELF.
9 -linux*)
10 +linux*|uclinux*)
11 version_type=linux
12 need_lib_prefix=no
13 need_version=no
14 @@ -2444,7 +2444,7 @@ irix5* | irix6* | nonstopux*)
15 ;;
16
17 # This must be Linux ELF.
18 -linux*)
19 +linux*|uclinux*)
20 lt_cv_deplibs_check_method=pass_all
21 ;;
22
23 @@ -3770,6 +3770,24 @@ case $host_os in
24 ;;
25 esac
26 ;;
27 + uclinux*)
28 + case $LDFLAGS in
29 + *-Wl,-elf2lft*)
30 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
31 + ;;
32 + *)
33 + case $host_cpu in
34 + bfin)
35 + CFLAGS="$CFLAGS -mfdpic"
36 + ;;
37 + *)
38 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
39 + ;;
40 + esac
41 + ;;
42 + esac
43 + ;;
44 +
45 vxworks*)
46 # FIXME: insert proper C++ library support
47 _LT_AC_TAGVAR(ld_shlibs, $1)=no
48 @@ -4949,6 +4967,23 @@ AC_MSG_CHECKING([for $compiler option to
49 ;;
50 esac
51 ;;
52 + linux|uclinux*)
53 + case $LDFLAGS in
54 + *-Wl,-elf2lft*)
55 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
56 + ;;
57 + *)
58 + case $host_cpu in
59 + bfin)
60 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-mfdpic'
61 + ;;
62 + *)
63 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
64 + ;;
65 + esac
66 + ;;
67 + esac
68 + ;;
69 *)
70 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
71 ;;
72 @@ -5232,6 +5267,23 @@ AC_MSG_CHECKING([for $compiler option to
73 esac
74 ;;
75
76 + linux|uclinux*)
77 + case $LDFLAGS in
78 + *-Wl,-elf2lft*)
79 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
80 + ;;
81 + *)
82 + case $host_cpu in
83 + bfin)
84 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-mfdpic'
85 + ;;
86 + *)
87 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
88 + ;;
89 + esac
90 + ;;
91 + esac
92 + ;;
93 *)
94 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
95 ;;
96 Index: src/Versions
97 ===================================================================
98 --- src/Versions (revision 4673)
99 +++ src/Versions (working copy)
100 @@ -1,8 +1,8 @@
101 ALSA_0.9 {
102 global:
103 + ___snd_*;
104 __snd_*;
105 _snd_*;
106 - snd_*;
107 local:
108 *;
109 };
110 @@ -10,281 +10,281 @@ ALSA_0.9 {
111 ALSA_0.9.0rc4 {
112 global:
113
114 - snd_pcm_hw_params_get_access;
115 - snd_pcm_hw_params_set_access_first;
116 - snd_pcm_hw_params_set_access_last;
117 -
118 - snd_pcm_hw_params_get_format;
119 - snd_pcm_hw_params_set_format_first;
120 - snd_pcm_hw_params_set_format_last;
121 -
122 - snd_pcm_hw_params_get_subformat;
123 - snd_pcm_hw_params_set_subformat_first;
124 - snd_pcm_hw_params_set_subformat_last;
125 -
126 - snd_pcm_hw_params_get_channels;
127 - snd_pcm_hw_params_get_channels_min;
128 - snd_pcm_hw_params_get_channels_max;
129 - snd_pcm_hw_params_set_channels_near;
130 - snd_pcm_hw_params_set_channels_first;
131 - snd_pcm_hw_params_set_channels_last;
132 -
133 - snd_pcm_hw_params_get_rate;
134 - snd_pcm_hw_params_get_rate_min;
135 - snd_pcm_hw_params_get_rate_max;
136 - snd_pcm_hw_params_set_rate_near;
137 - snd_pcm_hw_params_set_rate_first;
138 - snd_pcm_hw_params_set_rate_last;
139 -
140 - snd_pcm_hw_params_get_period_time;
141 - snd_pcm_hw_params_get_period_time_min;
142 - snd_pcm_hw_params_get_period_time_max;
143 - snd_pcm_hw_params_set_period_time_near;
144 - snd_pcm_hw_params_set_period_time_first;
145 - snd_pcm_hw_params_set_period_time_last;
146 -
147 - snd_pcm_hw_params_get_period_size;
148 - snd_pcm_hw_params_get_period_size_min;
149 - snd_pcm_hw_params_get_period_size_max;
150 - snd_pcm_hw_params_set_period_size_near;
151 - snd_pcm_hw_params_set_period_size_first;
152 - snd_pcm_hw_params_set_period_size_last;
153 -
154 - snd_pcm_hw_params_get_periods;
155 - snd_pcm_hw_params_get_periods_min;
156 - snd_pcm_hw_params_get_periods_max;
157 - snd_pcm_hw_params_set_periods_near;
158 - snd_pcm_hw_params_set_periods_first;
159 - snd_pcm_hw_params_set_periods_last;
160 -
161 - snd_pcm_hw_params_get_buffer_time;
162 - snd_pcm_hw_params_get_buffer_time_min;
163 - snd_pcm_hw_params_get_buffer_time_max;
164 - snd_pcm_hw_params_set_buffer_time_near;
165 - snd_pcm_hw_params_set_buffer_time_first;
166 - snd_pcm_hw_params_set_buffer_time_last;
167 -
168 - snd_pcm_hw_params_get_buffer_size;
169 - snd_pcm_hw_params_get_buffer_size_min;
170 - snd_pcm_hw_params_get_buffer_size_max;
171 - snd_pcm_hw_params_set_buffer_size_near;
172 - snd_pcm_hw_params_set_buffer_size_first;
173 - snd_pcm_hw_params_set_buffer_size_last;
174 -
175 - snd_pcm_hw_params_get_tick_time;
176 - snd_pcm_hw_params_get_tick_time_min;
177 - snd_pcm_hw_params_get_tick_time_max;
178 - snd_pcm_hw_params_set_tick_time_near;
179 - snd_pcm_hw_params_set_tick_time_first;
180 - snd_pcm_hw_params_set_tick_time_last;
181 + _snd_pcm_hw_params_get_access;
182 + _snd_pcm_hw_params_set_access_first;
183 + _snd_pcm_hw_params_set_access_last;
184 +
185 + _snd_pcm_hw_params_get_format;
186 + _snd_pcm_hw_params_set_format_first;
187 + _snd_pcm_hw_params_set_format_last;
188 +
189 + _snd_pcm_hw_params_get_subformat;
190 + _snd_pcm_hw_params_set_subformat_first;
191 + _snd_pcm_hw_params_set_subformat_last;
192 +
193 + _snd_pcm_hw_params_get_channels;
194 + _snd_pcm_hw_params_get_channels_min;
195 + _snd_pcm_hw_params_get_channels_max;
196 + _snd_pcm_hw_params_set_channels_near;
197 + _snd_pcm_hw_params_set_channels_first;
198 + _snd_pcm_hw_params_set_channels_last;
199 +
200 + _snd_pcm_hw_params_get_rate;
201 + _snd_pcm_hw_params_get_rate_min;
202 + _snd_pcm_hw_params_get_rate_max;
203 + _snd_pcm_hw_params_set_rate_near;
204 + _snd_pcm_hw_params_set_rate_first;
205 + _snd_pcm_hw_params_set_rate_last;
206 +
207 + _snd_pcm_hw_params_get_period_time;
208 + _snd_pcm_hw_params_get_period_time_min;
209 + _snd_pcm_hw_params_get_period_time_max;
210 + _snd_pcm_hw_params_set_period_time_near;
211 + _snd_pcm_hw_params_set_period_time_first;
212 + _snd_pcm_hw_params_set_period_time_last;
213 +
214 + _snd_pcm_hw_params_get_period_size;
215 + _snd_pcm_hw_params_get_period_size_min;
216 + _snd_pcm_hw_params_get_period_size_max;
217 + _snd_pcm_hw_params_set_period_size_near;
218 + _snd_pcm_hw_params_set_period_size_first;
219 + _snd_pcm_hw_params_set_period_size_last;
220 +
221 + _snd_pcm_hw_params_get_periods;
222 + _snd_pcm_hw_params_get_periods_min;
223 + _snd_pcm_hw_params_get_periods_max;
224 + _snd_pcm_hw_params_set_periods_near;
225 + _snd_pcm_hw_params_set_periods_first;
226 + _snd_pcm_hw_params_set_periods_last;
227 +
228 + _snd_pcm_hw_params_get_buffer_time;
229 + _snd_pcm_hw_params_get_buffer_time_min;
230 + _snd_pcm_hw_params_get_buffer_time_max;
231 + _snd_pcm_hw_params_set_buffer_time_near;
232 + _snd_pcm_hw_params_set_buffer_time_first;
233 + _snd_pcm_hw_params_set_buffer_time_last;
234 +
235 + _snd_pcm_hw_params_get_buffer_size;
236 + _snd_pcm_hw_params_get_buffer_size_min;
237 + _snd_pcm_hw_params_get_buffer_size_max;
238 + _snd_pcm_hw_params_set_buffer_size_near;
239 + _snd_pcm_hw_params_set_buffer_size_first;
240 + _snd_pcm_hw_params_set_buffer_size_last;
241 +
242 + _snd_pcm_hw_params_get_tick_time;
243 + _snd_pcm_hw_params_get_tick_time_min;
244 + _snd_pcm_hw_params_get_tick_time_max;
245 + _snd_pcm_hw_params_set_tick_time_near;
246 + _snd_pcm_hw_params_set_tick_time_first;
247 + _snd_pcm_hw_params_set_tick_time_last;
248
249 } ALSA_0.9;
250
251 ALSA_0.9.0rc8 {
252 global:
253
254 - snd_pcm_forward;
255 - snd_pcm_status_get_trigger_htstamp;
256 - snd_pcm_status_get_htstamp;
257 + _snd_pcm_forward;
258 + _snd_pcm_status_get_trigger_htstamp;
259 + _snd_pcm_status_get_htstamp;
260
261 } ALSA_0.9.0rc4;
262
263 ALSA_0.9.0 {
264 global:
265
266 - snd_pcm_type_name;
267 - snd_timer_query_info;
268 - snd_timer_query_params;
269 - snd_timer_query_status;
270 - snd_timer_params_set_exclusive;
271 - snd_timer_params_get_exclusive;
272 - snd_timer_params_set_filter;
273 - snd_timer_params_get_filter;
274 + _snd_pcm_type_name;
275 + _snd_timer_query_info;
276 + _snd_timer_query_params;
277 + _snd_timer_query_status;
278 + _snd_timer_params_set_exclusive;
279 + _snd_timer_params_get_exclusive;
280 + _snd_timer_params_set_filter;
281 + _snd_timer_params_get_filter;
282 } ALSA_0.9.0rc8;
283
284 ALSA_0.9.3 {
285 global:
286
287 - snd_ctl_elem_info_get_dimensions;
288 - snd_ctl_elem_info_get_dimension;
289 + _snd_ctl_elem_info_get_dimensions;
290 + _snd_ctl_elem_info_get_dimension;
291 } ALSA_0.9.0;
292
293 ALSA_0.9.5 {
294 global:
295
296 - alsa_lisp;
297 + _alsa_lisp;
298 } ALSA_0.9.3;
299
300 ALSA_0.9.6 {
301 global:
302
303 - snd_hctl_open_ctl;
304 - snd_seq_port_info_get_timestamping;
305 - snd_seq_port_info_get_timestamp_real;
306 - snd_seq_port_info_get_timestamp_queue;
307 - snd_seq_port_info_set_timestamping;
308 - snd_seq_port_info_set_timestamp_real;
309 - snd_seq_port_info_set_timestamp_queue;
310 + _snd_hctl_open_ctl;
311 + _snd_seq_port_info_get_timestamping;
312 + _snd_seq_port_info_get_timestamp_real;
313 + _snd_seq_port_info_get_timestamp_queue;
314 + _snd_seq_port_info_set_timestamping;
315 + _snd_seq_port_info_set_timestamp_real;
316 + _snd_seq_port_info_set_timestamp_queue;
317 } ALSA_0.9.5;
318
319 ALSA_0.9.7 {
320 global:
321
322 - snd_user_file;
323 - snd_hctl_ctl;
324 - sndo_*;
325 - alsa_lisp_*;
326 + _snd_user_file;
327 + _snd_hctl_ctl;
328 + _sndo_*;
329 + _alsa_lisp_*;
330 } ALSA_0.9.6;
331
332 ALSA_0.9.8 {
333 global:
334
335 - snd_ctl_elem_add;
336 - snd_ctl_elem_replace;
337 - snd_ctl_elem_remove;
338 - snd_hctl_poll_descriptors_revents;
339 + _snd_ctl_elem_add;
340 + _snd_ctl_elem_replace;
341 + _snd_ctl_elem_remove;
342 + _snd_hctl_poll_descriptors_revents;
343 } ALSA_0.9.7;
344
345 ALSA_1.0.4 {
346 global:
347
348 - snd_spcm_init;
349 - snd_spcm_init_duplex;
350 - snd_spcm_init_get_params;
351 + _snd_spcm_init;
352 + _snd_spcm_init_duplex;
353 + _snd_spcm_init_get_params;
354 } ALSA_0.9.8;
355
356 ALSA_1.0.5 {
357 global:
358
359 - snd_asoundlib_version;
360 - snd_timer_params_set_early_event;
361 - snd_timer_params_get_early_event;
362 + _snd_asoundlib_version;
363 + _snd_timer_params_set_early_event;
364 + _snd_timer_params_get_early_event;
365 } ALSA_1.0.4;
366
367 ALSA_1.0.8 {
368 global:
369
370 - snd_ctl_elem_add_integer;
371 - snd_ctl_elem_add_integer64;
372 - snd_ctl_elem_add_boolean;
373 - snd_ctl_elem_add_iec958;
374 - snd_ctl_elem_remove;
375 + _snd_ctl_elem_add_integer;
376 + _snd_ctl_elem_add_integer64;
377 + _snd_ctl_elem_add_boolean;
378 + _snd_ctl_elem_add_iec958;
379 + _snd_ctl_elem_remove;
380 } ALSA_1.0.5;
381
382 ALSA_1.0.9 {
383 global:
384
385 - snd_names_list;
386 - snd_names_list_free;
387 + _snd_names_list;
388 + _snd_names_list_free;
389
390 - snd_pcm_hw_params_set_rate_resample;
391 - snd_pcm_hw_params_get_rate_resample;
392 - snd_pcm_hw_params_set_export_buffer;
393 - snd_pcm_hw_params_get_export_buffer;
394 -
395 - snd_pcm_ioplug_create;
396 - snd_pcm_ioplug_delete;
397 - snd_pcm_ioplug_reinit_status;
398 - snd_pcm_ioplug_params_reset;
399 - snd_pcm_ioplug_set_param_minmax;
400 - snd_pcm_ioplug_set_param_list;
401 -
402 - snd_pcm_extplug_create;
403 - snd_pcm_extplug_delete;
404 - snd_pcm_extplug_params_reset;
405 - snd_pcm_extplug_set_param_list;
406 - snd_pcm_extplug_set_param_minmax;
407 - snd_pcm_extplug_set_slave_param_list;
408 - snd_pcm_extplug_set_slave_param_minmax;
409 -
410 - snd_pcm_parse_control_id;
411 -
412 - snd_async_add_timer_handler;
413 - snd_async_handler_get_timer;
414 -
415 - snd_timer_ginfo_sizeof;
416 - snd_timer_ginfo_malloc;
417 - snd_timer_ginfo_free;
418 - snd_timer_ginfo_copy;
419 - snd_timer_ginfo_set_tid;
420 - snd_timer_ginfo_get_tid;
421 - snd_timer_ginfo_get_flags;
422 - snd_timer_ginfo_get_card;
423 - snd_timer_ginfo_get_id;
424 - snd_timer_ginfo_get_name;
425 - snd_timer_ginfo_get_resolution;
426 - snd_timer_ginfo_get_resolution_min;
427 - snd_timer_ginfo_get_resolution_max;
428 - snd_timer_ginfo_get_clients;
429 + _snd_pcm_hw_params_set_rate_resample;
430 + _snd_pcm_hw_params_get_rate_resample;
431 + _snd_pcm_hw_params_set_export_buffer;
432 + _snd_pcm_hw_params_get_export_buffer;
433 +
434 + _snd_pcm_ioplug_create;
435 + _snd_pcm_ioplug_delete;
436 + _snd_pcm_ioplug_reinit_status;
437 + _snd_pcm_ioplug_params_reset;
438 + _snd_pcm_ioplug_set_param_minmax;
439 + _snd_pcm_ioplug_set_param_list;
440 +
441 + _snd_pcm_extplug_create;
442 + _snd_pcm_extplug_delete;
443 + _snd_pcm_extplug_params_reset;
444 + _snd_pcm_extplug_set_param_list;
445 + _snd_pcm_extplug_set_param_minmax;
446 + _snd_pcm_extplug_set_slave_param_list;
447 + _snd_pcm_extplug_set_slave_param_minmax;
448 +
449 + _snd_pcm_parse_control_id;
450 +
451 + _snd_async_add_timer_handler;
452 + _snd_async_handler_get_timer;
453 +
454 + _snd_timer_ginfo_sizeof;
455 + _snd_timer_ginfo_malloc;
456 + _snd_timer_ginfo_free;
457 + _snd_timer_ginfo_copy;
458 + _snd_timer_ginfo_set_tid;
459 + _snd_timer_ginfo_get_tid;
460 + _snd_timer_ginfo_get_flags;
461 + _snd_timer_ginfo_get_card;
462 + _snd_timer_ginfo_get_id;
463 + _snd_timer_ginfo_get_name;
464 + _snd_timer_ginfo_get_resolution;
465 + _snd_timer_ginfo_get_resolution_min;
466 + _snd_timer_ginfo_get_resolution_max;
467 + _snd_timer_ginfo_get_clients;
468
469 } ALSA_1.0.8;
470
471 ALSA_1.0.10 {
472 global:
473
474 - snd_mixer_get_hctl;
475 - snd_mixer_elem_get_private;
476 - snd_mixer_attach_hctl;
477 - snd_mixer_detach_hctl;
478 -
479 - snd_mixer_class_register;
480 - snd_mixer_add_elem;
481 - snd_mixer_remove_elem;
482 - snd_mixer_elem_new;
483 - snd_mixer_elem_add;
484 - snd_mixer_elem_remove;
485 - snd_mixer_elem_free;
486 - snd_mixer_elem_info;
487 - snd_mixer_elem_value;
488 - snd_mixer_elem_attach;
489 - snd_mixer_elem_detach;
490 - snd_mixer_elem_empty;
491 -
492 - snd_mixer_class_malloc;
493 - snd_mixer_class_free;
494 - snd_mixer_class_copy;
495 - snd_mixer_class_get_mixer;
496 - snd_mixer_class_get_event;
497 - snd_mixer_class_get_private;
498 - snd_mixer_class_get_compare;
499 - snd_mixer_class_set_event;
500 - snd_mixer_class_set_private;
501 - snd_mixer_class_set_private_free;
502 - snd_mixer_class_set_compare;
503 -
504 - snd_mixer_selem_set_playback_dB_all;
505 - snd_mixer_selem_set_capture_dB_all;
506 - snd_mixer_selem_is_enum_playback;
507 - snd_mixer_selem_is_enum_capture;
508 - snd_mixer_selem_compare;
509 - snd_mixer_sbasic_info;
510 - snd_mixer_sbasic_get_private;
511 - snd_mixer_sbasic_set_private;
512 - snd_mixer_sbasic_set_private_free;
513 + _snd_mixer_get_hctl;
514 + _snd_mixer_elem_get_private;
515 + _snd_mixer_attach_hctl;
516 + _snd_mixer_detach_hctl;
517 +
518 + _snd_mixer_class_register;
519 + _snd_mixer_add_elem;
520 + _snd_mixer_remove_elem;
521 + _snd_mixer_elem_new;
522 + _snd_mixer_elem_add;
523 + _snd_mixer_elem_remove;
524 + _snd_mixer_elem_free;
525 + _snd_mixer_elem_info;
526 + _snd_mixer_elem_value;
527 + _snd_mixer_elem_attach;
528 + _snd_mixer_elem_detach;
529 + _snd_mixer_elem_empty;
530 +
531 + _snd_mixer_class_malloc;
532 + _snd_mixer_class_free;
533 + _snd_mixer_class_copy;
534 + _snd_mixer_class_get_mixer;
535 + _snd_mixer_class_get_event;
536 + _snd_mixer_class_get_private;
537 + _snd_mixer_class_get_compare;
538 + _snd_mixer_class_set_event;
539 + _snd_mixer_class_set_private;
540 + _snd_mixer_class_set_private_free;
541 + _snd_mixer_class_set_compare;
542 +
543 + _snd_mixer_selem_set_playback_dB_all;
544 + _snd_mixer_selem_set_capture_dB_all;
545 + _snd_mixer_selem_is_enum_playback;
546 + _snd_mixer_selem_is_enum_capture;
547 + _snd_mixer_selem_compare;
548 + _snd_mixer_sbasic_info;
549 + _snd_mixer_sbasic_get_private;
550 + _snd_mixer_sbasic_set_private;
551 + _snd_mixer_sbasic_set_private_free;
552
553 - snd_ctl_ext_create;
554 - snd_ctl_ext_delete;
555 + _snd_ctl_ext_create;
556 + _snd_ctl_ext_delete;
557
558 } ALSA_1.0.9;
559
560 ALSA_1.0.11 {
561 global:
562
563 - snd_pcm_recover;
564 - snd_pcm_set_params;
565 - snd_pcm_get_params;
566 + _snd_pcm_recover;
567 + _snd_pcm_set_params;
568 + _snd_pcm_get_params;
569 } ALSA_1.0.10;
570
571 ALSA_1.0.12 {
572 global:
573
574 - snd_ctl_elem_tlv_read;
575 - snd_ctl_elem_tlv_write;
576 - snd_ctl_elem_tlv_command;
577 - snd_ctl_elem_info_is_tlv_readable;
578 - snd_ctl_elem_info_is_tlv_writable;
579 - snd_ctl_elem_info_is_tlv_commandable;
580 - snd_hctl_elem_tlv_read;
581 - snd_hctl_elem_tlv_write;
582 - snd_hctl_elem_tlv_command;
583 + _snd_ctl_elem_tlv_read;
584 + _snd_ctl_elem_tlv_write;
585 + _snd_ctl_elem_tlv_command;
586 + _snd_ctl_elem_info_is_tlv_readable;
587 + _snd_ctl_elem_info_is_tlv_writable;
588 + _snd_ctl_elem_info_is_tlv_commandable;
589 + _snd_hctl_elem_tlv_read;
590 + _snd_hctl_elem_tlv_write;
591 + _snd_hctl_elem_tlv_command;
592 } ALSA_1.0.11;