diff mbox

[FFmpeg-devel] configure: add pkg-config check for alsa

Message ID 20171016200154.6233-1-jeebjp@gmail.com
State Accepted
Commit 247281e8051102e09f46f5434a2ce1c8e54781f2
Headers show

Commit Message

Jan Ekström Oct. 16, 2017, 8:01 p.m. UTC
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

James Almer Oct. 16, 2017, 8:59 p.m. UTC | #1
On 10/16/2017 5:01 PM, Jan Ekström wrote:
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index b9a3a9bc1f..5aa642a9bb 100755
> --- a/configure
> +++ b/configure
> @@ -6254,7 +6254,8 @@ EOF
>  fi
>  check_header soundcard.h
>  
> -enabled alsa && check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
> +enabled alsa && use_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
> +    check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
>  
>  enabled jack && check_lib jack jack/jack.h jack_client_open -ljack &&
>      check_func jack_port_get_latency_range -ljack

Maybe mention in the commit message that it's needed/useful with static
builds as it lists all the needed dependencies.

LGTM in any case.
Jan Ekström Oct. 18, 2017, 1:27 p.m. UTC | #2
On Mon, Oct 16, 2017 at 11:01 PM, Jan Ekström <jeebjp@gmail.com> wrote:
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index b9a3a9bc1f..5aa642a9bb 100755
> --- a/configure
> +++ b/configure
> @@ -6254,7 +6254,8 @@ EOF
>  fi
>  check_header soundcard.h
>
> -enabled alsa && check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
> +enabled alsa && use_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
> +    check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
>
>  enabled jack && check_lib jack jack/jack.h jack_client_open -ljack &&
>      check_func jack_port_get_latency_range -ljack
> --
> 2.13.6
>

Just noticed that random user on #ffmpeg had private messaged me, and
yes - this had indeed fixed his linking issues with a static ALSA
library.

Please apply.

Jan
Jan Ekström Oct. 18, 2017, 2:40 p.m. UTC | #3
> Please apply.

Got my key registered onto the system and pushed along with an update
to the commit message noting the static linking use case.

Jan
diff mbox

Patch

diff --git a/configure b/configure
index b9a3a9bc1f..5aa642a9bb 100755
--- a/configure
+++ b/configure
@@ -6254,7 +6254,8 @@  EOF
 fi
 check_header soundcard.h
 
-enabled alsa && check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
+enabled alsa && use_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
+    check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
 
 enabled jack && check_lib jack jack/jack.h jack_client_open -ljack &&
     check_func jack_port_get_latency_range -ljack