deleted file mode 100644
@@ -1,45 +0,0 @@
-From 01b4d2e905e79a6858078927c111ce96bd03b314 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-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 ffmpeg-devel@ffmpeg.org,softworkz@hotmail.com,kasper93@gmail.com,
- https://lists.ffmpeg.org/archives/list/ffmpeg-devel@ffmpeg.org/message/6QKXQGZKGDNDQXH2XO5IO4LAQKVHHWZG/ ]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- ffbuild/common.mak | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ffbuild/common.mak b/ffbuild/common.mak
-index 059de5a..9ca7219 100644
---- a/ffbuild/common.mak
-+++ b/ffbuild/common.mak
-@@ -114,8 +114,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
-
@@ -11,12 +11,13 @@ It needs the missing directory creation dependency adding.
Upstream-Status: Submitted [Sent to https://lists.ffmpeg.org/archives/list/ffmpeg-devel@ffmpeg.org/ 2026/9/11]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+[Rebase on 9.1]
+Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
libswscale/x86/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libswscale/x86/Makefile b/libswscale/x86/Makefile
-index 0f7a3db..f56a5a4 100644
--- a/libswscale/x86/Makefile
+++ b/libswscale/x86/Makefile
@@ -1,3 +1,5 @@
@@ -25,11 +26,11 @@ index 0f7a3db..f56a5a4 100644
OBJS += x86/rgb2rgb.o \
x86/swscale.o \
x86/yuv2rgb.o \
-@@ -31,6 +33,6 @@ $(SUBDIR)x86/ops_common.o: $(SUBDIR)x86/uops_macros.gen.asm
+@@ -31,6 +33,6 @@
$(SUBDIR)x86/ops_int.o: $(SUBDIR)x86/uops_macros.gen.asm
$(SUBDIR)x86/ops_float.o: $(SUBDIR)x86/uops_macros.gen.asm
$(SUBDIR)x86/uops_macros.gen.asm: $(SRC_PATH)/libswscale/x86/uops_macros.asm.h \
-- $(SRC_PATH)/libswscale/uops_macros.h
-+ $(SRC_PATH)/libswscale/uops_macros.h | $(SUBDIR)x86
- $(HOSTCC) $(HOSTCC_E) $(CPPFLAGS) $<
+- $(SRC_PATH)/libswscale/uops_macros.h | $(MSCL)
++ $(SRC_PATH)/libswscale/uops_macros.h | $(MSCL) $(SUBDIR)x86
+ $(HOSTCC) $(HOSTCC_E) $(HOSTCPPFLAGS) $<
endif
similarity index 98%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_9.0.2.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_9.1.bb
@@ -23,11 +23,10 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
"
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
- file://0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch \
file://makerace.patch \
"
-SRC_URI[sha256sum] = "8c3850283eb25fa026482078a04051e0be17347b09ef81a0849bec15a96e002e"
+SRC_URI[sha256sum] = "1a4d394ae63d190a526cd052eb4415c156b5c5e2df37efab41a7de0b8fde2433"
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET:armv4 = "arm"
ChangeLog: https://github.com/FFmpeg/FFmpeg/blob/release/9.1/Changelog - Drop 0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch upstream handles it now - Refresh makerace.patch and rebase to 9.1 Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- ...ak-ensure-target-directories-are-cre.patch | 45 ------------------- .../ffmpeg/ffmpeg/makerace.patch | 11 ++--- .../ffmpeg/{ffmpeg_9.0.2.bb => ffmpeg_9.1.bb} | 3 +- 3 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0002-ffbuild-common.mak-ensure-target-directories-are-cre.patch rename meta/recipes-multimedia/ffmpeg/{ffmpeg_9.0.2.bb => ffmpeg_9.1.bb} (98%)