NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: fix build for ffplay

Browse Source 
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>
This commit is contained in:
Phil Eichinger 2016-12-06 15:32:37 +01:00 committed by Peter Korsgaard
parent 9dd5b1aafb
commit d767ff85f2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/ffmpeg/Config.in
View File

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

4
package/ffmpeg/ffmpeg.mk
View File

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