summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/ffmpeg
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-05-10 12:35:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-23 17:43:58 +0100
commite7be4005355808173d55bcc9f053f59939cc0048 (patch)
tree2bbc8ac23d067b3da5a55f507c58563ff947a61e /meta/recipes-multimedia/ffmpeg
parentc2790aad53075bf7d68fa79a4871abd8625eb0a6 (diff)
downloadopenembedded-core-contrib-e7be4005355808173d55bcc9f053f59939cc0048.tar.gz
openembedded-core-contrib-e7be4005355808173d55bcc9f053f59939cc0048.tar.bz2
openembedded-core-contrib-e7be4005355808173d55bcc9f053f59939cc0048.zip
ffmpeg: update to 3.3
--enabled-x11grab option has been removed upstream (and it was described as 'legacy' in the previous version) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb)7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.bb
index 3216f8eb00..c2b570e85c 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.bb
@@ -26,8 +26,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] = "39fd71024ac76ba35f04397021af5606"
-SRC_URI[sha256sum] = "6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a"
+SRC_URI[md5sum] = "368f1fff4bdadaf2823934cc0aadd71d"
+SRC_URI[sha256sum] = "599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d"
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET = "arm"
@@ -42,7 +42,7 @@ inherit autotools pkgconfig
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \
bzlib gpl lzma theora x264 \
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xv', '', d)}"
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}"
# libraries to build in addition to avutil
PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
@@ -69,7 +69,6 @@ PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
-PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl"
PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"