From patchwork Sun Jan 21 12:31:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 7379 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1764015jak; Sun, 21 Jan 2018 04:31:26 -0800 (PST) X-Google-Smtp-Source: AH8x225bTE9mUl84A4JjEjlcB3oj3+1ne2SR3FeljYZLjpY6MNEH4zpNQzNIIlYDKSykfbzso6U0 X-Received: by 10.28.229.194 with SMTP id c185mr2729117wmh.142.1516537886761; Sun, 21 Jan 2018 04:31:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516537886; cv=none; d=google.com; s=arc-20160816; b=kXT+KszNhIu4bAqIyCPERJafmHe1+eWk9tRiM1TzCdKoPt+cS5JODAl51xhmlt94hA RzgPK5BkjpFWgfCZoh25MDRnbx0S0sUvMmj1RIv9OvuUt/44IbC0NK+JUm4KV0e4tQkN ErbeY8cXJ4BFaexsOmC58Io6M8uS2yfhHCxbpxk+1K0mzuJNGuy9ij+TIpV/9JTS2NyD KfXCgnVDthYZzCnYPU/yxDYijqnt1sEm/UWx9fqjecRhF7b9HX+0iKmdOoxofEZJho2Q KYamw3or2QggMMvS+R5cY62I5FWOBp2WtETSaJlNAr9yshnoJshlppUyqoFyn1qsgWCa fowg== 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:mime-version:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=PIFsCUA39H0a3tBYEDO66HcnfOJ/COLNhQz4ikph8E0=; b=ysPAKjSC/jFtBBNAL3gQaRIV19wwXGuCRk+kb/5uf5aE5NzYGZAPif2KasNFf1Pwh4 Swr8iRNJgXuiQIK2Z3Q7gV0JX+z7RoKWleuByRAUJ8uezH7RrztLdxguWC23uqV1G92Z nhNB0o/Aj8W5YCtmk7MY/i4u4aq6GiXcdk4Xto6cDsj3OdQR0DLbuPNILwAGoW3Gfi3C 4yQo0ozYwUc6phZ7uX2UNXILoVd2JQ/zfnMOF9sYXkKgKAlsv44r++/8TnD/UKZYjiAw +XHeWD+dSn0vibIGGS98s/1N+1112Z9CWJN24oQTNU3iK1v8tG7/cB/vQk9PD9DcDbNq R6Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde201610 header.b=JeTrBxXT; 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=mail.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d124si3731872wmc.90.2018.01.21.04.31.26; Sun, 21 Jan 2018 04:31:26 -0800 (PST) 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=@mail.de header.s=mailde201610 header.b=JeTrBxXT; 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=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 551FF689FF3; Sun, 21 Jan 2018 14:31:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout02.mail.de (shout02.mail.de [213.128.151.217]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 399516899DC for ; Sun, 21 Jan 2018 14:31:17 +0200 (EET) Received: from postfix03.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout02.mail.de (Postfix) with ESMTP id 13A055FE63 for ; Sun, 21 Jan 2018 13:31:18 +0100 (CET) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix03.mail.de (Postfix) with ESMTP id BF87840005 for ; Sun, 21 Jan 2018 13:31:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde201610; t=1516537877; bh=uYu0lFTfCLUECwVWmurMRF5RpMgSXcrZlQpNwMiawrU=; h=To:From:Subject:Date:From; b=JeTrBxXTtCfYeNPHAT5CINDBjwRTiZ9bLm1ACCEu5C0AhXS3Zy/HqBvvuPZRWpdV/ i14nMlDgFmYXG91u7qOXjNjXUVj7P9CRIyg84IDAbJpEI26iR3gwvXnwRrw5w6QLkY mG+XAFoWKjN9TPcjsF6C/xxC8x3nXF08aH0MAe/w= Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id 8A2A0805AA for ; Sun, 21 Jan 2018 13:31:17 +0100 (CET) To: FFmpeg development discussions and patches From: Thilo Borgmann Message-ID: <520b41b7-a520-8b1d-bc33-c89f27ba138f@mail.de> Date: Sun, 21 Jan 2018 13:31:33 +0100 MIME-Version: 1.0 Content-Language: en-US X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 2033 X-purgate-ID: 154282::1516537877-0000749D-6C17ACA9/0/0 Subject: [FFmpeg-devel] [PATCH] configure: Fix checking external non-free 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi, fixes rejection of non-free libraries if "--enable-nonfree" is omitted for me. Git blame says this line is older than 10 months... is it for some reason the expected behaviour? -Thilo From 6fcb95d0094341149e865982b00cb763f99a92a3 Mon Sep 17 00:00:00 2001 From: Thilo Borgmann Date: Sun, 21 Jan 2018 13:22:53 +0100 Subject: [PATCH] configure: Fix checking external non-free libraries --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 5d53362..8532c25 100755 --- a/configure +++ b/configure @@ -3773,7 +3773,7 @@ map "die_license_disabled gpl" $EXTERNAL_LIBRARY_GPL_LIST $EXTERNAL_LIBRARY map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST $EXTERNAL_LIBRARY_GPLV3_LIST enabled gpl && map "die_license_disabled_gpl nonfree" $EXTERNAL_LIBRARY_NONFREE_LIST -map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_LIST +map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_LIST $EXTERNAL_LIBRARY_NONFREE_LIST enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }