diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-02-10 14:42:39 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-11 12:27:45 +0000 |
| commit | c24b0ab0de9a35f3d4131d7ece53ea499b5de56f (patch) | |
| tree | 83dd37aca162f51ac2ee5ad55b5b55f990838c6a /meta/recipes-multimedia | |
| parent | 9237097b79ae482df065f62bc371641721a1bf38 (diff) | |
| download | poky-c24b0ab0de9a35f3d4131d7ece53ea499b5de56f.tar.gz | |
ffmpeg: update to 2.8.6
Add libxv dependency only when libavdevice is enabled (as nothing else needs it).
(From OE-Core rev: 62fdbf2b89373adedd1a1058e1d7e21cab3cf592)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.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_2.8.6.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.5.bb) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.5.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb index 7107803c46..72393b3e82 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.5.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb | |||
| @@ -15,19 +15,19 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
| 15 | 15 | ||
| 16 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" | 16 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" |
| 17 | 17 | ||
| 18 | SRC_URI[md5sum] = "b34164bd181f4f81c21da3dd131d919d" | 18 | SRC_URI[md5sum] = "0cff5dae51375f0a31a651f986ed1534" |
| 19 | SRC_URI[sha256sum] = "76fb83a267d2d1cb332742dadf28ad8b58af7958165f51bb1a2c226a122f0ac7" | 19 | SRC_URI[sha256sum] = "25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea6e07fa" |
| 20 | 20 | ||
| 21 | # Should be API compatible with libav (which was a fork of ffmpeg) | 21 | # Should be API compatible with libav (which was a fork of ffmpeg) |
| 22 | # libpostproc was previously packaged from a separate recipe | 22 | # libpostproc was previously packaged from a separate recipe |
| 23 | PROVIDES = "libav libpostproc" | 23 | PROVIDES = "libav libpostproc" |
| 24 | 24 | ||
| 25 | DEPENDS = "alsa-lib zlib libogg yasm-native libxv" | 25 | DEPENDS = "alsa-lib zlib libogg yasm-native" |
| 26 | 26 | ||
| 27 | inherit autotools pkgconfig | 27 | inherit autotools pkgconfig |
| 28 | 28 | ||
| 29 | PACKAGECONFIG ??= "avdevice avfilter gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 29 | PACKAGECONFIG ??= "avdevice avfilter gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
| 30 | PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" | 30 | PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, libxv" |
| 31 | PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter" | 31 | PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter" |
| 32 | PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" | 32 | PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" |
| 33 | PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" | 33 | PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" |