summaryrefslogtreecommitdiffstats
path: root/meta
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:45:36 +0100
commitf785e0f6eaabcbf77accb0c49dcbae1fe6279b07 (patch)
treeeb7f3b5843a9c7a363574feff4fef33a3b62a142 /meta
parent33dc3dd55f7fe7a7fdbee7a8bfff62a302ae7b8c (diff)
downloadpoky-f785e0f6eaabcbf77accb0c49dcbae1fe6279b07.tar.gz
ffmpeg: update to 3.3
--enabled-x11grab option has been removed upstream (and it was described as 'legacy' in the previous version) (From OE-Core rev: e7be4005355808173d55bcc9f053f59939cc0048) 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')
-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 \
26SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ 26SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
27 file://mips64_cpu_detection.patch \ 27 file://mips64_cpu_detection.patch \
28 " 28 "
29SRC_URI[md5sum] = "39fd71024ac76ba35f04397021af5606" 29SRC_URI[md5sum] = "368f1fff4bdadaf2823934cc0aadd71d"
30SRC_URI[sha256sum] = "6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a" 30SRC_URI[sha256sum] = "599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d"
31 31
32# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 32# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
33ARM_INSTRUCTION_SET = "arm" 33ARM_INSTRUCTION_SET = "arm"
@@ -42,7 +42,7 @@ inherit autotools pkgconfig
42 42
43PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \ 43PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \
44 bzlib gpl lzma theora x264 \ 44 bzlib gpl lzma theora x264 \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xv', '', d)}" 45 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}"
46 46
47# libraries to build in addition to avutil 47# libraries to build in addition to avutil
48PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" 48PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
@@ -69,7 +69,6 @@ PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
69PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" 69PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
70PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" 70PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
71PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" 71PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
72PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl"
73PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" 72PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
74PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" 73PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
75 74