From patchwork Wed Aug 30 12:09:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 4908 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp449151jao; Wed, 30 Aug 2017 05:11:13 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6YsHG1j0tbU5uWo/4/Yd20fsopt3H5ZNPAKIpBEwfo9HYJVZ47C/saFnYUl+VbsFOos8FC X-Received: by 10.223.168.104 with SMTP id l95mr900424wrc.219.1504095073807; Wed, 30 Aug 2017 05:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504095073; cv=none; d=google.com; s=arc-20160816; b=eabhU2AGXG9RWUKMgFyxXN7zOtxkliFQuJDoL+3z1/221YjKhrNGfD3bmRNlWxpQ/d Snne5USGz67TWqMVodohnGopdAYIcY8mXz7U/15cycoX90UBevTEKKUUj07YNEclgS80 JtAG7u/l+3MhIUx3D8n5Lq5hQfAnpdM4Dra73sHRIRt/uP5dGiiA2rzKNGttMA0kWkXf 30CIUbORFr6mv9HY24V0fQv+aLKM2FbQUf5SFFFmzWnorQhCzs0C5WrD/pFjwJLqgBEj oGeoV3Xq6629mJfyPOczTCVeBxSd+oE9LIim5dTVIw111ibUG3t4AbzXVWM6YYeeB4RQ bDoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:domainkey-signature:dkim-signature :delivered-to:arc-authentication-results; bh=gSpgFvCSxfqpHGVO8XwJG9BukDpXEOVNmHwHtjaEOgc=; b=rRKb6oSyMIHRz+Ty/SdkxqmsKyIw1DKpo/eUXRdcyQ1YrmTa8GvLIh4dmOI+7MbelN BLLGawYt5WqShAqF4czYW97KghrXKYArsk2pzG2u2dd7+4nindqMhUrE+LbUkqX/k053 EelGhRXgn06lMlrKR/VpAMCwb+HSphK+SzI3hiKk7+ubq9Dsmjlj1074I2bJzJhwGhL6 1dUcQZ/SNQDYiLPuAepGZlCNuXfSy4EhEKy62i2CQMl+5aC7vFPOKdgdWHgL0pJ+gb0L rTqrQLmi4olKoEO9tWu72QEM1du9mTfwxqkisj1x6GYEACNBQ6yS4ZlWUiwYq0h2VILE Amig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=GCs8ZESc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x189si1549216wmd.273.2017.08.30.05.11.13; Wed, 30 Aug 2017 05:11:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=GCs8ZESc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1FB768A33A; Wed, 30 Aug 2017 15:09:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E16868A2D1 for ; Wed, 30 Aug 2017 15:09:33 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 3653f2e1; Wed, 30 Aug 2017 12:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=selector1; bh=u22hWWw KkZGdSlr2vHJVNPm5MnE=; b=GCs8ZEScGfBSsrg9OHI8XxUsFVe9h+al9JiQ/ji 6osqq1Jbb1UE9cNokARIk9uONsCqsLr3gcXbRrD6+uPJd+spV0GUTagEWLJL11k9 xmzhqAO8fXgzlNYbdWenV2A05d+B0KTGt3MivHATkN3iR9ZZZ4av+/L6Ix6LcfuJ HWRnoTx08BvJmt1RSM6A2TMuogtHA/gGL3uUR8nAQIi42IF90Zu+z59xV3cvh0Mk qim9iLWLZvMcflBthvwTc5TOLCgYJg66pW6V3nBAJL64mwJKqUsiu3pAqT9f+CkT UaMsscibmHTblaln1Q5r4E42d2UnKDgw6qXYROjpbetYppg== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=selector1; b=K j1BAM3+jFK8avGG0BoJnibeU1uj/oX7znAGRvdymOonyHuncSM4gl82GagRP4ceI rmuYimzFT/lKT2PE9c1jmpioppKZFCJYRB8zZ1DU5C4i9OOJhiFj0NWh7EKS9uZR em4LwJFBgyqoanHclAe585xTldOAR0CAFRWqDnSdIdlW/7fym5pc+QBRZK+dzSDj EaS7Jt5PkJ5dZWrnvlNncLo+t5Pi1m42kGrtEiNr2e8igaItfrYd1svc8jBjlLGi +mdRLIub+n8+Ib4ETDvoXr2rH3sRtYngTlAk7S46Mhs3OCdMcUYSJ+Xqh/NsZ0BC bwwoWp4j0a8C9ZNI7CLyw== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 9f78cbff; Wed, 30 Aug 2017 12:09:17 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Aug 2017 14:09:12 +0200 Message-Id: <20170830120915.13050-14-u@pkh.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170830120915.13050-1-u@pkh.me> References: <20170830120915.13050-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/16] build: make alsa part of the autodetected libraries X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Clément Bœsch alsa libs are already autodetected, this commit makes sure --disable-autodetect actually disable it unless --enable-alsa is specified. --- configure | 6 +++--- libavdevice/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0a961842df..d378023c5d 100755 --- a/configure +++ b/configure @@ -201,6 +201,7 @@ External library support: Also note that the following help text describes the purpose of the libraries themselves, not all their features will necessarily be usable by FFmpeg. + --disable-alsa disable ALSA support [autodetect] --enable-avisynth enable reading of AviSynth script files [no] --disable-bzlib disable bzlib [autodetect] --enable-chromaprint enable audio fingerprinting with chromaprint [no] @@ -1481,6 +1482,7 @@ EXAMPLE_LIST=" transcoding_example " EXTERNAL_AUTODETECT_LIBRARY_LIST=" + alsa bzlib iconv libxcb @@ -2060,7 +2062,6 @@ HAVE_LIST=" $THREADS_LIST $TOOLCHAIN_FEATURES $TYPES_LIST - alsa atomics_native dos_paths jack @@ -6111,8 +6112,7 @@ EOF fi check_header soundcard.h -enabled_any alsa_indev alsa_outdev && - check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound +enabled alsa && check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound enabled jack_indev && check_lib jack jack/jack.h jack_client_open -ljack && check_func jack_port_get_latency_range -ljack diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 80afa61e36..58362e3f2d 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -70,7 +70,7 @@ SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV) += fbdev_common.h SKIPHEADERS-$(CONFIG_LIBPULSE) += pulse_audio_common.h SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h -SKIPHEADERS-$(HAVE_ALSA) += alsa.h +SKIPHEADERS-$(CONFIG_ALSA) += alsa.h SKIPHEADERS-$(HAVE_SNDIO) += sndio.h TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter