freetype: upgrade package to 2.6.1
Upgrade media-libs/freetype to version 2.6.1
See the bug for details.
BUG=chromium:534621
TEST=`emerge-{BOARD} freetype` on x86-generic, daisy, link
TEST=`cbuildbot --remote -g 304340 chromiumos-sdk
x86-alex-release daisy-release`
Change-Id: I4c380c1d9f11757f5fe2ea93b190286909599657
Reviewed-on: https://chromium-review.googlesource.com/304340
Commit-Ready: Jungshik Shin <jshin@chromium.org>
Tested-by: Jungshik Shin <jshin@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index f8b5489..e2926c0 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1 +1 @@
-DIST freetype-2.6.tar.bz2 1726219 SHA256 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e SHA512 0242c832dcac3d9dc5d434b7f5145e63f2289d5df32f16e1c7afc1e31c3c92f0dd374e20dfef79a9ecb26b14419f42b0d897c7154f249f629c35ee7af0aa5297 WHIRLPOOL bf7f105b74348a1ca0e95e21091670a5d73793e8aea8aa8e0dad515086885a182f3bced713c2cf76704c7814031f308a642d6db45a0c065627d0e7bdcaedffd6
+DIST freetype-2.6.1.tar.bz2 1744692 SHA256 2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17 SHA512 cbc003e8f353d47ddcc2110aa8ecfdc1df53e61698e1ed68ed60afd5fd1d10d921c9719a505196c95865a68482822f9cccf5d131ec36d64c0230def774e7bb4b WHIRLPOOL 6319c8764f8d29669b241f0152338d356761d65a75235544c0c831aa03700e8b663b40b501519e57f09968c98bc8d56d1005ad069c9ee066c679b3400e20779a
diff --git a/media-libs/freetype/freetype-2.6.ebuild b/media-libs/freetype/freetype-2.6.1.ebuild
similarity index 94%
rename from media-libs/freetype/freetype-2.6.ebuild
rename to media-libs/freetype/freetype-2.6.1.ebuild
index b985270..ae71703 100644
--- a/media-libs/freetype/freetype-2.6.ebuild
+++ b/media-libs/freetype/freetype-2.6.1.ebuild
@@ -5,6 +5,8 @@
EAPI=5
inherit autotools-multilib flag-o-matic multilib toolchain-funcs
+INFINALITY_PATCH="03-infinality-2.6-2015.10.04.patch"
+
DESCRIPTION="A high-quality and portable font engine"
HOMEPAGE="http://www.freetype.org/"
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
@@ -13,7 +15,7 @@
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? ( https://dev.gentoo.org/~polynomial-c/${P}-infinality-patches.tar.xz )"
+ infinality? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.xz )"
LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
@@ -42,13 +44,13 @@
src_prepare() {
enable_option() {
sed -i -e "/#define $1/a #define $1" \
- include/config/ftoption.h \
+ include/${PN}/config/ftoption.h \
|| die "unable to enable option $1"
}
disable_option() {
sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
- include/config/ftoption.h \
+ include/${PN}/config/ftoption.h \
|| die "unable to disable option $1"
}
@@ -56,8 +58,7 @@
epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
if use infinality; then
- EPATCH_SOURCE="${WORKDIR}/${P}-infinality-patches" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" epatch
+ epatch ${WORKDIR}/${INFINALITY_PATCH}
# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 28c85b3..ed6ed08 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -32,5 +32,6 @@
</use>
<upstream>
<remote-id type="cpe">cpe:/a:freetype:freetype</remote-id>
+ <remote-id type="sourceforge">freetype</remote-id>
</upstream>
</pkgmetadata>
diff --git a/metadata/md5-cache/media-libs/freetype-2.6 b/metadata/md5-cache/media-libs/freetype-2.6.1
similarity index 88%
rename from metadata/md5-cache/media-libs/freetype-2.6
rename to metadata/md5-cache/media-libs/freetype-2.6.1
index c9acee1..7316cc4 100644
--- a/metadata/md5-cache/media-libs/freetype-2.6
+++ b/metadata/md5-cache/media-libs/freetype-2.6.1
@@ -10,6 +10,6 @@
RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
RESTRICT=!bindist? ( bindist )
SLOT=2
-SRC_URI=mirror://sourceforge/freetype/freetype-2.6.tar.bz2 mirror://nongnu/freetype/freetype-2.6.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.6.tar.bz2 mirror://nongnu/freetype/ft2demos-2.6.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.6.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.6.tar.bz2 ) infinality? ( https://dev.gentoo.org/~polynomial-c/freetype-2.6-infinality-patches.tar.xz )
+SRC_URI=mirror://sourceforge/freetype/freetype-2.6.1.tar.bz2 mirror://nongnu/freetype/freetype-2.6.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.6.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.6.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.6.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.6.1.tar.bz2 ) infinality? ( https://dev.gentoo.org/~polynomial-c/03-infinality-2.6-2015.10.04.patch.xz )
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils 3727db64c7b960903d5033280f108080 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=37cbaf6a3eed06de0deed4c2a9f1947f
+_md5_=ebec909ac3e540120d6567c618b322a0
