diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-04-04 16:45:58 -0500 |
---|---|---|
committer | Tom Hochstein <tom.hochstein@nxp.com> | 2022-04-04 16:57:41 -0500 |
commit | 1c6c0f6523c0a62c15ac973aa782e108a652a61e (patch) | |
tree | 2d10b15b96f19b2529947992947fd6204eff9077 /recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch | |
parent | 904c6c886587c611ed66d8b0bd9d3c7e6c20af13 (diff) | |
download | meta-freescale-1c6c0f6523c0a62c15ac973aa782e108a652a61e.tar.gz |
ffmpeg: Downgrade ffmpeg 5.0.0 -> 4.4.1 for NXP BSP
The i.MX 1.18.5 version of gstreamer1.0-libav is not compatible with
upstream ffmpeg 5.5.0 and results in the follow build errors:
```
/opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavaudenc.c.o: in function `gst_ffmpegaudenc_set_format':
/usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:246: undefined reference to `avcodec_get_context_defaults3'
/opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:292: undefined reference to `avcodec_get_context_defaults3'
/opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:336: undefined reference to `avcodec_get_context_defaults3'
/opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:317: undefined reference to `avcodec_get_context_defaults3'
/opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavaudenc.c.o: in function `gst_ffmpegaudenc_start':
/usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:197: undefined reference to `avcodec_get_context_defaults3'
/opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavvidenc.c.o:/usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavvidenc.c:252: more undefined references to `avcodec_get_context_defaults3' follow
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
```
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch')
-rw-r--r-- | recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch b/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch new file mode 100644 index 00000000..2b4ca0e9 --- /dev/null +++ b/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch | |||
@@ -0,0 +1,97 @@ | |||
1 | From 24a58d70cbb3997e471366bd5afe54be9007bfb1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 10 Nov 2020 15:32:14 +0000 | ||
4 | Subject: [PATCH] libavutil: include assembly with full path from source root | ||
5 | |||
6 | Otherwise nasm writes the full host-specific paths into .o | ||
7 | output, which breaks binary reproducibility. | ||
8 | |||
9 | Upstream-Status: Submitted [by email to jamrial@gmail.com,ffmpeg-devel@ffmpeg.org] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | libavutil/x86/cpuid.asm | 2 +- | ||
13 | libavutil/x86/emms.asm | 2 +- | ||
14 | libavutil/x86/fixed_dsp.asm | 2 +- | ||
15 | libavutil/x86/float_dsp.asm | 2 +- | ||
16 | libavutil/x86/lls.asm | 2 +- | ||
17 | libavutil/x86/pixelutils.asm | 2 +- | ||
18 | 6 files changed, 6 insertions(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm | ||
21 | index c3f7866..766f77f 100644 | ||
22 | --- a/libavutil/x86/cpuid.asm | ||
23 | +++ b/libavutil/x86/cpuid.asm | ||
24 | @@ -21,7 +21,7 @@ | ||
25 | ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
26 | ;****************************************************************************** | ||
27 | |||
28 | -%include "x86util.asm" | ||
29 | +%include "libavutil/x86/x86util.asm" | ||
30 | |||
31 | SECTION .text | ||
32 | |||
33 | diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm | ||
34 | index 8611762..df84f22 100644 | ||
35 | --- a/libavutil/x86/emms.asm | ||
36 | +++ b/libavutil/x86/emms.asm | ||
37 | @@ -18,7 +18,7 @@ | ||
38 | ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
39 | ;****************************************************************************** | ||
40 | |||
41 | -%include "x86util.asm" | ||
42 | +%include "libavutil/x86/x86util.asm" | ||
43 | |||
44 | SECTION .text | ||
45 | |||
46 | diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm | ||
47 | index 979dd5c..2f41185 100644 | ||
48 | --- a/libavutil/x86/fixed_dsp.asm | ||
49 | +++ b/libavutil/x86/fixed_dsp.asm | ||
50 | @@ -20,7 +20,7 @@ | ||
51 | ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
52 | ;****************************************************************************** | ||
53 | |||
54 | -%include "x86util.asm" | ||
55 | +%include "libavutil/x86/x86util.asm" | ||
56 | |||
57 | SECTION .text | ||
58 | |||
59 | diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm | ||
60 | index 517fd63..b773e61 100644 | ||
61 | --- a/libavutil/x86/float_dsp.asm | ||
62 | +++ b/libavutil/x86/float_dsp.asm | ||
63 | @@ -20,7 +20,7 @@ | ||
64 | ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
65 | ;****************************************************************************** | ||
66 | |||
67 | -%include "x86util.asm" | ||
68 | +%include "libavutil/x86/x86util.asm" | ||
69 | |||
70 | SECTION_RODATA 32 | ||
71 | pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0 | ||
72 | diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm | ||
73 | index 317fba6..d2526d1 100644 | ||
74 | --- a/libavutil/x86/lls.asm | ||
75 | +++ b/libavutil/x86/lls.asm | ||
76 | @@ -20,7 +20,7 @@ | ||
77 | ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
78 | ;****************************************************************************** | ||
79 | |||
80 | -%include "x86util.asm" | ||
81 | +%include "libavutil/x86/x86util.asm" | ||
82 | |||
83 | SECTION .text | ||
84 | |||
85 | diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm | ||
86 | index 36c57c5..8b45ead 100644 | ||
87 | --- a/libavutil/x86/pixelutils.asm | ||
88 | +++ b/libavutil/x86/pixelutils.asm | ||
89 | @@ -21,7 +21,7 @@ | ||
90 | ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
91 | ;****************************************************************************** | ||
92 | |||
93 | -%include "x86util.asm" | ||
94 | +%include "libavutil/x86/x86util.asm" | ||
95 | |||
96 | SECTION .text | ||
97 | |||