summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/ffmpeg
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-07-19 21:19:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-22 17:31:04 +0100
commitc3aaa4b54e2b21d3d07ce2391e09f714869fc365 (patch)
tree05bcb15ab797525ef9c16fd6efa48a4c57b70536 /meta/recipes-multimedia/ffmpeg
parent560549ba5863ffc2e9103f0a4460726cdf14246b (diff)
downloadpoky-c3aaa4b54e2b21d3d07ce2391e09f714869fc365.tar.gz
ffmpeg: upgrade to 4.1.4
Add a PACKAGECONFIG for the use of XCB and enable by default if X11 is in DISTRO_FEATURES. (From OE-Core rev: 69b0f94c117b3ab922e0061255a1814e69b16435) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.4.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb)11
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.4.bb
index 6d230c3316..884973d237 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.4.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] = "dcc20dd2682ea01c678b7b8324339d43" 29SRC_URI[md5sum] = "5307931aeb7aaee5e1509d9996040661"
30SRC_URI[sha256sum] = "0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d" 30SRC_URI[sha256sum] = "f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1"
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_armv4 = "arm" 33ARM_INSTRUCTION_SET_armv4 = "arm"
@@ -44,7 +44,7 @@ inherit autotools pkgconfig
44 44
45PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ 45PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
46 bzlib gpl lzma theora x264 \ 46 bzlib gpl lzma theora x264 \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}" 47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
48 48
49# libraries to build in addition to avutil 49# libraries to build in addition to avutil
50PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" 50PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
@@ -73,6 +73,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
73PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" 73PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
74PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" 74PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
75PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" 75PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
76PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb"
76PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" 77PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
77 78
78# Check codecs that require --enable-nonfree 79# Check codecs that require --enable-nonfree
@@ -89,10 +90,6 @@ EXTRA_OECONF = " \
89 --enable-pic \ 90 --enable-pic \
90 --enable-shared \ 91 --enable-shared \
91 --enable-pthreads \ 92 --enable-pthreads \
92 --disable-libxcb \
93 --disable-libxcb-shm \
94 --disable-libxcb-xfixes \
95 --disable-libxcb-shape \
96 ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ 93 ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
97 \ 94 \
98 --cross-prefix=${TARGET_PREFIX} \ 95 --cross-prefix=${TARGET_PREFIX} \