diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2025-10-05 20:49:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2025-10-05 20:49:53 +0200 |
| commit | b15e4ee063a381c4c4569dc7c17540ec913102b6 (patch) | |
| tree | 780860b7f5269d9b9279e9a3845d3a673c2787ee | |
| parent | 487d530123d44cc01e54fb3186ee7995ff6ad58a (diff) | |
ffmpeg: update to 7.1.2
| -rw-r--r-- | package/ffmpeg/Makefile | 10 | ||||
| -rw-r--r-- | package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch | 59 |
2 files changed, 5 insertions, 64 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 2920791d7..ce7180293 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 6.1.1 -PKG_RELEASE:= 2 -PKG_HASH:= 5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20 +PKG_VERSION:= 7.1.2 +PKG_RELEASE:= 1 +PKG_HASH:= 5eb62f529114778333b7eb0381cb16e2b8725ce2ae081d07b1082effe22b12e9 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads @@ -17,7 +17,7 @@ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_CHOICES_LIBFFMPEG:= WITH_LIBRESSL WITH_OPENSSL +PKG_CHOICES_LIBFFMPEG:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -196,7 +196,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-doc \ --disable-debug \ --disable-iconv \ - --disable-yasm \ --disable-optimizations \ --disable-stripping \ --enable-shared \ @@ -206,6 +205,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-swscale \ --enable-postproc \ --enable-openssl \ + --disable-x86asm \ $(CONFIGURE_CPU_OPTS) ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_BZIP2),y) diff --git a/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch b/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch deleted file mode 100644 index a23de2e78..000000000 --- a/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Fri, 9 Aug 2024 11:32:00 +0100 -Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with - binutils 2.43 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -binutils 2.43 has stricter validation for labels[1] and results in errors -when building ffmpeg for armv5: - -src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0' - -Remove the leading zero in the "01" label to resolve this error. - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b - -Signed-off-by: Ross Burton <ross.burton@arm.com> -Signed-off-by: Martin Storsjö <martin@martin.st> -Signed-off-by: Phil Sutter <phil@nwl.cc> ---- - libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S -index 4f9aa485fd21a..d31568611c30f 100644 ---- a/libavcodec/arm/mlpdsp_armv5te.S -+++ b/libavcodec/arm/mlpdsp_armv5te.S -@@ -229,7 +229,7 @@ A .endif - .endif - - // Begin loop --01: -+1: - .if TOTAL_TAPS == 0 - // Things simplify a lot in this case - // In fact this could be pipelined further if it's worth it... -@@ -241,7 +241,7 @@ A .endif - str ST0, [PST, #-4]! - str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] - str ST0, [PSAMP], #4 * MAX_CHANNELS -- bne 01b -+ bne 1b - .else - .if \fir_taps & 1 - .set LOAD_REG, 1 -@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1 - str ST3, [PST, #-4]! - str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] - str ST3, [PSAMP], #4 * MAX_CHANNELS -- bne 01b -+ bne 1b - .endif - b 99f - --- -2.43.0 - |