When freetype-2.5.1 or newer is used, we apply a backported patch to vlc-2.1.1 support it; fixes bug #493496, reported by Ben de Groot (yngwin).

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 41 insertions, 7 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 1d0a42e8eeb3..ea2e8abcd3ed 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.876 2013/12/06 17:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.877 2013/12/07 20:19:42 tomwij Exp $
+
+  07 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-2.1.1-freetype-2.5.1-support.patch, vlc-2.1.1.ebuild:
+  When freetype-2.5.1 or newer is used, we apply a backported patch to vlc-2.1.1
+  support it; fixes bug #493496, reported by Ben de Groot (yngwin).
 
   06 Dec 2013; Markus Meier <maekke@gentoo.org> vlc-2.0.8.ebuild,
   vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild, vlc-2.1.0.ebuild, vlc-2.1.1.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index f18034b638c9..b4cd9961580c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,6 +9,7 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83eb
 AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236486a885b9f64b4c80004db7964b2b931c1 SHA512 74cba8136b2abb7a78b5ee8c8b5a9b3509a4a16ff9d4f136a3a7e2d6ff634ce20e34b8d140810ac63dd6cd3115d71cbb87a6e213fb172485494e55ade1b5230a WHIRLPOOL 1d2e747f4097c7903b798d7dfd17e11de41c01e903afda0b2c766ef5d7977da32362c52e5bc41c93a1f801a93c857c08d2cee3840f76a55afe0b2a768250073e
 AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa6443e5e9f69528f1d668bfc53d SHA512 e13541f116a11e27ffc25a25ff3e94c7122dcfdbe4eed8ad97abe3b672df135648523716eb2d0cd191caf0b59af010b4aab48202b3fbf5f1f7d6ab2144093122 WHIRLPOOL 8c0278e069ea73593a57d013b045380fe99ff7cfb79ffbca08d9cd761ee5b3ebccbcaaaab939861016af38dee35b9c327bb573ee8bef36934c64bf3ab8207d86
 AUX vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch 1953 SHA256 bd1694702a2faef7175b746dd0bf710aaa155d07cfc8023ca3d503347844cb53 SHA512 9b0d8ab9ba8578d99dc098fbbdd2d04a73e2ba60b4a00308fb9b66cd1ffddf14d85a7f158766ff73b07aabc22abdf0257d2f3811f4a9377a5eb0ab19e7c6a3e2 WHIRLPOOL 637894d3fa9503280da9825168c3e894274b6dbcb67d1bbe0cee025d025b5ca3a2216d25e04cc3142f7579153a0ecac5d5969f2181af5491a5fc12319b1b16f2
+AUX vlc-2.1.1-freetype-2.5.1-support.patch 764 SHA256 424fd612665c1c3d8f9247053379de1f93f56f81cb788d15470076c583d949e4 SHA512 aa11369b9cc5a91a0edaf7e23ada1651cdab01fa3acd54d454358c0789db2b2539fc4200c798b6ac58448341f6a2cfa32c987d2a44ac1af815fa4c2a7b091597 WHIRLPOOL 9c11f2b6ba5b903443991654b80ac2f6b1fe898c08b5b3c8004c3cc11fa5a9f4b20fb76e5eaaf137fcdb2a84e871a357aa72d3955668e5301de63ed4d1ff3d79
 DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
 DIST vlc-2.0.6.tar.xz 18619836 SHA256 31cc98035e2ce36c71a8f105aa5a87e3d8b5e206a0b3f7208c5ced407cbe1963 SHA512 80793305f7e0e48c99be99adfd85d699deaff53184f740b7624cdc9cad106b7c70f1d221e26c1362a1d1e5b02b861a1289e21a3af8a4c5ae3dfc316c67f15e74 WHIRLPOOL 04d2ff943d59979e25707aeab8a4157a3417b604ddf4d7116a6affe235afcd24fede3c49fea15b2b54784f9716b6376aae753b8b5b89f65e471d1fe11bfa728d
 DIST vlc-2.0.7.tar.xz 18538256 SHA256 243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314 SHA512 6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2 WHIRLPOOL 7524f518a8c4575ac417261857326dcc6a2787cafd09f64a181fd597358b04433be09a4f418eb1186bb093ef467bb4de75f809721c392d60c117e1eefa0cce48
