RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fix for latest alsa (sys/asoundlib.h has been moved to alsa/asoundlib.h) 

cleanups for "usr/src/DVB/ost/include" detection
small cosmetic fixes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5856 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pl 2002-04-27 01:25:32 +00:00
parent 40f45bc8b3
commit b509c4a94a
3 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
configure vendored
View File

@ -1609,7 +1609,7 @@ fi
echores "$_bsdi_dvd" echores "$_bsdi_dvd"
echocheck "Have userspace SCSI headers on Solaris" echocheck "userspace SCSI headers (Solaris)"
cat > $TMPC << EOF cat > $TMPC << EOF
# include <unistd.h> # include <unistd.h>
# include <stropts.h> # include <stropts.h>
@ -2196,20 +2196,15 @@ EOF
_dvb=yes _dvb=yes
echores "yes" echores "yes"
else else
if cc_check -I/usr/src/DVB/ost/include ; then for I in "-I/usr/src/DVB/ost/include" "$_inc_extra/ost/include" ; do
_dvb=yes if cc_check "$I" ; then
echores "yes (using source from /usr/src/DVB/ost/include)" _dvb=yes
_inc_dvb="-I/usr/src/DVB/ost/include" _inc_dvb="$I"
else echores "yes (using $_inc_dvb)"
if cc_check $_inc_extra/ost/include ; then break
_dvb=yes fi
echores "yes (using source from $_inc_extra/ost/include)" done
_inc_dvb="$_inc_extra/ost/include" test "$_dvb" = no && echores "no (specify path to DVB/ost/include with --with-extraincdir=DIR)"
else
_dvb=no
echores "no (driver source not in /usr/src/DVB/ost/include, please add path with --with-extraincdir=DIR)"
fi
fi
fi fi
else else
echores "no" echores "no"
@ -2466,7 +2461,7 @@ echores "$_ossaudio"
echocheck "ALSA audio" echocheck "ALSA audio"
if test "$_alsa" = auto || test "$_alsa" = yes; then if test "$_alsa" != no ; then
_alsa=no _alsa=no
cat > $TMPC << EOF cat > $TMPC << EOF
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
@ -2478,31 +2473,41 @@ EOF
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); } int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
EOF EOF
cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x' cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-sys'
if test "$_alsaver" ; then cat > $TMPC << EOF
_alsa=yes #include <alsa/asoundlib.h>
echores "yes (using alsa $_alsaver)" int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
else EOF
echores "no" cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-alsa'
fi
else
echores "no"
fi fi
_def_alsa5='#undef HAVE_ALSA5' _def_alsa5='#undef HAVE_ALSA5'
_def_alsa9='#undef HAVE_ALSA9' _def_alsa9='#undef HAVE_ALSA9'
if test "$_alsa" = yes ; then _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H'
_def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H'
if test "$_alsaver" ; then
if test "$_alsaver" = '0.5.x' ; then if test "$_alsaver" = '0.5.x' ; then
_aosrc="$_aosrc ao_alsa5.c" _aosrc="$_aosrc ao_alsa5.c"
_aomodules="alsa5 $_aomodules" _aomodules="alsa5 $_aomodules"
_def_alsa5='#define HAVE_ALSA5 1' _def_alsa5='#define HAVE_ALSA5 1'
elif test "$_alsaver" = '0.9.x' ; then _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
echores "yes (using alsa 0.5.x and sys/asoundlib.h)"
elif test "$_alsaver" = '0.9.x-sys' ; then
_aosrc="$_aosrc ao_alsa9.c" _aosrc="$_aosrc ao_alsa9.c"
_aomodules="alsa9 $_aomodules" _aomodules="alsa9 $_aomodules"
_def_alsa9='#define HAVE_ALSA9 1' _def_alsa9='#define HAVE_ALSA9 1'
_def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
echores "yes (using alsa 0.9.x and sys/asoundlib.h)"
elif test "$_alsaver" = '0.9.x-alsa' ; then
_aosrc="$_aosrc ao_alsa9.c"
_aomodules="alsa9 $_aomodules"
_def_alsa9='#define HAVE_ALSA9 1'
_def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
echores "yes (using alsa 0.9.x and alsa/asoundlib.h)"
fi fi
_ld_alsa='-lasound' _ld_alsa="-lasound $_ld_dl $_ld_pthread"
else else
_noaomodules="alsa $_noaomodules" _noaomodules="alsa $_noaomodules"
echores "no"
fi fi
@ -2547,7 +2552,7 @@ fi
echores "$_mlib" echores "$_mlib"
echocheck "SGI Audio" echocheck "SGI audio"
if test "$_sgiaudio" = auto ; then if test "$_sgiaudio" = auto ; then
# check for SGI audio # check for SGI audio
cat > $TMPC << EOF cat > $TMPC << EOF
@ -3288,7 +3293,7 @@ fi
echores "$_tv_v4l" echores "$_tv_v4l"
echocheck "select" echocheck "audio select()"
if test "$_select" = no ; then if test "$_select" = no ; then
_def_select='#undef HAVE_AUDIO_SELECT' _def_select='#undef HAVE_AUDIO_SELECT'
elif test "$_select" = yes ; then elif test "$_select" = yes ; then
@ -3844,6 +3849,8 @@ $_def_ossaudio_devdsp
$_def_ossaudio_devmixer $_def_ossaudio_devmixer
$_def_alsa5 $_def_alsa5
$_def_alsa9 $_def_alsa9
$_def_sys_asoundlib_h
$_def_alsa_asoundlib_h
$_def_sunaudio $_def_sunaudio
$_def_sgiaudio $_def_sgiaudio
$_def_nas $_def_nas

7
libao2/ao_alsa1x.c
View File

@ -12,7 +12,14 @@
*/ */
#include <errno.h> #include <errno.h>
#if HAVE_SYS_ASOUNDLIB_H
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
#elif HAVE_ALSA_ASOUNDLIB_H
#include <alsa/asoundlib.h>
#else
#error "asoundlib.h is not in sys/ or alsa/ - please bugreport"
#endif
#include "../config.h" #include "../config.h"

7
libao2/ao_alsa9.c
View File

@ -12,7 +12,14 @@
*/ */
#include <errno.h> #include <errno.h>
#if HAVE_SYS_ASOUNDLIB_H
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
#elif HAVE_ALSA_ASOUNDLIB_H
#include <alsa/asoundlib.h>
#else
#error "asoundlib.h is not in sys/ or alsa/ - please bugreport"
#endif
#include "../config.h" #include "../config.h"