qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Cc: Brad Smith <brad@comstyle.com>
Subject: Re: [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config
Date: Thu, 24 Jan 2019 12:39:02 +0100	[thread overview]
Message-ID: <3313a4dc-4abb-d24f-83d5-c5ac1c4f4647@redhat.com> (raw)
In-Reply-To: <20190124112055.547-2-kraxel@redhat.com>

On 1/24/19 12:20 PM, Gerd Hoffmann wrote:
> Use pkg-config to probe for alsa and pulseaudio.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  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)
> 

  reply	other threads:[~2019-01-24 11:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-24 11:20 [Qemu-devel] [PATCH v3 0/6] audio: rework driver probing Gerd Hoffmann
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config Gerd Hoffmann
2019-01-24 11:39   ` Philippe Mathieu-Daudé [this message]
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 2/6] audio: allow optional audio drivers Gerd Hoffmann
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 3/6] audio: use try-sdl for openbsd Gerd Hoffmann
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 4/6] audio: check for pulseaudio daemon pidfile Gerd Hoffmann
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 5/6] audio: error message tweak Gerd Hoffmann
2019-01-24 11:40   ` Philippe Mathieu-Daudé
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 6/6] audio: probe audio drivers by default Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3313a4dc-4abb-d24f-83d5-c5ac1c4f4647@redhat.com \
    --to=philmd@redhat.com \
    --cc=brad@comstyle.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).