diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-11-03 15:09:52 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:00:22 +0000 |
| commit | 7795925fa985e10f61b92ecc0bb7c45692076f1c (patch) | |
| tree | fe0d3513240d18ebaed35fc855166eab33ad6044 | |
| parent | dfda42b624b539125443f30ae3a587ae55691ba4 (diff) | |
| download | openembedded-core-7795925fa985e10f61b92ecc0bb7c45692076f1c.tar.gz | |
ffmpeg: update to 3.4
Schroedinger support has been dropped:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/220b24c7c9
Remove upstreamed patch.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch | 44 | ||||
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb) | 8 |
2 files changed, 3 insertions, 49 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch deleted file mode 100644 index 3f8224aa07..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f34c567045bea5a7ded9bcfa8e785cfd24cc7dde Mon Sep 17 00:00:00 2001 -From: Shivraj Patil <shivraj.patil@imgtec.com> -Date: Tue, 4 Apr 2017 18:56:01 +0530 -Subject: [PATCH] build fix for mips - -Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> -Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> ---- -Upstream-Status: Backport - - libavcodec/mips/hevcpred_init_mips.c | 3 ++- - libavcodec/mips/hevcpred_msa.c | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libavcodec/mips/hevcpred_init_mips.c b/libavcodec/mips/hevcpred_init_mips.c -index 331cfac115..e987698d66 100644 ---- a/libavcodec/mips/hevcpred_init_mips.c -+++ b/libavcodec/mips/hevcpred_init_mips.c -@@ -18,7 +18,8 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#include "libavcodec/hevc.h" -+#include "config.h" -+#include "libavutil/attributes.h" - #include "libavcodec/mips/hevcpred_mips.h" - - #if HAVE_MSA -diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c -index 6a3b2815fd..963c64c861 100644 ---- a/libavcodec/mips/hevcpred_msa.c -+++ b/libavcodec/mips/hevcpred_msa.c -@@ -18,7 +18,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#include "libavcodec/hevc.h" -+#include "libavcodec/hevcdec.h" - #include "libavutil/mips/generic_macros_msa.h" - #include "hevcpred_mips.h" - --- -2.13.1 - diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb index 57e0ac0411..42dbe5582f 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb @@ -25,10 +25,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://mips64_cpu_detection.patch \ - file://0001-build-fix-for-mips.patch \ - " -SRC_URI[md5sum] = "e14a0200c78ce5c918427e57cd406a0d" -SRC_URI[sha256sum] = "98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957" + " +SRC_URI[md5sum] = "c64ba7247bb91e516f6a5789348fd5b5" +SRC_URI[sha256sum] = "aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET = "arm" @@ -64,7 +63,6 @@ PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis" PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz" PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" -PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2" PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex" PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora" |