From patchwork Fri Jun 9 12:51:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3887 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp3314306vsk; Fri, 9 Jun 2017 05:52:30 -0700 (PDT) X-Received: by 10.28.230.89 with SMTP id d86mr7703403wmh.80.1497012750685; Fri, 09 Jun 2017 05:52:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497012750; cv=none; d=google.com; s=arc-20160816; b=dxdVzsm4FUMaI7Cia897KF4Y0umMAB8kOVnaP58xiSRnaQEMgPSO7Tx+Dnc9VENjHh JnrTTTZm1msYLaFdiradDHCCrTl/Lp2D5850IkCp52OfG5pmbhES9UL+ETbehuC4KXB/ Avjrv10CGi8uELYtEpeXk82GZ2l84DDON5Eu2FrIH628M8ZgmUa2/ERoILBPIuWJ7Ioj iChxKU1pkHeLBsuL3NvUHsx5QJWwHwjUuBYpV2CDVdrmUF3JeOnzgQT/77QY9pynfzZG Job5rApFSw3jHyIwiyjGz2DTon68cidLVVvVaft6HP4myS9zeoQlQBzDmyiTf7BSlJtz TIFw== 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=bEKXhH4TQMc6GPZ5Fx8H50triCGRsMWXmf+NH4Smags=; b=pW3OnnAhE9k686oUap7qvk6ZS0qxoC+Y/MqTV6+8nrMB8wSHDlT83iThpv3ik0iP+P WJAU1QIveQnWsFiUJmMshFBe9vj+Vju6u5pTswJcJ7iSJIHcaT+6r4N06xLe9PE3x6tV q1Ls+GpMbKpAcJ4a350jIaha6LHugyXogrhkN/pbe4f9g8sTZQxD02j+WB4n1qcwMq9D xqvZD76HyoiferSmIgQaReOyMlLWkgS05+dI2LNhq1vxtU1nsBhXR/UYtjX1ovJHAA5v xRMj3xSl1/3EFuWUulNVwy/1RHSPcT/RaGOn5pEHgHTjmnDtvWA8is6Lkh19ljdgX2G3 oA2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com; 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 y202si1602318wme.131.2017.06.09.05.52.30; Fri, 09 Jun 2017 05:52:30 -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=@ob-encoder-com.20150623.gappssmtp.com; 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 BC180689E67; Fri, 9 Jun 2017 15:52:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CAA2689CE0 for ; Fri, 9 Jun 2017 15:52:10 +0300 (EEST) Received: by mail-wr0-f182.google.com with SMTP id v104so32071135wrb.0 for ; Fri, 09 Jun 2017 05:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=ff5LT1SEnyNFvhxLmvq42MFENHhFJSECPsPK00joc8Y=; b=xUgkqVpteZ95/UMAzjx4XZo79fqsSeraJvJE5zCXnn09jHFpzCIe+o/8fkokybpfbK XtObI263yFCPNLlLrX0U+0pIyTv+UvGgbNMJBYgO9bm3YYCRWGm5TPms12O28DjmnxbN 56DKlwKbG//lSUXLG6szJaj8ehMaY6Z1a396n8oeRokh6Q2n4mrUJeYYZRo91Yaln4eb i2SQvu2EtY8pS5JYD567Qhld/nQNdaX8GUKYdakDZ6JA3srKXhWfuGTlHR6L0vdJ8eKn ldAUeJWa4b0lrWXO7Djt+oSHVm07Pe7Sc+xs0wJuBiFzBb+gHw/StGG3q3dCroG7bzna MFzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=ff5LT1SEnyNFvhxLmvq42MFENHhFJSECPsPK00joc8Y=; b=eC1gpEm2Wg/IgSHxF/FZ3xZ7TbDhuvtuxGQRMh0L77Vtq8d+paKI1ppA3TxXqboa9s eHcCHkXBWNOn54kFpi1ki75IvL15c+xFRqP639bdFDiM11DacaV0JK8D5cnw2QPYnjYO /LwIB7Tg2Z2PBxfzwGPWLSK9st6kGjbXMDt+WsNeFmONlS6HzUF6QYSSYB1pta6Kiep1 E7HR8665sjCYp5d9PEO1Bjxl2enxvQfX2kDQd/ELHpc9BQw4/jmzu6b0RuDNyI97eACS iLYoNFbVDT8MdmG5wBJAsdGBId6XIu9kqwQlif7UxS0Nirpmm8cki3B65O9tLm7jOYr3 YVpw== X-Gm-Message-State: AODbwcDupeiPdq4riuCKtZOK3PpXsYRLInZyU/d2+Tp3RsPnjY62y/E+ powjduwfv6L0NDXFqs4= X-Received: by 10.223.134.186 with SMTP id 55mr18568842wrx.159.1497012730149; Fri, 09 Jun 2017 05:52:10 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id p17sm1497409wrc.66.2017.06.09.05.52.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2017 05:52:09 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Fri, 9 Jun 2017 14:51:33 +0200 Message-Id: <20170609125133.14355-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170609125133.14355-1-jdarnley@obe.tv> References: <20170609125133.14355-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 1/1] configure: require NASM version 2.11 or newer for external x86 assembly 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" --- configure | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/configure b/configure index e3941f9dfd..69bbf25bf5 100755 --- a/configure +++ b/configure @@ -3258,7 +3258,7 @@ pkg_config_default=pkg-config ranlib_default="ranlib" strip_default="strip" version_script='--version-script' -yasmexe_default="yasm" +yasmexe_default="nasm" windres_default="windres" nvcc_default="nvcc" nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2" @@ -5476,11 +5476,9 @@ EOF enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"' if ! disabled_any asm mmx yasm; then - if check_cmd $yasmexe --version; then - enabled x86_64 && yasm_extra="-m amd64" - yasm_debug="-g dwarf2" - elif check_cmd nasm -v; then - yasmexe=nasm + check_yasm "vdivpd zmm0{k1}{z}, zmm1, zmm3" || + die "nasm not found or too old, version 2.11 is now required. Use --disable-yasm for a crippled build." + yasm_debug="-g -F dwarf" if enabled x86_64; then case "$objformat" in @@ -5488,7 +5486,6 @@ EOF win32) objformat=win64 ;; esac fi - fi YASMFLAGS="-f $objformat $yasm_extra" enabled pic && append YASMFLAGS "-DPIC" @@ -5497,12 +5494,6 @@ EOF elf*) enabled debug && append YASMFLAGS $yasm_debug ;; esac - check_yasm "movbe ecx, [5]" && enable yasm || - die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build." - check_yasm "vextracti128 xmm0, ymm0, 0" || disable avx2_external - check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external - check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external - check_yasm "CPU amdnop" || disable cpunop fi case "$cpu" in