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:05:46 +0100 |
| commit | e6e228b36f2603540d33b06f515aed7d2f5b8a6d (patch) | |
| tree | 7e47fdeea25a28d39e1a8bbab94f55ade6c3c5c4 /meta/recipes-multimedia/ffmpeg/ffmpeg | |
| parent | 369a7f7232aa8406b63376f7888896fe90f9ce40 (diff) | |
| download | openembedded-core-contrib-e6e228b36f2603540d33b06f515aed7d2f5b8a6d.tar.gz | |
ffmpeg: Upgrade to 3.1.1
Fix build on mips64 while on it.
It was failing for mips64 with 3.1 too
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +It will add -mips64r6 and -mips64r2 to cmdline which will +cause conflicts + +in OE we user mips32r2 and mips64r2 for mips arch versions +so there is no benefit of detecting it automatically by +poking at tools especially in cross env + +Fixes errors like + +linking -mnan=2008 module with previous -mnan=legacy modules +failed to merge target specific data of file + +-Khem +Upstream-Status: Inappropriate [OE-Specific] + +Index: ffmpeg-3.1.1/configure +=================================================================== +--- ffmpeg-3.1.1.orig/configure ++++ ffmpeg-3.1.1/configure +@@ -5220,12 +5220,9 @@ elif enabled mips; then + + # Enable minimum ISA based on selected options + if enabled mips64; then +- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6' + enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' + disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' + else +- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6' +- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5' + enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' + disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' + fi |