From e59b99df9503539c0231e655a17bccf83f8a270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 25 Jun 2023 07:29:14 +0100 Subject: gentoo auto-resync : 25:06:2023 - 07:29:14 --- media-libs/Manifest.gz | Bin 68438 -> 68443 bytes media-libs/freetype/Manifest | 7 +- media-libs/freetype/freetype-2.12.1-r1.ebuild | 260 ------------------------- media-libs/freetype/freetype-2.13.1.ebuild | 262 ++++++++++++++++++++++++++ media-libs/freetype/freetype-9999.ebuild | 60 +++--- 5 files changed, 298 insertions(+), 291 deletions(-) delete mode 100644 media-libs/freetype/freetype-2.12.1-r1.ebuild create mode 100644 media-libs/freetype/freetype-2.13.1.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 72764fb549b8..ad6b7efc27d4 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 152b1f1a22b9..c7d96234a68a 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,12 +1,15 @@ AUX freetype-2.12.1-strict-prototypes-clang16.patch 1151 BLAKE2B 93a06eef003acdf4ca164b849dec970a3a3d1fad01d250edf4f2b3162ac4e5a3aea6aee558fdbf48ffcde5fb68d2423894f1b41645e2fb9ec505d8ffc6486a9c SHA512 0b300ea2f60536bb66b4c742f9f0bc4a46cdb79a5a71040d77f66a8dad3d897b0fda80fb43ded60b71bacf6d603852b983cf001bb7b61a8f2c70df34be79bd21 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 -EBUILD freetype-2.12.1-r1.ebuild 7440 BLAKE2B 682aabb8dcbe64775adc728c73f9199d858a279ba9f1eb1e53ba3345403caac58a863da48db5d16826d3f0aaaf586dca9ce1a032172c2fa786e4812cd32e0995 SHA512 13459b7162c2a6389303fa967418e0f1863e33b63888eacc19c46d0de1d433136c24da3d4ad2c3f04630a50425008e2784ac00e7c200b199b1e59233b7720255 +DIST ft2demos-2.13.1.tar.xz 339736 BLAKE2B 1d0371d70f81039b4338b76089a15b6d445862de40e50b4d22a9e298d15751746779e569f68dcbc3996773c2ab902ee4ad299b6b3b5479ec20d55ec3a177b9ed SHA512 c03205266a420c589eec2a95ca082ab1c5606215a477500fe1a2f31c2f30c327a61e1fececec4ca3268f1a8b92a0bc8310bacf26f276ec09062fa5c5b0878511 EBUILD freetype-2.12.1-r2.ebuild 7492 BLAKE2B 9a2f6bc077de017c57e29c8eae720fc7e646b85a2371bd8e0c6f83a1c2e57722abaf7bd62852a7754ec7986e7d15855abb091f110fc182808f97baf37ac008e8 SHA512 5e26cf40ab7a8032e1f48f10aac9a3baa59cd069ee33b474cf4965a4ec048ba30c260a6f97f80b14bd5949d54ecd77b0c93ee20262552d142d4d5ec1e779f6e0 EBUILD freetype-2.13.0.ebuild 7438 BLAKE2B 3de7d01d74374fa93eec4063f0c207034bed921a1e0ef690f48963b19ab664630591acd7739921af66ba61387fb54df436ece7fffa4d61b59a2ff36e162b5442 SHA512 66490af5aff26a3619cbf236e60e049a32f30d008b6b2ec7317dac9caa1826e91097bc28f7bc8fcf5d8ba6c7232780fb16ac5e7cbf7c66851a20d571140e997f -EBUILD freetype-9999.ebuild 7433 BLAKE2B 2c2043ea943cf72b7c67be62316f9b0a0f7bafce2c392abb02922619fc1b051c4a90120e7807d9bf0994e7af0e0a0e056454cd68e585141b6eae5e5e6afea291 SHA512 34ccb6326d9b1046b8fcf0cf2bba89178080e9d39d54e86203be1e94e75e69d15251ebb1dfb8fbff1da88a6755dcd8cf1dfee04f21d219fb59dce497441e4836 +EBUILD freetype-2.13.1.ebuild 7270 BLAKE2B 5370a078feb63c6fdd3a31c5a4c088bb4329ae2e7f57e3f733b52045f72dd2db699c6734d0f256a273b1f02477f2ca99d788b52e74ebfdf9ad526fc4334cff16 SHA512 86731281958e0892756fb04e4de21857cfcb8688252cb7453d1766ee8da6e655369572daaf91a77b70af53a3d9688242c6aed5ebbd3a01cd65af6a08cf5f800f +EBUILD freetype-9999.ebuild 7270 BLAKE2B 5370a078feb63c6fdd3a31c5a4c088bb4329ae2e7f57e3f733b52045f72dd2db699c6734d0f256a273b1f02477f2ca99d788b52e74ebfdf9ad526fc4334cff16 SHA512 86731281958e0892756fb04e4de21857cfcb8688252cb7453d1766ee8da6e655369572daaf91a77b70af53a3d9688242c6aed5ebbd3a01cd65af6a08cf5f800f MISC metadata.xml 1375 BLAKE2B 2ac56e19982dfb2f1379303f0669e242e922b53372de015d21054b232942d53826bab4f4c2565ce3054e554992d461c23ccee9349b7c2033ee21e6f39c51f622 SHA512 4d86374e7c22e60bd14f56d9d93d38af5b21f1e082609a5b295d6672c7c1e633f50cee8ba277003b9348c3f240ba6c61e1acbb126f3ce1f3b08b0d415d6f6a84 diff --git a/media-libs/freetype/freetype-2.12.1-r1.ebuild b/media-libs/freetype/freetype-2.12.1-r1.ebuild deleted file mode 100644 index d35d23b10e59..000000000000 --- a/media-libs/freetype/freetype-2.12.1-r1.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic libtool multilib-build 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 - inherit git-r3 -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) - utils? ( - svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( -) - -_egit_repo_handler() { - if [[ "${PV}" == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git" - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git" - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -pkg_pretend() { - if use svg && ! use utils ; then - einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled." - 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) - local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" - local dlg_src_dir="${S}/subprojects/dlg/src/dlg" - local dlg_dest_dir="${S}/include" - mkdir -p "${dlg_dest_dir}/dlg" || die - cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die - cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die - fi -} - -src_prepare() { - 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 - 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' \ - -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \ - 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 - - default - - pushd builds/unix &>/dev/null || die - # eautoheader produces broken ftconfig.in - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf - popd &>/dev/null || die - - # This is the same as the 01 patch from infinality - sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - 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" - } - - # Will be the new default for >=freetype-2.7.0 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - - if use infinality && use cleartype-hinting ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" - elif use infinality ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" - elif use cleartype-hinting ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - # See https://freetype.org/patents.html (expired!) - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - 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 - - # bug #869803 - rm docs/reference/sitemap.xml.gz || die - - # 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=( - --disable-freetype-config - --enable-shared - --with-zlib - $(use_with brotli) - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - $(use_enable static-libs static) - $(usex utils $(use_with svg librsvg) --without-librsvg) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows mis-detection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - export CC_BUILD="$(tc-getBUILD_CC)" - - 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" - emake DESTDIR="${D}" FT2DEMOS=1 \ - TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install - 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} - if [[ "${PV}" != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/media-libs/freetype/freetype-2.13.1.ebuild b/media-libs/freetype/freetype-2.13.1.ebuild new file mode 100644 index 000000000000..2b7f8dd6715c --- /dev/null +++ b/media-libs/freetype/freetype-2.13.1.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic libtool multilib-minimal toolchain-funcs + +DESCRIPTION="High-quality and portable font engine" +HOMEPAGE="https://www.freetype.org/" + +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}] + brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) + utils? ( + svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] ) + X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( +) + +_egit_repo_handler() { + if [[ ${PV} == 9999 ]] ; then + local phase="${1}" + case ${phase} in + fetch|unpack) + :; + ;; + *) + die "Please use this function with either \"fetch\" or \"unpack\"" + ;; + esac + + local EGIT_REPO_URI + EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git" + git-r3_src_${phase} + if use utils ; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git" + local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" + git-r3_src_${phase} + fi + else + default + fi +} + +pkg_pretend() { + if use svg && ! use utils ; then + einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled." + fi +} + +src_unpack() { + _egit_repo_handler ${EBUILD_PHASE} + + 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" + mkdir -p "${dlg_dest_dir}/dlg" || die + cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die + cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die + fi +} + +src_prepare() { + 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 + 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' \ + -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \ + 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 + unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE + popd &>/dev/null || die + fi + + default + + pushd builds/unix &>/dev/null || die + # eautoheader produces broken ftconfig.in + AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf + popd &>/dev/null || die + + # This is the same as the 01 patch from infinality + sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die + + enable_option() { + sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ + 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" + } + + # Will be the new default for >=freetype-2.7.0 + disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + + if use infinality && use cleartype-hinting ; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" + elif use infinality ; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" + elif use cleartype-hinting ; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + fi + + # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" + # via environment (new since v2.8) + enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES + + # See https://freetype.org/patents.html (expired!) + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + 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 + + # bug #869803 + rm docs/reference/sitemap.xml.gz || die + + # 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 + + export GNUMAKE=gmake + + local myeconfargs=( + --disable-freetype-config + --enable-shared + --with-zlib + $(use_with brotli) + $(use_with bzip2) + $(use_with harfbuzz) + $(use_with png) + $(use_enable static-libs static) + $(usex utils $(use_with svg librsvg) --without-librsvg) + + # Avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + case ${CHOST} in + mingw*|*-mingw*) ;; + # Workaround windows mis-detection: bug #654712 + # Have to do it for both ${CHOST}-windres and windres + *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; + esac + + export CC_BUILD="$(tc-getBUILD_CC)" + + 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" + emake DESTDIR="${D}" FT2DEMOS=1 \ + TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install + fi +} + +multilib_src_install_all() { + if use fontforge ; then + # 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' | \ + 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 [[ ${PV} != 9999 ]] && use doc ; then + docinto html + dodoc -r docs/* + fi + + find "${ED}" -type f -name '*.la' -delete || die +} 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 -- cgit v1.2.3