commit: 0c9c83e925a2fab2ba0dfd83b79d87597dc71dc0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 25 04:09:24 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 25 04:09:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9c83e9
media-libs/freetype: add 2.13.1 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/freetype/Manifest | 3 ++ ...freetype-9999.ebuild => freetype-2.13.1.ebuild} | 60 +++++++++++----------- media-libs/freetype/freetype-9999.ebuild | 60 +++++++++++----------- 3 files changed, 65 insertions(+), 58 deletions(-) diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 81c3cc095505..82595a305ebe 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,6 +1,9 @@ DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f DIST freetype-2.13.0.tar.xz 2492440 BLAKE2B 11aac3cddb3e71cc0e6a616ed609294d6641aa0011842aa8230eace826955883aca0063331660025be14582b44aa189718ce21e0e5193a66bb5d7cffa1d0fb7f SHA512 b93a69a92b99f54c4fc4a276066bc7a87597df132e42ef93f6d973f1425e64bebcc568defa511d39fb04ab4d3a2090a6db1e54cf992a80ff57d658fee28a9110 +DIST freetype-2.13.1.tar.xz 2508168 BLAKE2B edadf2cdd8eb17362239cc5ab7fdff7cb1ca398908d3a9fa0547c3922b098df331cc87e939cee62ce20a78b01f14372c952c823c30af9ac227fc7da10000d37b SHA512 045c43f9a3ca33e7d6a98c286895b94ea6ccfbb83851270d1b1861b31ef3ee5a574d8e49c6414c4e14bdfb9276dc49a0677b3be3e4f40ef279dcda99b769b962 DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d DIST freetype-doc-2.13.0.tar.xz 2084016 BLAKE2B aa88eb5a30223a683348902624827bd7df218129fad0dcbb0f2453b9acf3930da634e9c67eda31191e868ca68db92059ed37cc0bd0287dc4458743538fdfe126 SHA512 d4367513e1ca48691aa6d64c36bf53603f67a67214378a2ae3810b2227084647743ee0d7137453f31c966ccb9ce19c2a72b3b5445d4accbce9a63d71f6b6800e +DIST freetype-doc-2.13.1.tar.xz 2173864 BLAKE2B d61b58221d5eeb6d0c16ffbcc89ff1102992ac8f83193930971fb30f425bbfb882e9a29cf4c67754e497e19afc43cf87d23e304b5b9fb87bba51351b3dd5cb03 SHA512 e18f0851c52689628fb7fa520c6165895650412bfe1ebab8417bf5738d5cc7d1877e78e4afbede0996938f33554f53a0ea7b837fe81497a12b10daae5b8829ed DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7 DIST ft2demos-2.13.0.tar.xz 333952 BLAKE2B 34155615eb967dda2b62e47bb4095a6bf367dd79b7bd93dfc4dc172476b3bf704af4039623d55ee08d2d6a5365b4783e86a570e34b70af2e543bac64d40833b0 SHA512 7d686e9febdda587b74647cc38fa22f0722d0306ecb05430e319e05b6132c999d20728bcd7a6506b8d8ad45a6859443e2b69d766802497357a8f0ba3352404ba +DIST ft2demos-2.13.1.tar.xz 339736 BLAKE2B 1d0371d70f81039b4338b76089a15b6d445862de40e50b4d22a9e298d15751746779e569f68dcbc3996773c2ab902ee4ad299b6b3b5479ec20d55ec3a177b9ed SHA512 c03205266a420c589eec2a95ca082ab1c5606215a477500fe1a2f31c2f30c327a61e1fececec4ca3268f1a8b92a0bc8310bacf26f276ec09062fa5c5b0878511 diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-2.13.1.ebuild similarity index 84% copy from media-libs/freetype/freetype-9999.ebuild copy to media-libs/freetype/freetype-2.13.1.ebuild index 4a048452671f..2b7f8dd6715c 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-2.13.1.ebuild @@ -7,23 +7,28 @@ inherit autotools flag-o-matic libtool multilib-minimal toolchain-funcs DESCRIPTION="High-quality and portable font engine" HOMEPAGE="https://www.freetype.org/"; -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils" -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz - mirror://nongnu/freetype/${P/_/}.tar.xz - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - IUSE+=" doc" -else +if [[ ${PV} == 9999 ]] ; then inherit git-r3 +else + SRC_URI=" + mirror://sourceforge/freetype/${P/_/}.tar.xz + mirror://nongnu/freetype/${P/_/}.tar.xz + utils? ( + mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz + mirror://nongnu/freetype/ft2demos-${PV}.tar.xz + ) + doc? ( + mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz + ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="|| ( FTL GPL-2+ )" SLOT="2" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz infinality +png static-libs svg utils" RDEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] @@ -45,7 +50,7 @@ PATCHES=( ) _egit_repo_handler() { - if [[ "${PV}" == 9999 ]] ; then + if [[ ${PV} == 9999 ]] ; then local phase="${1}" case ${phase} in fetch|unpack) @@ -75,15 +80,11 @@ pkg_pretend() { fi } -src_fetch() { - _egit_repo_handler ${EBUILD_PHASE} -} - src_unpack() { _egit_repo_handler ${EBUILD_PHASE} - if [[ "${PV}" == 9999 ]] ; then - # Need to copy stuff from dlg subproject (#758902) + if [[ ${PV} == 9999 ]] ; then + # Need to copy stuff from dlg subproject (bug #758902) local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" local dlg_src_dir="${S}/subprojects/dlg/src/dlg" local dlg_dest_dir="${S}/include" @@ -94,10 +95,11 @@ src_unpack() { } src_prepare() { - if [[ "${PV}" == 9999 ]] ; then - # Do NOT automagically mess with submodules!!! + if [[ ${PV} == 9999 ]] ; then + # Do NOT automagically mess with submodules! sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die - # inspired by shipped autogen.sh script + + # Inspired by shipped autogen.sh script eval $(sed -n \ -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ @@ -105,11 +107,10 @@ src_prepare() { include/freetype/freetype.h || die) FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}" [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}" + pushd builds/unix &>/dev/null || die sed -e "s;@VERSION@;${FREETYPE};" \ < configure.raw > configure.ac || die - # eautoheader produces broken ftconfig.in - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE popd &>/dev/null || die fi @@ -175,7 +176,7 @@ src_prepare() { # bug #869803 rm docs/reference/sitemap.xml.gz || die - # we need non-/bin/sh to run configure + # 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 @@ -186,7 +187,8 @@ src_prepare() { multilib_src_configure() { append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake + + export GNUMAKE=gmake local myeconfargs=( --disable-freetype-config @@ -199,7 +201,7 @@ multilib_src_configure() { $(use_enable static-libs static) $(usex utils $(use_with svg librsvg) --without-librsvg) - # avoid using libpng-config + # Avoid using libpng-config LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" ) @@ -221,7 +223,7 @@ multilib_src_compile() { if multilib_is_native_abi && use utils ; then einfo "Building utils" - # fix for Prefix, bug #339334 + # Fix for Prefix, bug #339334 emake \ X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" @@ -240,7 +242,7 @@ multilib_src_install() { multilib_src_install_all() { if use fontforge ; then - # Probably fontforge needs less but this way makes things simplier... + # fontforge can probably cope with fewer of these, but this is simpler einfo "Installing internal headers required for fontforge" local header find src/truetype include/freetype/internal -name '*.h' | \ @@ -251,7 +253,7 @@ multilib_src_install_all() { fi dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ "${PV}" != 9999 ]] && use doc ; then + if [[ ${PV} != 9999 ]] && use doc ; then docinto html dodoc -r docs/* fi diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 4a048452671f..2b7f8dd6715c 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -7,23 +7,28 @@ inherit autotools flag-o-matic libtool multilib-minimal toolchain-funcs DESCRIPTION="High-quality and portable font engine" HOMEPAGE="https://www.freetype.org/"; -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils" -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz - mirror://nongnu/freetype/${P/_/}.tar.xz - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - IUSE+=" doc" -else +if [[ ${PV} == 9999 ]] ; then inherit git-r3 +else + SRC_URI=" + mirror://sourceforge/freetype/${P/_/}.tar.xz + mirror://nongnu/freetype/${P/_/}.tar.xz + utils? ( + mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz + mirror://nongnu/freetype/ft2demos-${PV}.tar.xz + ) + doc? ( + mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz + ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="|| ( FTL GPL-2+ )" SLOT="2" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz infinality +png static-libs svg utils" RDEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] @@ -45,7 +50,7 @@ PATCHES=( ) _egit_repo_handler() { - if [[ "${PV}" == 9999 ]] ; then + if [[ ${PV} == 9999 ]] ; then local phase="${1}" case ${phase} in fetch|unpack) @@ -75,15 +80,11 @@ pkg_pretend() { fi } -src_fetch() { - _egit_repo_handler ${EBUILD_PHASE} -} - src_unpack() { _egit_repo_handler ${EBUILD_PHASE} - if [[ "${PV}" == 9999 ]] ; then - # Need to copy stuff from dlg subproject (#758902) + if [[ ${PV} == 9999 ]] ; then + # Need to copy stuff from dlg subproject (bug #758902) local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" local dlg_src_dir="${S}/subprojects/dlg/src/dlg" local dlg_dest_dir="${S}/include" @@ -94,10 +95,11 @@ src_unpack() { } src_prepare() { - if [[ "${PV}" == 9999 ]] ; then - # Do NOT automagically mess with submodules!!! + if [[ ${PV} == 9999 ]] ; then + # Do NOT automagically mess with submodules! sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die - # inspired by shipped autogen.sh script + + # Inspired by shipped autogen.sh script eval $(sed -n \ -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ @@ -105,11 +107,10 @@ src_prepare() { include/freetype/freetype.h || die) FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}" [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}" + pushd builds/unix &>/dev/null || die sed -e "s;@VERSION@;${FREETYPE};" \ < configure.raw > configure.ac || die - # eautoheader produces broken ftconfig.in - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE popd &>/dev/null || die fi @@ -175,7 +176,7 @@ src_prepare() { # bug #869803 rm docs/reference/sitemap.xml.gz || die - # we need non-/bin/sh to run configure + # 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 @@ -186,7 +187,8 @@ src_prepare() { multilib_src_configure() { append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake + + export GNUMAKE=gmake local myeconfargs=( --disable-freetype-config @@ -199,7 +201,7 @@ multilib_src_configure() { $(use_enable static-libs static) $(usex utils $(use_with svg librsvg) --without-librsvg) - # avoid using libpng-config + # Avoid using libpng-config LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" ) @@ -221,7 +223,7 @@ multilib_src_compile() { if multilib_is_native_abi && use utils ; then einfo "Building utils" - # fix for Prefix, bug #339334 + # Fix for Prefix, bug #339334 emake \ X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" @@ -240,7 +242,7 @@ multilib_src_install() { multilib_src_install_all() { if use fontforge ; then - # Probably fontforge needs less but this way makes things simplier... + # fontforge can probably cope with fewer of these, but this is simpler einfo "Installing internal headers required for fontforge" local header find src/truetype include/freetype/internal -name '*.h' | \ @@ -251,7 +253,7 @@ multilib_src_install_all() { fi dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ "${PV}" != 9999 ]] && use doc ; then + if [[ ${PV} != 9999 ]] && use doc ; then docinto html dodoc -r docs/* fi
