From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 0D9FB4CBAC for <ffmpegdev@gitmailbox.com>; Tue, 27 May 2025 21:42:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F0AB968D9CC; Wed, 28 May 2025 00:41:52 +0300 (EEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id D39EE68D5CC for <ffmpeg-devel@ffmpeg.org>; Wed, 28 May 2025 00:41:46 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-742b614581dso3543559b3a.3 for <ffmpeg-devel@ffmpeg.org>; Tue, 27 May 2025 14:41:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748382105; x=1748986905; 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=JVUwCTF/4hUBtDmVTAVXsj9BBNjt2xfbRa4fgzz/hqk=; b=RfmB5mS2w9GlAi0H2NQ1SS+Evu4ytzJ2Ab7k7IkSwSYbcDwvFCfM8AtoSqIryvkNaC z/RaSs1wKrjRRjdO4UwbQhlBmoIoJ7HPThWdTa1g3jSxD0v0G9KMyzKmWQQiKMHNwEDy zSTS/3bpTttRa3eOvCd++vwdm66kR5ubOBoT4zmBR2r94RbaqWJXIsxIxgZHMCna5Kex KLNA/OkIV9MdMcGuox6caT54P3Ypxp1NBlDi+yjcsonGEyO+FEB6NuTLCRQEYdQTzxU2 Wm3nRxrEyMu5YKdWAkRrLsA7e0pGCzGcPHZcgQyI+3WuG2p8CebnLLywcqLAfI3UxZUE XC2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748382105; x=1748986905; 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=JVUwCTF/4hUBtDmVTAVXsj9BBNjt2xfbRa4fgzz/hqk=; b=HWAGFUFsUE5dTCe23DsZY7PuniHN1pXzeXZnkLy9kmBnxkdCnyL9WCIXz08Pi7UWvW fLXefhE9lpWQcjX+9hkROohgfoz+GcDm2cio5DvZSmPBtFXQMK5cJeRFbrWr8td13d1O PB9gYMJBM4Sz2A+981PTsUq8+27usTymxgi2c91COt1+qz+8l9J0pN6SFs4PQ8+UjxO/ IC9ahUhSlgfPqmkpcvYZAAMJXTfPncRO43qx/ySvCBrSR6y0bC/KJ49q55fVkKhhYKcj P89NpSamBaabn7yGWt86T3tOtDvUGeUGTzVIAG4lIl9i/ZVvrk0UAZCkVsBJBZK2vvET hFnw== X-Gm-Message-State: AOJu0Yy7WmQZH93qVKKxVlJP0+UaIPe7mmyZxPtrIUadKocnC3qeQj4y FER+/GzPv0h6X7hpezHBz9cK80wrk3nXKls5jLBPZ+rsRY3+UAMC32g6EVN8Yg== X-Gm-Gg: ASbGnctBsFn/+yVdNxAhe5NRQxjRYOapatDqhpPVsRiEWWzyALwx/X+4jUQzx1I4AZP zipZSHvwMosHcDOqtahOaToEXTtKo4pDt/YWXMI+dQOzzAGV2+BlsN7saQCA4BODwwmf8WL97j4 RdneYvdCGA+Nw2vYlAkzieZtpAiVsD3GGA/S+7Z//JCbfgUwfykU0bxMN9BD7o+3PTknhfpYJpV CRgDnbYGyQFB9j8EjO5k/uIKlJxir1jon4Gr651aKCIKBKn/inbbi7odbUBm5aQSqZaWfpaL7qL kk00DnTcsUHvmvBgnzmhqT2KAcl/zk+w0pxhJ5mokU4/gNBVS0dOZTtuda8uWWslxPJMoA== X-Google-Smtp-Source: AGHT+IG1OiwkzhjeY64lTKHzik668+iHbzsP9seQhTuN0zMvOKjLCUzt2lHMyHg0QHZu2Ipg4oSKrQ== X-Received: by 2002:a05:6a00:4189:b0:746:199d:525f with SMTP id d2e1a72fcca58-746199d52bamr9962938b3a.7.1748382105018; Tue, 27 May 2025 14:41:45 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-746682ee668sm48196b3a.129.2025.05.27.14.41.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 May 2025 14:41:44 -0700 (PDT) From: softworkz <ffmpegagent@gmail.com> X-Google-Original-From: softworkz <softworkz@hotmail.com> Message-Id: <9ff1856142f8dd069f1b034c5466a10f50a4b9b5.1748382088.git.ffmpegagent@gmail.com> In-Reply-To: <pull.80.v5.ffstaging.FFmpeg.1748382088.ffmpegagent@gmail.com> References: <pull.80.v4.ffstaging.FFmpeg.1748037922309.ffmpegagent@gmail.com> <pull.80.v5.ffstaging.FFmpeg.1748382088.ffmpegagent@gmail.com> Date: Tue, 27 May 2025 21:41:27 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: softworkz <softworkz@hotmail.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/9ff1856142f8dd069f1b034c5466a10f50a4b9b5.1748382088.git.ffmpegagent@gmail.com/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> From: softworkz <softworkz@hotmail.com> This commit simplifies and consolidates all the rules around ptx and resource file compression. Signed-off-by: softworkz <softworkz@hotmail.com> --- ffbuild/common.mak | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index f03b9ca051..f446a12b92 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,63 +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: %.css - # Must start with a tab in the real Makefile - sed 's!/\\*.*\\*/!!g' $< \ - | tr '\n' ' ' \ - | tr -s ' ' \ - | sed 's/^ //; s/ $$//' \ - > $@ + $(RUN_MINIFY) ifdef CONFIG_RESOURCE_COMPRESSION -# 2) Gzip the minified CSS %.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: %.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".