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>

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index e5981fee55ccdb246f29da0da93d44e59adfbcbb..a273aead2c5fefcd18b427baaf286c9c8508cef1 100644 (file)
--- 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.

diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in
index 0eef7512a15dac2cfac8dc79afd3dcfa4d5554d5..9799672d92631a13159b52463c158db8d9623569 100644 (file)
--- a/package/minidlna/Config.in
+++ b/package/minidlna/Config.in
@@ -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)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 3bfeb3e9f52d07a378b74be3cd7ba46a76805516..0b3bb72494dbc9f9d8c4792abcb0b04ef83e948d 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -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

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index aca51740791c7a29ca87bab68e6759e880ae3882..a5fafc170e342fe312868f1eda3151b876e2a122 100644 (file)
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -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.
 

diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index 2f51580e16accf7c11d0fe3cc07f909059820e31..873680515b1d3fff462db1e0476292fd8136f085 100644 (file)
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -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.
 

diff --git a/package/squeezelite/Config.in b/package/squeezelite/Config.in
index be8f11a387fa69f8dd5ef2519b5b611069b38286..6befee17adde65ea3c53c8bcb18e57ac2aef1544 100644 (file)
--- a/package/squeezelite/Config.in
+++ b/package/squeezelite/Config.in
@@ -21,8 +21,7 @@ config BR2_PACKAGE_SQUEEZELITE_FFMPEG
        bool "Enable WMA and ALAC decoding"
        default y
        select BR2_PACKAGE_FFMPEG
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305 # ffmpeg
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405 # ffmpeg
+       depends on !BR2_nios2 # ffmpeg
 
 config BR2_PACKAGE_SQUEEZELITE_DSD
        bool "Enable DSD decoding"

diff --git a/package/tovid/Config.in b/package/tovid/Config.in
index ccf031e8a6c0773c5d1efc8c29e97fbdc78664ee..79eaec49c6074df8ee68696f9dadb8ce5f90c1ee 100644 (file)
--- a/package/tovid/Config.in
+++ b/package/tovid/Config.in
@@ -5,8 +5,7 @@ config BR2_PACKAGE_TOVID
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
        depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305 # ffmpeg
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405 # ffmpeg
+       depends on !nios2 # ffmpeg
        depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
        # The below dependencies are runtime dependencies only
        select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng