summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/ffmpeg/ffmpeg.mk17
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
OpenPOWER on IntegriCloud