[SCM] libav/master: Use the freetype API correctly (Closes: #731307).

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 07e9602b7755cb6d5b91762da2d9e14dd84ab233
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Wed Dec 4 10:28:11 2013 +0100

    Use the freetype API correctly (Closes: #731307).

diff --git a/debian/confflags b/debian/confflags
index 66fe53c..1abf757 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -116,7 +116,7 @@ endif
 # Additional features
 confflags += $(call cond_enable,/usr/include/bzlib.h,bzlib)
 confflags += $(call cond_enable,/usr/include/dc1394/dc1394.h,libdc1394)
-confflags += $(call cond_enable,/usr/include/freetype2/freetype/freetype.h,libfreetype)
+confflags += $(call cond_enable,/usr/include/freetype2/ft2build.h,libfreetype)
 confflags += $(call cond_enable,/usr/include/frei0r.h,frei0r)
 confflags += $(call cond_enable,/usr/include/gnutls/gnutls.h,gnutls)
 confflags += $(call cond_enable,/usr/include/gsm/gsm.h,libgsm)
diff --git a/debian/control b/debian/control
index 0123f82..4bcf244 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  libcdio-dev,
  libcdio-paranoia-dev,
  libdc1394-22-dev [linux-any],
- libfreetype6-dev,
+ libfreetype6-dev (>= 2.5.1),
  libgnutls-dev,
  libgsm1-dev,
  libjack-dev,
diff --git a/debian/patches/freetype-api.patch b/debian/patches/freetype-api.patch
new file mode 100644
index 0000000..08b08e0
--- /dev/null
+++ b/debian/patches/freetype-api.patch
@@ -0,0 +1,25 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Description: Use the freetype API correctly.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731307
+
+--- a/configure
++++ b/configure
+@@ -3481,7 +3481,7 @@ enabled frei0r     && { check_header fre
+ enabled gnutls     && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
+ enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+ enabled libfdk_aac && require  libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
+-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
++enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
+ enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
+ enabled libilbc    && require  libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
+ enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
+--- a/libavfilter/vf_drawtext.c
++++ b/libavfilter/vf_drawtext.c
+@@ -47,7 +47,6 @@
+ #include "video.h"
+ 
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8012f3f..b5ce535 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 03-disable-configuration-warnings.patch
 makeinfo.patch
 spelling-errors.patch
+freetype-api.patch

-- 
Libav/FFmpeg packaging