From patchwork Sun Jul 24 10:11:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 36935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1440803pzb; Sun, 24 Jul 2022 03:12:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u/EVNvV36ihD+8WdFdsTFWtWe6apDZ8nt+LJ26TIgdJ7jt4jjT/FZnz6GiE06N1iVdSRDz X-Received: by 2002:aa7:cad5:0:b0:43a:bd45:f6e5 with SMTP id l21-20020aa7cad5000000b0043abd45f6e5mr8271933edt.63.1658657548235; Sun, 24 Jul 2022 03:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658657548; cv=none; d=google.com; s=arc-20160816; b=D0ryDJ0OyrRqxD2ZG1BbKmQCZejm/W+/hREES0Yb/ae7OxeUFff/dek+frm18Y4tCJ 57vMqSu0hzUdQ2+m3EyUcMd07lT2wfQJNQkdpgxWejx1gHo5ErRc0f/KDovWRDI8sFzd ZS9nWCK0/tKbbKyrFIkwSGqZgo9rGp+KBzSEZ+SUp1iVW9SBTrwfUrXhD1snsaq58GwC 6ilRBSa6CQjCD1d61OmX852SUoybCzb0sRzN5eoodspGdWYJ7YN9XX2xFhQ5dudvy3j1 9pTEK6pNEpTremBSYisx83jYB1sTYR53rqHkD2katrFDZ5TuroWv9W74XAozzWG76AKN IUAQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=gnnHqOH2KFmjd8OBq/d5Kgfr50dyqvNGc2Wog9KgAS4=; b=e3VpZBl522y7alPkurwx3CFPqn+IjZ8MuKEJpcPZ4sKOhYnsLqv3gU0i3mYV8dY6wX /QMlzyZC70QbUwzMwpbvIN4ev4wxF71WV6KwKD0XKJkyceAfvhQihoHa/sG4oajNjm0p kouQracBj4N9QON+zd4AKFjgllKR6Rudxawu6HNdGnXWA1Ih9U1gp9y3NtX6GYrrTfeF 2KYDBfAhywxMef96EABlx38ZFVty87Aa+eQzdwt26CTn07HBKDuEMok0X4PODNTpyr/I TjncDER47sdevRX6tDKORapt6qZ9m7QQ/U9qXl4K5KzG6vVILhGyUN4jk0J82euYk6wx miVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jHxFIY+C; 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=QUARANTINE 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 nc41-20020a1709071c2900b0072eece129bdsi12228617ejc.59.2022.07.24.03.12.27; Sun, 24 Jul 2022 03:12:28 -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=20210112 header.b=jHxFIY+C; 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=QUARANTINE 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 76CC968B7D3; Sun, 24 Jul 2022 13:12:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FDD068B1E1 for ; Sun, 24 Jul 2022 13:12:16 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id j22so15600013ejs.2 for ; Sun, 24 Jul 2022 03:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Binbbp3L65rO7nYcFfqXScWvHXC3ZnAtE7Zl1I//hZA=; b=jHxFIY+Czsfpxj+yFdBEXKXeHWwudkAnHze6xDEbwntplTHiIKWLC+M6AbUSpS2lQ1 WHY0noMI8F9JnsuEHNhsR5OIjB0LtlWiZVqi0Jc4PK0/QwOmAJ3Dicp0FEazyciMAmmh MuS57OdJ6KzKqzT36UnluPV5a1hS0fM8AenBinzXzOoMVAC9H2N6UReCHgmIzw+pim9z ZMRK9PldxpmnyuijDBzCf1yKOjofQFVX1QwiCH0BPByONLUoX4LIBSuZVDnO9yFwxu3u lexmcesZ8IcsFhfhqK4Fcs/y/f05p2Na/PcitBIOJOyQffVKOOyzIOJk359ZJ/extIWA FnWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Binbbp3L65rO7nYcFfqXScWvHXC3ZnAtE7Zl1I//hZA=; b=WkZl7ffKONcv2VBsW2kM3jsjOnV3dXMlQelAAy6ROo1sP4K85w/0Jhz5o5AJF0Mo4X uy0sy8g8AX7MgLyDpbrJGOnDRaGcitfCsHCTiq13MVajONWnxwkaSRV24+WVOzOC4nHv mOXcv6oI7D2AEEE+a7KtYJ8veC38H7Fuh+KfRqjkElooEdC2vmwbY9fvEwIfptoyY7Iz f8L6Rx/QRZ6q8rh2VoZ6JMua/QoxVMy/0oBQhqLjtxC6tXR0Dt7aj3p6WYUoNvCrnX2c cyAs9BvokocR1Ks1S013EptPqEegVB2g1JK1iC3sE+lZ8QJUyqLPkugGcDaUiJfGhi+W tasQ== X-Gm-Message-State: AJIora+jCAiN5hnMYH1yZW67N1xTairlYJ6Vmiodzx9zzsrToDdDdCbZ 2mfYDepfXSzvwhkcHkJW10GxoSlKsEU= X-Received: by 2002:a17:906:7308:b0:72f:3294:8002 with SMTP id di8-20020a170906730800b0072f32948002mr5796360ejc.311.1658657535511; Sun, 24 Jul 2022 03:12:15 -0700 (PDT) Received: from localhost.localdomain (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id es21-20020a056402381500b0042de3d661d2sm5409509edb.1.2022.07.24.03.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jul 2022 03:12:14 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Jul 2022 12:11:49 +0200 Message-Id: <20220724101149.50584-1-epirat07@gmail.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: properly require libx264 if enabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qDFoJkCGuTTK When libx264 can not be found even though it is enabled, it should error out properly instead of silently disabling it. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 46f6490a64..6629d14099 100755 --- a/configure +++ b/configure @@ -6673,7 +6673,7 @@ enabled libvpx && { enabled libwebp && { enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } -enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && +enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && { [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&