diff options
| author | Alexander Strasser <eclipse7@gmx.net> | 2013-12-06 17:20:26 +0100 |
|---|---|---|
| committer | Alexander Strasser <eclipse7@gmx.net> | 2013-12-29 11:37:29 +0100 |
| commit | dcd1acce1a69aebc36306a1155c025cc4175badc (patch) | |
| tree | 2e0ff0fd6beb16b80999159be2248ac38a7b8394 | |
| parent | 5c502e5d4141709db616b1ab4576f8dbabdd216f (diff) | |
| download | ffmpeg-dcd1acce1a69aebc36306a1155c025cc4175badc.tar.gz | |
configure: Special case libfreetype test
Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.
Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.
(cherry picked from commit cea5812fa723c08b89d929eeba73462e05de2973)
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Conflicts:
configure
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | libavfilter/vf_drawtext.c | 1 |
2 files changed, 21 insertions, 2 deletions
@@ -1075,6 +1075,26 @@ require_pkg_config(){ add_extralibs $(get_safe ${pkg}_libs) } +require_libfreetype(){ + log require_libfreetype "$@" + pkg="freetype2" + check_cmd $pkg_config --exists --print-errors $pkg \ + || die "ERROR: $pkg not found" + pkg_cflags=$($pkg_config --cflags $pkg) + pkg_libs=$($pkg_config --libs $pkg) + { + echo "#include <ft2build.h>" + echo "#include FT_FREETYPE_H" + echo "long check_func(void) { return (long) FT_Init_FreeType; }" + echo "int main(void) { return 0; }" + } | check_ld "cc" $pkg_cflags $pkg_libs \ + && set_safe ${pkg}_cflags $pkg_cflags \ + && set_safe ${pkg}_libs $pkg_libs \ + || die "ERROR: $pkg not found" + add_cflags $(get_safe ${pkg}_cflags) + add_extralibs $(get_safe ${pkg}_libs) +} + hostcc_o(){ eval printf '%s\\n' $HOSTCC_O } @@ -3904,7 +3924,7 @@ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaa enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs -enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType +enabled libfreetype && require_libfreetype enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do check_lib "${gsm_hdr}" gsm_create -lgsm && break; done || die "ERROR: libgsm not found"; } diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 2358e35c26..4c08092249 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -48,7 +48,6 @@ #include "video.h" #include <ft2build.h> -#include <freetype/config/ftheader.h> #include FT_FREETYPE_H #include FT_GLYPH_H #if CONFIG_FONTCONFIG |