summaryrefslogtreecommitdiffstats
path: root/package/ffmpeg
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-11 15:55:07 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-11 15:55:07 +0100
commit8b58ec016973bee87a4fc1cc99a32b206bdee136 (patch)
treeb01d5a621940ecf427fcc9655f16a95892c8f805 /package/ffmpeg
parentcdf55a12658dc9ff5496f4bf0cc980a662008cd6 (diff)
downloadbuildroot-8b58ec016973bee87a4fc1cc99a32b206bdee136.tar.gz
buildroot-8b58ec016973bee87a4fc1cc99a32b206bdee136.zip
ffmpeg: mark as not available on nios2
ffmpeg was already marked as not available for the NIOS2 Sourcery toolchains, but it could still be built with the internal toolchain backend or a custom external toolchain. However, an inspection of the latest glibc source code indicates that FE_INVALID, FE_OVERFLOW and FE_UNDERFLOW and indeed not available in the nios2 variant of <fenv.h>. Consequently, this patch makes ffmpeg not available on nios2, which allows to simplify a bit the dependencies. It propagates this dependency to: - minidlna (and at the same time makes sure the minidlna comment is not displayed on nios2, which wasn't properly taken into account until now) - mpd - opencv - opencv3 - squeezelite - tovid Even if it selects ffmpeg, Kodi does not need an update since Kodi is only available on a limited number of architectures (which don't include nios2, obviously). Other packages only make use of ffmpeg when available. Fixes: http://autobuild.buildroot.org/results/921/9212f5a6432c5e695ac0630695405cea05e28610/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/ffmpeg')
-rw-r--r--package/ffmpeg/Config.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index e5981fee55..a273aead2c 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -1,8 +1,7 @@
menuconfig BR2_PACKAGE_FFMPEG
bool "ffmpeg"
- # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
+ # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
+ depends on !BR2_nios2
help
FFmpeg is a complete, cross-platform solution to record, convert
and stream audio and video.
OpenPOWER on IntegriCloud