[gentoo-commits] gentoo-x86 commit in media-libs/freetype: metadata.xml freetype-2.4.12.ebuild ChangeLog

[Ben de Groot (yngwin)]

yngwin      13/06/02 07:41:04

  Modified:             metadata.xml ChangeLog
  Added:                freetype-2.4.12.ebuild
  Log:
  Version bump, with thanks to Mario Kicherer for his contributions in bug #469904
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)

Revision  Changes    Path
1.19                 media-libs/freetype/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/metadata.xml?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/metadata.xml?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/metadata.xml?r1=1.18&r2=1.19

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/metadata.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- metadata.xml	27 May 2013 02:49:29 -0000	1.18
+++ metadata.xml	2 Jun 2013 07:41:04 -0000	1.19
@@ -12,6 +12,7 @@
 		<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>
 		<flag name="auto-hinter">Use the unpatented auto-hinter instead
 			of the (recommended) TrueType bytecode interpreter</flag>
 		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>



1.373                media-libs/freetype/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.373&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.373&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?r1=1.372&r2=1.373

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- ChangeLog	27 May 2013 02:49:29 -0000	1.372
+++ ChangeLog	2 Jun 2013 07:41:04 -0000	1.373
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.372 2013/05/27 02:49:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.373 2013/06/02 07:41:04 yngwin Exp $
+
+*freetype-2.4.12 (02 Jun 2013)
+
+  02 Jun 2013; Ben de Groot <yngwin@g.o>
+  +files/freetype-2.4.12-set-adobe-cff-hinting-as-default.patch,
+  +freetype-2.4.12.ebuild, metadata.xml:
+  Version bump, with thanks to Mario Kicherer for his contributions in bug
+  #469904
 
   27 May 2013; Patrick Lauer <patrick@g.o> metadata.xml:
   Remove unneeded useflag from metadata



1.1                  media-libs/freetype/freetype-2.4.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild?rev=1.1&content-type=text/plain

Index: freetype-2.4.12.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild,v 1.1 2013/06/02 07:41:04 yngwin Exp $

EAPI=5

inherit autotools-multilib flag-o-matic 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 )
	infinality? ( http://www.infinality.net/fedora/linux/zips/freetype-infinality-${PV}-20130514_01-x86_64.tar.bz2 )"

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 auto-hinter bindist bzip2 adobe-cff debug doc fontforge infinality
static-libs utils"

# Note: replace emul-linux dep when bzip2 becomes multilib-aware
# (and all [${MULTILIB_USEDEP}] on it then!)
DEPEND="sys-libs/zlib
	amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )
	bzip2? ( app-arch/bzip2 )
	X?	( x11-libs/libX11
		  x11-libs/libXau
		  x11-libs/libXdmcp )"
RDEPEND="${DEPEND}
	infinality? ( media-libs/fontconfig-infinality )
	abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )"

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 infinality; then
		epatch "${WORKDIR}"/freetype-entire-infinality-patchset-20130514-01.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
		epatch "${FILESDIR}"/${PN}-2.4.12-set-adobe-cff-hinting-as-default.patch
	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
	[[ -n ${CONFIG_SHELL} ]] && \
		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
			"${S}"/builds/unix/configure

	autotools-utils_src_prepare
}

src_configure() {
	append-flags -fno-strict-aliasing
	type -P gmake &> /dev/null && export GNUMAKE=gmake

	local myeconfargs=(
		--enable-biarch-config
		$(use_with bzip2)
	)

	autotools-multilib_src_configure
}

src_compile() {
	autotools-multilib_src_compile

	if use utils; then
		einfo "Building utils"
		# fix for Prefix, bug #339334
		multilib_for_best_abi autotools-utils_src_compile \
			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
	fi
}

src_install() {
	autotools-multilib_src_install

	if use utils; then
		install_utils() {
			einfo "Installing utils"
			rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
			local ft2demo
			for ft2demo in ../ft2demos-${PV}/bin/*; do
				"${BUILD_DIR}"/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
					"${ED}"/usr/bin || die
			done
		}
		multilib_for_best_abi install_utils
	fi

	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,*.txt,PROBLEMS,TODO}
	use doc && dohtml -r docs/*
}