From ce4dbc6fdb984553f2edb2b226c296776ec60282 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 8 Jan 2015 00:15:34 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- media-libs/freetype/ChangeLog | 9 +- media-libs/freetype/Manifest | 23 ++- media-libs/freetype/freetype-2.5.5.ebuild | 175 ++++++++++++++++++++++ 3 files changed, 201 insertions(+), 6 deletions(-) create mode 100644 media-libs/freetype/freetype-2.5.5.ebuild diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 231be5166580..b760567deaee 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/freetype -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.411 2014/12/14 20:35:02 floppym Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.412 2015/01/08 00:15:32 polynomial-c Exp $ + +*freetype-2.5.5 (08 Jan 2015) + + 08 Jan 2015; Lars Wendler +freetype-2.5.5.ebuild: + Version bump. *freetype-2.5.4-r1 (14 Dec 2014) diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index aca28b411d9c..be0bf569cd0c 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -9,18 +9,33 @@ DIST freetype-2.5.1-infinality.patch 164325 SHA256 ff7c1760dfbc72675348810b3fd75 DIST freetype-2.5.3.tar.bz2 1703842 SHA256 c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e SHA512 bdd779dc11e9fdb52dfa87839ccc40293df3ea417da0232feadf0e711caa3e62ff145e9afdfd9c3d158df0bc69a805cfbf05b18af8ae7ab5a65213e9c66d242e WHIRLPOOL 01b3e7808b638c400bf101848d4ea7e5b81e8e8163fc0e6055ddb103d5f72ec88c00a84f46cee4169666307cc8714b4718085b1b806e23f4bfa81eb383385979 DIST freetype-2.5.4-infinality-patches.tar.xz 33492 SHA256 9e8a94e5c95091866200f6c51ce787184d1b7c2a921c75b166f95ef0934d679a SHA512 b09b50d75e86846c4251be0896a197c1277bd0030144418f14c41fcfdaedf796883567347c98f9f1f13bfec699788742f8bd7861114ff256da0294ad4c8e0c39 WHIRLPOOL 086060826bd964909607650b900409e073c24e045bbe3de422c59e7f520981df7736d0425db9f2cb81db774dcd0fb1f8110dfe896af540085b15ae27d069b6a4 DIST freetype-2.5.4.tar.bz2 1726105 SHA256 3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb SHA512 466b9f9ba8b467b3daa09a81c19e50fd0b8d1851f80bf3cb231b731be1703abeff91fd21d00b2b61cd078ff8285be058a4a9484ef3b8f877d6dcff2148f201be WHIRLPOOL 6f1937fded32e28aa13e4b27cc45635f083364e4c15372f43908721d229a31530e3381774ce6b6765fc25d82e11529fcd589d7546bf8d33f7157fda0b6c9d22a +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 DIST freetype-doc-2.5.3.tar.bz2 109607 SHA256 fd9cbf5f939b9a63fc04ca2b4cef721dd1cd7f047eaac2daec3dc2e1b68ff4a8 SHA512 c9424473d4427b5e8b280c53b5330b455ba033472c6e230e20ec256874b2a8c8043cb7a3d035c738c9b742aa053c005bb31974b4c9cfe12a6318f206e53c4cc4 WHIRLPOOL 49ce5be77741311a3eff5080a4e0f6b13ddf480a356aa3ae7c04116defab256bac4398a442039c73d4162bd0818f9e75eb29b2f4acffcf123e48ebde9dd0da6b DIST freetype-doc-2.5.4.tar.bz2 109647 SHA256 9fa6fb39a324d0b6b744d3745509c51d10a68c7a4f440b23fd00c8b49de6c388 SHA512 28f47ed95ecbbf8b048d1cd99cd0125d915eec24608a0cb908fdd961d1016c00dfa39ee43f97f739a7e75f87178564ab371bcc7d7e2c5cec1b49c7034cbde4ba WHIRLPOOL 7a60f3d3ba9166bd5e93e5ddf33f04600a7820682ffb3833745011f3271a46fd26821af2c89350fa48fe4bb628b0188adc46687dae83163a6436dede2ff35eae +DIST freetype-doc-2.5.5.tar.bz2 108133 SHA256 68becbae3578a8101e9f3c55f10e435fb75535011d3f7a523719371e86e368e7 SHA512 0e2455433f72766ec88275d2e53e49630457579a83ca491697bb5ce12196ee964618d1af86956651557d34e8ea1d57f75f69e0d60ef90e943509bc571370fb64 WHIRLPOOL 28d13ae3ce9bc3fb278df9a963cef3622672fa288fc0fd654e874054bedccd8510a3dcf7636ea2ec107b5299984742607d2a9436d5e473202856e27bf262655f DIST ft2demos-2.5.3.tar.bz2 186773 SHA256 e6c9d0b344b88ff5ab25f20640cf78e2ec56bb81a89d1cd1716839357f646c8a SHA512 b239d6b7c1f4c0fa4137a97ab27834f296572a1d086247f1cb8ed01c7d1b3f54137ebfce1eea6f4a209079460ae2686d743097be5ab01e5bb108cf0d55361f4d WHIRLPOOL 0ceb42eca210814286a84cf0f066483ada3c7a9f97310051c5dfb1f1f6249608444c5d16400f5ce781073a303f70299226e9e8554882bd65ceb436b2f80ece2c DIST ft2demos-2.5.4.tar.bz2 187225 SHA256 54621937130926235abe05ba08aeb390a983998d2d1173c5fdc9ccb5bda4d96a SHA512 8fc0dd33ce7debc40b2ca696d965df7a72797042c7963aa19a41bc82c20fbc1c1a953535c58ff804a15dddb6f4f58a5d7038abd3949c37a787288720c7712345 WHIRLPOOL 270d8ef5b8d25c7e7c6b77f303eedd85c459b23ac699961637430869f7a3d6d21ee3ce97a34aee6633b25118b1048d7fe65283a26400f2c93eda829f08202602 +DIST ft2demos-2.5.5.tar.bz2 182006 SHA256 b87c7deb5d9b1fddb8520c091a5491cc63ecac4de25139e1da38aebee82195ea SHA512 c6e1855f2315665e39a894ecfcb65f8546de435c1dada0ea0a6665a1e3ef22331d6949cd9261dfb6b68e653631d4c2e74f8ea31b53b40e46f44ab4dae38e368b WHIRLPOOL 55d6add5e3fac008a39231e3805e151a5a9b7cafb6ef970e546d96d3fa338a6a4a744aeb59ea04804312164aedd5e5a21e19773dbf5c42a1acfc42d283d90930 EBUILD freetype-2.5.3-r1.ebuild 5324 SHA256 9238160476f32980772b6cf54004b8aa20f2f226e51faf959c04adf65223d33a SHA512 ac9d9e3048e78e59a45705b933d255fbdb52ec33bfc8e7ccc24bb6e8ec63871f50c4ecb93fe5c1dda6179375a1c0f34e2bfb3ae1fd2c97bcbd33e641aa11062e WHIRLPOOL 5e0a523f2f0e4c86db6846b9c99a24e6d250ce05f699101a2e4e6a2647b5c562e0822350f01870469f19d32e7d4122a3a9326a3fb26f57195cd711d4a3f000e3 EBUILD freetype-2.5.4-r1.ebuild 5563 SHA256 c87a0b1f72f487e921f927f1fbabe16f87a7f11beb046bb83653835170547d6b SHA512 1a93b8873b5abd55cb48907c8ba667cabc592399c45d6a6939329cc4e76e7f3e593000ce76114b2734d1f7d5fd328b8a9c2281c822f1a6e33c908c30c9fd86f2 WHIRLPOOL d69dd9ba0d6af58f35fab6ca3f827d1e86b24747dcf6e9c445a5153629db22bf303d68c94ef57e970f89801e6ed064102665d0a3a98aa39f421dee21455cc34b -MISC ChangeLog 62699 SHA256 3f3fb2cadfa95ce1eace314d7c8a9585ce635e2540aba54bbdb98bf07e44f9d6 SHA512 efc4685a7c19203ed8a1dc4777bec2837446290f27b0da5fd5f84648296b09c9f34328ac6581de8bfe8d2d5e571fc5b568ae2bfda03a08d0f9899ef9cc048f5f WHIRLPOOL e6a272967b4a44b65ba7828f8e23a0943121750a2754c62be5affa513bf89c9eb0e4567f21dda227c3b9c8dcb4be63142797d422faa02e1b894deec3ab71d0b4 +EBUILD freetype-2.5.5.ebuild 5547 SHA256 94e1631900db6bab8b916306fa821dc2141d20f7ed496541b3c44a1a927b6c90 SHA512 9941394c24baa4573ddc4a7727e64d6bf7a8fb3458869f37c7d60a09af800966a31d5852fe62184336b960114ca8f30179565e806691a96ab282b1298343d150 WHIRLPOOL 1456283922408988ef069873d0110b8bf052efd47b60ffd31925711dabdb1c09edae6afe5d78b24fa1097c0cb84a84606dc3ff289251ad942b455a5aec1e813b +MISC ChangeLog 62830 SHA256 e7763246041f4f19d0b881ee612bd3543237a45308a5b55a22c80bb05eb17a87 SHA512 6798e8b06fdbd78b59c0406f1869facbbd81d3429891b1a2f58a7a9fea9aa25b35d77d4b2b7cf568d7ef7c8ebf1ef90294517c538c3f38d4619f4d82ce859e23 WHIRLPOOL 1c53f11415103eaea8c514e9479709da3ef245f1b6fdbb6a861972a21623cba2548390255a965144272239df18919fc99d44e810cc8b3a5153d80804f6c6adac MISC metadata.xml 1400 SHA256 65a92662484be603be8adae907f727219ca78e4cb042350d2741c2fa03fde8a7 SHA512 e3052be471b660ff82261b8cf055a2ae20421d51c0ecdbc31a777aabab3708578012682e01b8b7d200cdd53bf980b4515de68196aac5711a2fd4a8799c1051a9 WHIRLPOOL 3bb9331dde6579280d3b673b62d6086f142a23210f40ab2c3a0cedfed39b067c5d2bf5eed3055f03071e650822723ce919d6a938ada5276c38d05265d71dc828 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSN9HgACgkQC77qH+pIQ6TgIwD+O1HO0x6pVjjqL+HvkWYQ42LF -HXAuHWnN58RzUP461aAA/jo6M20YrzlOAlZMB5FidgQiaomTKMCYkKx80oPdOi1e -=td7w +iQIcBAEBCAAGBQJUrcwmAAoJEPiazRVxLXTFCPQP+wZFB5pBZSKsdP3Cv/C5l1Wd +c1UEZBQdGvkEqBaYma3Xhvm4b657/eNQEw/eXxgf4Q2Ff2ktZUyBnqjBC4LzTxHz +HUxAxYihPeu3G5IOGNVziIVrEL0qdKUmF3A+AXce+t06jXPecQ4y0x2T+mYVDClg +M0dkRHhnSm+yXCQvpdghZG/nsqcm5kMxcjI7Dg9QNs6Pa2v22XbHtVoyeKaKeOOf +p7eTSq0jvHujn91OKilk0rCugtDup3k9JOlpUemPmHwJYSY3gvmEPSk7cc+ncBFK +0VX711Vv4ILLhJaPt+b3BUsPI+YsnK0qfYnxDSKX75vatlr4OSwb0KXjlmEUS3gO +q1I681w0aZzn74UZ79CcrGvY+tucs8cxYxH76KTqRB/4mHgYy0uJzgwLn6zKici9 +W731Y83n8Zxv8VCHUMUBKCdviJ2GEYnYqLEe6suhTGBdM6ibHVpjIp5nbPABYI9x +BnGoUFzyJWJGdSLV1smiSBTlesqQjLKol6qZI4F34THQty3LWq6pBLvWrUI3xtP0 +wHBMSnkvMNvl128g4XOd8JHe21mHRgosKq+dZSCj8oNtiGxf/xxQDiBQpZdGgDFz +DwR9311IolodmFtzAd/FjjDLQOQeS6tAzyP3j6ylTO88TqifhiQL7hfG6QOXlFvO +/Xtgu90uBZSYA0KputsX +=YxzX -----END PGP SIGNATURE----- diff --git a/media-libs/freetype/freetype-2.5.5.ebuild b/media-libs/freetype/freetype-2.5.5.ebuild new file mode 100644 index 000000000000..6bc50c556362 --- /dev/null +++ b/media-libs/freetype/freetype-2.5.5.ebuild @@ -0,0 +1,175 @@ +# 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.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 + 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz + infinality png static-libs utils" +REQUIRED_USE="harfbuzz? ( auto-hinter )" + +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.19[truetype,${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) + utils? ( + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] + ) + )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" +PDEPEND="infinality? ( media-libs/fontconfig-infinality )" + +src_prepare() { + enable_option() { + sed -i -e "/#define $1/a #define $1" \ + include/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ + include/config/ftoption.h \ + || die "unable to disable option $1" + } + + # This is the same as the 01 patch from infinality + 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 + + # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11 + enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING + fi + + 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 adobe-cff; then + enable_option CFF_CONFIG_OPTION_OLD_ENGINE + fi + + if use debug; then + enable_option FT_DEBUG_LEVEL_TRACE + enable_option FT_DEBUG_MEMORY + fi + + epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 + + if use utils; then + cd "${WORKDIR}/ft2demos-${PV}" || die + # Disable tests needing X11 when USE="-X". (bug #177597) + 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 + if [[ -n ${CONFIG_SHELL} ]] ; then + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ + "${S}"/builds/unix/configure || die + fi + + autotools-utils_src_prepare +} + +multilib_src_configure() { + append-flags -fno-strict-aliasing + type -P gmake &> /dev/null && export GNUMAKE=gmake + + local myeconfargs=( + --enable-biarch-config + $(use_with bzip2) + $(use_with harfbuzz) + $(use_with png) + + # avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + autotools-utils_src_configure +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use utils; then + einfo "Building utils" + # fix for Prefix, bug #339334 + emake \ + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use utils; then + einfo "Installing utils" + rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die + local ft2demo + for ft2demo in ../ft2demos-${PV}/bin/*; do + ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ + "${ED}"/usr/bin || die + done + fi +} + +multilib_src_install_all() { + if use fontforge; then + # Probably fontforge needs less but this way makes things simplier... + einfo "Installing internal headers required for fontforge" + local header + find src/truetype include/freetype/internal -name '*.h' | \ + while read header; do + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + done + fi + + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} + use doc && dohtml -r docs/* + + prune_libtool_files --all +} + +pkg_postinst() { + if use auto-hinter && ! use harfbuzz; then + 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. But it is recommended not to use the auto-hinter." + fi +} -- 2.26.2