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 F41D74C86D for ; Tue, 27 May 2025 01:34:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BD7C068CCEE; Tue, 27 May 2025 04:33:43 +0300 (EEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9E4A568CC49 for ; Tue, 27 May 2025 04:33:35 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43cfebc343dso21210095e9.2 for ; Mon, 26 May 2025 18:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748309614; x=1748914414; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OrlmTL3TgUJv00VyIwleFBfjCcfaPo8SmqOGdnf5wHc=; b=VDBDsNia6whm9N3Q7LKkWm+j2vkO4a8ICkDSJiDuON/+WtxoRAgp6cf3cRy4fFhwjq VHF7cbx/lLy//xQGkKLLBDToQzLkw+FqzCUyo3Cdl/H+cUiWqmrSbxiN1v1v1qR7D4B5 azX/Sw95nw4fN/t42BFsS2SsTDxIc+oYAtm4KNYcgDa7LvUHnjiBADxx4QKdTHk9UmMG B3rAKvaeYdwiCBU5qdBceP0a9Kr3+nkm+NCda36FSH1mlAz/a1e39HOC9padmB0hqHPc nV0+v86ZwFAlAMAyzBihT9RXtHvat3t982yuwAoQ3Ql+gX0anClYjBBHfjdTjAGXZjMB 7iBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748309614; x=1748914414; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OrlmTL3TgUJv00VyIwleFBfjCcfaPo8SmqOGdnf5wHc=; b=T0BK8xkKh/Eou0WgGDDjrwybpUeZZ3GFUx657cqHBCfGH8Ba5+tvnPQkaElloRy4XH Mie0OCbKH9CzrLWFvyuvNcMWlcTpSl94MNFQV+1c8kkUwIcGslCkpRNHph0Z6tIZTYmJ qRIUTd92UiTJJXw3Jp30Gvx5SDD3WxD8fFfVEIpyJWkZRMZxNLWdVP0wmjsU4C+wAaoy 6Niz0C9EYGP3vCip2tgzX5hS6yVpiodhaM5myK8XIr9QKorM/yL1TeZb/0HvWbwOKcJY v4dNnz9WclSIEYcxSZ4TfvQlmFmwgAie8wLhwH4cbcHOEB442WqP+yGPv2LM0Yu7CHuu KMmw== X-Gm-Message-State: AOJu0YwINpiW18V/FVeaaDXdMWkQY6Jz/GaRuwP/y9L35Q6dwWvaNQLW 2TG0pb1XX5vRK8UmoHe+6X4I+VIwl7roxLXfYzdXQTTFyLyS1LGNpPpZENUrWCi9Ado= X-Gm-Gg: ASbGncuHeSTEvdXheOF7YUrjVh47XINgBDui1H0xzzEMYnRcDLmx74QJH0IJAfz8099 vWQX0G6kae/kjaGa61q0jBbdyk3XqkeF0KxtdL5A0FsKUYgfV2jK+MX4e5vdSF7Z36E/IHAzbM/ v+Eoc7H+eHk8dBAoxNbpfm/WtaiVkP52yeIyDS6uKgk9NI2oHm1ncNwddcM0rh9unQ0MkbNO+A/ /wT25UoNgBdD4jgqjWed3BQUpdhmmKDoudVFSDVtxWCvGVGv4DnHRgkmwiCdihAbDzCQc2PrNAg A6TihVkc3FGrxTghmo1Cm57bkohGqQKWQKtWgxi1Kefr+WsmoDWPqWQKgg7wL8k29ufn7HcJBc2 NGejsMM2kGjH3zjkAscGrl+ieVIDdOPk= X-Google-Smtp-Source: AGHT+IGojLxZKb7l1Te3HGg91nC9+SQOAQloqRdYfK5ZTwm44+i2Ms2hkbHoCGCmM70RQhRWaJtqKA== X-Received: by 2002:a05:600c:6090:b0:441:d446:b636 with SMTP id 5b1f17b1804b1-44c933ed957mr93992515e9.27.1748309614336; Mon, 26 May 2025 18:33:34 -0700 (PDT) Received: from walden.local (20.238-74-193.fia-dyn.isp.proximus.be. [193.74.238.20]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f3dd99absm248886645e9.37.2025.05.26.18.33.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 18:33:32 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 May 2025 03:33:27 +0200 Message-Id: <20250527013328.308477-4-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250527013328.308477-1-ramiro.polla@gmail.com> References: <20250527013328.308477-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] ffbuild/common.mak: clean up and move fftools/resources-specific code its Makefile 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 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: - Intermediate files are no longer removed; - A .res suffix has been added to resource files, so that there's no need to add new rules for each new filetype; - Superfluous comments have been removed; - Targets depending on CONFIG_RESOURCE_COMPRESSION have been deduplicated. --- ffbuild/common.mak | 45 +------------------ fftools/resources/.gitignore | 7 ++- fftools/resources/Makefile | 31 ++++++++++--- .../resources/{graph.css => graph.css.res} | 0 .../resources/{graph.html => graph.html.res} | 0 fftools/resources/resman.c | 12 ++--- 6 files changed, 36 insertions(+), 59 deletions(-) rename fftools/resources/{graph.css => graph.css.res} (100%) rename fftools/resources/{graph.html => graph.html.res} (100%) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index ddf48923ea..27dd48a4e6 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -139,46 +139,6 @@ else $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) 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/ $$//' \ - > $@ - -ifdef CONFIG_RESOURCE_COMPRESSION - -# 2) Gzip the minified CSS -%.css.min.gz: TAG = GZIP -%.css.min.gz: %.css.min - $(M)gzip -nc9 $< > $@ - -# 3) Convert the gzipped CSS to a .c array -%.css.c: %.css.min.gz $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) - -# 4) Gzip the HTML file (no minification needed) -%.html.gz: TAG = GZIP -%.html.gz: %.html - $(M)gzip -nc9 $< > $@ - -# 5) Convert the gzipped HTML to a .c array -%.html.c: %.html.gz $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) - -else # NO COMPRESSION - -# 2) Convert the minified CSS to a .c array -%.css.c: %.css.min $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) - -# 3) Convert the plain HTML to a .c array -%.html.c: %.html $(BIN2CEXE) - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) -endif - clean:: $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%) @@ -229,10 +189,9 @@ SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) PTXOBJS = $(filter %.ptx.o,$(OBJS)) -RESOURCEOBJS = $(filter %.css.o %.html.o,$(OBJS)) $(HOBJS): CCFLAGS += $(CFLAGS_HEADERS) checkheaders: $(HOBJS) -.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:%.css.o=%.css.min) $(RESOURCEOBJS:%.css.o=%.css.min.gz) $(RESOURCEOBJS:%.html.o=%.html.gz) $(RESOURCEOBJS:.o=) +.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) alltools: $(TOOLS) @@ -252,7 +211,7 @@ $(TOOLOBJS): | tools OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS)) -CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *.html.gz *.html.c *.css.gz *.css.c *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb +CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *.min.res *.res.gz *.res.c *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a define RULES diff --git a/fftools/resources/.gitignore b/fftools/resources/.gitignore index 5f496535a6..4c56856284 100644 --- a/fftools/resources/.gitignore +++ b/fftools/resources/.gitignore @@ -1,4 +1,3 @@ -*.html.c -*.css.c -*.html.gz -*.css.gz +*.res.c +*.res.gz +*.res diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile index 8579a52678..a8eb111441 100644 --- a/fftools/resources/Makefile +++ b/fftools/resources/Makefile @@ -1,13 +1,32 @@ clean:: $(RM) $(CLEANSUFFIXES:%=fftools/resources/%) -vpath %.html $(SRC_PATH) -vpath %.css $(SRC_PATH) +vpath %.res $(SRC_PATH) -# Uncomment to prevent deletion during build -#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c +RESOURCEOBJS += fftools/resources/graph.css.min.res.o +RESOURCEOBJS += fftools/resources/graph.html.res.o OBJS-resman += \ fftools/resources/resman.o \ - fftools/resources/graph.html.o \ - fftools/resources/graph.css.o \ + $(RESOURCEOBJS) + +%.css.min.res: TAG = SED +%.css.min.res: %.css.res + $(M)sed 's!/\\*.*\\*/!!g' $< \ + | tr '\n' ' ' \ + | tr -s ' ' \ + | sed 's/^ //; s/ $$//' \ + > $@ + +ifdef CONFIG_RESOURCE_COMPRESSION +RES_GZ = .gz +endif + +%.res.gz: TAG = GZIP +%.res.gz: %.res + $(M)gzip -nc9 $< > $@ + +%.res.c: %.res$(RES_GZ) $(BIN2CEXE) + $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) + +.SECONDARY: $(RESOURCEOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:.o=.gz) diff --git a/fftools/resources/graph.css b/fftools/resources/graph.css.res similarity index 100% rename from fftools/resources/graph.css rename to fftools/resources/graph.css.res diff --git a/fftools/resources/graph.html b/fftools/resources/graph.html.res similarity index 100% rename from fftools/resources/graph.html rename to fftools/resources/graph.html.res diff --git a/fftools/resources/resman.c b/fftools/resources/resman.c index a9e21626fa..00518efd87 100644 --- a/fftools/resources/resman.c +++ b/fftools/resources/resman.c @@ -38,15 +38,15 @@ #include "libavutil/dict.h" #include "libavutil/common.h" -extern const unsigned char ff_graph_html_data[]; -extern const unsigned int ff_graph_html_len; +extern const unsigned char ff_graph_html_res_data[]; +extern const unsigned int ff_graph_html_res_len; -extern const unsigned char ff_graph_css_data[]; -extern const unsigned ff_graph_css_len; +extern const unsigned char ff_graph_css_min_res_data[]; +extern const unsigned ff_graph_css_min_res_len; static const FFResourceDefinition resource_definitions[] = { - [FF_RESOURCE_GRAPH_CSS] = { FF_RESOURCE_GRAPH_CSS, "graph.css", &ff_graph_css_data[0], &ff_graph_css_len }, - [FF_RESOURCE_GRAPH_HTML] = { FF_RESOURCE_GRAPH_HTML, "graph.html", &ff_graph_html_data[0], &ff_graph_html_len }, + [FF_RESOURCE_GRAPH_CSS] = { FF_RESOURCE_GRAPH_CSS, "graph.css", &ff_graph_css_min_res_data[0], &ff_graph_css_min_res_len }, + [FF_RESOURCE_GRAPH_HTML] = { FF_RESOURCE_GRAPH_HTML, "graph.html", &ff_graph_html_res_data[0], &ff_graph_html_res_len }, }; -- 2.39.5 _______________________________________________ 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".