From: Steve Kenton <skenton@ou.edu>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH][Resend] ffmpeg: enable freetype support
Date: Fri, 02 Jan 2015 15:51:30 -0600 [thread overview]
Message-ID: <54A712E2.8080506@ou.edu> (raw)
In-Reply-To: <5494F00B.4080107@ou.edu>
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
prev parent reply other threads:[~2015-01-02 21:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-20 3:42 [Buildroot] [PATCH] ffmpeg: enable freetype support Steve Kenton
2015-01-02 21:51 ` Steve Kenton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54A712E2.8080506@ou.edu \
--to=skenton@ou.edu \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox