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 deleted file mode 100644 index 6af9254d95..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-ffbuild-commonmak-Consolidate-pattern-rules-for-comp.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 95f1f05409fceb8b3615fa618554667a238f99a5 Mon Sep 17 00:00:00 2001 -From: softworkz -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 - -Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a125f5db03b86c03fffb9598bd6e2026ba2c7a97] -Signed-off-by: Alexander Kanavin ---- - 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/0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch deleted file mode 100644 index 20009c1022..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-fftools-resources-Fix-double-build-by-disabling-.d-f.patch +++ /dev/null @@ -1,78 +0,0 @@ -From a789ffae9de93eb70c355a81f9dd2ebf5d6b17a7 Mon Sep 17 00:00:00 2001 -From: softworkz -Date: Mon, 23 Jun 2025 14:56:19 +0200 -Subject: [PATCH] fftools/resources: Fix double-build by disabling .d file - generation - -Signed-off-by: softworkz - -Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f52d9dd8693bc4628520258f18f89b4a3bf85533] -Signed-off-by: Alexander Kanavin ---- - ffbuild/common.mak | 6 ++---- - fftools/Makefile | 1 + - fftools/resources/Makefile | 12 +++++++++--- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/ffbuild/common.mak b/ffbuild/common.mak -index ddf4892..81e8a46 100644 ---- a/ffbuild/common.mak -+++ b/ffbuild/common.mak -@@ -229,11 +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) - - $(HOSTOBJS): %.o: %.c -@@ -252,7 +250,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 *.html.gz *.html.c *.css.min.gz *.css.min *.css.c *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb - LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a - - define RULES -diff --git a/fftools/Makefile b/fftools/Makefile -index b3c08ae..bdb44fc 100644 ---- a/fftools/Makefile -+++ b/fftools/Makefile -@@ -36,6 +36,7 @@ OBJS-ffmpeg += \ - fftools/textformat/tw_buffer.o \ - fftools/textformat/tw_stdout.o \ - $(OBJS-resman) \ -+ $(RESOBJS) \ - - OBJS-ffprobe += \ - fftools/textformat/avtextformat.o \ -diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile -index 8579a52..3c93648 100644 ---- a/fftools/resources/Makefile -+++ b/fftools/resources/Makefile -@@ -4,10 +4,16 @@ 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 \ -+ -+ -+RESOBJS += \ - fftools/resources/graph.html.o \ - fftools/resources/graph.css.o \ -+ -+ -+$(RESOBJS): CCDEP = -+$(RESOBJS): CC_DEPFLAGS = -+ -+.SECONDARY: $(RESOBJS:.o=.gz) $(RESOBJS:.o=.c) $(RESOBJS:%.css.o=%.css.min) $(RESOBJS:%.css.o=%.css.min.gz) $(RESOBJS:%.html.o=%.html.gz) $(RESOBJS:.o=) 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 index a27e30f710..2e26078f0f 100644 --- 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 @@ -30,7 +30,7 @@ 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 +@@ -126,8 +126,8 @@ $(BIN2CEXE): ffbuild/bin2c_host.o $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS) RUN_BIN2C = $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.1.1.bb similarity index 93% rename from meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.1.bb rename to meta/recipes-multimedia/ffmpeg/ffmpeg_8.1.1.bb index b6d3ceb6dc..bfa35882ea 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.1.1.bb @@ -23,12 +23,10 @@ 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] = "05ee0b03119b45c0bdb4df654b96802e909e0a752f72e4fe3794f487229e5a41" +SRC_URI[sha256sum] = "b6863adde98898f42602017462871b5f6333e65aec803fdd7a6308639c52edf3" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET:armv4 = "arm" @@ -172,14 +170,9 @@ FILES:${PN}-examples = "${datadir}/${BPN}/examples" CVE_PRODUCT = "ffmpeg libswresample libavcodec" -CVE_STATUS_GROUPS = "CVE_STATUS_WRONG_CPE" -CVE_STATUS_WRONG_CPE = "CVE-2023-51791 CVE-2023-51793 CVE-2023-51794 CVE-2023-51795 CVE-2023-51796 CVE-2023-51797 CVE-2023-51798 CVE-2025-22921" -CVE_STATUS_WRONG_CPE[status] = "fixed-version: these CVEs are fixed in used version" - CVE_STATUS[CVE-2022-2566] = "fixed-version: these CVEs are fixed since v5.1.1" CVE_STATUS[CVE-2025-9951] = "fixed-version: these CVEs are fixed since v8.0" CVE_STATUS[CVE-2025-25468] = "fixed-version: these CVEs are fixed since v8.0" CVE_STATUS[CVE-2025-25469] = "fixed-version: these CVEs are fixed since v8.0" -CVE_STATUS[CVE-2025-12343] = "fixed-version: this CVE are fixed since v8.0" CVE_STATUS[CVE-2025-59729] = "fixed-version: this CVE are fixed since v8.0" CVE_STATUS[CVE-2025-59730] = "fixed-version: this CVE are fixed since v8.0"