[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config |
Date: |
Thu, 24 Jan 2019 12:39:02 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 |
On 1/24/19 12:20 PM, Gerd Hoffmann wrote:
> Use pkg-config to probe for alsa and pulseaudio.
>
> Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> configure | 39 +++++++++++++--------------------------
> 1 file changed, 13 insertions(+), 26 deletions(-)
>
> diff --git a/configure b/configure
> index 8f312ac3e2..5fcd0f4795 100755
> --- a/configure
> +++ b/configure
> @@ -3342,39 +3342,26 @@ fi
> ##########################################
> # Sound support libraries probe
>
> -audio_drv_probe()
> -{
> - drv=$1
> - hdr=$2
> - lib=$3
> - exp=$4
> - cfl=$5
> - cat > $TMPC << EOF
> -#include <$hdr>
> -int main(void) { $exp }
> -EOF
> - if compile_prog "$cfl" "$lib" ; then
> - :
> - else
> - error_exit "$drv check failed" \
> - "Make sure to have the $drv libs and headers installed."
> - fi
> -}
> -
> audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
> for drv in $audio_drv_list; do
> case $drv in
> alsa)
> - audio_drv_probe $drv alsa/asoundlib.h -lasound \
> - "return snd_pcm_close((snd_pcm_t *)0);"
> - alsa_libs="-lasound"
> + if $pkg_config alsa --exists; then
> + alsa_libs=$($pkg_config alsa --libs)
> + else
> + error_exit "$drv check failed" \
> + "Make sure to have the $drv libs and headers installed."
> + fi
> ;;
>
> pa)
> - audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \
> - "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL);
> return 0;"
> - pulse_libs="-lpulse"
> - audio_pt_int="yes"
> + if $pkg_config libpulse --exists; then
> + pulse_libs=$($pkg_config libpulse --libs)
> + audio_pt_int="yes"
> + else
> + error_exit "$drv check failed" \
> + "Make sure to have the $drv libs and headers installed."
> + fi
> ;;
>
> sdl)
>
- [Qemu-devel] [PATCH v3 0/6] audio: rework driver probing., Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 2/6] audio: allow optional audio drivers., Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 4/6] audio: check for pulseaudio daemon pidfile, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config, Gerd Hoffmann, 2019/01/24
- Re: [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 6/6] audio: probe audio drivers by default, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 3/6] audio: use try-sdl for openbsd, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 5/6] audio: error message tweak, Gerd Hoffmann, 2019/01/24