From 49a01e3c83ace3f7fa0c8fe910d78759ee16bc33 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 13 Apr 2016 22:53:13 +0200 Subject: media-libs/freetype: Revbump to update infinality patch (bug 578562). Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler --- media-libs/freetype/Manifest | 2 +- media-libs/freetype/freetype-2.6.3-r1.ebuild | 173 +++++++++++++++++++++++++++ media-libs/freetype/freetype-2.6.3.ebuild | 173 --------------------------- 3 files changed, 174 insertions(+), 174 deletions(-) create mode 100644 media-libs/freetype/freetype-2.6.3-r1.ebuild delete mode 100644 media-libs/freetype/freetype-2.6.3.ebuild (limited to 'media-libs') diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 3b4f3db9123f..eb52dc0d9633 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,5 +1,5 @@ DIST 03-infinality-2.6.2-2015.11.28.patch.xz 27056 SHA256 a91f27f76fdcdffcea1d377824db84d6c6d5ab1f6afd61c62a29471dae06f0ea SHA512 676978f117fcb9b6a25886cbf7c7eb0d451eca745c72feed6c7caec17287881e087757ed15a2776377cdca53477d3cd832ef967759635b7c5b36232eb4d7d99c WHIRLPOOL f1bd477c1b5c8dddbcd6801d51c2e687b91411113b7002e418237d6fb6154e1c89c0f82f22abbdca3fc695abbae6409e7491416afe1057d2ea20cfe7afee525a -DIST 03-infinality-2.6.3-2015.11.28.patch.xz 26092 SHA256 92b30ac53a1ce27a658aff17f6f6d0e0a7303412acd620904c7328e290e452a7 SHA512 9f7838dc2b002d5d996c90d284f99c08d5f3000b77f9b68652da8592517aeda7af052c56e2040568c5f4eecfb15d3e3ca188e980234716760f41afc545917554 WHIRLPOOL 7b3ca16ad418f3b0622780fffdc198f8656279d19cd6ad5f8b556a24b809e8ddb850d1c6157a80cc21ae21c9ecf1a82c5d97d265181e867f2621b1c24348c612 +DIST 03-infinality-2.6.3-2016.03.26.patch.xz 28104 SHA256 330540ead509aaeba3885236275cfab998c0a23143ef1de9c9c4bfabca8054d6 SHA512 c28c7bcd826acb608b9e240328cf91583ff1462c60ee8e6b3a677ec1ee8941cdc1a5f05680742f2d35c8b6cbfd62e1df6e12e6e9f80942935b8debc349cd1dba WHIRLPOOL 8a7d6a6ba58d363cff06f2223ac20ef56b2ec99fb895f7e308ae9d2451ca4c984c713dbe1b10870e90e55c497af9d81a6fa7f9bc783cf58b897a8cb7e3f4bac2 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-2.6.2.tar.bz2 1767940 SHA256 baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892 SHA512 269d7a2ba728b4cb79d1d533ce93674bfd483566ab80bc6be0ec24f869cb65ba1fd852fbeff8f045607dd044845ce3d125374faeb14c986761b94dce7d1ff48b WHIRLPOOL d1ffa0d84605ac4e1480c46f7ff7c9c6f87137a539258c3a38900850dbf53cf4f752b57f2e5d22164020d62295b6c4e50ae529ac953b7591b3c3a034701d845c diff --git a/media-libs/freetype/freetype-2.6.3-r1.ebuild b/media-libs/freetype/freetype-2.6.3-r1.ebuild new file mode 100644 index 000000000000..19e0605c1ab3 --- /dev/null +++ b/media-libs/freetype/freetype-2.6.3-r1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools flag-o-matic multilib multilib-build multilib-minimal toolchain-funcs + +INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch" + +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? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.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 bindist bzip2 debug doc fontforge harfbuzz + infinality png static-libs utils" +RESTRICT="!bindist? ( bindist )" # bug 541408 + +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 )" + +PATCHES=( + # This is the same as the 01 patch from infinality + "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch + + "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 +) + +src_prepare() { + enable_option() { + sed -i -e "/#define $1/a #define $1" \ + include/${PN}/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to disable option $1" + } + + default + + if use infinality; then + eapply "${WORKDIR}/${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 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 + + 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 + + elibtoolize --patch-only +} + +multilib_src_configure() { + append-flags -fno-strict-aliasing + type -P gmake &> /dev/null && export GNUMAKE=gmake + + local myeconfargs=( + --enable-biarch-config + --enable-shared + $(use_with bzip2) + $(use_with harfbuzz) + $(use_with png) + $(use_enable static-libs static) + + # avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + ECONF_SOURCE="${S}" \ + econf "${myeconfargs[@]}" +} + +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/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} + if use doc ; then + docinto html + dodoc -r docs/* + fi + + prune_libtool_files --all +} diff --git a/media-libs/freetype/freetype-2.6.3.ebuild b/media-libs/freetype/freetype-2.6.3.ebuild deleted file mode 100644 index ffed637b5ade..000000000000 --- a/media-libs/freetype/freetype-2.6.3.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit autotools flag-o-matic multilib multilib-build multilib-minimal toolchain-funcs - -INFINALITY_PATCH="03-infinality-2.6.3-2015.11.28.patch" - -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? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.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 bindist bzip2 debug doc fontforge harfbuzz - infinality png static-libs utils" -RESTRICT="!bindist? ( bindist )" # bug 541408 - -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 )" - -PATCHES=( - # This is the same as the 01 patch from infinality - "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch - - "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 -) - -src_prepare() { - enable_option() { - sed -i -e "/#define $1/a #define $1" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - default - - if use infinality; then - eapply "${WORKDIR}/${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 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 - - 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 - - elibtoolize --patch-only -} - -multilib_src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - local myeconfargs=( - --enable-biarch-config - --enable-shared - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - $(use_enable static-libs static) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -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/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} - if use doc ; then - docinto html - dodoc -r docs/* - fi - - prune_libtool_files --all -} -- cgit v1.2.3-65-gdbad