* [Buildroot] [PATCH] ffmpeg: enable freetype support
@ 2014-12-20 3:42 Steve Kenton
2015-01-02 21:51 ` [Buildroot] [PATCH][Resend] " Steve Kenton
0 siblings, 1 reply; 2+ messages in thread
From: Steve Kenton @ 2014-12-20 3:42 UTC (permalink / raw)
To: buildroot
If libfreetype has been select configure ffmpeg to use it if possible
Since this requires fenv.h it won't happen when using uClibc except for x86 targets
Signed-off-by Stephen M. Kenton <skenton@ou.edu>
---
diff -pruN buildroot-2014.11.clean/package/ffmpeg/ffmpeg.mk buildroot-2014.11.modified/package/ffmpeg/ffmpeg.mk
--- buildroot-2014.11.clean/package/ffmpeg/ffmpeg.mk 2014-12-01 03:19:00.000000000 -0600
+++ buildroot-2014.11.modified/package/ffmpeg/ffmpeg.mk 2014-12-19 21:27:00.321228195 -0600
@@ -50,7 +49,6 @@ FFMPEG_CONF_OPTS = \
--disable-libopencv \
--disable-libdc1394 \
--disable-libfaac \
- --disable-libfreetype \
--disable-libgsm \
--disable-libmp3lame \
--disable-libnut \
@@ -229,6 +233,22 @@ else
FFMPEG_CONF_OPTS += --disable-libvpx
endif
+# ffmpeg freetype support require fenv.h
+# which is not available in uClibc
+ifneq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+ffmpeg_environment_has_fenv ?= y
+endif
+# except for uClibc on x86
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
+ffmpeg_environment_has_fenv ?= y
+endif
+ifeq ($(BR2_PACKAGE_FREETYPE)$(ffmpeg_environment_has_fenv),yy)
+FFMPEG_CONF_OPTS += --enable-libfreetype
+FFMPEG_DEPENDENCIES += freetype
+else
+FFMPEG_CONF_OPTS += --disable-libfreetype
+endif
+
ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
FFMPEG_CONF_OPTS += --enable-libx264
FFMPEG_DEPENDENCIES += x264
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH][Resend] ffmpeg: enable freetype support
2014-12-20 3:42 [Buildroot] [PATCH] ffmpeg: enable freetype support Steve Kenton
@ 2015-01-02 21:51 ` Steve Kenton
0 siblings, 0 replies; 2+ messages in thread
From: Steve Kenton @ 2015-01-02 21:51 UTC (permalink / raw)
To: buildroot
If libfreetype has been select configure ffmpeg to use it if possible
Since this requires fenv.h it won't happen when using uClibc except for x86 targets
Signed-off-by Stephen M. Kenton <skenton@ou.edu>
---
Noticed the stray line at the bottom of the last version
Updated against last nights snapshot
diff -pruN buildroot.orig/package/ffmpeg/ffmpeg.mk buildroot/package/ffmpeg/ffmpeg.mk
--- buildroot.orig/package/ffmpeg/ffmpeg.mk 2015-01-01 17:02:23.000000000 -0600
+++ buildroot/package/ffmpeg/ffmpeg.mk 2015-01-02 15:25:30.649237010 -0600
@@ -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 not available in uClibc
+ifneq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+ffmpeg_environment_has_fenv ?= y
+endif
+# except for uClibc on x86
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
+ffmpeg_environment_has_fenv ?= y
+endif
+ifeq ($(BR2_PACKAGE_FREETYPE)$(ffmpeg_environment_has_fenv),yy)
+FFMPEG_CONF_OPTS += --enable-libfreetype
+FFMPEG_DEPENDENCIES += freetype
+else
+FFMPEG_CONF_OPTS += --disable-libfreetype
+endif
+
ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
FFMPEG_CONF_OPTS += --enable-libx264
FFMPEG_DEPENDENCIES += x264
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-02 21:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-20 3:42 [Buildroot] [PATCH] ffmpeg: enable freetype support Steve Kenton
2015-01-02 21:51 ` [Buildroot] [PATCH][Resend] " Steve Kenton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox