From 4f064d2f2d61a575a6e418623bd2dc3c8599ad13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Aug 2023 12:15:20 +0100 Subject: gentoo auto-resync : 15:08:2023 - 12:15:20 --- media-libs/Manifest.gz | Bin 68664 -> 68666 bytes media-libs/freetype/Manifest | 3 +- media-libs/freetype/freetype-2.13.1-r1.ebuild | 255 ++++++++++++++++++++++++++ media-libs/freetype/freetype-9999.ebuild | 13 +- 4 files changed, 260 insertions(+), 11 deletions(-) create mode 100644 media-libs/freetype/freetype-2.13.1-r1.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index ffe69a0834c6..9ceb4de93dec 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 c7d96234a68a..20dd250e868a 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -10,6 +10,7 @@ DIST ft2demos-2.13.0.tar.xz 333952 BLAKE2B 34155615eb967dda2b62e47bb4095a6bf367d 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-2.13.1-r1.ebuild 6954 BLAKE2B 36939510f8aab7689e0ce20ad89995b7a7bfca3fedb1b1b77c46889283e6118df6c57350c274cd030cef384e64d6c644fed94531742c6ab7e84de4e1c2444d1e SHA512 f9ab1fa8a92f64ecd627b3b9cf6f76b8a215e557426753ec3c543bb08151da17fc4ff4846ea4f997f7cc50ba187211e2231a6dcac52c865e93fdf39e80c7a49c EBUILD freetype-2.13.1.ebuild 7270 BLAKE2B 5370a078feb63c6fdd3a31c5a4c088bb4329ae2e7f57e3f733b52045f72dd2db699c6734d0f256a273b1f02477f2ca99d788b52e74ebfdf9ad526fc4334cff16 SHA512 86731281958e0892756fb04e4de21857cfcb8688252cb7453d1766ee8da6e655369572daaf91a77b70af53a3d9688242c6aed5ebbd3a01cd65af6a08cf5f800f -EBUILD freetype-9999.ebuild 7270 BLAKE2B 5370a078feb63c6fdd3a31c5a4c088bb4329ae2e7f57e3f733b52045f72dd2db699c6734d0f256a273b1f02477f2ca99d788b52e74ebfdf9ad526fc4334cff16 SHA512 86731281958e0892756fb04e4de21857cfcb8688252cb7453d1766ee8da6e655369572daaf91a77b70af53a3d9688242c6aed5ebbd3a01cd65af6a08cf5f800f +EBUILD freetype-9999.ebuild 6954 BLAKE2B 36939510f8aab7689e0ce20ad89995b7a7bfca3fedb1b1b77c46889283e6118df6c57350c274cd030cef384e64d6c644fed94531742c6ab7e84de4e1c2444d1e SHA512 f9ab1fa8a92f64ecd627b3b9cf6f76b8a215e557426753ec3c543bb08151da17fc4ff4846ea4f997f7cc50ba187211e2231a6dcac52c865e93fdf39e80c7a49c MISC metadata.xml 1375 BLAKE2B 2ac56e19982dfb2f1379303f0669e242e922b53372de015d21054b232942d53826bab4f4c2565ce3054e554992d461c23ccee9349b7c2033ee21e6f39c51f622 SHA512 4d86374e7c22e60bd14f56d9d93d38af5b21f1e082609a5b295d6672c7c1e633f50cee8ba277003b9348c3f240ba6c61e1acbb126f3ce1f3b08b0d415d6f6a84 diff --git a/media-libs/freetype/freetype-2.13.1-r1.ebuild b/media-libs/freetype/freetype-2.13.1-r1.ebuild new file mode 100644 index 000000000000..6f8fac775721 --- /dev/null +++ b/media-libs/freetype/freetype-2.13.1-r1.ebuild @@ -0,0 +1,255 @@ +# 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 +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" + } + + if ! use cleartype-hinting ; then + disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING + 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 2b7f8dd6715c..6f8fac775721 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -28,7 +28,7 @@ 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" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils" RDEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] @@ -137,15 +137,8 @@ src_prepare() { || 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" + if ! use cleartype-hinting ; then + disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING fi # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" -- cgit v1.2.3