Mercurial > mplayer.hg
diff configure @ 34247:1c35122fba8c
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 |
line wrap: on
line diff
--- a/configure Wed Nov 09 00:32:12 2011 +0000 +++ b/configure Wed Nov 09 01:22:02 2011 +0000 @@ -5494,44 +5494,32 @@ fi if test "$_alsa" != no ; then _alsa=no - cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)' -lasound $ld_dl $ld_pthread && _alsaver='0.5.x' cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-sys' cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-alsa' cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-sys' cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-alsa' fi def_alsa='#undef CONFIG_ALSA' -def_alsa5='#undef CONFIG_ALSA5' def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then _alsa=yes - if test "$_alsaver" = '0.5.x' ; then - _alsa5=yes - aomodules="alsa5 $aomodules" - def_alsa5='#define CONFIG_ALSA5 1' - def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' - res_comment="using alsa 0.5.x and sys/asoundlib.h" - elif test "$_alsaver" = '0.9.x-sys' ; then - _alsa9=yes + if test "$_alsaver" = '0.9.x-sys' ; then aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then - _alsa9=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then - _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then - _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' @@ -7276,7 +7264,7 @@ if test "$_radio" = yes ; then def_radio='#define CONFIG_RADIO 1' inputmodules="radio $inputmodules" - if test "$_alsa9" != yes -a "$_alsa1x" != yes -a "$_ossaudio" != yes ; then + if test "$_alsa" != yes -a "$_ossaudio" != yes ; then _radio_capture=no fi if test "$_radio_capture" = yes ; then @@ -8037,9 +8025,7 @@ # features 3DFX = $_3dfx AA = $_aa -ALSA1X = $_alsa1x -ALSA9 = $_alsa9 -ALSA5 = $_alsa5 +ALSA = $_alsa APPLE_IR = $_apple_ir APPLE_REMOTE = $_apple_remote ARTS = $_arts @@ -8319,9 +8305,7 @@ */ #define CONFIG_FAKE_MONO 1 -/* set up max. outburst. use 131072 for TrueHD SPDIF pass-through, - * use 65536 for ALSA 0.5, for others 16384 is enough - */ +/* set up max. outburst. use 131072 for TrueHD SPDIF pass-through */ #define MAX_OUTBURST 131072 /* set up audio OUTBURST. Do not change this! */ @@ -8519,7 +8503,6 @@ /* Audio output drivers */ $def_alsa -$def_alsa5 $def_arts $def_coreaudio $def_dart