diff options
| author | Steve Kenton <skenton@ou.edu> | 2015-01-26 19:22:35 -0600 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-01-27 23:06:18 +0100 |
| commit | 0ff42f101f26bf6fe6035afaa90f808f33398590 (patch) | |
| tree | eeff25b3bf063314dddc492ba14a119f4548f3f4 | |
| parent | 3f1fc3f238dac4878361154a214a83f6adccf103 (diff) | |
| download | buildroot-0ff42f101f26bf6fe6035afaa90f808f33398590.tar.gz buildroot-0ff42f101f26bf6fe6035afaa90f808f33398590.zip | |
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: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index bc8c220983..16f53be699 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -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 |
