From patchwork Wed Jul 7 19:00:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 28857 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6364202ios; Wed, 7 Jul 2021 12:09:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLVxp1X77YCF+FlT5hn0ah2gTC9XwAW34rE+TruRLXRmBlm+80yUz8jVVFXgQwYysjLulN X-Received: by 2002:a17:906:248c:: with SMTP id e12mr16702754ejb.113.1625684950727; Wed, 07 Jul 2021 12:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625684950; cv=none; d=google.com; s=arc-20160816; b=NpleOBk1WCXed4EzBKoRGv1cxn108BrMTsWw/k5jmchD8qwdCzZvrZjA047uHaY4J8 J7v16ZLMHCiI/c32s/4CDNv7TgCSbS5srVq4oC4v2V4gqI4EHCWpMSzYnoOGleENwJdV JxosQKCXS43Apj2vp7NTwv741FdHI39lMkp6R8AqereN8ERHSWokgwI7HLcN+b0fVXtK GbpJvO3CpuW2Qtp8hd5jySq7GW4Jt51bWbDp9CUz8Tj4kYM4VNGAhM4KofSe7YNV/y/W WTHQRDUxFxLZRwHy68GeGpqxuPbn3qgs9OdTSI+gAxqrKKT1uQsl4QpdnNr2BwprgWbR ibmw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=5Lw2ygbIRYuFBlno6euZLRKPECA9ts6THK7UWJxzFZY=; b=cuB1Z3lGHOsN175Y++8Xxja6l8AcgGCPOxbOq/dZ7jfzPu9YTHbXnXM4Bb+6IkiX6d /zdrqWvYufLUQhF1NdeDj7jZUKg11TQOPUu1Rpu19wOhlm+/I7Uj980k5zXwG88FeLgx m5q7Pb6UgLs9U038vsIxyp515F+cFG4/GjEIAy2VrIXMM1KFvtHIc/v7cTe0Gq18JFC8 BZOvOKXvns+ZVnibyNMQwIJBwnpPZKexWdSeViRVZ+ac5dgswlwmtNB/xSVIT5YHX/eP So69A+zAtxTJFSe8JZMlR5ncFuTuPsYpH9H+R5BB2FnR0ZXYC/9ADkEQlYZxzWaOf1lo BhyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="pbecY/EC"; 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 q18si19054323edd.415.2021.07.07.12.09.10; Wed, 07 Jul 2021 12:09:10 -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="pbecY/EC"; 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 5C31F68A7BD; Wed, 7 Jul 2021 22:09:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0122E68A543 for ; Wed, 7 Jul 2021 22:09:01 +0300 (EEST) Received: by mail-lf1-f49.google.com with SMTP id q18so6800388lfc.7 for ; Wed, 07 Jul 2021 12:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jI9Dn8DaHbQK4UXyFghf/B6FBu49gsdWlcUPxabEMXo=; b=pbecY/ECKrTtVCdpyjlQ8F8fzie5DnJC7ixK5Zzv3InrO8HK/GzUB6lB29qKKkt2mK 8Fr1+SZ7zFkJymCKdnc3S6mTs6FaH4tXVotDFyLRfGjWNeZ48C7N7lci7flF3GPhkL1Z ZLtj9PcNXIOD0QNUZ/m6zR8cqEIMihniqYN8Dog8yq2HW8rIOE1cyTBmANmJqyL8gHmd BTHwEfXqj2QLy+u0eecfEp5hwcFk2VG/++vWse5lNqJq0/cQWO3gPusUvVlX0YyRASNr paSpmmItSwY2wK89IoisIo23EopvRMvmj5wl54d0IkJI/wU/7A4M77xaVMFeX/GMToPx VSlA== 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:mime-version :content-transfer-encoding; bh=jI9Dn8DaHbQK4UXyFghf/B6FBu49gsdWlcUPxabEMXo=; b=EL9gPpIJ7su1kViCaYzWgpNiaRDzgkcepsOiNOvRFUjFxgRhn5ZMBel+0/Tz9GyuLo rvtXVaaQpRWLQfvxopv7FYD44wa5P4RQDCgsKTRFqnIDQ1GJ+a5hobcygNWlnBPl29Fy C9tVlNKO+OHyuGeQrNPjIWqH33U05NNqvgasG1jeaKzMonIdl90TECIbaaFBoQfj4iwn Ph0E+HRPOh6Extp9LPgadgmvlrwt0Ch06DucJSQanRsI2OJhoOgQUoidSI+9Rv9zNniF KNIhAUMW4dkTaydkIgA59AVYD2KZkQdY0r77F1fGXVOpKwFj/joBPWYpZXuLNcgD3+Uf BUbg== X-Gm-Message-State: AOAM531i7sckL++VEomEMwe6xi7CczaD4Kjsh7yl4dS50JGaKL6qucUf SheXrMxdXvxgU25UXGxJEnFrpgCFmsyImkqm X-Received: by 2002:a05:6512:22c5:: with SMTP id g5mr20287305lfu.476.1625684467150; Wed, 07 Jul 2021 12:01:07 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id w13sm2252520ljd.27.2021.07.07.12.01.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 12:01:06 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jul 2021 22:00:58 +0300 Message-Id: <20210707190100.76447-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 0/2] libx264 configure check clean-up 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: XEqr6Wpv8f1Q Changes compared to v2: - Kept the CONFIG_LIBX264RGB_ENCODER define check for ff_libx264rgb_encoder and the AVClass for libx264rgb. - Removed the libx264rgb removal from this patch set since while I hoped I would be getting the initial two fixups reviewed even if people would oppose the libx264rgb removal, so at least those could get in - that didn't seem to be happening. This way I hope people would be more likely to focus on that bit at first. The patch set contains two improvements to the libx264rgb configure checks, as I found out that for all the time I had been building FFmpeg with a custom prefix and utilizing pkg-config - it never got enabled due to the configure check relying on the header being in the default include paths or in extra-cflags. - The first change fixes libx264rgb enablement without having x264.h in the system default include path, such as with custom prefixes. - The second change removes the separate X264_CSP_BGR check as x264.h has this define unconditionally defined with the required X264_BUILD 118 or newer (it was added a few X264_BUILD versions before). This change was checked by bumping the require_cpp_condition check to X264_BUILD >= 255 and checking with both pkg-config as well as by not having PKG_CONFIG_PATH defined as well as making the non-pkg-config check pass with `--extra-cflags="-I/prefix/include" --extra-ldflags="-L/prefix/lib -ldl"` So the X264_BUILD check should properly fail the enablement in case X264_BUILD is older than the one requested in the relevant require_cpp_condition. Best regards, Jan Jan Ekström (2): configure: move x264_csp_bgr check under general libx264 checks {configure,avcodec/libx264}: remove separate x264_csp_bgr check configure | 3 +-- libavcodec/libx264.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-)