diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-07-29 15:28:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:22:21 +0100 |
commit | 76fc5ab81db5c185d881a90f31693ef3458a82ef (patch) | |
tree | b48508ba8540f478ca3a6cb3fce452470f0621c8 /meta/recipes-multimedia/ffmpeg/ffmpeg | |
parent | 8b21a516b0824aa6b47fa21287b160edfa232d96 (diff) | |
download | poky-76fc5ab81db5c185d881a90f31693ef3458a82ef.tar.gz |
ffmpeg: Upgrade to 3.1.1
Fix build on mips64 while on it.
It was failing for mips64 with 3.1 too
(From OE-Core rev: e6e228b36f2603540d33b06f515aed7d2f5b8a6d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch new file mode 100644 index 0000000000..69429af8f0 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | It will add -mips64r6 and -mips64r2 to cmdline which will | ||
2 | cause conflicts | ||
3 | |||
4 | in OE we user mips32r2 and mips64r2 for mips arch versions | ||
5 | so there is no benefit of detecting it automatically by | ||
6 | poking at tools especially in cross env | ||
7 | |||
8 | Fixes errors like | ||
9 | |||
10 | linking -mnan=2008 module with previous -mnan=legacy modules | ||
11 | failed to merge target specific data of file | ||
12 | |||
13 | -Khem | ||
14 | Upstream-Status: Inappropriate [OE-Specific] | ||
15 | |||
16 | Index: ffmpeg-3.1.1/configure | ||
17 | =================================================================== | ||
18 | --- ffmpeg-3.1.1.orig/configure | ||
19 | +++ ffmpeg-3.1.1/configure | ||
20 | @@ -5220,12 +5220,9 @@ elif enabled mips; then | ||
21 | |||
22 | # Enable minimum ISA based on selected options | ||
23 | if enabled mips64; then | ||
24 | - enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6' | ||
25 | enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' | ||
26 | disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' | ||
27 | else | ||
28 | - enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6' | ||
29 | - enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5' | ||
30 | enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' | ||
31 | disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' | ||
32 | fi | ||