From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 10DE74F997 for ; Mon, 23 Jun 2025 22:56:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3555A68D5E8; Tue, 24 Jun 2025 01:56:32 +0300 (EEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 823D268D3AE for ; Tue, 24 Jun 2025 01:56:25 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-748d982e92cso3078352b3a.1 for ; Mon, 23 Jun 2025 15:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750719384; x=1751324184; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=rT/kZXs+KVPzZgp8oL8A3QcTapPNotIxJE0oow2uvUE=; b=QwOhPvDDq/bzAlrX068DV4l0YDa7qYVaR6CM4qRkhhUz1IDvJwnhcosnAjHHfSoRA1 Xsg2MNGbRTC8VcyiFe+xlrGvYIZy3lJnC9DKZVs/XiF5C+cyp2qe4JsQATboOG/AjNWe 14GuBOK2amvFhN4Q4x32lHjTMsiCu0xPtd6ocvm7NU5oC73FyyIrG4er+TSn+jYLyZNc /n9J2gQUHGgzCZBIaHpFfa39qfyiwb2TzxUi9PXlqlMpaTBIW3hN7GjLHIdigZnxxvs6 lvvMRDSJ0xBVWS/YHLPcvb55xgmLFXXFP4eg+Vg1Lst91Jk5pkCWGuX0cz4/ZKZNUHLm 0zlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750719384; x=1751324184; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rT/kZXs+KVPzZgp8oL8A3QcTapPNotIxJE0oow2uvUE=; b=DuaeyMZkMOgOT04MPSwz2zbudtf3u7n511Ag2ug3PQf/y/hpWpyztI4ysrqKdfCDaU WUQx3ELQv56aP0XCkgkTcg2LR+XpdY/EBf6ate4v+2YafTRTGXE3OmHMFv+ff8G92AtI YWzwfibnQRltZyC3sxDGMZjumOXv9yPkwcVhVjCVu9kdXXUSw954kEb7Gva2XuxKB875 eENIGEJ0WD5+LGB6Bhquxe5hMYsB2QLnRm8PcrlLqyTD8SBMqv56BT/4Zk7uzpY2dFz1 mUs2FOvU4BsksShxYN50YXn6J09xpBX0lteIK7zqKxNgqPgovAnZwhAW7c6NaDTc4pxB sajw== X-Gm-Message-State: AOJu0YyWnwi0dM+68/f7+jW2zrW4FvGGgDvLZvjuZtLIJwDzOmGkl/Ke vbiTVI5cuexhTpOKgL7IpGmCjMOIMxDGxrxzlqYy1hcQHYI4VNEsMBKTgeK/8g== X-Gm-Gg: ASbGncsX++KjX9ba9M+YYDXWEVewj+nE/Hrl/8RdYM6uEraTIDOt7IyvfAXMi3FrZUG Fz4udsBsQdec4Aq1nVEDFftonC0Fm/DSHDwlb0Nt4EXULpHezbJ4kXk+RC5syGFwyBMaFLiyta4 iXGG58QMZdTWn0IvFowt+t67jRJ4QW35zj5SWWM8uuppTxqeTmh81ExmTOJjtnhssFtHN3MCAo4 PMrwhHoPrij5nLvmZwPatzLLtFuWCiIGA/SHVyRwDgmRg7svu5/fTZWazd/9kESftuiJTE5prWi xXoWEyFWoL6xWMEKJJbb1flJCPJ5g1aDAMVvf3XM57DLNK5JvisaLwHQopAAXNDJe2qr6tqzS5V XpVqD X-Google-Smtp-Source: AGHT+IH9zmGPcxORIbokLYWwRpUVzt729v/uq13H84PVo7wZBYL6eBSzVeOfc4kQJzLB3DB8CiKmWg== X-Received: by 2002:a05:6a21:6e4a:b0:21a:ed12:bdf9 with SMTP id adf61e73a8af0-22026c818camr20659165637.17.1750719383789; Mon, 23 Jun 2025 15:56:23 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-749b5e2178csm213491b3a.46.2025.06.23.15.56.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 15:56:23 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <17b0af91ecbff7033c26cdbac481abec3d02b497.1750719366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 22:56:05 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v8 2/3] ffbuild/commonmak: Consolidate pattern rules for compression 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: softworkz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz This commit simplifies and consolidates all the rules around ptx and resource file compression. Signed-off-by: softworkz --- ffbuild/common.mak | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 81e8a46d0c..0a60d01623 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -115,6 +115,12 @@ COMPILE_LASX = $(call COMPILE,CC,LASXFLAGS) $(BIN2CEXE): ffbuild/bin2c_host.o $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS) +RUN_BIN2C = $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) +RUN_GZIP = $(M)gzip -nc9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@ +RUN_MINIFY = $(M)sed 's!/\\*.*\\*/!!g' $< | tr '\n' ' ' | tr -s ' ' | sed 's/^ //; s/ $$//' > $@ +%.gz: TAG = GZIP +%.min: TAG = MINIFY + %.metal.air: %.metal $(METALCC) $< -o $@ @@ -122,61 +128,46 @@ $(BIN2CEXE): ffbuild/bin2c_host.o $(METALLIB) --split-module-without-linking $< -o $@ %.metallib.c: %.metallib $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) + $(RUN_BIN2C) %.ptx: %.cu $(SRC_PATH)/compat/cuda/cuda_runtime.h $(COMPILE_NVCC) ifdef CONFIG_PTX_COMPRESSION -%.ptx.gz: TAG = GZIP %.ptx.gz: %.ptx - $(M)gzip -nc9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@ + $(RUN_GZIP) %.ptx.c: %.ptx.gz $(BIN2CEXE) - $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) + $(RUN_BIN2C) else %.ptx.c: %.ptx $(BIN2CEXE) - $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) + $(RUN_BIN2C) endif -# 1) Preprocess CSS to a minified version -%.css.min: TAG = SED %.css.min: %.css - $(M)sed 's!/\\*.*\\*/!!g' $< \ - | tr '\n' ' ' \ - | tr -s ' ' \ - | sed 's/^ //; s/ $$//' \ - > $@ + $(RUN_MINIFY) ifdef CONFIG_RESOURCE_COMPRESSION -# 2) Gzip the minified CSS -%.css.min.gz: TAG = GZIP %.css.min.gz: %.css.min - $(M)gzip -nc9 $< > $@ + $(RUN_GZIP) -# 3) Convert the gzipped CSS to a .c array %.css.c: %.css.min.gz $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) + $(RUN_BIN2C) -# 4) Gzip the HTML file (no minification needed) -%.html.gz: TAG = GZIP %.html.gz: %.html - $(M)gzip -nc9 $< > $@ + $(RUN_GZIP) -# 5) Convert the gzipped HTML to a .c array %.html.c: %.html.gz $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) + $(RUN_BIN2C) else # NO COMPRESSION -# 2) Convert the minified CSS to a .c array %.css.c: %.css.min $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) + $(RUN_BIN2C) -# 3) Convert the plain HTML to a .c array %.html.c: %.html $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) + $(RUN_BIN2C) endif clean:: -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".