Add infinality lcdfilter support

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 149 insertions, 13 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 9101876712c0..350e886ca378 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.343 2012/07/18 06:59:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.344 2012/07/29 18:04:56 yngwin Exp $
+
+*freetype-2.4.10-r1 (29 Jul 2012)
+
+  29 Jul 2012; Ben de Groot <yngwin@gentoo.org> +freetype-2.4.10-r1.ebuild,
+  metadata.xml:
+  Add infinality lcdfilter support
 
   18 Jul 2012; Fabian Groffen <grobian@gentoo.org> freetype-2.4.10.ebuild:
   Drop eautoreconf for Prefix, it actually breaks the build, thanks Steven
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index b5267fb66b07..80362ea42a07 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX freetype-1.4-glibc-2.10.patch 2377 SHA256 60d41048bd11a024c041a24a424c9663b4debe3ab188db400928925b71039d4a SHA512 ff86986d7ac58832cd6ebc2371a81ee9610451677f0f5806d3db1c2e97b282c10b641142b3b23bc57d8aa3b21e214b1581536824df69367a701903cb073591b0 WHIRLPOOL 671b3126b2f7e15dd69f1a4c7e2eec160097516c0e07f1bcc3c359315e108b8fff2f4b7879545e9b3ac48eece621a9829a66beff06f8886d89e6c7859f365217
 AUX freetype-1.4_pre-contrib-destdir.patch 3679 SHA256 8d99ce9264a83033d6df455488e80e763f3774b74a97b27c321b5c018076cad2 SHA512 146258f9d820fb2a0f9f7c880909a9ceb08da7e2e6bc1df591178857b9cf42e0c2940feca947864be9ef671988b787404ecba4bce40d7eeebf58f0d25249df7f WHIRLPOOL c5ad3e01d7c6e5ee7348a66ae2559a9ae6fa36bdde8613874108365b695ac07b401befbae6e20c1c58da82bd5260e54f3560bf4c1ca5e349ab0e188ec722f401
 AUX freetype-1.4_pre-malloc.patch 494 SHA256 a69ea481382974172440bc717d29ae3480cf119175c9d2411385118ec5cffde6 SHA512 4a477291fa9fb32a77dec252aedc3fbdd473f309c86732d9a92ab1c8ace56e30eb11e467e25e77285b5836f5ed4ef24a712f748c7adfa553a48b5722185b8e68 WHIRLPOOL 509eba126805bf6791cb5e3c13843101656df837d5e8788824b6f27d5ed87a485bc9d24edf7b92acd8a71bb444874c24d028586afd15f7a458a74bd244b94beb
@@ -15,6 +12,7 @@ AUX freetype-1.4_pre20080316-kpathsea_version.patch 1215 SHA256 e95fa815f820fbc1
 AUX freetype-2.3.2-enable-valid.patch 624 SHA256 3c26cd8b92510490b4bdbdd12b078e33a4f8607eaee64a800c3ea23097d5d43b SHA512 4dd637fa77b3386cc20fff3e68c64411fdc85a09b5bd61a75647aeff294e037c22cf0b788dae1e90f4cb12b1cb2775d0ac658c82eb998603b070af5f8242cff6 WHIRLPOOL 2c25610f0ecde1d5517c780d6db96abd00bbf04fda9343a3cb1ccaddf6b3263bfb6806d198db110566df1cfd765e1c734f6e303ab81a50e60ce7697ce506162e
 AUX freetype-2.4.9-type1-incremental.patch 3213 SHA256 a41b8a606ab53ff84d96e6390514ed3ee3cba28d35f822c504169771525ef012 SHA512 ca877af277d8e95240020907ef874facf09b35f23c70218bd59285a9285a2c7bca72cad42a89e71648cd6fb0d44a6eb8c3ff76068bf0484c77126d7301621ad4 WHIRLPOOL 24bdfc8af7cfa021ae2e78920cb9c841d0fe830d79ad24088c25ce27e3d01160418b210b8dd82cc916be32f3e8971d8901793e430604a3ab576eda9816b96b32
 DIST freetype-1.4_pre20080316.tar.bz2 1199805 SHA256 b88e8827dfeebcd0c663cac19c798acbd2f1129eaf89172eb26c3594700316a2 SHA512 196d9f4f11e4a613e0e59de131cd143ec9bc6d07cef870b6652e204c94d31986b31286819cd0a34b7d01afc9269f3447b346e2f7c6cf4a60d993e1f2d240e5f7 WHIRLPOOL 8eab54dc5d41362c379e0b2bdbeed026bab387de00b779e9b50c97717be429bae18896d6d4a5b58e2cb1462cbf0150ab77429c05a290bb3eef1ee14d65e7b540
