- rel 3

[packages/ffmpeg.git] / freetype2.patch

--- ffmpeg-2.1.1/configure~	2013-11-30 13:14:22.612044487 +0100
+++ ffmpeg-2.1.1/configure	2013-11-30 13:24:12.010919213 +0100
@@ -1102,6 +1102,13 @@
     add_extralibs $(get_safe ${pkg}_libs)
 }
 
+require_pkg_config2(){
+    pkg="$1"
+    check_cmd $pkg_config --exists --print-errors $pkg || 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
 }
@@ -4242,7 +4249,7 @@
 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_pkg_config2 freetype2
 enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
 enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
--- ffmpeg-2.1.1/libavfilter/vf_drawtext.c~	2013-11-20 03:28:56.000000000 +0100
+++ ffmpeg-2.1.1/libavfilter/vf_drawtext.c	2013-11-30 13:29:31.113931329 +0100
@@ -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