diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-08 08:42:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-10 08:20:13 +0100 |
commit | 861bb6a01a7ced150333a57890844a123ed8bd6e (patch) | |
tree | 906897e186717d9fd99f2df00fba534a1dd31c06 /meta/recipes-multimedia | |
parent | 2e9f2bf42bfc52a112775b548d600cde8c2f7645 (diff) | |
download | openembedded-core-contrib-861bb6a01a7ced150333a57890844a123ed8bd6e.tar.gz |
ffmpeg: update 5.0.1 -> 5.1
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch | 112 | ||||
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.1.bb) | 6 |
2 files changed, 2 insertions, 116 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch deleted file mode 100644 index 7d0a06f85b..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 4a891e1eddbf63f32fe769b5bff289f6748abf45 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 10 Nov 2020 15:32:14 +0000 -Subject: [PATCH] libavutil: include assembly with full path from source root - -Otherwise nasm writes the full host-specific paths into .o -output, which breaks binary reproducibility. - -Upstream-Status: Submitted [http://ffmpeg.org/pipermail/ffmpeg-devel/2022-January/291781.html] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - libavutil/x86/cpuid.asm | 2 +- - libavutil/x86/emms.asm | 2 +- - libavutil/x86/fixed_dsp.asm | 2 +- - libavutil/x86/float_dsp.asm | 2 +- - libavutil/x86/lls.asm | 2 +- - libavutil/x86/pixelutils.asm | 2 +- - libavutil/x86/tx_float.asm | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm -index c3f7866..766f77f 100644 ---- a/libavutil/x86/cpuid.asm -+++ b/libavutil/x86/cpuid.asm -@@ -21,7 +21,7 @@ - ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ;****************************************************************************** - --%include "x86util.asm" -+%include "libavutil/x86/x86util.asm" - - SECTION .text - -diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm -index 8611762..df84f22 100644 ---- a/libavutil/x86/emms.asm -+++ b/libavutil/x86/emms.asm -@@ -18,7 +18,7 @@ - ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ;****************************************************************************** - --%include "x86util.asm" -+%include "libavutil/x86/x86util.asm" - - SECTION .text - -diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm -index 979dd5c..2f41185 100644 ---- a/libavutil/x86/fixed_dsp.asm -+++ b/libavutil/x86/fixed_dsp.asm -@@ -20,7 +20,7 @@ - ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ;****************************************************************************** - --%include "x86util.asm" -+%include "libavutil/x86/x86util.asm" - - SECTION .text - -diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm -index 517fd63..b773e61 100644 ---- a/libavutil/x86/float_dsp.asm -+++ b/libavutil/x86/float_dsp.asm -@@ -20,7 +20,7 @@ - ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ;****************************************************************************** - --%include "x86util.asm" -+%include "libavutil/x86/x86util.asm" - - SECTION_RODATA 32 - pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0 -diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm -index 317fba6..d2526d1 100644 ---- a/libavutil/x86/lls.asm -+++ b/libavutil/x86/lls.asm -@@ -20,7 +20,7 @@ - ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ;****************************************************************************** - --%include "x86util.asm" -+%include "libavutil/x86/x86util.asm" - - SECTION .text - -diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm -index 36c57c5..8b45ead 100644 ---- a/libavutil/x86/pixelutils.asm -+++ b/libavutil/x86/pixelutils.asm -@@ -21,7 +21,7 @@ - ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ;****************************************************************************** - --%include "x86util.asm" -+%include "libavutil/x86/x86util.asm" - - SECTION .text - -diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm -index 4d2283f..ea39f21 100644 ---- a/libavutil/x86/tx_float.asm -+++ b/libavutil/x86/tx_float.asm -@@ -29,7 +29,7 @@ - ; replace some shuffles with vblends? - ; avx512 split-radix - --%include "x86util.asm" -+%include "libavutil/x86/x86util.asm" - - %if ARCH_X86_64 - %define ptr resq diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.bb index dd14f8df6f..bb507b4974 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.0.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.bb @@ -22,10 +22,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ - file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \ - " -SRC_URI[sha256sum] = "ef2efae259ce80a240de48ec85ecb062cecca26e4352ffb3fda562c21a93007b" +SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" +SRC_URI[sha256sum] = "55eb6aab5ee235550fa54a33eaf8bf1b4ec66c01453182b12f6a993d75698b03" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET:armv4 = "arm" |