@@ -26,16 +27,20 @@ EBUILD vlc-2.0.8a.ebuild 13190 SHA256 48e48517a576af17eee0dee0a6b4fee784c690c970
 EBUILD vlc-2.0.9.ebuild 13189 SHA256 a2a52804ce239ba7eae80f271c124d43244de668204920cf732c468d29a2e8a1 SHA512 f53e7848868d2c713b8f7b0cf6c74c6f514c7ef0ba59ec00b8cd84c1afe202da263b4ee7690948372458013e94f8b93e7d56584ec8ba2988f0251863efe1908b WHIRLPOOL 76d1969d6e37cfe8d238919222b3f82b7120fc360628429775d70dfed53b7951d3e56e28f8d77f0eb934d688f8309326a79aca2880f62d908fe1ada57fa32955
 EBUILD vlc-2.0.9999.ebuild 13212 SHA256 86c556ecf191fa8f9b0afb5bda98541bb29013d20614e0631aabcc3195cfae01 SHA512 dc4c067c6bbb3f1e4b5479809e4bbd4d936faeeb466771709fac007c2214f6f86c237dbfe7aa538b96b0ca05893b225a6a7d216f8edddfcff38915bcb75c0410 WHIRLPOOL 1bdc5db654181158f80a12095f16c1a44c0b8ad45e7082abbd5f87d3ea4a0a5fe04870b4668ae1647d594a44b201a03610214172292878d31e8d6132d73c9d4d
 EBUILD vlc-2.1.0.ebuild 14110 SHA256 68dc25a970339a0d3d236c9a606e1b3f2cb912b684893e74766d80ca9bc89e52 SHA512 8f8bf88c4894227a68c22234347591a72d1441c377630deb06a43a714186744056cf808987249287dc55cc361de93cbc2226b104cf0362d46fbc9bed50f8c04d WHIRLPOOL 3889bfb88d9c41046de209f21a91f6d1d2471821091d2104b36992b0b0b777b5217ed27b6bf5281c0e4981470dbda3043542ff8a13e1f7be0a4446976a5d1f7b
-EBUILD vlc-2.1.1.ebuild 13942 SHA256 5640be6eb806d83bf10e18a8ca8e657b99294b88ef590d4c75d9a149fca87231 SHA512 23c4490b67928f689dd1a2fbcfa5b61c73812147314de5d840c3850c9580d3c728d6db735c74d17e4cb0c72f699031f3dce2503bd770aa24d49f4a36337f3039 WHIRLPOOL 3b97fb0cd32f5981680eff09576d7b2d8fae565ad3de28c22e880810bb8fa937ab44878319b784ef27664caeda627d79ced15099cc14216c0ac3d3ce1b1de194
+EBUILD vlc-2.1.1.ebuild 14088 SHA256 3c8d5fef2463e4428fbc688517bff267291f7a1a82bb298f65a928e16bc6d6c1 SHA512 c692b567eaa8d2696068af38d4433f10adea3a46048181c79285f47a93722a19b85f933e75aef7db88be6909dbc2b828ebfb31ed54bf461dbd1e5aa98e599008 WHIRLPOOL 0f7c876f8e4a250ca06b56bdea11558e98bcc9dd74a9cc3f29425bd431c14266cd7e7e02e506b319544e6ff9c4c2c2cfe5f56dd0efbaa23f8ff2fa4e86848f7e
 EBUILD vlc-2.1.9999.ebuild 13815 SHA256 72296bf7c6acfd49ee040c229eda0b4e79497c1a72a32a0a00eeaeaa73850ff2 SHA512 2495216f6daf6190d44a2db102fab1403bd8535bcb363775c2ec2d6bee50f281284c64665fa622227792b356fa0740b79527519301cac7ea63c1131b57f8765b WHIRLPOOL cae596a9ccbed0255b57e928b20b6e955e02fdce8af549e1b866474963873b041ed57283c826c4848e71e91cb5e7208ba2cfe71de1e35198e662eeee7dee1604
 EBUILD vlc-9999.ebuild 14052 SHA256 ea74558f511497cc535c2a7afdbccb921cde08354aa53c882207d20fbe8423c4 SHA512 234185f1f530025ea9e2b4f21e972c20a19b7d65039fbebf0151f33b3607ada6e2aacf43252c32f104800805d97c91cb1eeb808de862a1e09e4d017df31a811f WHIRLPOOL 31b6a4cedd567cdf9acaeb71a353fa74a0bcf1dc2b8f48e72fa74716ea530fc24dca5b5192b7b3f66f014fd47c4dbec59174469ce0c7ee50361b352a99725a10
