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 B9EBF4F917 for ; Mon, 23 Jun 2025 17:27:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DB65268DED8; Mon, 23 Jun 2025 20:27:32 +0300 (EEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id D11C268DEB6 for ; Mon, 23 Jun 2025 20:27:26 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7490702fc7cso2356069b3a.1 for ; Mon, 23 Jun 2025 10:27:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750699645; x=1751304445; 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=PPwcWhZ+PkGebuIYzOUsGmD8nBGm92tGf2zrbwl9Pb94/ORxxMKFimfgmUP6TDv+Lj 6y3zF3SioF0MtviC9P+/j0tEaFjdEeHjGTkbWt3/4C8nswdgxUwqiScESrbGLhkapW8G 64z5ACgsjxmGLCDsKDm92gQp5/8DwAKv3Pz6lZchFosVJ4wLZAIatgH2LG3ZDz80Rs+B 9hOXDsVWrv9qdIglwszhJGzlNRPYUSc7VrvmD+DsE6OIPdAI9b97UEEX+UQp93CR2KZS a4yl8lFT2QAaJ420luQLy/tKIhbGVXjTEJAoz7X9zTq1fXzInC7iplXskMGc+SGzvSkz TK1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750699645; x=1751304445; 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=GVxUIFPjKXgiN4QATq5UuuOCR1T9WunEOudc6QNH6vD1wKGvPVF6U66oIa4OHwqo9P 4Bs7U9OptOFZ+0OxJ0odB+7c7njYuM2T8ucoLqun4qkTGLwctQ3xftZAITViMbScD0T6 wKB32Y2MLQo7Rxu2qHa7jdxYxc+kekB2lHACGGCZvZbQaJj6L9Wc4T9V1OfxpZs4s5KC VvZshTJTpYkEROCzT8u9ygzbW/pEbq68VGo9+M/JWYrsVv3Vp6NtyiWuIlZKZU9zAM0M UU9Z+7VDzR4uzmhObJFwu5Mx9xNhg9lG98gmmWURGW+8H5ZN9AgtiTa8CRtkYwmNjm/o 7OqA== X-Gm-Message-State: AOJu0YzHLtSby1lUTDOTUnkH59oBPzS6+Ir82y2ba4EnKnCn6Ur4A7zT yFIqLBCYfAJ39XRQ1tPQV28SHqYcdgwB4kKwL5JBBxoZer9heNUSdeuRah/Z/g== X-Gm-Gg: ASbGncvPjFnHMMcgZHCHEZSVMZQWiSUjKQ8NZYeeimGE8qHBxjdWI6jcXQqrU3KUwY6 k57YiwfFA18VWprxlMzvCsAo2204WqMqaefbZwYVrvhMZDvT/alr25+eYK0Ja+CamY1V0F+dFWh EUb7PhRdFjyjVEPkD8o+6KZTGaOYyzSNgrfxblSu9leg6zHPybQSDYXmhk+9XNAznVp9J2yVo4N 8f39bkwQ7Zh6zrm5S9//wPSp8kIQ6n1hh5jMo/GcQUJDbW8Nryg/X8FqsrVnd/px3/tPr6/FQkP QjwXj5oyJiJO9lxJFCIz2KbyPdrygnZH2au1msIcgEU4Br4OVzyUIkfP42Yv4HlWnbgsusZEMd6 0GcQi X-Google-Smtp-Source: AGHT+IEXv9retjnhFvt0EdxuXbDCkTw+XGPaf6DadqFxj2NKpykLCSgB1mZJWEOgIEQurm6VkD5BSg== X-Received: by 2002:a05:6a00:178c:b0:742:a7e3:7c84 with SMTP id d2e1a72fcca58-7490d665528mr17496073b3a.13.1750699645098; Mon, 23 Jun 2025 10:27:25 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7490a66a739sm9071922b3a.138.2025.06.23.10.27.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 10:27:24 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <17b0af91ecbff7033c26cdbac481abec3d02b497.1750699628.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 17:27:07 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v7 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".