From patchwork Fri Dec 15 12:52:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 45160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5626392pzf; Fri, 15 Dec 2023 04:52:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEZlVNnmaaOKNiHItsHAXYhblo9aM80lD2RvFhidGKExBfttHTu0PdD4OT7XiGffy6Bv8I7 X-Received: by 2002:a17:907:7d8c:b0:a1f:6961:76d2 with SMTP id oz12-20020a1709077d8c00b00a1f696176d2mr4941828ejc.29.1702644751231; Fri, 15 Dec 2023 04:52:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702644751; cv=none; d=google.com; s=arc-20160816; b=o7KW6VNMWsMUST/pwKtFtQ7j4t0F30ph447+AvU/wly2GX2ZeXSMrAgKXHtUVRSN0m 0a/crupNuLufgBAFlevlESXcp2B4BFV8e53MKl9clI/c5PoY7p+uvVhHT2z/VQBKRez4 hNfX4FKc5DF5YxKDk9EJhRwTtZXDJhJWkMr5SQGekwKqRjxYjcIZiy8rbinTmWc+FY3Y yNIp8jE430I2dxPZA7PMwr0x13mS2Qs1Qd/IOWob9gJ/7/tx+EyXL2joW1PDcY+6JaMc KyshuA9Bq+Gw9I3DsO6IPIHV5Jj8Tn6UFen63kXMhcLB9pNbMmmJ1xpzJF1MLwpynRhO Vj3A== 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=FCIDIJHghXMrOt5LwnUw81UN2zV/L2hh6zakGOci2TY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=dW572S56J2/y2hZ58llsSdHKguc+uF8qzrJY3rjgFr85eE9s/WxFHsPplxGHMxE2D7 YH7AU+BLq0W15xf8l6Lh7ij7Vz6gRLYo623p1+YKahZ4uqGYnS/b08OQk/6Vh01g8BAo rWUxIzY/fxO1b0s38HKscTkmd39ec8mx/5Za4X7R4TFtn/0ENiWqCXBYPj1mRqiaEAfH 9d5gxdHkt4qh+GxnYNZEeaKiDnQWH4PwmnWGwGw/jmRN9S72lzkLJHrc0T8XesUZoraG PLN8VatYTF9RQ9cfz9YkMqcx9lI5fb0ySZvGGWMpxQS1kDnRbNfPQkpAj4pg7gR4RYf2 skdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=LRN7pf2a; 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 o5-20020a1709062e8500b00a1ce99ee462si7039307eji.267.2023.12.15.04.52.30; Fri, 15 Dec 2023 04:52:31 -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=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=LRN7pf2a; 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 D6B6768D2A3; Fri, 15 Dec 2023 14:52:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A09268D0CB for ; Fri, 15 Dec 2023 14:52:21 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-50e0daa57b3so581748e87.3 for ; Fri, 15 Dec 2023 04:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1702644740; x=1703249540; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=kHmWyRqsIXvih7/d0ugmnaCfZGdMikJShJIyganrJsM=; b=LRN7pf2aQOuyTUYpDRH2RasZQIvUuLp+uWQ1KeIHcXsr6BHTHRvfvytOzCNsmmoFtj 84h0StDbffDsCPUB2rXg9JwO2mfY+sM9vmbTMhHV5RndlP7Y2lyP0yHOMAfFj3QMKWcW VL4kOm5ocClvovC2w6zKqHc9EshEHbeStJ6ZfxGld15LHaVX4SMGp2svxir4PI5Ypt7o PgJS2ULveaLCuTqaFMi+1F0RVzFgf2/qL/8nJbnfM0ZX6IkGPfKOycyE5X6JbQ0QosHT r3D5yCfx0/frnjDlcDCDhZAA7GQYVWoLrS9ZkARwGVvucHmv1ydVcFmU4Um7zdUuAOqR po8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702644740; x=1703249540; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kHmWyRqsIXvih7/d0ugmnaCfZGdMikJShJIyganrJsM=; b=tJZ3wu1diZIGHVue0nYXsEGBmtUBL3d3DlPyI3yK5Z/Cn/DBj/a4ZaArux4p/MVsgy oI+a5jKKr1V41hUV4Zv/nUv/2OXWAqGuvKJeP8soDaZWQphN1tnwwPU71u+6Q3ySbrQ3 Qwi2kUF+JgED7pDKXlOusvyz2neeAtz3HXb1FSvD9zSiTRDI+W7N01dFZm6V1yMnJ1W9 /6qjBS/t/vBk4bCcnWP+l9Pbwr9WVFOxoXtvzbdID7Iufw4ktigCI/83X8ozfdTqwRnO Go6emrJV2kmmrKXh3B6ZuIlgct0JVdgPDecp1OnLModJiaTMwvtO7ZSI1SsoSkPWPaSA ATCw== X-Gm-Message-State: AOJu0YwDHP8/rgHIMhpEs8ZZXvhmytS3TWEWymVQ6v5KdkX3JH9L+bDx a/eIsP4hxBWw46iktiGLWyU+2wbDFTVcU9jB8JnDsA== X-Received: by 2002:a19:9111:0:b0:50b:f88b:1685 with SMTP id t17-20020a199111000000b0050bf88b1685mr3194557lfd.193.1702644740002; Fri, 15 Dec 2023 04:52:20 -0800 (PST) Received: from localhost (host-97-144.parnet.fi. [77.234.97.144]) by smtp.gmail.com with ESMTPSA id i4-20020ac25b44000000b0050945385a2esm2120283lfp.228.2023.12.15.04.52.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Dec 2023 04:52:19 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Dec 2023 14:52:19 +0200 Message-Id: <20231215125219.85897-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: Add a --disable-version-tracking option 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: VKOaeDpUH+hk This disables regenerating ffversion.h whenever the checked out git commit changes, speeding up development rebuilds. Whenever this option is set, force the version to be printed as "unknown" rather than showing potentially stale information. --- Makefile | 7 ++++++- configure | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2fc3e538c1..dbc930270b 100644 --- a/Makefile +++ b/Makefile @@ -133,13 +133,18 @@ endif $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) VERSION_SH = $(SRC_PATH)/ffbuild/version.sh +ifeq ($(VERSION_TRACKING),yes) GIT_LOG = $(SRC_PATH)/.git/logs/HEAD +endif .version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak .version: M=@ +ifneq ($(VERSION_TRACKING),yes) +libavutil/ffversion.h .version: REVISION=unknown +endif libavutil/ffversion.h .version: - $(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION) + $(M)revision=$(REVISION) $(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION) $(Q)touch .version # force version.sh to run whenever version might have changed diff --git a/configure b/configure index 7d2ee66000..9911428213 100755 --- a/configure +++ b/configure @@ -504,6 +504,7 @@ Developer options (useful when working on FFmpeg itself): --enable-macos-kperf enable macOS kperf (private) API --disable-large-tests disable tests that use a large amount of memory --disable-ptx-compression don't compress CUDA PTX code even when possible + --disable-version-tracking don't include the git/release version in the build NOTE: Object files are built at the place where configure is launched. EOF @@ -2576,6 +2577,7 @@ CMDLINE_SELECT=" optimizations rpath stripping + version_tracking " PATHS_LIST=" @@ -3980,6 +3982,7 @@ enable $DOCUMENT_LIST enable $EXAMPLE_LIST enable $LIBRARY_LIST enable stripping +enable version_tracking enable asm enable debug @@ -8013,6 +8016,7 @@ SAMPLES:=${samples:-\$(FATE_SAMPLES)} NOREDZONE_FLAGS=$noredzone_flags LIBFUZZER_PATH=$libfuzzer_path IGNORE_TESTS=$ignore_tests +VERSION_TRACKING=$version_tracking EOF map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> ffbuild/config.mak' $LIBRARY_LIST