+DIST freetype-2.4.10-infinality-patches.tar.xz 43264 SHA256 b8bedfba61fcf8f20a700d76e1ad0b0322efefb901bad47b6dcf90c4d158658e SHA512 e4c00f4290aeb5d70d07edd2993dee180d7413765cca7e41cfb585fbdca27be3e94624fe088a03f19c6ce4390cafb2e6f922541e64dac49d39ffc0199ea340ce WHIRLPOOL e69de0560d8829a3ca50d5c929e312baf85c5306178952fdcfd94d1f22a5795172ad7afa2ad82b8a75d25b5bd5320bed2c8c20a9a6ef9e707a43c46934006b73
 DIST freetype-2.4.10.tar.bz2 1508927 SHA256 0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f SHA512 41547dba00a949792b44f42a8b5a69fb6dd4c6f3d454221a0b20ac6eaedd938465922197ccdd49bdff4c03e85ab4d38a77d3c48a597e3c69790ebeba359a0107 WHIRLPOOL 455efafdc97677bec9ee234d3aedde0945123587a788e483bfeb9c1a1d00a121e2921632145678d439fbd497c96191b053143247fb31ed039ad5984d0be47eef
 DIST freetype-2.4.9.tar.bz2 1504819 SHA256 c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9 SHA512 30f388c7c0cf00deacffcb402ac97682f7957365d9eb94ba1c20d1c6f1ff1163b6a1d88a833edc9cd274bb21c9b87f5403f2c465c042bbaf599971074ac040f7 WHIRLPOOL e9fd9217cec39243409818b104918ca578c3b4bc750d1795ac6bcd78b98bd68f1f6a09549ee697fee785e4b731f77203886ae30234b7ca1909d13bfae6ea4706
 DIST freetype-doc-2.4.10.tar.bz2 106697 SHA256 b83b46fd02d00c256eea12bddf598454f95858dbeaa853b76dac5974f0321fd8
@@ -22,14 +20,8 @@ DIST freetype-doc-2.4.9.tar.bz2 106690 SHA256 138ec5c5081c2c0d1d4624e83bf3797a27
 DIST ft2demos-2.4.10.tar.bz2 163949 SHA256 3fb7e97f35c0f59ecd967577a3e77fbcca10d84c00129a74e5da45bf3625cc45
 DIST ft2demos-2.4.9.tar.bz2 163748 SHA256 7a67ac6dff11078464c5b9dc68fa2f62c8f05067e0fd15645f5cb7efb05413f9
 EBUILD freetype-1.4_pre20080316-r2.ebuild 3846 SHA256 9e98e088897e55eac345a5d2ce45a780f35536a350dd9a7dc9787ee29fc01c9b SHA512 96169067fa60fa63767eaf6ef84124d7dcd313a484072e23f762a59208f552ba7a9866db5c465a9be5da8f597e65d52af3839f055276523cd661914af4c5fb2c WHIRLPOOL 1593de4680354e01b9af9d2bcc3656cf56d7f6c6d6e72bfc988d138a8c6fb7dce78c56d6e04832d7e3473bf591e67fb8208103443a946eb9b54b520e8282e1f7
+EBUILD freetype-2.4.10-r1.ebuild 4041 SHA256 c40750e75800430a4ad5353c589536ffc4c8394e5b41f3f0d7f9118fd7ddc963 SHA512 ea67f343fd36785146ae34a10702c890ea042b76130f6fcaf27b7e1b01fcba02ad7fd35592ffb09b82735622e1898c56d9447939a6444680b2e97041c4e01ecd WHIRLPOOL 934c832084f9ec32495ba3a732a4ccd7cd1c58db197a3bcc54b00ae935396ddc451ffaf59bfbf9a8aa099b338cce7ce6132d1093bddf3a42a27d565af949dd9c
 EBUILD freetype-2.4.10.ebuild 3612 SHA256 9e24924973b0e84ca36f7ed247f92bea8a9a20575bcadc4d1795911bdbf5e951 SHA512 320f0d1921b1d38ab70a4976246541e6f284d13c088e908bb7f3673c10b827bd6fcf8c55f5c9b63cef1e59b00f3c69c9e8d0d06d5b7b138bc410c231a946f3a3 WHIRLPOOL c77139cc1dab9e5a8661b9584d02045017b0860325b3befb365ad12663bb582a3b77a1d2dc01b9abdb4c2207adadfce70fc02828c87e60be6055d03646163eb3
 EBUILD freetype-2.4.9-r1.ebuild 4090 SHA256 acc8d99ed4a440c4c6e1b8b2ed9041841a3f843a608ff95a185a9f7121a87265 SHA512 05c0a5e632b49dfe7b5183e3c1cdfea7fc0a0e885fbb8d0e1c704060d35311b32af6d0de5aaeedb1e71b3e97a200c31546120e22fa414c14f7d1b54ef8ed7f83 WHIRLPOOL f257e0aff41e32ac769989ec2c087ecec0ce0602adaca058e99c6466a0aba98b8a985003b7ee81086237129cf2853e76b4ebee8a4bfc97b80596715a376a662c
