ffmpeg: add BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index a273aead2c5fefcd18b427baaf286c9c8508cef1..6b7a6e7b1f29154b71805db8e4dae90a81b48e01 100644 (file)
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -1,7 +1,11 @@
+config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
+       bool
+       # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
+       default y if !BR2_nios2
+
 menuconfig BR2_PACKAGE_FFMPEG
        bool "ffmpeg"
-       # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
-       depends on !BR2_nios2
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        help
          FFmpeg is a complete, cross-platform solution to record, convert
          and stream audio and video.

diff --git a/package/gstreamer1/gst1-libav/Config.in b/package/gstreamer1/gst1-libav/Config.in
index 8c3c834968b762aeb5208dd9c009704ea5fbce09..23d78b6ad19d241ab6f3c54bfe8f4927a6ec2417 100644 (file)
--- a/package/gstreamer1/gst1-libav/Config.in
+++ b/package/gstreamer1/gst1-libav/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GST1_LIBAV
        bool "gst1-libav"
-       depends on !BR2_nios2 # ffmpeg
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        select BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_FFMPEG_SWSCALE
        select BR2_PACKAGE_GST1_PLUGINS_BASE

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index ff2e75cb2fe0cf9884acb415009fa5e0ae0bf9de..d9760cac529f26b25f8270885a9190ec400cc222 100644 (file)
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KODI_ARCH_SUPPORTS
        bool
        default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \
+               && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
                && BR2_PACKAGE_BOOST_ARCH_SUPPORTS \
                && BR2_TOOLCHAIN_HAS_SYNC_8
 

diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in
index 999ea019d25dc598b17888d4a173f2e7f154ced6..c900143f7596671c4ae0cae3dbde585e9d64d398 100644 (file)
--- a/package/minidlna/Config.in
+++ b/package/minidlna/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_MINIDLNA
        depends on BR2_USE_WCHAR # flac
        depends on BR2_USE_MMU # fork
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        select BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_FLAC
        select BR2_PACKAGE_LIBVORBIS # selects libogg
@@ -13,7 +14,6 @@ config BR2_PACKAGE_MINIDLNA
        select BR2_PACKAGE_JPEG
        select BR2_PACKAGE_SQLITE
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       depends on !BR2_nios2 # ffmpeg
        help
          MiniDLNA (aka ReadyDLNA) is server software with the aim of being
          fully compliant with DLNA/UPnP-AV clients.
@@ -22,6 +22,6 @@ config BR2_PACKAGE_MINIDLNA
 
 comment "minidlna needs a toolchain w/ dynamic library, threads, wchar"
        depends on BR2_USE_MMU
-       depends on !BR2_nios2
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
                BR2_STATIC_LIBS

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 3ac806f74a39f2427e6688e4800474f019085fdd..31be8bb7748bdfa12f2a193ae9540e1938901d1e 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -77,8 +77,8 @@ config BR2_PACKAGE_MPD_FAAD2
 
 config BR2_PACKAGE_MPD_FFMPEG
        bool "ffmpeg"
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        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/mpv/Config.in b/package/mpv/Config.in
index b354d4dd4f77ddcf84f927223ea5918e8657bf6f..1cef6c50094d18b3a1e195bff3a91a05d3b0dd36 100644 (file)
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MPV
        bool "mpv"
-       depends on !BR2_nios2 # ffmpeg
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_FFMPEG_SWSCALE
@@ -15,5 +15,5 @@ config BR2_PACKAGE_MPV
          https://mpv.io/
 
 comment "mpv needs a toolchain w/ threads"
-       depends on !BR2_nios2
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 05c1fc1571502bdda25dea079b718afd4219c4c9..c046baaa4b4352d68844315117679c278f7d9ac4 100644 (file)
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -191,10 +191,10 @@ comment "3rd party support"
 
 config BR2_PACKAGE_OPENCV_WITH_FFMPEG
        bool "ffmpeg support"
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        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 9629a643e2c57b3f03a4b703ed77121ee628b874..2f4aa7aca86fd9dc014194af75f0a8583e8619e2 100644 (file)
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -242,11 +242,11 @@ comment "3rd party support"
 
 config BR2_PACKAGE_OPENCV3_WITH_FFMPEG
        bool "ffmpeg support"
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        select BR2_PACKAGE_BZIP2
        select BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_FFMPEG_AVRESAMPLE
        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 1c2960ea62aad01212129268ec622f7302890597..79d29474971b804c51fc92d0c8f65f656e629f15 100644 (file)
--- a/package/squeezelite/Config.in
+++ b/package/squeezelite/Config.in
@@ -21,8 +21,8 @@ if BR2_PACKAGE_SQUEEZELITE
 config BR2_PACKAGE_SQUEEZELITE_FFMPEG
        bool "Enable WMA and ALAC decoding"
        default y
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        select BR2_PACKAGE_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 093bfdf2a2b817ef1c40734779dc11d1b44a0c42..1288f849e2e1b04fbbfea19b4047f8948cba423d 100644 (file)
--- a/package/tovid/Config.in
+++ b/package/tovid/Config.in
@@ -5,7 +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_nios2 # ffmpeg
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
        # The below dependencies are runtime dependencies only
        select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng
@@ -28,6 +28,7 @@ config BR2_PACKAGE_TOVID
 
 comment "tovid needs a toolchain w/ threads, C++, wchar"
        depends on BR2_USE_MMU
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
        depends on !BR2_TOOLCHAIN_HAS_THREADS \
                || !BR2_INSTALL_LIBSTDCPP \
@@ -35,4 +36,5 @@ comment "tovid needs a toolchain w/ threads, C++, wchar"
 
 comment "tovid depends on python or python3"
        depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
+       depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
        depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS