浏览代码

ffmpeg: fix build for ffplay

Upstream has dropped SDL support for ffplay in favor of SDL2.
This results in silently not building ffplay even if it is selected
in Buildroot config.

[Peter: propagate !static dependency from sdl2]
Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Phil Eichinger 8 年之前
父节点
当前提交
d767ff85f2
共有 2 个文件被更改,包括 7 次插入3 次删除
  1. 5 1
      package/ffmpeg/Config.in
  2. 2 2
      package/ffmpeg/ffmpeg.mk

+ 5 - 1
package/ffmpeg/Config.in

@@ -41,12 +41,16 @@ config BR2_PACKAGE_FFMPEG_FFMPEG
 config BR2_PACKAGE_FFMPEG_FFPLAY
 	bool "Build ffplay"
 	select BR2_PACKAGE_FFMPEG_SWSCALE
-	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL2
+	depends on !BR2_STATIC_LIBS # sdl2
 	help
 	  FFplay is a very simple and portable media player using the
 	  FFmpeg libraries and the SDL library.
 	  It is mostly used as a testbed for the various FFmpeg APIs.
 
+comment "ffplay needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_FFMPEG_FFSERVER
 	bool "Build ffserver"
 	depends on BR2_USE_MMU # fork()

+ 2 - 2
package/ffmpeg/ffmpeg.mk

@@ -80,9 +80,9 @@ FFMPEG_CONF_OPTS += --disable-ffmpeg
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_FFPLAY),y)
-FFMPEG_DEPENDENCIES += sdl
+FFMPEG_DEPENDENCIES += sdl2
 FFMPEG_CONF_OPTS += --enable-ffplay
-FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
+FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl2-config
 else
 FFMPEG_CONF_OPTS += --disable-ffplay
 endif