-MISC ChangeLog 51472 SHA256 b95ce39d45fdb967e7444bedeae2f39830dd2b04166d1cee166f02050301d495 SHA512 4bcf6fb1259b5b33cd4c4f7ccdb4739c151730425a246a7bee748ea999eaac4b9ad661659cc086282ab6922fa2abf39e4ba770fa78ee102676dbff48ea89c400 WHIRLPOOL a5311825c26d49089a82c57a09da9773fa59aa697f53728cb30c9f11259b9eb09357e4afbc38490cc5416430b35f6ae1d3870cfa427fe95b5f2f694cd7b684e4
-MISC metadata.xml 670 SHA256 a2a2d457514a52a3f36a68c87fd757dfe6af2d368d1c3287783e30cb22b33398 SHA512 8ebc5c2a739692b5820e94bda033a6d86787ce2517d100d554f230c05c5ce6c59087d20c3fe53d2857e2b9cdb2da785c26e5d437b229a9ad2ea42bb8fe0d7b3d WHIRLPOOL 1c88db56f8e59b4494f0a2855d22394520e0bd6cef6490087aadd0ace9c4d8b1f1202e564c3891b406b89b42d42293e90c6e92d68bfaf9caa61c4d50b69db5c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
-
-iEYEAREKAAYFAlAGXssACgkQX3X2B8XHTondRgCfY6lU0FJsTXuO/WoT0hEX6qwP
-HK4AmwdWw2OzOlRNvhHyMfPzApt02GKl
-=eP/B
------END PGP SIGNATURE-----
+MISC ChangeLog 51634 SHA256 f7e609f8beb513fce7de46a5d6727da9a5b03e1b6a4c03f2966225cc9f360f04 SHA512 aff5096ee49958d2420c29068aeb9f48d3c449ad0b8545eb734f3bba80402ccdcdd47ef6a7785f7b74551866769b670958de67885ec6e12cc9980abb5dc84180 WHIRLPOOL 775343b99edcf2ac0af765e62304b8f5eeb95f4d103903b82ea6e95cdce75ccab230e8352fc1702d99e622559bd56e1912ab5adff959bc30c5cc530472000c6a
+MISC metadata.xml 741 SHA256 630e182dca4bf6a3c2c903948fe71a2904056c9f07a876424b5e10b61f3189b5 SHA512 19d93a3d30403ade3328df30a4cfc6d74a6cbc15073f870352d7a13b18bb490dbe478a67dca0d792e2451db0f7f56a7a2390f9c7bd114a78c3099910b05d43a3 WHIRLPOOL 1fa0304b328f1c8d56dce9f7a78124cc4c418cbaef72cb188784516c3ca9e8c92ed9973182e4ef3cfa1d22ed1139cd3b46b7d5cb730eebff83510189ee77af86
diff --git a/media-libs/freetype/freetype-2.4.10-r1.ebuild b/media-libs/freetype/freetype-2.4.10-r1.ebuild
new file mode 100644
index 000000000000..5ef4e2814b3c
--- /dev/null
+++ b/media-libs/freetype/freetype-2.4.10-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.10-r1.ebuild,v 1.1 2012/07/29 18:04:56 yngwin Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic libtool multilib
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 )
+	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )
+	lcdfilter? ( http://dev.gentoo.org/~yngwin/distfiles/${P}-infinality-patches.tar.xz )"
+
+LICENSE="FTL GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X auto-hinter bindist bzip2 debug doc fontforge lcdfilter static-libs utils"
+
+DEPEND="sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	X?	( x11-libs/libX11
+		  x11-libs/libXau
+		  x11-libs/libXdmcp )"
+RDEPEND="${DEPEND}
+	lcdfilter? ( media-libs/fontconfig-infinality )"
+
+src_prepare() {
+	enable_option() {
+		sed -i -e "/#define $1/a #define $1" \
+			include/freetype/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+			include/freetype/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if use auto-hinter; then
+		disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+		enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
+
+	if use lcdfilter; then
+		epatch "${WORKDIR}"/patches/freetype-add-subpixel-hinting-infinality.patch
+		epatch "${WORKDIR}"/patches/freetype-entire-infinality-patchset.patch
+
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+		enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
+	fi
+
+	epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}"
+		sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+	fi
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	# we need non-/bin/sh to run configure
+	[[ -n ${CONFIG_SHELL} ]] && \
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with bzip2)
+}
+
+src_compile() {
+	emake
+
+	if use utils; then
+		einfo "Building utils"
+		cd "${WORKDIR}/ft2demos-${PV}"
+		# fix for Prefix, bug #339334
+		emake X11_PATH="${EPREFIX}/usr/$(get_libdir)"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED}"/usr/bin
+		done
+	fi
+
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+		done
+	fi
+
+	prune_libtool_files
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO}
+
+	use doc && dohtml -r docs/*
+
+}
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 5677e3af075d..99860207e05e 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -10,6 +10,7 @@
 	debugger in <pkg>media-gfx/fontforge</pkg> (built with
 	USE=truetype-debugger)</flag>
     <flag name="kpathsea">Enable TeX support (ttf2pk and ttf2pfb)</flag>
+	<flag name="lcdfilter">Enable infinality LCD filtering support</flag>
     <flag name="utils">Install utilities and examples from ft2demos</flag>
   </use>
 </pkgmetadata>