-MISC ChangeLog 21037 SHA256 beebc04cb335fff8db2d795f8cd25e3a36c76ce4da806c5e770ab53b323f9f24 SHA512 f0bf37b87bde1bd7b5ac395cb016176ac33b5832e66d0f90de2c2502222f4c8cb98ea54e196d4ea98a4bb9dc70298cfc475c4602e1fc4e69c4c85944f1e7a4d4 WHIRLPOOL 1e6aacd034f1dd228764d8c90da05170fb19faefafa9a71220fa37d6bd05470bb2a663d83ad7ff64cfcd3433b4b2cbbaa0e9c5c6ad4d00899fcd67c3e37fff20
+MISC ChangeLog 21301 SHA256 5252e47c9f780a4bff24bb8407570d3a4677877445e58d9859bd8ca0cdbb53cb SHA512 6e02381daa2d488bec9f89f84f3e77fdd4b50bdd7fa06dd1016860114da036022d3c07e58e1e55405b9ab45ee4df44210286c8be8e81ae4b4a5b27df131d8e51 WHIRLPOOL b89b78a48b8808f3ef7ee18d4a4430bbd2d5d775efac1c071481bb9f668aaf3cfdef6d15a9bf85f6e3e7939ee325a565aa815aafadbd3937065bf36102425dca
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6882 SHA256 3620cc5667481a82177337d6c85e3a85b94850039f7d04a5407a9f19f36d7a82 SHA512 a68bda118fd709fc8ee71d899205080d3108efb8db49bdb74973f434ce3deecc610784d1ca6118a2b09ce62a858ba6d841763d83a71ef5ef8919826e0e5a9638 WHIRLPOOL 8bffe3ded979f9bbd0fa45017900edefb0598f9657fb91de1f918160614af611103425bf9125057b230583071367b0c0144ad839bca9972349be0ee3d980c8d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKiBuQACgkQkKaRLQcq0GKK9gCdEHg66JD3B8F0dlhyZYpymrCO
-qjUAniSZF+qieSO4S90YY3+QcjHHVyHh
-=DrHE
+iQEcBAEBCAAGBQJSo4LkAAoJEJWyH81tNOV9oUAH/3/nREmySff6RWhqtTEI4xCb
+PsrvvIj7CBB8wnG2r4eLz9VPNH7I3zb6bmjOFPDgIs5Bdsyd8j+JpoQLwH9dDcus
+A6cqFuFm+aY1vKeG+Y8C+vnBUFXpgLk5Le36ByUtmyudbxW4TK3nh0wiks1vix5I
+8fttbbgjavVneUB/2dc9Xo7sBePXag5+5lI1GJ/WTMRgsVa0CJ2UmQrkEdPkNfVk
+cTGyNwAhhfaZQZwUYNGzq/JzewcQ8qGQG669X7DP9bijPh+I33z3Y4H8WnYrtftU
+mWAuYxcoklRNG1NZ1KyoUo79somQL54hh4z+qT2JCwWduYS8vNcNFWGEc1lf7Do=
+=1o4U
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch b/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch
new file mode 100644
index 000000000000..242db38d4417
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch
@@ -0,0 +1,19 @@
+X-Git-Url: http://git.videolan.org/?p=vlc%2Fvlc-2.1.git;a=blobdiff_plain;f=modules%2Ftext_renderer%2Ffreetype.c;h=c27ec4558956f00b1fd2b448fa07d680a2be5c82;hp=25d6b15650d13982fd8c792df92389fd4de8eadd;hb=4eb6d91e94f720bf2dd22dcfee171e4ff4b790df;hpb=9ebead9dfbdcac2da31bc856cec51c058f5ddca8
+
+diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
+index 25d6b15..c27ec45 100644
+--- a/modules/text_renderer/freetype.c
++++ b/modules/text_renderer/freetype.c
+@@ -90,10 +90,11 @@
+ #endif
+ 
+ /* Freetype */
+-#include <freetype/ftsynth.h>
++#include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_STROKER_H
++#include FT_SYNTHESIS_H
+ 
+ #define FT_FLOOR(X)     ((X & -64) >> 6)
+ #define FT_CEIL(X)      (((X + 63) & -64) >> 6)
diff --git a/media-video/vlc/vlc-2.1.1.ebuild b/media-video/vlc/vlc-2.1.1.ebuild
index 11c91d1ac3a1..fad5a6621a0c 100644
--- a/media-video/vlc/vlc-2.1.1.ebuild
+++ b/media-video/vlc/vlc-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/vlc/vlc-2.1.1.ebuild,v 1.2 2013/12/06 17:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild,v 1.3 2013/12/07 20:19:42 tomwij Exp $
 
 EAPI="5"
 
@@ -239,6 +239,11 @@ src_prepare() {
 	# Fix up broken audio; first is a fixed reversed bisected commit, latter two are backported.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
+	# Support for freetype-2.5.1.
+	if has_version '>=media-libs/freetype-2.5.1' ; then
+		epatch "${FILESDIR}"/${P}-freetype-2.5.1-support.patch
+	fi
+
 	# Disable avcodec checks when avcodec is not used.
 	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die