summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-02-24 15:53:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:04 +0000
commit8c2e420398c38794db7ef1922000820bd897f5a7 (patch)
treefb850f7825aebb8a1c393ee769ce7916593fbfe4 /meta/recipes-multimedia
parentafce2470f2ac167920cae71bf899bdc3f1403e52 (diff)
downloadopenembedded-core-contrib-8c2e420398c38794db7ef1922000820bd897f5a7.tar.gz
openembedded-core-contrib-8c2e420398c38794db7ef1922000820bd897f5a7.tar.bz2
openembedded-core-contrib-8c2e420398c38794db7ef1922000820bd897f5a7.zip
ffmpeg: update to 3.0
Also, enforce arm instruction set (thumb is causing build failures) (From OE-Core rev: e4bd6c8f991915534ec1375faca1321db134a237) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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_3.0.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb)7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
index 72393b3e82..3f0cbf84f0 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
@@ -15,8 +15,11 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
-SRC_URI[md5sum] = "0cff5dae51375f0a31a651f986ed1534"
-SRC_URI[sha256sum] = "25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea6e07fa"
+SRC_URI[md5sum] = "ef9b6634bb7c920efc940b4d55adf7b2"
+SRC_URI[sha256sum] = "12f32cee41c74435f608c30793fd616bdf53467bb513278e273e135a4c58e470"
+
+# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
+ARM_INSTRUCTION_SET = "arm"
# Should be API compatible with libav (which was a fork of ffmpeg)
# libpostproc was previously packaged from a separate recipe