* [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts
@ 2025-05-16 23:01 Timo Rothenpieler
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new css/html steps Timo Rothenpieler
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Timo Rothenpieler @ 2025-05-16 23:01 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Timo Rothenpieler
Without this, make install triggers a full re-generation of the graph
stuff, which results in re-linking during install.
---
ffbuild/common.mak | 3 +--
fftools/resources/Makefile | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index 0e1eb1f62b..4a3cc0c748 100644
--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -229,10 +229,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)
diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile
index 8579a52678..3a307bef12 100644
--- a/fftools/resources/Makefile
+++ b/fftools/resources/Makefile
@@ -4,10 +4,9 @@ clean::
vpath %.html $(SRC_PATH)
vpath %.css $(SRC_PATH)
-# Uncomment to prevent deletion during build
-#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c
-
OBJS-resman += \
fftools/resources/resman.o \
fftools/resources/graph.html.o \
fftools/resources/graph.css.o \
+
+.SECONDARY: $(OBJS-resman:.o=.c) $(OBJS-resman:.css.o=.css.min) $(OBJS-resman:.css.o=.css.min.gz) $(OBJS-resman:.html.o=.html.gz)
--
2.49.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 7+ messages in thread
* [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new css/html steps
2025-05-16 23:01 [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts Timo Rothenpieler
@ 2025-05-16 23:01 ` Timo Rothenpieler
2025-05-17 17:43 ` softworkz .
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 3/3] fftools/resources: add missing extensions to .gitignore Timo Rothenpieler
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Timo Rothenpieler @ 2025-05-16 23:01 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Timo Rothenpieler
---
ffbuild/common.mak | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index 4a3cc0c748..31ed19c141 100644
--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -140,9 +140,9 @@ else
endif
# 1) Preprocess CSS to a minified version
+%.css.min: TAG = SED
%.css.min: %.css
- # Must start with a tab in the real Makefile
- sed 's!/\\*.*\\*/!!g' $< \
+ $(M)sed 's!/\\*.*\\*/!!g' $< \
| tr '\n' ' ' \
| tr -s ' ' \
| sed 's/^ //; s/ $$//' \
@@ -151,6 +151,7 @@ endif
ifdef CONFIG_RESOURCE_COMPRESSION
# 2) Gzip the minified CSS
+%.css.min.gz: TAG = GZIP
%.css.min.gz: %.css.min
$(M)gzip -nc9 $< > $@
@@ -159,6 +160,7 @@ ifdef CONFIG_RESOURCE_COMPRESSION
$(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@)))
# 4) Gzip the HTML file (no minification needed)
+%.html.gz: TAG = GZIP
%.html.gz: %.html
$(M)gzip -nc9 $< > $@
--
2.49.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 7+ messages in thread
* [FFmpeg-devel] [PATCH 3/3] fftools/resources: add missing extensions to .gitignore
2025-05-16 23:01 [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts Timo Rothenpieler
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new css/html steps Timo Rothenpieler
@ 2025-05-16 23:01 ` Timo Rothenpieler
2025-05-17 17:45 ` softworkz .
2025-05-17 17:28 ` [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts softworkz .
2025-05-18 2:13 ` softworkz .
3 siblings, 1 reply; 7+ messages in thread
From: Timo Rothenpieler @ 2025-05-16 23:01 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Timo Rothenpieler
---
fftools/resources/.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fftools/resources/.gitignore b/fftools/resources/.gitignore
index 5f496535a6..bda2c59a1c 100644
--- a/fftools/resources/.gitignore
+++ b/fftools/resources/.gitignore
@@ -2,3 +2,5 @@
*.css.c
*.html.gz
*.css.gz
+*.min
+*.min.gz
--
2.49.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts
2025-05-16 23:01 [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts Timo Rothenpieler
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new css/html steps Timo Rothenpieler
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 3/3] fftools/resources: add missing extensions to .gitignore Timo Rothenpieler
@ 2025-05-17 17:28 ` softworkz .
2025-05-18 2:13 ` softworkz .
3 siblings, 0 replies; 7+ messages in thread
From: softworkz . @ 2025-05-17 17:28 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Timo Rothenpieler
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Timo
> Rothenpieler
> Sent: Samstag, 17. Mai 2025 01:02
> To: ffmpeg-devel@ffmpeg.org
> Cc: Timo Rothenpieler <timo@rothenpieler.org>
> Subject: [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of
> intermediary resman build artifacts
>
> Without this, make install triggers a full re-generation of the graph
> stuff, which results in re-linking during install.
> ---
> ffbuild/common.mak | 3 +--
> fftools/resources/Makefile | 5 ++---
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/ffbuild/common.mak b/ffbuild/common.mak
> index 0e1eb1f62b..4a3cc0c748 100644
> --- a/ffbuild/common.mak
> +++ b/ffbuild/common.mak
> @@ -229,10 +229,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)
>
> diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile
> index 8579a52678..3a307bef12 100644
> --- a/fftools/resources/Makefile
> +++ b/fftools/resources/Makefile
> @@ -4,10 +4,9 @@ clean::
> vpath %.html $(SRC_PATH)
> vpath %.css $(SRC_PATH)
>
> -# Uncomment to prevent deletion during build
> -#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c
> -
> OBJS-resman += \
> fftools/resources/resman.o \
> fftools/resources/graph.html.o \
> fftools/resources/graph.css.o \
> +
> +.SECONDARY: $(OBJS-resman:.o=.c) $(OBJS-resman:.css.o=.css.min) $(OBJS-
> resman:.css.o=.css.min.gz) $(OBJS-resman:.html.o=.html.gz)
> --
> 2.49.0
>
> _______________________________________________
Hi Timo,
thanks for the patchset!
Most of it LGTM, but for the main issue, that's not the optimal way yet,
because with that patch, the intermediates do not get deleted when doing
make clean (I've been there already).
I wasn't aware of the relinking issue, have started to investigate futher.
Thanks
sw
_______________________________________________
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".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new css/html steps
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new css/html steps Timo Rothenpieler
@ 2025-05-17 17:43 ` softworkz .
0 siblings, 0 replies; 7+ messages in thread
From: softworkz . @ 2025-05-17 17:43 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Timo Rothenpieler
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Timo
> Rothenpieler
> Sent: Samstag, 17. Mai 2025 01:02
> To: ffmpeg-devel@ffmpeg.org
> Cc: Timo Rothenpieler <timo@rothenpieler.org>
> Subject: [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new
> css/html steps
>
> ---
> ffbuild/common.mak | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/ffbuild/common.mak b/ffbuild/common.mak
> index 4a3cc0c748..31ed19c141 100644
> --- a/ffbuild/common.mak
> +++ b/ffbuild/common.mak
> @@ -140,9 +140,9 @@ else
> endif
>
> # 1) Preprocess CSS to a minified version
> +%.css.min: TAG = SED
> %.css.min: %.css
> - # Must start with a tab in the real Makefile
> - sed 's!/\\*.*\\*/!!g' $< \
> + $(M)sed 's!/\\*.*\\*/!!g' $< \
> | tr '\n' ' ' \
> | tr -s ' ' \
> | sed 's/^ //; s/ $$//' \
> @@ -151,6 +151,7 @@ endif
> ifdef CONFIG_RESOURCE_COMPRESSION
>
> # 2) Gzip the minified CSS
> +%.css.min.gz: TAG = GZIP
> %.css.min.gz: %.css.min
> $(M)gzip -nc9 $< > $@
>
> @@ -159,6 +160,7 @@ ifdef CONFIG_RESOURCE_COMPRESSION
> $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@)))
>
> # 4) Gzip the HTML file (no minification needed)
> +%.html.gz: TAG = GZIP
> %.html.gz: %.html
> $(M)gzip -nc9 $< > $@
>
> --
Thanks for the patch. I had those tags in earlier revisions, dropped them
while investigating the OOT build issue and then forgotten to re-add.
LGTM
_______________________________________________
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".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [FFmpeg-devel] [PATCH 3/3] fftools/resources: add missing extensions to .gitignore
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 3/3] fftools/resources: add missing extensions to .gitignore Timo Rothenpieler
@ 2025-05-17 17:45 ` softworkz .
0 siblings, 0 replies; 7+ messages in thread
From: softworkz . @ 2025-05-17 17:45 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Timo Rothenpieler
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Timo
> Rothenpieler
> Sent: Samstag, 17. Mai 2025 01:02
> To: ffmpeg-devel@ffmpeg.org
> Cc: Timo Rothenpieler <timo@rothenpieler.org>
> Subject: [FFmpeg-devel] [PATCH 3/3] fftools/resources: add missing extensions
> to .gitignore
>
> ---
> fftools/resources/.gitignore | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fftools/resources/.gitignore b/fftools/resources/.gitignore
> index 5f496535a6..bda2c59a1c 100644
> --- a/fftools/resources/.gitignore
> +++ b/fftools/resources/.gitignore
> @@ -2,3 +2,5 @@
> *.css.c
> *.html.gz
> *.css.gz
> +*.min
> +*.min.gz
> --
LGTM, thanks!
_______________________________________________
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".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts
2025-05-16 23:01 [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts Timo Rothenpieler
` (2 preceding siblings ...)
2025-05-17 17:28 ` [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts softworkz .
@ 2025-05-18 2:13 ` softworkz .
3 siblings, 0 replies; 7+ messages in thread
From: softworkz . @ 2025-05-18 2:13 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Timo Rothenpieler
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Timo
> Rothenpieler
> Sent: Samstag, 17. Mai 2025 01:02
> To: ffmpeg-devel@ffmpeg.org
> Cc: Timo Rothenpieler <timo@rothenpieler.org>
> Subject: [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of
> intermediary resman build artifacts
>
> Without this, make install triggers a full re-generation of the graph
> stuff, which results in re-linking during install.
> ---
> ffbuild/common.mak | 3 +--
> fftools/resources/Makefile | 5 ++---
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/ffbuild/common.mak b/ffbuild/common.mak
> index 0e1eb1f62b..4a3cc0c748 100644
> --- a/ffbuild/common.mak
> +++ b/ffbuild/common.mak
> @@ -229,10 +229,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)
>
> diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile
> index 8579a52678..3a307bef12 100644
> --- a/fftools/resources/Makefile
> +++ b/fftools/resources/Makefile
> @@ -4,10 +4,9 @@ clean::
> vpath %.html $(SRC_PATH)
> vpath %.css $(SRC_PATH)
>
> -# Uncomment to prevent deletion during build
> -#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c
> -
> OBJS-resman += \
> fftools/resources/resman.o \
> fftools/resources/graph.html.o \
> fftools/resources/graph.css.o \
> +
> +.SECONDARY: $(OBJS-resman:.o=.c) $(OBJS-resman:.css.o=.css.min) $(OBJS-
> resman:.css.o=.css.min.gz) $(OBJS-resman:.html.o=.html.gz)
> --
Hi,
I managed to hunt down the underlying problem for why the preservation even
appeared to be needed. Please see my upcoming patch
"ffbuild/commonmak: Fix rebuild check with implicit rule chains"
Thanks
sw
_______________________________________________
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".
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-05-18 2:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-16 23:01 [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts Timo Rothenpieler
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 2/3] ffbuild: correctly silence and tag new css/html steps Timo Rothenpieler
2025-05-17 17:43 ` softworkz .
2025-05-16 23:01 ` [FFmpeg-devel] [PATCH 3/3] fftools/resources: add missing extensions to .gitignore Timo Rothenpieler
2025-05-17 17:45 ` softworkz .
2025-05-17 17:28 ` [FFmpeg-devel] [PATCH 1/3] fftools/resources: fix preservation of intermediary resman build artifacts softworkz .
2025-05-18 2:13 ` softworkz .
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git