mirror of
https://git.yoctoproject.org/poky
synced 2026-02-26 03:19:41 +01:00
ffmpeg: fix reproducibility
(From OE-Core rev: d10ea68968bd76c9f436291c68ebf39db62ce3a8) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a4f7c6f831a551e3df503091fdca5c9f4add879d) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
089ea89f89
commit
ad77210892
@@ -0,0 +1,97 @@
|
||||
From 24a58d70cbb3997e471366bd5afe54be9007bfb1 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: Pending
|
||||
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 +-
|
||||
6 files changed, 6 insertions(+), 6 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
|
||||
|
||||
@@ -25,6 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
|
||||
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
|
||||
file://mips64_cpu_detection.patch \
|
||||
file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb"
|
||||
|
||||
@@ -128,6 +129,11 @@ do_configure() {
|
||||
${S}/configure ${EXTRA_OECONF}
|
||||
}
|
||||
|
||||
# patch out build host paths for reproducibility
|
||||
do_compile_prepend_class-target() {
|
||||
sed -i -e "s,${WORKDIR},,g" ${B}/config.h
|
||||
}
|
||||
|
||||
PACKAGES =+ "libavcodec \
|
||||
libavdevice \
|
||||
libavfilter \
|
||||
|
||||
Reference in New Issue
Block a user