From patchwork Thu Oct 12 17:25:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5540 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2113382jah; Thu, 12 Oct 2017 10:26:01 -0700 (PDT) X-Received: by 10.28.238.73 with SMTP id m70mr2345591wmh.23.1507829161291; Thu, 12 Oct 2017 10:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507829161; cv=none; d=google.com; s=arc-20160816; b=pkGiSQlJ4LrYso8NQfuktu4xZ8KsLPU4qDWVX4XgfOgYtKLcfd5ng38qaVOQUDPNqc nZY7VjkIjBEmKSrSougG+px6GMbUJR1xmBDvVpI66CYfDi3yTia4xszpHMSDRY/QLNVE H/xxSsTlqw4/G/UNXvqxNb1Haadp/UeAS+2GucaAkqjrGKR7csLptgmSKvLyWAMdQ0v3 Qe3o4lfGf1TY75XCUlBQzAKb8YO05PiAMZyxqERcGHb5lSS8DsdSSYmWd5G+UQRsYI/d LxaUTIuaUVUU8sY8wIRJWfJpmXVU6PC5b0TWUKefwhc9wjMeRCWhFfmbQ13L63uZsRKc i7BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=QsQsfcWQLTzNJkJ0NQ/h4hhVw6zGJ4a82crcS8oSx6k=; b=qi2ZoQtN3SAiCXAOke2w/gBy37dSDPfK6v9MB4rYBjgUPes4yivEpZZqm71TTlWCFM ioAmkwzfYTo3ezRwbm6AbGytJ2TDQxLBrdjm8ka92Y5W1MJZqazbN5qq0buUD5Ba6JmH wt4pzGNTCvmEUpA30NwfWEAF27bbpVWdO3eYppmBOWwJGhcexVs3KITGzQLjF71V/rZ1 4UydF4aMy6D95NbyysdLG3dTZ2jJbgO2AFvUNMmRNw4tv4SaJ2Z7MLlyxPMI2XNSOSrD 9DcYvmnstnhRQ41DRgEClWmRNnQvka/zZ39bp2OsVTf8fPlYUpdUTwSgE9fYFg3j/JyT R3kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iz9HIzSA; 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 y3si6328633wrd.181.2017.10.12.10.26.00; Thu, 12 Oct 2017 10:26:01 -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=iz9HIzSA; 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 14300689C70; Thu, 12 Oct 2017 20:25:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f171.google.com (mail-qt0-f171.google.com [209.85.216.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB0E1689AE2 for ; Thu, 12 Oct 2017 20:25:49 +0300 (EEST) Received: by mail-qt0-f171.google.com with SMTP id z28so12509473qtz.13 for ; Thu, 12 Oct 2017 10:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=rWwKVm+0PPiNA4LS8ZrY3fY6UuT2YpeDkRDRnM0Zk8s=; b=iz9HIzSArBlbVdaR/4fqfdlRZ0N8EaXzr6/JRFRBFlUXD7MTU65aMpfbfnpBqyshLh dlQV0UFMUFrR698QdSAECPUHL0Ks2UTLjzCZMyPTdatWVpkTUibru1vPFiETCoLn/2co F9ZfgdgTROBOCrk4G2wcEq0aBRZkC5xT+F5SE+hl1z8TfjHELUBiO/0bcklgDi1SxHT5 NWT7GMtcL9AQNGfsD6hSUU0y4sn2yMBscLgVIf8+vQDJ91jk0cAmMH9iyvp8RLXw4KzA mY7ixJnae+MGU5/vQ4BFFZnF81PaUEIUPDNOKHSMljfxUF7VlagQ51Iqb0b6wC3VA9Vv Ghwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=rWwKVm+0PPiNA4LS8ZrY3fY6UuT2YpeDkRDRnM0Zk8s=; b=iq4Y7bLw1lUI+QkHnsYPCifohQU0H1sDr8g/KOM+Xgl03pXnsVrunf/iH2eMsxYJPB Ih6dMXKhZxhanifSGJgut88cebzx6CAgRJbjgAAiREiLLfGS/6ay+ZQB0T4PRvv3Vtx0 XRpDDKBL2lZ78XA/0GIwW9IosPqxO6ZRNMzc8e2x1Z+rZoHPEdxh//H8NDyRmE7FP96H bh+LT3w+/4y8V7Lq8GmqDk5tyJPRNVY6GO1m7gXID4TJl88Id+TenQ6bj9v7dR+oK2yC WF75dFtKZEhO9z00eGlCOyspzWI41j6yFj2ziQTVHrrLkmeyuRIYdJvfbuqAyzwWE47I reyA== X-Gm-Message-State: AMCzsaVTuFAqugC1Q+PsgfOjs2oMDNhSU/h4m4eUt8/MiK8j9EemAGzK YDe+uI/598k8B5nXtx7zojM8EahU X-Google-Smtp-Source: AOwi7QDogehd0vg4rlUfAXU5ejsEgLHNFbcF5C8ecf43grg1jlLhzLQ65UFJgSFxKpSNzkozdemofA== X-Received: by 10.200.35.39 with SMTP id a36mr4632088qta.308.1507829151529; Thu, 12 Oct 2017 10:25:51 -0700 (PDT) Received: from [192.168.0.4] ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id g132sm9627843qke.11.2017.10.12.10.25.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Oct 2017 10:25:50 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org References: <20171011212622.A0E83175447@albiero.videolan.org> <20171012002236.GB11608@nb4> <34e27316-ffc8-f815-d03d-37bbd4b922c5@gmail.com> <20171012165656.GG6009@nb4> From: James Almer Message-ID: <80511c36-5370-c366-8889-d31204c7e9b6@gmail.com> Date: Thu, 12 Oct 2017 14:25:46 -0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171012165656.GG6009@nb4> Content-Language: en-US Subject: Re: [FFmpeg-devel] [FFmpeg-cvslog] Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63' 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 10/12/2017 1:56 PM, Michael Niedermayer wrote: > On Wed, Oct 11, 2017 at 10:30:13PM -0300, James Almer wrote: >> On 10/11/2017 9:22 PM, Michael Niedermayer wrote: >>> On Wed, Oct 11, 2017 at 09:26:18PM +0000, James Almer wrote: >>>> ffmpeg | branch: master | James Almer | Wed Oct 11 17:55:25 2017 -0300| [6dfcbd80ad446ff163b47f2bf432bbf706436ea8] | committer: James Almer >>>> >>>> Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63' >>>> >>>> * commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63': >>>> build: Fine-grained link-time dependency settings >>>> >>>> Also included are bug fix commits 5ff3b5cafcc685b6936d16602b0f80aa09a95870, >>>> d9da7151eef7fc469787e7298196cea291acfd82 and >>>> 5e27ef800bfa2be17a6353ddedac6b7400e4624f. >>>> >>>> Merged-by: James Almer >>>> >>>>> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dfcbd80ad446ff163b47f2bf432bbf706436ea8 >>>> --- >>>> >>>> Makefile | 3 +- >>>> configure | 297 +++++++++++++++++++++++++++++------------------- >>>> ffbuild/common.mak | 2 +- >>>> ffbuild/library.mak | 2 +- >>>> tests/checkasm/Makefile | 2 +- >>>> 5 files changed, 187 insertions(+), 119 deletions(-) >>> >>> This breaks build here (linux x86-64) >>> >>> ./configure --enable-libxavs --enable-gpl >>> ERROR: libxavs not found >>> >>> Iam trying to test most patches for FFmpeg before they are pushed, but >>> i can only test what is posted for review on ffmpeg-devel ... >> >> Testing locally i see it's complaining about missing pthreads and libm >> ldflag, since they of course are not part of the global extralibs anymore. >> Switching detection to pkg-config would be ideal, but for some reason >> even the supplied .pc file doesn't include the -lm ldflag, only the >> pthreads one, and libxavs looks like it hasn't been updated for six >> years now (at least the one in sourceforge), so it's unlikely to be >> fixed on their end. >> >> Can you test the attached patch? > > seems to fix it Pushed then. Thanks. > but i get a build failure with fontconfig now: > > ../configure --enable-fontconfig && make -j12 > > LD ffmpeg_g > libavfilter/libavfilter.a(avf_showcqt.o): In function `render_fontconfig': > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:606: undefined reference to `FcInitLoadConfigAndFonts' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:611: undefined reference to `FcNameParse' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:617: undefined reference to `FcDefaultSubstitute' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:619: undefined reference to `FcConfigSubstitute' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:626: undefined reference to `FcFontMatch' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:627: undefined reference to `FcPatternDestroy' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:643: undefined reference to `FcPatternDestroy' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:644: undefined reference to `FcConfigDestroy' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:621: undefined reference to `FcPatternDestroy' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:622: undefined reference to `FcConfigDestroy' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:635: undefined reference to `FcPatternGetString' > ffmpeg/nasm/src/libavfilter/avf_showcqt.c:613: undefined reference to `FcConfigDestroy' > collect2: error: ld returned 1 exit status > make: *** [ffmpeg_g] Error 1 That'd be because showcqt is missing its fontconfig and freetype deps in configure, a mistake that was hidden by extralibs being global before this merge. Does the attached patch fix it? From 4043aa1b28dfe6a86a1d68884da6716d18c93b4b Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 12 Oct 2017 14:17:43 -0300 Subject: [PATCH] configure: add missing libfontconfig and libfreetype dependencies to showcqt filter Signed-off-by: James Almer --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 2de19fab0f..211ce9e33b 100755 --- a/configure +++ b/configure @@ -3267,6 +3267,7 @@ scale_filter_deps="swscale" scale_qsv_filter_deps="libmfx" select_filter_select="pixelutils" showcqt_filter_deps="avcodec avformat swscale" +showcqt_filter_suggest="libfontconfig libfreetype" showcqt_filter_select="fft" showfreqs_filter_deps="avcodec" showfreqs_filter_select="fft"