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>

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

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 699de2ac8f27ccaf2c56ff55176c2c2e3af21659..a68119242445ce6fcd8b12569ba4bc49b32cb2d2 100644 (file)
--- a/package/ffmpeg/ffmpeg.mk
+++ b/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