audio: allow optional audio drivers.
For those audio drivers which can be probed (sdl, alsa, pulse) add a try-$name variants. Unlike the variants without try- prefix they will not error out on probe failure, the driver will be dropped from the list instead. Mainly useful for the audio_drv_list default values. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20190124112055.547-3-kraxel@redhat.com
This commit is contained in:
parent
c80a867fa0
commit
e42975a153
|
@ -3345,22 +3345,36 @@ fi
|
||||||
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
|
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
|
||||||
for drv in $audio_drv_list; do
|
for drv in $audio_drv_list; do
|
||||||
case $drv in
|
case $drv in
|
||||||
alsa)
|
alsa | try-alsa)
|
||||||
if $pkg_config alsa --exists; then
|
if $pkg_config alsa --exists; then
|
||||||
alsa_libs=$($pkg_config alsa --libs)
|
alsa_libs=$($pkg_config alsa --libs)
|
||||||
|
if test "$drv" = "try-alsa"; then
|
||||||
|
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-alsa/alsa/')
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
error_exit "$drv check failed" \
|
if test "$drv" = "try-alsa"; then
|
||||||
"Make sure to have the $drv libs and headers installed."
|
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-alsa//')
|
||||||
|
else
|
||||||
|
error_exit "$drv check failed" \
|
||||||
|
"Make sure to have the $drv libs and headers installed."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
pa)
|
pa | try-pa)
|
||||||
if $pkg_config libpulse --exists; then
|
if $pkg_config libpulse --exists; then
|
||||||
pulse_libs=$($pkg_config libpulse --libs)
|
pulse_libs=$($pkg_config libpulse --libs)
|
||||||
audio_pt_int="yes"
|
audio_pt_int="yes"
|
||||||
|
if test "$drv" = "try-pa"; then
|
||||||
|
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa/pa/')
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
error_exit "$drv check failed" \
|
if test "$drv" = "try-pa"; then
|
||||||
"Make sure to have the $drv libs and headers installed."
|
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-pa//')
|
||||||
|
else
|
||||||
|
error_exit "$drv check failed" \
|
||||||
|
"Make sure to have the $drv libs and headers installed."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -3370,6 +3384,14 @@ for drv in $audio_drv_list; do
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
try-sdl)
|
||||||
|
if test "$sdl" = "no"; then
|
||||||
|
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-sdl//')
|
||||||
|
else
|
||||||
|
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/try-sdl/sdl/')
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
coreaudio)
|
coreaudio)
|
||||||
coreaudio_libs="-framework CoreAudio"
|
coreaudio_libs="-framework CoreAudio"
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue