From patchwork Wed Aug 30 12:09:14 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: 4906 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp449437jao; Wed, 30 Aug 2017 05:11:34 -0700 (PDT) X-Google-Smtp-Source: ADKCNb64dOtgYuxrXIYHPYJRYFV9qPCwl8krfLyS+leY2O7XmHLFQzme2/riDMZxGvWfdsXJHlBs X-Received: by 10.28.126.215 with SMTP id z206mr1420796wmc.57.1504095093987; Wed, 30 Aug 2017 05:11:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504095093; cv=none; d=google.com; s=arc-20160816; b=mrh5uFHZe5E9dF8ES/lAqqZedT0pQ3rIBh7ykvRIjihz/u/85E3SnhMzoGNnm0m+O7 dXFBpEhpGc20VbJt60Z4O2sztKS2ZKZXFhGKmU3LYK6h6V7qo7SGNiQkGpyRkfT7eovl 1EB7amXNdLHWDyVaLIulXew34OU2Lh8J08g+5QUjd5cUiPHIgM7olHkCb+GWH0vBaBe3 sGqE13iQdFe1XkuEbNMJHH5ie1zW6oRNQPfWlZcrzOVTybFRcl4JurfWLYyBt5vW+b/F 70u2heCCfgz41MXv9c/am9O51H5HHgOb166j05ge+M/XELVPNrNTxeRl1ytIwbrYhfy0 NJCg== 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=uKU97coZ7oqasv8bUg8nONny1iRH5BJih1bkfkkbEBo=; b=VgJA7YD7Q7QnV752TqZDO13m3rpOxvlR85EJkukP9J17h5H17wO5BCvyuwyINvwKjj TqzjibTSYJ2oY2wRgwz/W22Y17JKe9rMRl3v0W20hTU47V+ZMEWAV8ENHaYPgIYmxocN iMDN1IaoI1mwAexN8roZwcOaqCm72EY9rcTQS8BtPH/EgTWQO5fy2CXBOipMw/VJuPIK M7W0IHEhz2xYmDDOpbkqyKvzHvvU8Voih7velm9wAJIsbF53sCbBMPa0xx/h0j2JstDt CFos8wyo9PdcfeefWx+J4qtGg59mwy2O4uwCVep610YAUsihzyRG9+mfm27OLiPTP69f LjiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=XxpSvlWc; 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 96si4193624wrk.537.2017.08.30.05.11.33; Wed, 30 Aug 2017 05:11:33 -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=XxpSvlWc; 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 6CE6F68A34A; Wed, 30 Aug 2017 15:09:40 +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 A988268A2C6 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 22dd99ea; Wed, 30 Aug 2017 12:09:21 +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=dGTeXEg RKGpEZcL05/h7yyPXuKo=; b=XxpSvlWcs1om4ZaiDlcaeQX/cH3g2ltg+oAAj4U QeRV0IYN4CpmPQgNlDgYS0lkHy8jF+7RjOp4VTGmOHN84O6MxGBE0h3swxxONPUN DcXb74Vstm0qBnWo4ewSud+7vjuNxhGc3vO2oyWMUpDpJkoZPl1bjrmS4EgVUTMr i9ruEIhy/VtjKLyNZc/0pcK4JOiVbQqeegXrnOXU6jwvKELlWwIIkk2ymc+q/EyR f12WFo+EH5rRxm2eiQw+rwWTq3on/XO2CMTb5gwGRYW6L6jaHvWlDJU/5MF4a2mN vYT53DXipPI94QTLrrDO48Q0Uvz29jgKRtWR4fXqRr8VdRw== 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=H tRKCZhoXWzvKilqnCmAcs8eHrPl+hFXcgh3y6shDSzMxdJWKNStdTTWQ/D93ighr Tn1DqB13GxNKBwDpfH3W1D4zRRS37NiCxIRSJrE/VXcDcZJteyo+akZCPx3dMf7S gEN3td8UN322VFTUlHW5NipOehEyWii2ZDJLfJasA2qy75arwZga8xiuZwnmmGwp mGp+3A5Rur/e4aO+0JOxGw1+1K99/6r+++9lyLhyFj14q9GieG4keA9Jszc4Ob95 F2pOeaty0r7SI9NJNtyvG2AToH6CynVSUn8nA3CgUCX6FpzIoJS4yIEDkp6EZw+z XKtYuw2hAtRP9ckdjueFw== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 525c8408; 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:14 +0200 Message-Id: <20170830120915.13050-16-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 15/16] build: make sndio 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 sndio is already autodetected, this commit makes sure --disable-autodetect actually disable it unless --enable-sndio is specified. --- configure | 5 +++-- libavdevice/Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index bb7caef5d7..f2af0711e3 100755 --- a/configure +++ b/configure @@ -288,6 +288,7 @@ External library support: --enable-opengl enable OpenGL rendering [no] --enable-openssl enable openssl, needed for https support if gnutls is not used [no] + --disable-sndio disable sndio support [autodetect] --disable-schannel disable SChannel SSP, needed for TLS support on Windows if openssl and gnutls are not used [autodetect] --disable-sdl2 disable sdl2 [autodetect] @@ -1495,6 +1496,7 @@ EXTERNAL_AUTODETECT_LIBRARY_LIST=" schannel sdl2 securetransport + sndio xlib zlib " @@ -2073,7 +2075,6 @@ HAVE_LIST=" perl pod2man section_data_rel_ro - sndio texi2html threads uwp @@ -6118,7 +6119,7 @@ enabled alsa && 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 -enabled_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open -lsndio +enabled sndio && check_lib sndio sndio.h sio_open -lsndio if enabled libcdio; then check_lib libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 58362e3f2d..cd077b292e 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -71,6 +71,6 @@ SKIPHEADERS-$(CONFIG_LIBPULSE) += pulse_audio_common.h SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h SKIPHEADERS-$(CONFIG_ALSA) += alsa.h -SKIPHEADERS-$(HAVE_SNDIO) += sndio.h +SKIPHEADERS-$(CONFIG_SNDIO) += sndio.h TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter