From: Alexander Kanavin <[email protected]> This should address [YOCTO #16000].
Signed-off-by: Alexander Kanavin <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 86396b85b4e8f6748885710e50428271cd3493a8) Signed-off-by: Yoann Congal <[email protected]> --- ...k-Consolidate-pattern-rules-for-comp.patch | 106 ++++++++++++++++++ ...ak-ensure-target-directories-are-cre.patch | 43 +++++++ meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb | 2 + 3 files changed, 151 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-ffbuild-commonmak-Consolidate-pattern-rules-for-comp.patch create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-ffbuild-commonmak-Consolidate-pattern-rules-for-comp.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-ffbuild-commonmak-Consolidate-pattern-rules-for-comp.patch new file mode 100644 index 0000000000..6af9254d95 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-ffbuild-commonmak-Consolidate-pattern-rules-for-comp.patch @@ -0,0 +1,106 @@ +From 95f1f05409fceb8b3615fa618554667a238f99a5 Mon Sep 17 00:00:00 2001 +From: softworkz <[email protected]> +Date: Tue, 27 May 2025 23:24:20 +0200 +Subject: [PATCH] ffbuild/commonmak: Consolidate pattern rules for compression + +This commit simplifies and consolidates all the rules around +ptx and resource file compression. + +Signed-off-by: softworkz <[email protected]> + +Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a125f5db03b86c03fffb9598bd6e2026ba2c7a97] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + ffbuild/common.mak | 43 +++++++++++++++++-------------------------- + 1 file changed, 17 insertions(+), 26 deletions(-) + +diff --git a/ffbuild/common.mak b/ffbuild/common.mak +index 81e8a46..0a60d01 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:: diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch new file mode 100644 index 0000000000..a27e30f710 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch @@ -0,0 +1,43 @@ +From 6cd4855ea3dd62e6eb36c0796f8cd7bd4aaae05c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 11 Dec 2025 19:55:46 +0100 +Subject: [PATCH] ffbuild/common.mak: ensure target directories are created + before running shell redirects into them + +Otherwise, occasional build races have been observed: +https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3001/steps/13/logs/stdio + +/bin/sh: 4: cannot create fftools/resources/graph.css.min: Directory nonexistent +mkdir -p fftools/graph +/bin/sh: 1: cannot create fftools/resources/graph.html.gz: Directory nonexistent +make: *** [/srv/pokybuild/.../ffmpeg-8.0.1/ffbuild/common.mak:165: fftools/resources/graph.html.gz] Error 2 +make: *** Waiting for unfinished jobs.... +make: *** [/srv/pokybuild/.../ffmpeg-8.0.1/ffbuild/common.mak:145: fftools/resources/graph.css.min] Error 2 + +There's a separate rule for making those directories, but unfortunately +it's racing with the rules that expect the directories to exist. Rather +than add a Makefile dependency, I've injected the dir creation directly +in front of commands that can otherwise fail - a proper fix would probably +add the rule rather. + +Upstream-Status: Submitted [by email to [email protected],[email protected],[email protected]] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + ffbuild/common.mak | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ffbuild/common.mak b/ffbuild/common.mak +index 0a60d01..346bb0a 100644 +--- a/ffbuild/common.mak ++++ b/ffbuild/common.mak +@@ -116,8 +116,8 @@ $(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/ $$//' > $@ ++RUN_GZIP = mkdir -p $(dir $@) && $(M)gzip -nc9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@ ++RUN_MINIFY = mkdir -p $(dir $@) && $(M)sed 's!/\\*.*\\*/!!g' $< | tr '\n' ' ' | tr -s ' ' | sed 's/^ //; s/ $$//' > $@ + %.gz: TAG = GZIP + %.min: TAG = MINIFY + diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb index 5e8d7bde55..fdc16598d4 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.bb @@ -24,6 +24,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch \ + file://0001-ffbuild-commonmak-Consolidate-pattern-rules-for-comp.patch \ + file://0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch \ " SRC_URI[sha256sum] = "b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229667): https://lists.openembedded.org/g/openembedded-core/message/229667 Mute This Topic: https://lists.openembedded.org/mt/117361352/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
