From patchwork Sat Oct 14 16:30:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5562 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1935138jah; Sat, 14 Oct 2017 09:30:34 -0700 (PDT) X-Received: by 10.28.92.136 with SMTP id q130mr3653452wmb.35.1507998634573; Sat, 14 Oct 2017 09:30:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507998634; cv=none; d=google.com; s=arc-20160816; b=ienMgkPonndZyCnasns3ulK/jsLAtKiPJyY4sK06QQSQBHqB8PvJKSyn3iRekTZeIC cpDiHO5hms0f4DR17lgKwC3jP/SVvsxG/Thb/gbWwv7CYhIPNjN2u/Ghqyz0o2Jl68MR t36gTDNnpLUMG7WZTpUDvPyaBm/He/Iq49eYZgZu9c34fGcB6FXoxz3iQqB5gi6GZCTD bkK9l+JsvgiA0AqAJF/o9LwG8GRXVHE4gid9s4uVlxfZIZTbCVO0HWv+1qnDiPKqrKVC b4EgTqak7E+IuYze8GiUMiwOucb1YoSGkaauD6kKd4/F/1THd+B1muOldm8XyZIRZizz cv6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=RwEqCrBSa2khoOhhY86yiL0M6K2xJlcf5bXY8IJXFTQ=; b=VdIFU0FUEPo8vPhA1Cq3UVXAkEhL6yV4av/vrOIupKBBVN1s//V8KI8syAm8v0PsVj 3CYQoXuP+DbllgnaJV86Xd1NQVebQA3R/N4ddz6pJYY/Zy4B7un4BWHKAWkcDrxb7rtZ eh9x2wntb25n3owODhF2q3ZM4dI5x615a02DMZQk1vMHM+ry3W260xFfiTJaz+UEt6yX u0jMzFEYfeHR+3XFiAAV8ocRo8Uz+ksuQo7DzQBm8HS7nMou5FAO5LE5l7og69hnh+d/ NRk5tco3ziWDJ/dDswVrz/jvOaX6b66HfJ6rpFAowuy7VlIk3v+6ouuWdjzdUEbKo0/J RArw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IanVZ+pb; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v76si2584421wmd.4.2017.10.14.09.30.34; Sat, 14 Oct 2017 09:30:34 -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=@gmail.com header.s=20161025 header.b=IanVZ+pb; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EF9D680419; Sat, 14 Oct 2017 19:30:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 566E4689E4B for ; Sat, 14 Oct 2017 19:30:22 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id 8so24715350qtv.1 for ; Sat, 14 Oct 2017 09:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=EeJaCsOYfhiOIXx7205NUgYAN8UXy2AIAkwhm/MOuzc=; b=IanVZ+pbkW8lxFAxk3zJmpVKWkmusgFDy6Lmrn0WBkGXIdNKMTwj0/TZtvj+WfSMkl Pqzdv/2mmuoaVF4rcH2wuIcZpYYexW7yOunP4TRM9lKGoYIhO1/GwZ6dU5KslFR8qCQt eoQJH0tUTHzz1vSuKOz0cOOeeiNatmL98rJ7L+wj3ggvaExfBR/zUEIK1ipO97BpOVnx UjJWmo8DVaEA6e0f5mfEgt6Wfw0scdu07G3eFz5At0h03Ilb2MUuhAiFHI5ZOFfeJBx2 78PM0WfiM06+kN+1YSPEG5lA2kX1nvc066Gq/m9V+Ky1OuOlD5Y2Efz3BmR5+tGshRj6 LxGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=EeJaCsOYfhiOIXx7205NUgYAN8UXy2AIAkwhm/MOuzc=; b=GBwx8+yEv/lt9ZuuLzKlQZA+1oBqCnyC6vJ8dRXv6YgS/wGv0WXA5VItwS67Aa5mDR O7kg1g8F+ycd4qpXsPV3sgVz7G+gRBBEAY0FCKId40fMsg8sZG+fEITMWsgtumo57RId 60WUu5Zz6Ly2WTkL1U137s6OuaAvYG3PCMMEDZBnYOJDcfx7XnRoMWXewUUeinBj2NSO Xtx/2qbYzb075wZtaN0e0RX2y0M5yYUdNYgTP2aQXNzju0dY3/J1K7kYK36DIh62GUZa d8gw7M7is7eZTB0wKUFYgL8JKwr8jXhrnhx68dAlRCK/KyCuaGAGRGu1uYiuW7iAdzxx SEeg== X-Gm-Message-State: AMCzsaU9eHUNEmFiWlVPEDVHdp2hNYbzVqmjZkhpMDtKwU3Y+9UxnteE PJKd68d/Gf+Ver0ybsH6ppBu5Q== X-Google-Smtp-Source: AOwi7QD2StFrjwl8SR77bnwvFt/uuhYr2F47qLfuUMstrI3KJvTDtzZweeYqVE+9WIj5d+R7Z5szsA== X-Received: by 10.237.59.90 with SMTP id q26mr6890489qte.153.1507998624689; Sat, 14 Oct 2017 09:30:24 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id i12sm2159970qkh.83.2017.10.14.09.30.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 14 Oct 2017 09:30:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Oct 2017 13:30:09 -0300 Message-Id: <20171014163009.240-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171014155926.5276-1-jamrial@gmail.com> References: <20171014155926.5276-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH] configure: add pthreads ldflags globally 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It's used by libavutil and by extension every other library, and by making it global we simplify a lot of checks. Signed-off-by: James Almer --- configure | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure b/configure index a0bfb269e8..09f8ed305b 100755 --- a/configure +++ b/configure @@ -3327,7 +3327,6 @@ transcode_aac_example_deps="avcodec avformat swresample" transcoding_example_deps="avfilter avcodec avformat avutil" # EXTRALIBS_LIST -cpu_init_extralibs="pthreads_extralibs" cws2fws_extralibs="zlib_extralibs" # libraries, in linking order @@ -3344,9 +3343,8 @@ swresample_deps="avutil" swresample_suggest="libsoxr" swscale_deps="avutil" -avcodec_extralibs="pthreads_extralibs iconv_extralibs" -avfilter_extralibs="pthreads_extralibs" -avutil_extralibs="nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" +avcodec_extralibs="iconv_extralibs" +avutil_extralibs="nanosleep_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" # programs ffmpeg_deps="avcodec avfilter avformat swresample" @@ -5925,6 +5923,7 @@ fi if enabled pthreads; then + add_extralibs $pthreads_extralibs check_func pthread_cancel $pthreads_extralibs fi @@ -5993,7 +5992,7 @@ enabled libgme && { use_pkg_config libgme libgme gme/gme.h gme_new_em enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break; done || die "ERROR: libgsm not found"; } -enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc $pthreads_extralibs +enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get # While it may appear that require is being used as a pkg-config # fallback for libmfx, it is actually being used to detect a different @@ -6094,7 +6093,7 @@ enabled libx264 && { use_pkg_config libx264 x264 "stdint.h x264.h" x26 enable libx262; } enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition x265.h "X265_BUILD >= 68" -enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs" +enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.3.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new