Mercurial > mplayer.hg

comparison configure @ 34247:1c35122fba8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove obsolete ALSA 0.5 audio output and ALSA 0.9 audio input. ALSA 0.5 was last released in 2000, 0.9 in 2003; besides the ALSA 0.9 and 1.x audio inputs heavily duplicated code.
author diego
date Wed, 09 Nov 2011 01:22:02 +0000
parents 30adc04c4041
children a9bfa5a9fcac
comparison
equal deleted inserted replaced
34246:4f35512cf7b1 34247:1c35122fba8c
5492 _alsa=no 5492 _alsa=no
5493 res_comment="alloca missing" 5493 res_comment="alloca missing"
5494 fi 5494 fi
5495 if test "$_alsa" != no ; then 5495 if test "$_alsa" != no ; then
5496 _alsa=no 5496 _alsa=no
5497 cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)' -lasound $ld_dl $ld_pthread && _alsaver='0.5.x'
5498 cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-sys' 5497 cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-sys'
5499 cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-alsa' 5498 cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-alsa'
5500 cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-sys' 5499 cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-sys'
5501 cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-alsa' 5500 cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-alsa'
5502 fi 5501 fi
5503 def_alsa='#undef CONFIG_ALSA' 5502 def_alsa='#undef CONFIG_ALSA'
5504 def_alsa5='#undef CONFIG_ALSA5'
5505 def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' 5503 def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H'
5506 def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' 5504 def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H'
5507 if test "$_alsaver" ; then 5505 if test "$_alsaver" ; then
5508 _alsa=yes 5506 _alsa=yes
5509 if test "$_alsaver" = '0.5.x' ; then 5507 if test "$_alsaver" = '0.9.x-sys' ; then
5510 _alsa5=yes
5511 aomodules="alsa5 $aomodules"
5512 def_alsa5='#define CONFIG_ALSA5 1'
5513 def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5514 res_comment="using alsa 0.5.x and sys/asoundlib.h"
5515 elif test "$_alsaver" = '0.9.x-sys' ; then
5516 _alsa9=yes
5517 aomodules="alsa $aomodules" 5508 aomodules="alsa $aomodules"
5518 def_alsa='#define CONFIG_ALSA 1' 5509 def_alsa='#define CONFIG_ALSA 1'
5519 def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 5510 def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5520 res_comment="using alsa 0.9.x and sys/asoundlib.h" 5511 res_comment="using alsa 0.9.x and sys/asoundlib.h"
5521 elif test "$_alsaver" = '0.9.x-alsa' ; then 5512 elif test "$_alsaver" = '0.9.x-alsa' ; then
5522 _alsa9=yes
5523 aomodules="alsa $aomodules" 5513 aomodules="alsa $aomodules"
5524 def_alsa='#define CONFIG_ALSA 1' 5514 def_alsa='#define CONFIG_ALSA 1'
5525 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' 5515 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
5526 res_comment="using alsa 0.9.x and alsa/asoundlib.h" 5516 res_comment="using alsa 0.9.x and alsa/asoundlib.h"
5527 elif test "$_alsaver" = '1.0.x-sys' ; then 5517 elif test "$_alsaver" = '1.0.x-sys' ; then
5528 _alsa1x=yes
5529 aomodules="alsa $aomodules" 5518 aomodules="alsa $aomodules"
5530 def_alsa='#define CONFIG_ALSA 1' 5519 def_alsa='#define CONFIG_ALSA 1'
5531 def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' 5520 def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
5532 res_comment="using alsa 1.0.x and sys/asoundlib.h" 5521 res_comment="using alsa 1.0.x and sys/asoundlib.h"
5533 elif test "$_alsaver" = '1.0.x-alsa' ; then 5522 elif test "$_alsaver" = '1.0.x-alsa' ; then
5534 _alsa1x=yes
5535 aomodules="alsa $aomodules" 5523 aomodules="alsa $aomodules"
5536 def_alsa='#define CONFIG_ALSA 1' 5524 def_alsa='#define CONFIG_ALSA 1'
5537 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' 5525 def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
5538 res_comment="using alsa 1.0.x and alsa/asoundlib.h" 5526 res_comment="using alsa 1.0.x and alsa/asoundlib.h"
5539 else 5527 else
7274 7262
7275 echocheck "Radio interface" 7263 echocheck "Radio interface"
7276 if test "$_radio" = yes ; then 7264 if test "$_radio" = yes ; then
7277 def_radio='#define CONFIG_RADIO 1' 7265 def_radio='#define CONFIG_RADIO 1'
7278 inputmodules="radio $inputmodules" 7266 inputmodules="radio $inputmodules"
7279 if test "$_alsa9" != yes -a "$_alsa1x" != yes -a "$_ossaudio" != yes ; then 7267 if test "$_alsa" != yes -a "$_ossaudio" != yes ; then
7280 _radio_capture=no 7268 _radio_capture=no
7281 fi 7269 fi
7282 if test "$_radio_capture" = yes ; then 7270 if test "$_radio_capture" = yes ; then
7283 _audio_input=yes 7271 _audio_input=yes
7284 def_radio_capture="#define CONFIG_RADIO_CAPTURE 1" 7272 def_radio_capture="#define CONFIG_RADIO_CAPTURE 1"
8035 VSSCANF = $vsscanf 8023 VSSCANF = $vsscanf
8036 8024
8037 # features 8025 # features
8038 3DFX = $_3dfx 8026 3DFX = $_3dfx
8039 AA = $_aa 8027 AA = $_aa
8040 ALSA1X = $_alsa1x 8028 ALSA = $_alsa
8041 ALSA9 = $_alsa9
8042 ALSA5 = $_alsa5
8043 APPLE_IR = $_apple_ir 8029 APPLE_IR = $_apple_ir
8044 APPLE_REMOTE = $_apple_remote 8030 APPLE_REMOTE = $_apple_remote
8045 ARTS = $_arts 8031 ARTS = $_arts
8046 AUDIO_INPUT = $_audio_input 8032 AUDIO_INPUT = $_audio_input
8047 BITMAP_FONT = $_bitmap_font 8033 BITMAP_FONT = $_bitmap_font
8317 -stereo has three possible values (0 for stereo, 1 for left-only, 2 for 8303 -stereo has three possible values (0 for stereo, 1 for left-only, 2 for
8318 right-only), with 0 being the default. 8304 right-only), with 0 being the default.
8319 */ 8305 */
8320 #define CONFIG_FAKE_MONO 1 8306 #define CONFIG_FAKE_MONO 1
8321 8307
8322 /* set up max. outburst. use 131072 for TrueHD SPDIF pass-through, 8308 /* set up max. outburst. use 131072 for TrueHD SPDIF pass-through */
8323 * use 65536 for ALSA 0.5, for others 16384 is enough
8324 */
8325 #define MAX_OUTBURST 131072 8309 #define MAX_OUTBURST 131072
8326 8310
8327 /* set up audio OUTBURST. Do not change this! */ 8311 /* set up audio OUTBURST. Do not change this! */
8328 #define OUTBURST 512 8312 #define OUTBURST 512
8329 8313
8517 $def_xshape 8501 $def_xshape
8518 8502
8519 8503
8520 /* Audio output drivers */ 8504 /* Audio output drivers */
8521 $def_alsa 8505 $def_alsa
8522 $def_alsa5
8523 $def_arts 8506 $def_arts
8524 $def_coreaudio 8507 $def_coreaudio
8525 $def_dart 8508 $def_dart
8526 $def_esd 8509 $def_esd
8527 $def_esd_latency 8510 $def_esd_latency