From 7b00340f97f2d9456a0e6d6cee4c1a92165cde91 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 23 Dec 2013 01:03:48 +0100 Subject: [PATCH 1/2] configure: Support preprocessor macros as header names New versions of FreeType have moved the location of their API header(s) and hide the location behind a macro. Since the location changes between versions and no other way to know the location exists, this workaround becomes necessary. Signed-off-by: Luca Barbato (cherry picked from commit 52ccc4a0ece88030e67254418317d72089a0ecc8) Signed-off-by: Luca Barbato Conflicts: configure --- configure | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 844069bcc9..f9eac08588 100755 --- a/configure +++ b/configure @@ -654,6 +654,13 @@ check_ld(){ check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $libs $extralibs } +print_include(){ + hdr=$1 + test "${hdr%.h}" = "${hdr}" && + echo "#include $hdr" || + echo "#include <$hdr>" +} + check_cppflags(){ log check_cppflags "$@" set -- $($filter_cppflags "$@") @@ -723,7 +730,7 @@ check_func_headers(){ shift 2 { for hdr in $headers; do - echo "#include <$hdr>" + print_include $hdr done for func in $funcs; do echo "long check_$func(void) { return (long) $func; }" From ec772cca60423b9994fe00c7cef239f93eae6112 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sun, 5 Jan 2014 12:30:45 +0100 Subject: [PATCH 2/2] drawtext: Drop pointless header It should be forward compatible with newer freetype. (cherry picked from commit d68dc3c9446e38b4d686cc0f55433c9e8d7c128b) Signed-off-by: Luca Barbato --- libavfilter/vf_drawtext.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index dcde542118..273dc97a7d 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -45,7 +45,6 @@ #undef time #include -#include #include FT_FREETYPE_H #include FT_GLYPH_H