Update freetype to 2.5.5
BUG=chromium:452324
TEST=build and run on lumpy
Change-Id: I906b1e10b7fe86d0179c13345887e1af016d6397
Reviewed-on: https://chromium-review.googlesource.com/245152
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Commit-Queue: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
(cherry picked from commit 0d0f9af60eb391a4f1a544af8f71a0e893015280)
Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/246540
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 2d6a7a7..1149e0c 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,2 +1,2 @@
-DIST freetype-2.5.1-infinality.patch 164325 SHA256 ff7c1760dfbc72675348810b3fd750b626f9d329b63daf7a78fb09d1ddfc4148 SHA512 d9ccc6e7143c901bc170d3d2014b7a0dae2cbc91af01795bb94fbbd56ece90dbc68cda78470e4402c89ea82d482746404d1f199acdf7b206b4129716e13ab2ef WHIRLPOOL d1550cdf2e23718e9642da7edde206b4687961c98153a3b108b1080924d3b72c23e42feffc67cf3527d9eba642c139999ec0c75e59d7ad6fd09b71f3a25b3cf5
-DIST freetype-2.5.3.tar.bz2 1703842 SHA256 c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e SHA512 bdd779dc11e9fdb52dfa87839ccc40293df3ea417da0232feadf0e711caa3e62ff145e9afdfd9c3d158df0bc69a805cfbf05b18af8ae7ab5a65213e9c66d242e WHIRLPOOL 01b3e7808b638c400bf101848d4ea7e5b81e8e8163fc0e6055ddb103d5f72ec88c00a84f46cee4169666307cc8714b4718085b1b806e23f4bfa81eb383385979
+DIST freetype-2.5.5-infinality-patches.tar.xz 24380 SHA256 6b7bc373b068c71feca2e19c3741993ee0ff787984aa0653ca66814e05ef195f SHA512 8831e3337214cc57a0381c56ef6750f85b11f1b6358adaa3dda34d449f234335bede124be9d23df817ae8c06f80c8e3ce63ed3fc32eb05586b8c8e43ce52e575 WHIRLPOOL 27b945e9524e984ef57f96415a86095d91dea8fa8e402a3eb6a3d7c38a7636d53d5e47fc37b734ca88f41a499f3398ab9d7bd147e1424c19b09f41e17f2cbe8d
+DIST freetype-2.5.5.tar.bz2 1714529 SHA256 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9 SHA512 1fc72d24da1744a6a5faf3338e49912c81ce83f30def1e80a2a15b50e7f83893a4fe24a70ef88b65ecc217bed1c15d85804c364eba221b35e25531c727fe8559 WHIRLPOOL 57cf0f020cda6a66cfe8e2a30e1e997c0fd7f97bdaed38da65cce0b360fcc60cfdf1ba0724c1745668ae3f80743052e135edb8356dff4c90365caa6262d59158
diff --git a/media-libs/freetype/freetype-2.5.3-r1.ebuild b/media-libs/freetype/freetype-2.5.5.ebuild
similarity index 82%
rename from media-libs/freetype/freetype-2.5.3-r1.ebuild
rename to media-libs/freetype/freetype-2.5.5.ebuild
index 6e3e694..1aa9822 100644
--- a/media-libs/freetype/freetype-2.5.3-r1.ebuild
+++ b/media-libs/freetype/freetype-2.5.5.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.3-r1.ebuild,v 1.12 2014/07/22 07:40:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.5.ebuild,v 1.1 2015/01/08 00:15:32 polynomial-c Exp $
EAPI=5
-
inherit autotools-multilib flag-o-matic multilib toolchain-funcs
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 )
- infinality? ( https://raw.github.com/bohoomil/fontconfig-ultimate/ddda669247330d1a1b8c9473cfe5052d42e1b313/01_lib32-freetype2-iu-2.5.1-2/infinality-2.5.1.patch -> ${PN}-2.5.1-infinality.patch )"
+ mirror://nongnu/freetype/${P/_/}.tar.bz2
+ utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+ mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+ doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+ mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )
+ infinality? ( http://dev.gentoo.org/~polynomial-c/${P}-infinality-patches.tar.xz )"
LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
@@ -22,7 +24,7 @@
CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] )
utils? (
X? (
@@ -34,8 +36,8 @@
DEPEND="${CDEPEND}
virtual/pkgconfig"
RDEPEND="${CDEPEND}
- infinality? ( media-libs/fontconfig-infinality )
abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
src_prepare() {
enable_option() {
@@ -50,11 +52,14 @@
|| die "unable to disable option $1"
}
- if use infinality; then
- epatch "${DISTDIR}/${PN}-2.5.1-infinality.patch"
+ # This is the same as the 01 patch from infinality
+ epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
- # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in
- # freetype-2.4.11
+ if use infinality; then
+ EPATCH_SOURCE="${WORKDIR}/${P}-infinality-patches" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" epatch
+
+ # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
fi
@@ -78,8 +83,6 @@
enable_option FT_DEBUG_MEMORY
fi
- epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
-
epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
if use utils; then
@@ -88,6 +91,7 @@
if ! use X; then
sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
fi
+ cd "${S}" || die
fi
# we need non-/bin/sh to run configure
@@ -166,6 +170,6 @@
elog "To improve OpenType font hinting with the auto-hinter, the harfbuzz"
elog "useflag needs to be enabled for ${CATEGORY}/${PN}."
elog "See the INSTALL.UNIX file in the doc directory of this package for"
- elog "more information."
+ elog "more information. But it is recommended not to use the auto-hinter."
fi
}
