commit: 719dce2b16e6750114066cc7a7a11895dcdc1a74 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Apr 16 15:21:29 2022 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Apr 16 20:54:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719dce2b
media-libs/freetype: Removed old Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-libs/freetype/Manifest | 4 - .../files/freetype-2.10.3-sizeof-types.patch | 31 --- .../freetype-2.11.0-COLR_missing_blend_mode.patch | 58 ----- ...freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch | 26 --- .../files/freetype-2.11.0-quiet_noop.patch | 41 ---- media-libs/freetype/freetype-2.11.0-r1.ebuild | 252 -------------------- media-libs/freetype/freetype-2.11.0-r2.ebuild | 253 --------------------- 7 files changed, 665 deletions(-) diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 4825dc8a5add..28887f7823f8 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,10 +1,6 @@ -DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29 -DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d DIST freetype-2.11.1.tar.xz 2270728 BLAKE2B 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 DIST freetype-2.12.0.tar.xz 2340352 BLAKE2B 09227c883e52b4e4aefd68d8e4bfaf36eed0c4d92d22d6f5f88e2a69a94be6040ecff7285ca92f30cd9ce71a4af0ffa74141f3263f7a75e29d87b8a4fe27bf08 SHA512 d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54 -DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301 DIST freetype-doc-2.11.1.tar.xz 2038348 BLAKE2B 2248d16bb12b29294226a67a10328c61b064c8e0ad7fb5f004c2e6da1237175f03d51a48d5df03a3de3bbe935307e573014c079c31468c9f59416bc4e9057a9c SHA512 c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36 DIST freetype-doc-2.12.0.tar.xz 2038684 BLAKE2B ac5197f1a31a4c29a218c0a35af4658a289afbea9ad6b5a200dd0518d63a1b647467b3c460b72863a4048269c249ca2fbc83146ba3de6594e00bfa88a701d979 SHA512 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6 -DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531 DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5 DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2 diff --git a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch deleted file mode 100644 index ea02a15df115..000000000000 --- a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 56e6ee69d298c0d150e2b76d2cfa2306e901df40 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sun, 11 Oct 2020 08:59:08 +0200 -Subject: [PATCH] Prevent apps from using the autoconf sizeof branch. - -Use #error to make sure that any app trying to enable that branch fails -miserably. This guarantees the code to be multilib-friendly and also -removes the header differences triggering QA errors. ---- - builds/unix/ftconfig.h.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/builds/unix/ftconfig.h.in b/builds/unix/ftconfig.h.in -index 00b5a8226..020593a95 100644 ---- a/builds/unix/ftconfig.h.in -+++ b/builds/unix/ftconfig.h.in -@@ -45,10 +45,7 @@ - #undef FT_USE_AUTOCONF_SIZEOF_TYPES - #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES - --#undef SIZEOF_INT --#undef SIZEOF_LONG --#define FT_SIZEOF_INT SIZEOF_INT --#define FT_SIZEOF_LONG SIZEOF_LONG -+#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org." - - #endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */ - --- -2.28.0 - diff --git a/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch b/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch deleted file mode 100644 index af24a09ef213..000000000000 --- a/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e40ae7569aa4ef591f66ff9066df2f91de75bb77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <[email protected]> -Date: Mon, 9 Aug 2021 13:44:55 +0300 -Subject: [PATCH] [sfnt] Add missing blend mode 'plus' to 'COLR' v1. - -* include/freetype/ftcolor.h (FT_Composite_Mode): Add missing blend mode -'plus' after it was added to the spec. ---- - include/freetype/ftcolor.h | 33 +++++++++++++++++---------------- - 1 file changed, 17 insertions(+), 16 deletions(-) - -diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h -index b98289917..cbd2d85bb 100644 ---- a/include/freetype/ftcolor.h -+++ b/include/freetype/ftcolor.h -@@ -740,22 +740,23 @@ FT_BEGIN_HEADER - FT_COLR_COMPOSITE_SRC_ATOP = 9, - FT_COLR_COMPOSITE_DEST_ATOP = 10, - FT_COLR_COMPOSITE_XOR = 11, -- FT_COLR_COMPOSITE_SCREEN = 12, -- FT_COLR_COMPOSITE_OVERLAY = 13, -- FT_COLR_COMPOSITE_DARKEN = 14, -- FT_COLR_COMPOSITE_LIGHTEN = 15, -- FT_COLR_COMPOSITE_COLOR_DODGE = 16, -- FT_COLR_COMPOSITE_COLOR_BURN = 17, -- FT_COLR_COMPOSITE_HARD_LIGHT = 18, -- FT_COLR_COMPOSITE_SOFT_LIGHT = 19, -- FT_COLR_COMPOSITE_DIFFERENCE = 20, -- FT_COLR_COMPOSITE_EXCLUSION = 21, -- FT_COLR_COMPOSITE_MULTIPLY = 22, -- FT_COLR_COMPOSITE_HSL_HUE = 23, -- FT_COLR_COMPOSITE_HSL_SATURATION = 24, -- FT_COLR_COMPOSITE_HSL_COLOR = 25, -- FT_COLR_COMPOSITE_HSL_LUMINOSITY = 26, -- FT_COLR_COMPOSITE_MAX = 27 -+ FT_COLR_COMPOSITE_PLUS = 12, -+ FT_COLR_COMPOSITE_SCREEN = 13, -+ FT_COLR_COMPOSITE_OVERLAY = 14, -+ FT_COLR_COMPOSITE_DARKEN = 15, -+ FT_COLR_COMPOSITE_LIGHTEN = 16, -+ FT_COLR_COMPOSITE_COLOR_DODGE = 17, -+ FT_COLR_COMPOSITE_COLOR_BURN = 18, -+ FT_COLR_COMPOSITE_HARD_LIGHT = 19, -+ FT_COLR_COMPOSITE_SOFT_LIGHT = 20, -+ FT_COLR_COMPOSITE_DIFFERENCE = 21, -+ FT_COLR_COMPOSITE_EXCLUSION = 22, -+ FT_COLR_COMPOSITE_MULTIPLY = 23, -+ FT_COLR_COMPOSITE_HSL_HUE = 24, -+ FT_COLR_COMPOSITE_HSL_SATURATION = 25, -+ FT_COLR_COMPOSITE_HSL_COLOR = 26, -+ FT_COLR_COMPOSITE_HSL_LUMINOSITY = 27, -+ FT_COLR_COMPOSITE_MAX = 28 - - } FT_Composite_Mode; - --- -GitLab - diff --git a/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch b/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch deleted file mode 100644 index f602866f591a..000000000000 --- a/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fed5521016227bf8cc4475f66450a9963568d162 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <[email protected]> -Date: Mon, 9 Aug 2021 19:27:34 +0200 -Subject: [PATCH] * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Minor - fix. - ---- - src/sfnt/ttcolr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c -index 2f3e8846d..68807127f 100644 ---- a/src/sfnt/ttcolr.c -+++ b/src/sfnt/ttcolr.c -@@ -863,7 +863,7 @@ - - format = FT_NEXT_BYTE( p1 ); - -- if ( format < 0 || format > 1 ) -+ if ( format > 1 ) - return 0; - - /* `face->root.size->metrics.x_scale` and `y_scale` are factors */ --- -GitLab - diff --git a/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch b/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch deleted file mode 100644 index 46206465ffaf..000000000000 --- a/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov <[email protected]> -Date: Fri, 20 Aug 2021 16:01:32 -0400 -Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs. - -Fixes #1076. - -* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when -rendering a bitmap glyph. ---- - src/base/ftobjs.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c -index 342ac4a27..7b40c6421 100644 ---- a/src/base/ftobjs.c -+++ b/src/base/ftobjs.c -@@ -4703,7 +4703,7 @@ - else - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - -- error = FT_ERR( Unimplemented_Feature ); -+ error = FT_ERR( Cannot_Render_Glyph ); - while ( renderer ) - { - error = renderer->render( renderer, slot, render_mode, NULL ); -@@ -4719,6 +4719,11 @@ - /* format. */ - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - } -+ -+ /* it is not an error if we cannot render a bitmat glyph */ -+ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) && -+ slot->format == FT_GLYPH_FORMAT_BITMAP ) -+ error = FT_Err_Ok; - } - } - --- -GitLab - diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild deleted file mode 100644 index c9d88a7e1080..000000000000 --- a/media-libs/freetype/freetype-2.11.0-r1.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit 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 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 )" - SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - IUSE+=" doc" -else - inherit autotools 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? ( - 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="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 - "${WORKDIR}"/${P}-COLR_v1_clipbox.patch - "${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch - "${FILESDIR}"/${P}-COLR_missing_blend_mode.patch -) - -_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://git.sv.nongnu.org/r/freetype/freetype2.git"; - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"; - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - 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 - - # 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 - - # 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-biarch-config - --enable-shared - $(use_with brotli) - $(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)" - ) - - 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.11.0-r2.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild deleted file mode 100644 index 27f4cfde1ab2..000000000000 --- a/media-libs/freetype/freetype-2.11.0-r2.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit 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 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 )" - SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - IUSE+=" doc" -else - inherit autotools 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? ( - 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="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 - "${WORKDIR}"/${P}-COLR_v1_clipbox.patch - "${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch - "${FILESDIR}"/${P}-COLR_missing_blend_mode.patch - "${FILESDIR}"/${P}-quiet_noop.patch #820500 -) - -_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://git.sv.nongnu.org/r/freetype/freetype2.git"; - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"; - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - 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 - - # 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 - - # 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-biarch-config - --enable-shared - $(use_with brotli) - $(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)" - ) - - 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 -}
