[PATCH 02/13] ffmpeg: update to 3.2

Alexander Kanavin
2016-11-01T15:27:50Z

Drop faac package config as upstream ./configure doesn't have it anymore.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-multimedia/ffmpeg/{ffmpeg_3.1.4.bb => ffmpeg_3.2.bb} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.1.4.bb => ffmpeg_3.2.bb} (95%)

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.bb
similarity index 95%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.4.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.bb
index 06e7a306..1091952 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.4.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.bb
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
"
-SRC_URI[md5sum] = "b54d3e3d2d14d64305b840bb3d287445"
-SRC_URI[sha256sum] = "a80cb378dda5c9bbcdbd62a99bdec0e4eedbcb47f290e72845af4855c1146b5b"
+SRC_URI[md5sum] = "3c065fb5baae1aeb1494a09ac984b2de"
+SRC_URI[sha256sum] = "88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da"

# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET = "arm"
@@ -46,7 +46,6 @@ PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"

# features to support
PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2"
-PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
@@ -64,7 +63,7 @@ PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"

# Check codecs that require --enable-nonfree
-USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '', d)}"
+USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}"

EXTRA_OECONF = " \
--disable-stripping \
--
2.10.1