Commit 8b58ec01 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent cdf55a12

package/ffmpeg/Config.in

+2 −3
Original line number Diff line number Diff line 
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.

package/minidlna/Config.in

+2 −3
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ config BR2_PACKAGE_MINIDLNA 
	select BR2_PACKAGE_LIBJPEG

	select BR2_PACKAGE_SQLITE

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

	# Triggers the _gp link issue in nios2

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

	depends on !nios2 # ffmpeg

	help

	  MiniDLNA (aka ReadyDLNA) is server software with the aim of being

	  fully compliant with DLNA/UPnP-AV clients.
@@ -23,4 +21,5 @@ config BR2_PACKAGE_MINIDLNA 


comment "minidlna needs a toolchain w/ threads, wchar"

	depends on BR2_USE_MMU

	depends on !nios2

	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)

package/mpd/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ config BR2_PACKAGE_MPD_FAAD2 
config BR2_PACKAGE_MPD_FFMPEG

	bool "ffmpeg"

	select BR2_PACKAGE_FFMPEG

	depends on !BR2_nios2 # ffmpeg

	help

	  Enable ffmpeg input support.

	  Select this if you want to play back files supported by

package/opencv/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG 
	select BR2_PACKAGE_BZIP2

	select BR2_PACKAGE_FFMPEG

	select BR2_PACKAGE_FFMPEG_SWSCALE

	depends on !BR2_nios2 # ffmpeg

	help

	  Use ffmpeg from the target system.

package/opencv3/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ config BR2_PACKAGE_OPENCV3_WITH_FFMPEG 
	select BR2_PACKAGE_BZIP2

	select BR2_PACKAGE_FFMPEG

	select BR2_PACKAGE_FFMPEG_SWSCALE

	depends on !BR2_nios2 # ffmpeg

	help

	  Use ffmpeg from the target system.