Commit 0ff42f10 authored by Steve Kenton's avatar Steve Kenton Committed by Peter Korsgaard
Browse files

ffmpeg: enable use of freetype and fontconfig 



Configure ffmpeg to use freetype and fontconfig
if those packages are selected.

ffmpeg freetype support require fenv.h, which is not available in uClibc or
musl, except for certain archs / depending on specific configuration
options, so only enable it for glibc.

[Peter: only enable on glibc, simplify logic]
Signed-off-by Stephen M. Kenton <skenton@ou.edu>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 3f1fc3f2

package/ffmpeg/ffmpeg.mk

+16 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ FFMPEG_CONF_OPTS = \ 
	--disable-libopencv \

	--disable-libdc1394 \

	--disable-libfaac \

	--disable-libfreetype \

	--disable-libgsm \

	--disable-libmp3lame \

	--disable-libnut \
@@ -234,6 +233,22 @@ else 
FFMPEG_CONF_OPTS += --disable-libvpx

endif



# ffmpeg freetype support require fenv.h which is only

# available/working on glibc

ifeq ($(BR2_PACKAGE_FREETYPE)$(BR2_TOOLCHAIN_USES_GLIBC),yy)

FFMPEG_CONF_OPTS += --enable-libfreetype

FFMPEG_DEPENDENCIES += freetype

else

FFMPEG_CONF_OPTS += --disable-libfreetype

endif



ifeq ($(BR2_PACKAGE_FONTCONFIG),y)

FFMPEG_CONF_OPTS += --enable-fontconfig

FFMPEG_DEPENDENCIES += fontconfig

else

FFMPEG_CONF_OPTS += --disable-fontconfig

endif



ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)

FFMPEG_CONF_OPTS += --enable-libx264

FFMPEG_DEPENDENCIES += x264