yngwin 14/03/16 10:38:24 Modified: metadata.xml ChangeLog Added: freetype-2.5.3-r1.ebuild Log: Add harfbuzz useflag to prevent circular dep (bug #504544) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x0F9C590B7FF324F6!)
Revision Changes Path 1.22 media-libs/freetype/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/metadata.xml?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/metadata.xml?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/metadata.xml?r1=1.21&r2=1.22 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/metadata.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- metadata.xml 9 Dec 2013 07:21:01 -0000 1.21 +++ metadata.xml 16 Mar 2014 10:38:24 -0000 1.22 @@ -13,7 +13,8 @@ <maintainer> <email>[email protected]</email> <name>gx86-multilib project</name> - <description>Handling the bugs related to multilib support in the package and related changes.</description> + <description>Handling the bugs related to multilib support in the + package and related changes.</description> </maintainer> <use> <flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag> @@ -23,6 +24,8 @@ <flag name="fontforge">Install internal headers required for TrueType debugger in <pkg>media-gfx/fontforge</pkg> (built with USE=truetype-debugger)</flag> + <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for auto-hinting + OpenType fonts. WARNING: may trigger circular dependencies!</flag> <flag name="infinality">Enable infinality options for improved LCD filtering</flag> <flag name="utils">Install utilities and examples from ft2demos</flag> 1.391 media-libs/freetype/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.391&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.391&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?r1=1.390&r2=1.391 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- ChangeLog 12 Mar 2014 09:55:55 -0000 1.390 +++ ChangeLog 16 Mar 2014 10:38:24 -0000 1.391 @@ -1,6 +1,12 @@ # 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.390 2014/03/12 09:55:55 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.391 2014/03/16 10:38:24 yngwin Exp $ + +*freetype-2.5.3-r1 (16 Mar 2014) + + 16 Mar 2014; Ben de Groot <[email protected]> +freetype-2.5.3-r1.ebuild, + metadata.xml: + Add harfbuzz useflag to prevent circular dep (bug #504544) 12 Mar 2014; Ben de Groot <[email protected]> -freetype-2.4.11-r2.ebuild, -freetype-2.4.12.ebuild, -freetype-2.5.2-r1.ebuild: 1.1 media-libs/freetype/freetype-2.5.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.3-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.3-r1.ebuild?rev=1.1&content-type=text/plain Index: freetype-2.5.3-r1.ebuild =================================================================== # Copyright 1999-2014 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.1 2014/03/16 10:38:24 yngwin 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 )" 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 ~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 )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}] bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) harfbuzz? ( media-libs/harfbuzz[truetype] ) png? ( media-libs/libpng[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXau[${MULTILIB_USEDEP}] x11-libs/libXdmcp[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND} infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )" 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" } if use infinality; then epatch "${DISTDIR}/${PN}-2.5.1-infinality.patch" # 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.3.2-enable-valid.patch 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 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_build_binaries && 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_build_binaries && 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." fi }
