Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493596)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

10 files changed, 229 insertions, 7 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 8389bf83dba8..94fe5bd3370a 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.696 2013/12/08 10:51:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.697 2013/12/10 12:28:38 polynomial-c Exp $
+
+  10 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> ffmpeg-0.10.10.ebuild,
+  ffmpeg-1.0.8.ebuild, ffmpeg-1.2.4.ebuild, ffmpeg-2.0.2.ebuild,
+  ffmpeg-2.1.1.ebuild, +files/ffmpeg-0.10.10-freetype251.patch,
+  +files/ffmpeg-1.0.8-freetype251.patch, +files/ffmpeg-1.2.4-freetype251.patch,
+  +files/ffmpeg-2.0.2-freetype251.patch:
+  Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493596).
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> ffmpeg-1.0.8.ebuild:
   x86 stable, bug #492252
diff --git a/media-video/ffmpeg/ffmpeg-0.10.10.ebuild b/media-video/ffmpeg/ffmpeg-0.10.10.ebuild
index 5a48265ce1f6..2edeeb0ea63c 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.10.ebuild,v 1.1 2013/11/14 19:38:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.10.ebuild,v 1.2 2013/12/10 12:28:38 polynomial-c Exp $
 
 EAPI="5"
 
@@ -132,6 +132,8 @@ src_prepare() {
 			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
 			configure libavdevice/libcdio.c || die
 	fi
+
+	epatch "${FILESDIR}"/${PN}-0.10.10-freetype251.patch
 }
 
 multilib_src_configure() {
diff --git a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
index 9f924e17fb4b..27a7ff5a1743 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.6 2013/12/08 10:51:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.7 2013/12/10 12:28:38 polynomial-c Exp $
 
 EAPI="4"
 
@@ -135,6 +135,8 @@ src_prepare() {
 			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
 			configure libavdevice/libcdio.c || die
 	fi
+
+	epatch "${FILESDIR}"/${PN}-1.0.8-freetype251.patch
 }
 
 src_configure() {
diff --git a/media-video/ffmpeg/ffmpeg-1.2.4.ebuild b/media-video/ffmpeg/ffmpeg-1.2.4.ebuild
index fa5fada29633..a33ace308f20 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.4.ebuild,v 1.2 2013/10/26 07:36:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.4.ebuild,v 1.3 2013/12/10 12:28:38 polynomial-c Exp $
 
 EAPI="4"
 
@@ -131,6 +131,8 @@ src_prepare() {
 	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
+
+	epatch "${FILESDIR}"/${PN}-1.2.4-freetype251.patch
 	epatch_user
 }
 
diff --git a/media-video/ffmpeg/ffmpeg-2.0.2.ebuild b/media-video/ffmpeg/ffmpeg-2.0.2.ebuild
index 52ec8a2863f9..06517b3ece10 100644
--- a/media-video/ffmpeg/ffmpeg-2.0.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.0.2.ebuild,v 1.2 2013/10/26 07:36:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.0.2.ebuild,v 1.3 2013/12/10 12:28:38 polynomial-c Exp $
 
 EAPI="5"
 
@@ -146,6 +146,8 @@ src_prepare() {
 	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
+
+	epatch "${FILESDIR}"/${PN}-2.0.2-freetype251.patch
 	epatch_user
 }
 
diff --git a/media-video/ffmpeg/ffmpeg-2.1.1.ebuild b/media-video/ffmpeg/ffmpeg-2.1.1.ebuild
index 6516e846f153..4125de021913 100644
--- a/media-video/ffmpeg/ffmpeg-2.1.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.1.1.ebuild,v 1.1 2013/11/22 06:26:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.1.1.ebuild,v 1.2 2013/12/10 12:28:38 polynomial-c Exp $
 
 EAPI="5"
 
@@ -30,7 +30,8 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2
+		http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=cea5812fa723c08b89d929eeba73462e05de2973 -> ${PN}-2.1.1-freetype251.patch"
 fi
 FFMPEG_REVISION="${PV#*_p}"
 
@@ -149,6 +150,8 @@ src_prepare() {
 	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
+
+	epatch "${DISTDIR}"/${PN}-2.1.1-freetype251.patch
 	epatch_user
 }
 
diff --git a/media-video/ffmpeg/files/ffmpeg-0.10.10-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-0.10.10-freetype251.patch
new file mode 100644
index 000000000000..e55d62e71bfb
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-0.10.10-freetype251.patch
@@ -0,0 +1,51 @@
+Patch based on
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
+
+--- ffmpeg-0.10.10/configure
++++ ffmpeg-0.10.10/configure
+@@ -943,6 +943,26 @@
+     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)
++}
++
+ check_host_cc(){
+     log check_host_cc "$@"
+     cat > $TMPC
+@@ -3134,7 +3154,7 @@
+     "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h"  \
+     "dirac_decoder_init dirac_encoder_init"
+ enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
++enabled libfreetype && require_libfreetype
+ enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
+ enabled libmodplug && require  libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
+ enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
+--- ffmpeg-0.10.10/libavfilter/vf_drawtext.c
++++ ffmpeg-0.10.10/libavfilter/vf_drawtext.c
+@@ -47,7 +47,6 @@
+ #undef time
+ 
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ 
diff --git a/media-video/ffmpeg/files/ffmpeg-1.0.8-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-1.0.8-freetype251.patch
new file mode 100644
index 000000000000..cb7cc0d59c03
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-1.0.8-freetype251.patch
@@ -0,0 +1,51 @@
+Patch based on
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
+
+--- ffmpeg-1.0.8/configure
++++ ffmpeg-1.0.8/configure
+@@ -1025,6 +1025,26 @@
+     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
+ }
+@@ -3646,7 +3666,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_libfreetype
+ enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
+ enabled libilbc    && require  libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
+ enabled libmodplug && require  libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
+--- ffmpeg-1.0.8/libavfilter/vf_drawtext.c
++++ ffmpeg-1.0.8/libavfilter/vf_drawtext.c
+@@ -49,7 +49,6 @@
+ #undef time
+ 
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #if CONFIG_FONTCONFIG
diff --git a/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch
new file mode 100644
index 000000000000..c809ff16824c
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch
@@ -0,0 +1,51 @@
+Patch based on
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
+
+--- ffmpeg-1.2.4/configure
++++ ffmpeg-1.2.4/configure
+@@ -1075,6 +1075,26 @@
+     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
+ }
+@@ -3902,7 +3922,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_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"; }
+--- ffmpeg-1.2.4/libavfilter/vf_drawtext.c
++++ ffmpeg-1.2.4/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
diff --git a/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch
new file mode 100644
index 000000000000..3b88c3a69ff9
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch
@@ -0,0 +1,51 @@
+Patch based on 
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
+
+--- ffmpeg-2.0.2/configure
++++ ffmpeg-2.0.2/configure
+@@ -1096,6 +1096,26 @@
+     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
+ }
+@@ -4143,7 +4163,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_libfreetype
+ enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme
+ enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
+--- ffmpeg-2.0.2/libavfilter/vf_drawtext.c
++++ ffmpeg-2.0.2/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