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>
This commit is contained in:
Vicente Olivert Riera 2016-05-26 16:54:19 +01:00 committed by Thomas Petazzoni
parent 4a1e4a5c7d
commit e6e549b9e4
10 changed files with 19 additions and 12 deletions

View File

@ -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 menuconfig BR2_PACKAGE_FFMPEG
bool "ffmpeg" bool "ffmpeg"
# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on !BR2_nios2
help help
FFmpeg is a complete, cross-platform solution to record, convert FFmpeg is a complete, cross-platform solution to record, convert
and stream audio and video. and stream audio and video.

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_GST1_LIBAV config BR2_PACKAGE_GST1_LIBAV
bool "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
select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FFMPEG_SWSCALE
select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_KODI_ARCH_SUPPORTS config BR2_PACKAGE_KODI_ARCH_SUPPORTS
bool bool
default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \ 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_PACKAGE_BOOST_ARCH_SUPPORTS \
&& BR2_TOOLCHAIN_HAS_SYNC_8 && BR2_TOOLCHAIN_HAS_SYNC_8

View File

@ -4,6 +4,7 @@ config BR2_PACKAGE_MINIDLNA
depends on BR2_USE_WCHAR # flac depends on BR2_USE_WCHAR # flac
depends on BR2_USE_MMU # fork depends on BR2_USE_MMU # fork
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FLAC select BR2_PACKAGE_FLAC
select BR2_PACKAGE_LIBVORBIS # selects libogg select BR2_PACKAGE_LIBVORBIS # selects libogg
@ -13,7 +14,6 @@ config BR2_PACKAGE_MINIDLNA
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_SQLITE select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
depends on !BR2_nios2 # ffmpeg
help help
MiniDLNA (aka ReadyDLNA) is server software with the aim of being MiniDLNA (aka ReadyDLNA) is server software with the aim of being
fully compliant with DLNA/UPnP-AV clients. 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" comment "minidlna needs a toolchain w/ dynamic library, threads, wchar"
depends on BR2_USE_MMU 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 || \ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
BR2_STATIC_LIBS BR2_STATIC_LIBS

View File

@ -77,8 +77,8 @@ config BR2_PACKAGE_MPD_FAAD2
config BR2_PACKAGE_MPD_FFMPEG config BR2_PACKAGE_MPD_FFMPEG
bool "ffmpeg" bool "ffmpeg"
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG
depends on !BR2_nios2 # ffmpeg
help help
Enable ffmpeg input support. Enable ffmpeg input support.
Select this if you want to play back files supported by Select this if you want to play back files supported by

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_MPV config BR2_PACKAGE_MPV
bool "mpv" bool "mpv"
depends on !BR2_nios2 # ffmpeg
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FFMPEG_SWSCALE
@ -15,5 +15,5 @@ config BR2_PACKAGE_MPV
https://mpv.io/ https://mpv.io/
comment "mpv needs a toolchain w/ threads" comment "mpv needs a toolchain w/ threads"
depends on !BR2_nios2 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS

View File

@ -191,10 +191,10 @@ comment "3rd party support"
config BR2_PACKAGE_OPENCV_WITH_FFMPEG config BR2_PACKAGE_OPENCV_WITH_FFMPEG
bool "ffmpeg support" bool "ffmpeg support"
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FFMPEG_SWSCALE
depends on !BR2_nios2 # ffmpeg
help help
Use ffmpeg from the target system. Use ffmpeg from the target system.

View File

@ -242,11 +242,11 @@ comment "3rd party support"
config BR2_PACKAGE_OPENCV3_WITH_FFMPEG config BR2_PACKAGE_OPENCV3_WITH_FFMPEG
bool "ffmpeg support" bool "ffmpeg support"
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_AVRESAMPLE select BR2_PACKAGE_FFMPEG_AVRESAMPLE
select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FFMPEG_SWSCALE
depends on !BR2_nios2 # ffmpeg
help help
Use ffmpeg from the target system. Use ffmpeg from the target system.

View File

@ -21,8 +21,8 @@ if BR2_PACKAGE_SQUEEZELITE
config BR2_PACKAGE_SQUEEZELITE_FFMPEG config BR2_PACKAGE_SQUEEZELITE_FFMPEG
bool "Enable WMA and ALAC decoding" bool "Enable WMA and ALAC decoding"
default y default y
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG
depends on !BR2_nios2 # ffmpeg
config BR2_PACKAGE_SQUEEZELITE_DSD config BR2_PACKAGE_SQUEEZELITE_DSD
bool "Enable DSD decoding" bool "Enable DSD decoding"

View File

@ -5,7 +5,7 @@ config BR2_PACKAGE_TOVID
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 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 depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
# The below dependencies are runtime dependencies only # The below dependencies are runtime dependencies only
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng 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" comment "tovid needs a toolchain w/ threads, C++, wchar"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS \ depends on !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_INSTALL_LIBSTDCPP \ || !BR2_INSTALL_LIBSTDCPP \
@ -35,4 +36,5 @@ comment "tovid needs a toolchain w/ threads, C++, wchar"
comment "tovid depends on python or python3" comment "tovid depends on python or python3"
depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS