From patchwork Thu Jul 1 21:54:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 28734 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1041915ios; Thu, 1 Jul 2021 15:02:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMybX3CKh4BquQWGl/esA/MAHwAfuDAvWpDwd2v/CO2WQ7ZU/h+Q/WTpPVpPRQve1e4yhY X-Received: by 2002:a05:6402:34d3:: with SMTP id w19mr2506021edc.288.1625176960692; Thu, 01 Jul 2021 15:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625176960; cv=none; d=google.com; s=arc-20160816; b=MfIlJD590ubgFtddgtMnzA9Vzxeq4s2lS0ap2REHY23BjUeIKUHjfBllkFpTrMzZdh j24fd/hLts08mhiNu6t/UfZeQdaDHWTlx39DwR+0OgAauL52i9sEtEGUa7V12rdw852s tak36nNUMiEBAaBtz5VUiXEzWuVN6UlChKIqK1aAm3zKRrG5VBrjqAxidoyH5JO/2uQp rWL36kkkiyiWJgZbGfZz6hGIXQc3ccJTYqqyfpUYHxFQ4GOrEgHM4DimxaklzTHx0R1/ tJuErtcD6vB6nxCdMKw1spGvyuZdk9+tRWAgY+s7R3sAKUdYs1lhM3rlJ0RyIN06NnKH KRQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=T/sVsdAJbNUfn78JuKU9lkDhl+cNc+RiL86DlPT+Cxs=; b=FhiERe8dVrlr+MUNXufvAv/QOacog7sygZpxnYnQciF/z2meV8RCJAXQUcsdJDhx1S GxuhTCRSNlLxyHFDZceq4irdoVYSWzDw+yrNIGWjIKXvQYqsAdPdnUDeu2sic0NePvJ9 2zVZt3qP85lbmOPYION/FCe630zVB7p2Si5l2ZHFQH8vMGb9UAiWTx20+cxXk091iad8 gxuEsQdhxk76C0Sw5KVYQ+8xYussWbcMqsKDt0j/8p1fvHXfJZeWrhOBUQLE3oosK0UG RBvhJUvtV+3n+UVur5qAmkjgoy+mg+Fm7rK2x+R9SnDoOa/AI6fFGw/po60Dvsv9MwAC Ycnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YvsQoBv4; 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 w12si964713edd.491.2021.07.01.15.02.40; Thu, 01 Jul 2021 15:02:40 -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=YvsQoBv4; 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 70B3668A57B; Fri, 2 Jul 2021 01:02:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDCA4688178 for ; Fri, 2 Jul 2021 01:02:30 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id t17so14589654lfq.0 for ; Thu, 01 Jul 2021 15:02:30 -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:mime-version :content-transfer-encoding; bh=d8kqpelCljsQMho/EOSsmf6WSi4pYxRErPOfzUHnAb0=; b=YvsQoBv4MahYqsC67a5OWAApj15ZimoOWZ3bilbSem59YJOeC3bTfK5tr6DRRmi/pK gWQ7F5dIeMVfb1flq2XSDNJeb//3wOv+8Ss+usYv9AEsyjFwrEKooQuvGCdJ5NS6qg85 D9Xye3vh8scTLzpLwqULVkGeMRoE3Cqy97cSXjuV3G0E6B6PtpypYlleEILPd5kdmyGG 3bvzM7MUucJUhKdrWzKodYFwYfBmvbjt/PO/AuS8QMIq7GKgDNOBu3L9L/BI9QVU9oQj dOu0zPvHqm4T3EIjYZK+Ro4J+cqA9duQf2BbITdkh8AtOTMsA1rMiatuiteWF+gSeKo6 a6BA== 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:mime-version:content-transfer-encoding; bh=d8kqpelCljsQMho/EOSsmf6WSi4pYxRErPOfzUHnAb0=; b=f300/piX8UTdM8/Vv1vWPFsoQUDKCGQkGltgoypB23KvZUxj3uuIqKWe8063n7TMPU p/y/HkmzECd+cCVuVhSvw5ppZM6Qb4QpvLwWvq20N9+RRV2v+Un6Jew6K564g3lE7tDA vluVdyTBlL4ES+aIfd7qtrQQkmNhC1iUs0ddoBSVn1qKlDo4vKGTvYVrRfE35VHKmYt+ NxbdwBYzUDZkGJiptG0t6MN+P9a44N1qkSXtXruT4q9iBgFQqI1VPlR806jaZ1i0gWPw sOxMVv75GOUYQU07p6mCH5ZraB0tBHCRlm/isztV7Zfamm1D9Kdv0KJcyFchyxoxsqDB bA/w== X-Gm-Message-State: AOAM532FMdsGndUfZ09pzfBhNkAkqMHf/KS3vCIIkV+v9yCWeJc1Y5AT KNQliAhC8BA8t2yM8+Th8W/GPOPT26YtfA== X-Received: by 2002:a2e:9b98:: with SMTP id z24mr1271071lji.161.1625176495329; Thu, 01 Jul 2021 14:54:55 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id f15sm84225lfa.56.2021.07.01.14.54.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 14:54:54 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jul 2021 00:54:45 +0300 Message-Id: <20210701215447.34169-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210701215447.34169-1-jeebjp@gmail.com> References: <20210701215447.34169-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] configure: move x264_csp_bgr check under general libx264 checks 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: p1taKw477X2D This makes the libx264rgb check work when pkg-config is utilized and x264.h is not part of the standard include path (as is often with cross-compilation, or when you just have a custom prefix in general in f.ex. your home directory). The X264_BUILD >= 118 required by configure since 2011 should have X264_CSP_BGR defined unconditionally (it was added a few X264_BUILD updates earlier), but as 134cba728bc6f4e3c5caec98b800faad244d8cfb added this additional check, I have kept it for now. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b124411609..ab27220688 100755 --- a/configure +++ b/configure @@ -6132,7 +6132,6 @@ check_builtin MemoryBarrier windows.h "MemoryBarrier()" check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)" check_builtin gmtime_r time.h "time_t *time; struct tm *tm; gmtime_r(time, tm)" check_builtin localtime_r time.h "time_t *time; struct tm *tm; localtime_r(time, tm)" -check_builtin x264_csp_bgr "stdint.h x264.h" "X264_CSP_BGR" case "$custom_allocator" in jemalloc) @@ -6530,6 +6529,7 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && warn "using libx264 without pkg-config"; } } && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && + check_cpp_condition x264_csp_bgr x264.h "X264_CSP_BGR" && check_cpp_condition libx262 x264.h "X264_MPEG2" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 70"