首页 发现 帮助
注册 登录
PUBLIC_REPOS
/
buildroot
镜像自地址 git://git.buildroot.net/buildroot
2
1
派生 0
文件
浏览代码

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>
Vicente Olivert Riera 9 年之前
父节点
4a1e4a5c7d
当前提交
e6e549b9e4
共有 10 个文件被更改，包括 19 次插入 和 12 次删除
合并视图 显示文件统计
  1. 6 2
      package/ffmpeg/Config.in
  2. 1 1
      package/gstreamer1/gst1-libav/Config.in
  3. 1 0
      package/kodi/Config.in
  4. 2 2
      package/minidlna/Config.in
  5. 1 1
      package/mpd/Config.in
  6. 2 2
      package/mpv/Config.in
  7. 1 1
      package/opencv/Config.in
  8. 1 1
      package/opencv3/Config.in
  9. 1 1
      package/squeezelite/Config.in
  10. 3 1
      package/tovid/Config.in

+ 6 - 2
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
 
 menuconfig BR2_PACKAGE_FFMPEG
 
 	bool "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
 
 	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.

+ 1 - 1
package/gstreamer1/gst1-libav/Config.in
查看文件 

@@ -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

+ 1 - 0
package/kodi/Config.in
查看文件 

@@ -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

+ 2 - 2
package/minidlna/Config.in
查看文件 

@@ -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

+ 1 - 1
package/mpd/Config.in
查看文件 

@@ -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

+ 2 - 2
package/mpv/Config.in
查看文件 

@@ -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

+ 1 - 1
package/opencv/Config.in
查看文件 

@@ -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.

+ 1 - 1
package/opencv3/Config.in
查看文件 

@@ -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.

+ 1 - 1
package/squeezelite/Config.in
查看文件 

@@ -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"

+ 3 - 1
package/tovid/Config.in
查看文件 

@@ -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