diff mbox series

[2/2] ffmpeg: Fix makefile directory creation race

Message ID 20260911141348.3434533-2-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit fe7a24bc67118e7e184b5f5247258715e3904e7c
Headers show
Series [1/2] ffmpeg: Upgrade 9.0 -> 9.0.1 | expand

Commit Message

Richard Purdie Sept. 11, 2026, 2:13 p.m. UTC 
The recent upgrade exposed another make race in ffmpeg. Add a patch which
resolves it, submitted upstream (pending moderator approval).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../ffmpeg/ffmpeg/makerace.patch              | 29 +++++++++++++++++++
 .../recipes-multimedia/ffmpeg/ffmpeg_9.0.1.bb |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/makerace.patch
diff mbox series

Patch

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/makerace.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/makerace.patch
new file mode 100644
index 00000000000..c2f87b25fb5
--- /dev/null
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/makerace.patch
@@ -0,0 +1,29 @@ 
+An easy to reproduce make race:
+
+$ make libswscale/x86/uops_macros.gen.asm
+HOSTCC	libswscale/x86/uops_macros.gen.asm
+cc1: fatal error: opening output file libswscale/x86/uops_macros.gen.asm: No such file or directory
+
+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>
+ 
+Index: ffmpeg-9.0.1/libswscale/x86/Makefile
+===================================================================
+--- ffmpeg-9.0.1.orig/libswscale/x86/Makefile
++++ ffmpeg-9.0.1/libswscale/x86/Makefile
+@@ -1,3 +1,5 @@
++OUTDIRS += $(SUBDIR)x86
++
+ OBJS                            += x86/rgb2rgb.o                        \
+                                    x86/swscale.o                        \
+                                    x86/yuv2rgb.o                        \
+@@ -31,6 +33,6 @@ $(SUBDIR)x86/ops_common.o: $(SUBDIR)x86/
+ $(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) $<
+ endif
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_9.0.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_9.0.1.bb
index a954234e7f1..07eff2a4e5e 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_9.0.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_9.0.1.bb
@@ -24,6 +24,7 @@  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] = "cf38e0e28c7e5605942c4a77755349b0145804a397af37eb1fb4c77cb237f635"