summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-07-29 15:28:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-04 15:22:21 +0100
commit76fc5ab81db5c185d881a90f31693ef3458a82ef (patch)
treeb48508ba8540f478ca3a6cb3fce452470f0621c8 /meta/recipes-multimedia
parent8b21a516b0824aa6b47fa21287b160edfa232d96 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch32
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.1.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.bb)9
2 files changed, 37 insertions, 4 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 @@
1It will add -mips64r6 and -mips64r2 to cmdline which will
2cause conflicts
3
4in OE we user mips32r2 and mips64r2 for mips arch versions
5so there is no benefit of detecting it automatically by
6poking at tools especially in cross env
7
8Fixes errors like
9
10linking -mnan=2008 module with previous -mnan=legacy modules
11failed to merge target specific data of file
12
13-Khem
14Upstream-Status: Inappropriate [OE-Specific]
15
16Index: 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
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.1.bb
index 2d83ef084f..b8acb61297 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.1.bb
@@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ 13 file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
14 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 14 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
15 15
16SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" 16SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
17 17 file://mips64_cpu_detection.patch \
18SRC_URI[md5sum] = "24ef0c0d541c857c8bc39215619b126f" 18 "
19SRC_URI[sha256sum] = "919022430e2dad782fabccffdd6c4cae4e7029f84f0701aa662f036a9ca65423" 19SRC_URI[md5sum] = "4ba7033da5d9ac4d0391516c7e5d97e4"
20SRC_URI[sha256sum] = "71bc11f2a8202ef3fbe5e43a9a163b4b698855da39fb6216d9a4614eddd031db"
20 21
21# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 22# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
22ARM_INSTRUCTION_SET = "arm" 23ARM_INSTRUCTION_SET = "arm"