Fixed compilation with >=freetype-2.5.1 (bug #504332)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 39 insertions, 11 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 5b152e0f524e..fc90b88728a5 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mlt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.107 2013/07/12 13:11:34 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.108 2014/03/21 19:33:35 polynomial-c Exp $
+
+  21 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> mlt-0.9.0.ebuild,
+  +files/mlt-0.9.0-freetype251.patch:
+  Fixed compilation with >=freetype-2.5.1 (bug #504332).
 
   12 Jul 2013; Alexis Ballier <aballier@gentoo.org> mlt-0.8.2.ebuild,
   mlt-0.8.8.ebuild, mlt-0.9.0.ebuild:
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index e5f9a9b1284b..a09b859c205d 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,18 +4,29 @@ Hash: SHA256
 AUX mlt-0.7.2-ruby-link.patch 680 SHA256 fbcf41da78bc150afd2fcc5394eda2022d2c19d7b1cb788910b443b64d0cdd56 SHA512 ef0dceab4355e56eeb2b812d05a9a9c4855b3af2d6a8a27f8b0ee63ea0158a31c187858dc6c7a5e570711322e62adde9d86bcb6c361d55862ebeacedc60cb287 WHIRLPOOL 4474b009e35b30c20f206bf2ae6d06d5eac694768dead867b03ff3b9ddab8f6884959e8c3a730c8068c9cce783dc6dee227b9ead890df5bde531210e7321fcc0
 AUX mlt-0.8.2-av_codec_is_encoder.patch 1480 SHA256 823199f9a0090d0076a3131c3fa6a6854986fa16b472e022aa6edacff2b2e901 SHA512 5c1d9081b651246bfce8fef8d109a633a7c2997de5fb6f3c3bf08a7ff4b614a6646b48e30a70ae211e3af0e10232c87aa67bfd6a3b11ca4489b127d8e67d7ea9 WHIRLPOOL 4a5798e7d430dfd23e337a693f5b47094aa668fd3cfb888870da8a0863c319c32164abb59c0af1de4578c944485520625ea2b0f57869df30dcee44d2da677001
 AUX mlt-0.8.6-ruby-link.patch 682 SHA256 2a0b7cadd8f37e2052392435ce8709e121601bf2a34afe2d6c1b6c1b5bb6a6a7 SHA512 a0d847cf07a3f65f1ed68074bd1306219d89463aa4abe5b0285b09d6da3f495b234bf946f868406ce4a9305377a60ac707c5d326fc579529aa96173c834048c6 WHIRLPOOL ab58a4fc0fe575673d9bbc05280e928e6cbeefac1994fefa0dbc2e2d5091d361cfd1d29f57aa8641f662c222bc05d2795a2c620681ff8864c5ac2205aea782a6
+AUX mlt-0.9.0-freetype251.patch 341 SHA256 b9402134cf83c21a4075b85cda048a8a63056fa29a4e2b3c574a803465b14f2f SHA512 98a0219c2d5d0645c5268e6a2b02aa7597954a424fa3bb85b84c5c7c030ed839954a7304b605d82bde4ff741d6720ed2b75fbf0cc9b648c116739f7064cb39df WHIRLPOOL fd8aab43521a1b408b882c949c5e8ca095ece27bb77a7a25e6f4191699ff0437751d53b6490ffb5204d8a2a60518e5aaed07fa2c6e427702d437dd34e3427acf
 DIST mlt-0.8.2.tar.gz 1161293 SHA256 36c743d2abc68ce737ac526507fc2caf71b3d6a53a2bf31d22e8193a8b899577 SHA512 ab71018e5a188b95d91b4aceeb4ca0dfc59d0dd981ec3e4fa220b91ce812e2c98ebad1d51998005c6bc98999c7478444c8bfd398d61bd2084ff732a1638ca6aa WHIRLPOOL 4d72efbffd2f7c77041065c948c18ccbb4a65eb7f4ec7209ccde15e142fee84c70324390bc921c0302c30ad7673336c8cf00be8c710154fe31c8a3063987622b
 DIST mlt-0.8.8.tar.gz 1108652 SHA256 cc0e1cdb97a1cd59811a74553b5d3fbff590eb859c475253e188de1069ff9654 SHA512 d29d982632dec14e4397db602688816e06f095b1831514a816bc7640d574a04d3d56cc16240ea0a01229887e95c80891b87c5df981063cb2d6a14b50ff67589f WHIRLPOOL 6e5665e5b4c9471d252faea7073cfd21580e31b55941ba51a415783d79bec3d857fcd01f111da25e24551a3f03a728390e17ab9b127e1bd0977bac94c83162a5
 DIST mlt-0.9.0.tar.gz 1167943 SHA256 f20c6a9c9acaed3da84c601bf9293b2d148168386e5be2bc55651a75f95c1cc9 SHA512 631ab41ee6e3673c712f784b9c02b567a5e3b982d49eabe032ef20e89be9424cf9ce6d97fe6906f03b0ac082544316ba8524ae041d017aeac009ab9b98d457d9 WHIRLPOOL b39e78837f2f2785721315ac174d106e33bafd2dd55b8883b254a39dc98f664be29ce3e84413d2ba55f881bb42ca10c36a9117de00b1a5efc3dff8577a6a29af
 EBUILD mlt-0.8.2.ebuild 4836 SHA256 716ac6577a2d48586f50671f1044c89aae7bda18a2116a7a37fb50839020fbf6 SHA512 b342930075d9fd3c82f74f75549d652163194dfccec2e2cfbd274c99284106ee06e4cce9d9f6907422b455d984da8bbd0cc339d51c36dbb1f513f362e9946951 WHIRLPOOL 885434c265db0cec7bba806f733a63a30035d1dc06292e9c23642155cf6c3f40f911ae4f2175c8d73d386229cd8b3334045cbe5ba576e82cc695d6c5728020bd
 EBUILD mlt-0.8.8.ebuild 4910 SHA256 992ecc1048aba1e1617ef7c96351d47ae664c8053144fc499353a9e2c65027bb SHA512 df994c699b6c324f0b96e1fca2b6b47e13f578e78a079f8fdef55df00d20c0c4514502d611eee1ce72b3bde1ad70fb5f714b5e430635fb5bcff04eef124a9c5b WHIRLPOOL 1f45a3f7575701438e3c33a5ea1ee77fd713ca24dffc04e166e86e06745ad1131ab9884fcd1b816c1a5d138fb4bdd9f6b89c533ea6958b473dbb6f8af3cffb1f
-EBUILD mlt-0.9.0.ebuild 4944 SHA256 39c8e1f35672f6660c14cef546cbd430416d5a5a51904fd431b8962cdd8761aa SHA512 2a8a8f3124d05c2ceb2d019ad6ed2a161292a68112c8946bad119c80189e04cbabfad06f69ff2db88323852869518d9562df0a663da1441e550dec2b90e071f6 WHIRLPOOL 5a69e1ae927a742f79e36cecb99c2f912fcd0923e6b404de3b4f05e44197883d3206fc3168640c7d2fca259b997cce4e8d2946dda97b4734071deadd45545aca
-MISC ChangeLog 16534 SHA256 a9973e62951abe2c6a83aeaf1604bacd17eaa5d94b029c80e8de0c49e5f8d4f2 SHA512 94174e9720d0c7df2f2093366724db54ef8e60ceb6ac182df5743eb1a688902e5b34ba9757da7cf2cfb0aba9fd60e36d56b979d1af03ed2096620c75142aba26 WHIRLPOOL 7dadd71b75983aa258f6c9d93dbdb459550293804333f079bdae7480bb11296c53961d5943fd3d24ecf8e979648950b4ce0955a494d97265d826821fa8ccb944
+EBUILD mlt-0.9.0.ebuild 4996 SHA256 6b284fb315a303e4c9d994fa43200503491ef91ed0cab21b2379ffe0c660a1af SHA512 c5706b1e965f3f67042136133935f2bffe84690b961d6576becc4a35c4d1883a8357ceced97bbbf1a887fc7a1f65141d39a43e0f8d774d94a18c55acc608caeb WHIRLPOOL 7ddf696bb956ba3093b97f920a0aac5bca74f5b559cc797e852fc5267a4b368f70fd7f23861b22ae6aac10b73c11d7819e824df0458724c1246fcc4f654bfbbd
+MISC ChangeLog 16706 SHA256 103894e7574711b958b089a2bbb0fa04be0ca706d73c6cd6b9c391b9f813794e SHA512 4ff404dd2c1d28e9660a88e1ce7f76d4923beb3aa52841158d05a37ec4ab698574a116f41f0fe6a18149e52b96b717b3814c4c154f716443b5d6a7a418387694 WHIRLPOOL 014cb6be39b8761057a94c30cad705620dcd4af44a113ec3ef0a0a9f112748dc4e00064ffd3b8e6c0570f238ea13df3e25e2c4f160a3a5eb3689a8f48d50c5a7
 MISC metadata.xml 1157 SHA256 08612c2ce4f642148f14f2d86c4eb8813cadabecd8e7ef3dcf13349cc3eda05a SHA512 38e69c1a4eb98dc6065bb26ae41f5bb75be53d81b3851ab3c9e83cfdb7d5e67f91c8a4d52d6ac4f5eadcaee0e3e768baee24c8d3faf2bc6579359bb89fbe53c8 WHIRLPOOL b8165ab773ae549bb89f7031f892b6ab81fedfe670f4131a0ac089373d2b520a630e101513872bf2225f3061dc0793a9b16563e3be9c9c625ef920447b6166df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHgAIgACgkQvFcC4BYPU0qLzgCfdZhahqEdoHGo5q/mcPaez4uo
-Wz8An1egsGHVPn7SllDRhnhSgUOAIGZ3
-=R4Jm
+iQIcBAEBCAAGBQJTLJQQAAoJEPiazRVxLXTFce0QAJawx+Zj0PU1kqxT7UqvzVcb
+oY2+BXXlelXlV5YKzGPYnWqr5ZKXJ/hNa3n+5R/dWp9VE+MizEsOR+2HppPx0zbp
+BmCB0CkzOEuMjSfwEuVwd67OBlR1ymFFQxhte6hIikmr7LEXCXnmcrTSX02I5cwA
+D3S1l3gjaICtCidVH9lh27CcwVHY1TIioBVFCCuc3aYlZX2dgEWm5wUiVxQAPsCy
+dw7495kmBP5pAjqbIvhnyMOF9SjJU2qYAIKlYoBnGnd3xWp0CDCcF8W1jRyD3h5w
+GwqnsOFfIIs9mtgvgwQ4RcPkbC8WFNdnMsOhxCue8q/pjp3IFIpKg24cOzNVPIA1
+vdcUqpOVOmRAB43Cy0iUpJyVv29vQwuqAy6RGF7s7Cc+ziqLC/UEe/otBvurdh3c
+gVeFu5aTOF+YEh6CCUQSNxPzeijICqdsQQzW8YJM3Rsx5eip3wYImYJkdUZlsy+A
+pQWagZGVtEXy+XOBfhPDETfv482HPTpqN6GaOHjDKjNyVcZOoC/GDXJIkHXACW2L
+JkYts4xxeCJqGvsRF0ubr7xa74mDGSJ6XSVhW3frDwHjqfOu5dcxG7vB2TpdPYaB
+9rUbY0eW9BtT9ZWrA5p9ivEQ8UwC+z9/Be6CXYKdqS96tHtJeD5M3C3wrhy5TE85
+IRU3eVqykBFw/+ovrwM8
+=jfwp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.9.0-freetype251.patch b/media-libs/mlt/files/mlt-0.9.0-freetype251.patch
new file mode 100644
index 000000000000..058412199fae
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.9.0-freetype251.patch
@@ -0,0 +1,12 @@
+--- mlt-0.9.0/src/modules/gtk2/producer_pango.c
++++ mlt-0.9.0/src/modules/gtk2/producer_pango.c
+@@ -25,7 +25,8 @@
+ #include <string.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <pango/pangoft2.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <iconv.h>
+ #include <pthread.h>
+ #include <ctype.h>
diff --git a/media-libs/mlt/mlt-0.9.0.ebuild b/media-libs/mlt/mlt-0.9.0.ebuild
index 3c247734b524..bb803d1166f4 100644
--- a/media-libs/mlt/mlt-0.9.0.ebuild
+++ b/media-libs/mlt/mlt-0.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v 1.2 2013/07/12 13:11:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v 1.3 2014/03/21 19:33:35 polynomial-c Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -69,7 +69,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.6-ruby-link.patch
+	epatch "${FILESDIR}"/${PN}-0.8.6-ruby-link.patch \
+		"${FILESDIR}"/${PN}-0.9.0-freetype251.patch
 
 	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
 	for x in python lua; do