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 386BF407B3 for ; Tue, 17 Jun 2025 16:02:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C204568D521; Tue, 17 Jun 2025 19:02:20 +0300 (EEST) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8C39D68D52C for ; Tue, 17 Jun 2025 19:02:13 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-3122a63201bso5577093a91.0 for ; Tue, 17 Jun 2025 09:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750176132; x=1750780932; 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=brNVW4OG+yeKPzZRwBDant0K7BZ0XV3h1RxjytJYt7E=; b=RNKx9NPbvUDbwV0zjLVGIS4MgGpm4cv93XRTo6AR+86N7qEshJ2yIuMGnB1PStKxlo DdvqHV6C0AzotRlJVD8Yk5Z/BW8ZQZjvpxhjFCR2JIUwVHvWqUu0iXvlU+Cz5z7dEIuy CHQQIyIad0R5dQsJ6BC26SLoihZ4T1TtZ/ewuuXeFcWGnKaKC+SIjCXCKajn3xhhI9ZS zQQlm3D7VX06fu2LaXwfDGEYiTyDtM2bqTP7H7wvuP6Xy6dfY+UN2Z0N3LhDwhULFZj5 vpmyZaO9GNfCsVTKEhXx5R/IMtdOXLLSwIrphTDwKCqg3tArcXuHenZvnkbFUevtR3r6 qB0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750176132; x=1750780932; 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=brNVW4OG+yeKPzZRwBDant0K7BZ0XV3h1RxjytJYt7E=; b=AU3rhSim8QO+l+zfPoS7DAnXdMYlwiVWGdPN8TqOeAKtu/wp6DaZVOEx7Zj+5Et56c 3hOwE8gYtE6zsEjcxgKFCq2ltCHgcGCnLqMXqoFfmtPgBsRdhUBWqOvzyazZyY6d33dt 1rw/D8PtN8nzMb0MxXY9xpgoI1nXXPaCQ/XEJ+EMDyis47y5Fj7hg04/JmJDUbhgrTGr R5HHIaxhdKSg484ZMeaW3iUEGuE2MwNDJRBA2drOcTgANNa5RocouAd0AX/ffLwP/2Zr s5Y8ncC3RHUEkwa8sVFSQ+uGYY4/TbeLlAxuUveBiodLvAi6vm9fQN1H1Jy6tLBE49RX T71g== X-Gm-Message-State: AOJu0YyBpUHthRvkp/ZOEx4/UzAx0sfdl6UMToormmBKrDkkIt7LWhXf QwJNNkvrAnU7n73gKyL/Kr8UZ+OkBSrmzstqxMoASKmXH9ilKw1vrjszOTOktQ== X-Gm-Gg: ASbGncucT1eKVFborL4dMsS0cdU08vLWkZiqUav21ZQ8iJi7+nKXmlTvograkROC4I1 2ThFP9wktE4BOb64KadH/1ZVoI3frEE/F5w5uo1NsHS3ZhflAkKTRxjBuQIvTBVdsnushaNuxup pLJKk4g7bpOEbcOwYX+3cH0f4fDkGVw2zO9i9UMePvnusqXnKci5TEj+8xpUukioOsVB1/S2KHC oyImW2i5J69UynUYPb0m5gYVTDahYJyfOcRt5JlBzi1wok5rCwVhfQ8Ndrh9JwOUV2AgPeeLjkf /h64OKHWJzKbMtVQ/UUR5y0yk3xTGhkTmJbMf2oTQOa3u3H4mQccBestpTP6CBoiK2DA9fv9bKy 9Nijb X-Google-Smtp-Source: AGHT+IFohecdCMkgaKVLUscJyTB5v8I5KBj8cWHw7Z04kcszOj6uYPvrzKUr/uFshcUajthTyzoOkQ== X-Received: by 2002:a17:90b:4e84:b0:313:dcf4:37bc with SMTP id 98e67ed59e1d1-313f1dd74acmr17282442a91.34.1750176131540; Tue, 17 Jun 2025 09:02:11 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-313c1bcbb39sm10838326a91.8.2025.06.17.09.02.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2025 09:02:11 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <1781c5fc162d15b5f07b2fa941064c78a8c0c93b.1750176111.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 17 Jun 2025 16:01:51 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v6 2/2] 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 8304a9e9cb..c6726b2afc 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,65 +128,50 @@ $(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 %.ptx.o: CCDEP = %.ptx.o: CC_DEPFLAGS = -# 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 %.html.o %.css.o: CCDEP = -- 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".