[gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2020-11-18  7:36 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-11-18  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     209ba4903e93f9e05e998511bd895e05b66282fa
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 07:36:00 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 07:36:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209ba490

media-libs/freetype: Security cleanup

Bug: https://bugs.gentoo.org/750275
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/freetype/Manifest                       |   6 -
 .../files/freetype-2.4.11-sizeof-types.patch       |  31 ---
 media-libs/freetype/freetype-2.10.2-r1.ebuild      | 242 ---------------------
 media-libs/freetype/freetype-2.10.3.ebuild         | 242 ---------------------
 4 files changed, 521 deletions(-)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index cb7d28558e6..50c714e584a 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,9 +1,3 @@
-DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
-DIST freetype-2.10.3.tar.xz 2416752 BLAKE2B 8ce360c07777ad5b031ff7a840ef0cec95f358e764897f1aea9e8fd40a21e8bada3610943dc70b279856116396e6703b5127a4d672fb6e0dc8e5fe7f9233265e SHA512 3f9d1a44cdae51ec4b13116aba5af1730e6be46132ddd9e49486e8d681b61756baa9897daaf0f06e79f00f2db0e57e0fa66d27f44d65735da1167d5b3c170373
 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
-DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
-DIST freetype-doc-2.10.3.tar.xz 2079036 BLAKE2B fca0915a5f268ce4d5205822d712b451f73d891e00518b3db0dd7c431fd7bd6544fa36fc374344c94f43d731fe7a1076724c3fdd42c8143647aa5763b4736556 SHA512 135ae51706197d1bd208cb48d8d1881c14aeee5283dbdab88a7fa6864aed888613df43bd3deb24ff530fa767f94fe997f97dee10bf2be7763231211bf7d5225f
 DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
-DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
-DIST ft2demos-2.10.3.tar.xz 235388 BLAKE2B c1c7e9d61fde441b2cc107a3ad8f1499c03ce8219a54b2bdc4ab7168a0d61a6c83c7e6e3d2de6a8ed0f09b29c398708618e4683d5ed24d6e8ae7505b8920770f SHA512 860fbeefd70caa4aa9483d90df5c3376ee2bef8fe93ab26010c4ca4f95cfd281870da461e2f335f42d3e6d2007f8e46c99d7834d2177b7806a2d92422ed08b41
 DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8

diff --git a/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch b/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch
deleted file mode 100644
index 5be0530ee00..00000000000
--- a/media-libs/freetype/files/freetype-2.4.11-sizeof-types.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8af7b9e403240c2c3ace1005f5a91fa2f1625ac9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 11 Mar 2013 22:13:34 +0100
-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.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
-index 9531afd..457cbfc 100644
---- a/builds/unix/ftconfig.in
-+++ b/builds/unix/ftconfig.in
-@@ -78,10 +78,7 @@ FT_BEGIN_HEADER
- #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."
- 
- #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
- 
--- 
-1.8.1.5
-

diff --git a/media-libs/freetype/freetype-2.10.2-r1.ebuild b/media-libs/freetype/freetype-2.10.2-r1.ebuild
deleted file mode 100644
index 6166c56a048..00000000000
--- a/media-libs/freetype/freetype-2.10.2-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist 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 )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-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
-"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-)
-
-_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}
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		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
-
-	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=(
-		--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
-
-	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
-		dodir /usr/bin #654780
-		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/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}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}

diff --git a/media-libs/freetype/freetype-2.10.3.ebuild b/media-libs/freetype/freetype-2.10.3.ebuild
deleted file mode 100644
index b8b52e17acc..00000000000
--- a/media-libs/freetype/freetype-2.10.3.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist 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 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-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
-"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-)
-
-_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}
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		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
-
-	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=(
-		--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
-
-	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
-		dodir /usr/bin #654780
-		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/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}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2023-12-01  0:11 Matt Turner
  0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2023-12-01  0:11 UTC (permalink / raw
  To: gentoo-commits

commit:     316979fde535734e14de99119acb60d4148282ad
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 00:02:32 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 00:11:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316979fd

media-libs/freetype: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/freetype/Manifest                       |   6 -
 ...freetype-2.12.1-strict-prototypes-clang16.patch |  36 ---
 media-libs/freetype/freetype-2.12.1-r2.ebuild      | 261 --------------------
 media-libs/freetype/freetype-2.13.1-r1.ebuild      | 255 --------------------
 media-libs/freetype/freetype-2.13.1.ebuild         | 262 ---------------------
 5 files changed, 820 deletions(-)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index c2ddbdc138ef..7b1e25c0102a 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,12 +1,6 @@
-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-2.13.2.tar.xz 2501764 BLAKE2B cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e SHA512 a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194
-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 freetype-doc-2.13.2.tar.xz 2173920 BLAKE2B 273ab405b6c7097ace9c7882fddb22d2a0cf8cc1594e9d141ca18d13a3745ee2e481bd2ee214cba6d99224ef0d67fdcba1b08aa06e3556a80cda29f3b6026f97 SHA512 ca3438dcf6f995af556d8db3cb3cfdcabb81ab5a7dd88464ff757e3e418b3219b0011857cde8a338372e30d8375486ac8e50914da2ea948dc874f70010bce60c
-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
 DIST ft2demos-2.13.2.tar.xz 341140 BLAKE2B 5e2c3eb2fccb359d03e154b94d349baab27aa465e40274ea99be1e19c8519ec9c434749c78a41743540bd38064a7c68e5389ff99443b8e320e617c4fe7f4558b SHA512 aa83ba4212ff7c4453b72f036136cb9b04cacf7d196388a3e4752613e000b3bb45a4dcf63d3d1d5b3d6ada10720304b532fb6e33ed6a5b399dcce45c27af9ade

diff --git a/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch b/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
deleted file mode 100644
index 0526c27df405..000000000000
--- a/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.freedesktop.org/freetype/freetype/-/commit/e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830
-
-From e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 6 Nov 2022 05:18:59 +0000
-Subject: [PATCH] Fix `-Wstrict-prototypes`.
-
-* builds/unix/configure.raw: Fix `-Wstrict-prototypes`.
-Clang 16 warns on these and they will be dropped in C23.
-
-* builds/unix/freetype2.m4: Ditto.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/builds/unix/configure.raw
-+++ b/builds/unix/configure.raw
-@@ -50,7 +50,7 @@ if test ${cross_compiling} = yes; then
- 
-   AC_MSG_CHECKING([for suffix of native executables])
-   rm -f a.* b.* a_out.exe conftest.*
--  echo > conftest.c "int main() { return 0;}"
-+  echo > conftest.c "int main(void) { return 0;}"
-   ${CC_BUILD} conftest.c || AC_MSG_ERROR([native C compiler is not working])
-   rm -f conftest.c
-   if test -x a.out -o -x b.out -o -x conftest; then
---- a/builds/unix/freetype2.m4
-+++ b/builds/unix/freetype2.m4
-@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
- #include <stdlib.h>
- 
- int
--main()
-+main(void)
- {
-   FT_Library library;
-   FT_Error  error;
-GitLab

diff --git a/media-libs/freetype/freetype-2.12.1-r2.ebuild b/media-libs/freetype/freetype-2.12.1-r2.ebuild
deleted file mode 100644
index 4c89acc664bf..000000000000
--- a/media-libs/freetype/freetype-2.12.1-r2.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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-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=(
-	"${FILESDIR}"/${P}-strict-prototypes-clang16.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://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-r1.ebuild b/media-libs/freetype/freetype-2.13.1-r1.ebuild
deleted file mode 100644
index 6f8fac775721..000000000000
--- a/media-libs/freetype/freetype-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# 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-2.13.1.ebuild b/media-libs/freetype/freetype-2.13.1.ebuild
deleted file mode 100644
index 2b7f8dd6715c..000000000000
--- a/media-libs/freetype/freetype-2.13.1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2022-11-10  7:13 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-11-10  7:13 UTC (permalink / raw
  To: gentoo-commits

commit:     0f47f234cebf80ebc7c857823f09b0641a0e5515
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 07:12:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 07:12:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f47f234

media-libs/freetype: fix -Wstrict-prototypes

I've been revbumping for these anyway Just In Case (also to reveal
quickly if there's any remaining issues) but in this case, it includes
a fix to the installed freetype2.m4 macro as well.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...freetype-2.12.1-strict-prototypes-clang16.patch |  36 +++
 media-libs/freetype/freetype-2.12.1-r2.ebuild      | 261 +++++++++++++++++++++
 2 files changed, 297 insertions(+)

diff --git a/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch b/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
new file mode 100644
index 000000000000..0526c27df405
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/freetype/freetype/-/commit/e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830
+
+From e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Nov 2022 05:18:59 +0000
+Subject: [PATCH] Fix `-Wstrict-prototypes`.
+
+* builds/unix/configure.raw: Fix `-Wstrict-prototypes`.
+Clang 16 warns on these and they will be dropped in C23.
+
+* builds/unix/freetype2.m4: Ditto.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/builds/unix/configure.raw
++++ b/builds/unix/configure.raw
+@@ -50,7 +50,7 @@ if test ${cross_compiling} = yes; then
+ 
+   AC_MSG_CHECKING([for suffix of native executables])
+   rm -f a.* b.* a_out.exe conftest.*
+-  echo > conftest.c "int main() { return 0;}"
++  echo > conftest.c "int main(void) { return 0;}"
+   ${CC_BUILD} conftest.c || AC_MSG_ERROR([native C compiler is not working])
+   rm -f conftest.c
+   if test -x a.out -o -x b.out -o -x conftest; then
+--- a/builds/unix/freetype2.m4
++++ b/builds/unix/freetype2.m4
+@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
+ #include <stdlib.h>
+ 
+ int
+-main()
++main(void)
+ {
+   FT_Library library;
+   FT_Error  error;
+GitLab

diff --git a/media-libs/freetype/freetype-2.12.1-r2.ebuild b/media-libs/freetype/freetype-2.12.1-r2.ebuild
new file mode 100644
index 000000000000..a42c32a28638
--- /dev/null
+++ b/media-libs/freetype/freetype-2.12.1-r2.ebuild
@@ -0,0 +1,261 @@
+# 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	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=(
+	"${FILESDIR}"/${P}-strict-prototypes-clang16.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://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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2022-08-17 16:21 Matt Turner
  0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2022-08-17 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     1e1ae215ec653d12554c7a5031255390b3f6ce40
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:52:14 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:21:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1ae215

media-libs/freetype: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/freetype/Manifest                       |   3 -
 .../freetype-2.12.0-cffgload_segfault_fix.patch    |  31 ---
 .../files/freetype-2.12.0-librsvg_automagic.patch  |  56 -----
 media-libs/freetype/freetype-2.12.0-r1.ebuild      | 261 ---------------------
 4 files changed, 351 deletions(-)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 8cc5622db110..d11d53a8501b 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,3 @@
-DIST freetype-2.12.0.tar.xz 2340352 BLAKE2B 09227c883e52b4e4aefd68d8e4bfaf36eed0c4d92d22d6f5f88e2a69a94be6040ecff7285ca92f30cd9ce71a4af0ffa74141f3263f7a75e29d87b8a4fe27bf08 SHA512 d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54
 DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
-DIST freetype-doc-2.12.0.tar.xz 2038684 BLAKE2B ac5197f1a31a4c29a218c0a35af4658a289afbea9ad6b5a200dd0518d63a1b647467b3c460b72863a4048269c249ca2fbc83146ba3de6594e00bfa88a701d979 SHA512 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6
 DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
-DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7

diff --git a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch b/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
deleted file mode 100644
index 6578475f4d7f..000000000000
--- a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 978eefee5401abee6bf702c6bcde9afb47893145 Mon Sep 17 00:00:00 2001
-From: Georg Brandl <georg@python.org>
-Date: Tue, 12 Apr 2022 11:43:37 +0000
-Subject: [PATCH] * src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_SVG]:
- Fix segfault.
-
-This can happen if the function is called with `size` being `NULL`.
-
-Fixes #1147.
----
- src/cff/cffgload.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
-index 5c15c804b..7586b886f 100644
---- a/src/cff/cffgload.c
-+++ b/src/cff/cffgload.c
-@@ -370,8 +370,8 @@
-       SFNT_Service  sfnt;
- 
- 
--      if ( size->root.metrics.x_ppem < 1 ||
--           size->root.metrics.y_ppem < 1 )
-+      if ( size && (size->root.metrics.x_ppem < 1 ||
-+                    size->root.metrics.y_ppem < 1 ) )
-       {
-         error = FT_THROW( Invalid_Size_Handle );
-         return error;
--- 
-GitLab
-

diff --git a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch b/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
deleted file mode 100644
index bb6854e9ecb5..000000000000
--- a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/156
-
---- freetype-2.12.0/builds/unix/configure.ac
-+++ freetype-2.12.0/builds/unix/configure.ac
-@@ -530,13 +530,20 @@
-                [test "$ac_cv_search_clock_gettime" = "none required" \
-                 || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
- 
--# 'librsvg' is needed to demonstrate SVG support.
--PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
--                  [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
--
- FT_DEMO_CFLAGS=""
- FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
- 
-+# 'librsvg' is needed to demonstrate SVG support.
-+AC_ARG_WITH([librsvg],
-+  [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
-+                  [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
-+  [], [with_librsvg=auto])
-+
-+have_librsvg=no
-+AS_IF([test x"$with_librsvg" != xno], [
-+	PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
-+			  [have_librsvg="yes (pkg-config)"])
-+])
- if test "$have_librsvg" != no; then
-   FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
-   FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
---- freetype-2.12.0/builds/unix/configure.raw
-+++ freetype-2.12.0/builds/unix/configure.raw
-@@ -530,13 +530,20 @@
-                [test "$ac_cv_search_clock_gettime" = "none required" \
-                 || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
- 
--# 'librsvg' is needed to demonstrate SVG support.
--PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
--                  [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
--
- FT_DEMO_CFLAGS=""
- FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
- 
-+# 'librsvg' is needed to demonstrate SVG support.
-+AC_ARG_WITH([librsvg],
-+  [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
-+                  [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])],
-+  [], [with_librsvg=auto])
-+
-+have_librsvg=no
-+AS_IF([test x"$with_librsvg" != xno], [
-+	PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
-+			  [have_librsvg="yes (pkg-config)"])
-+])
- if test "$have_librsvg" != no; then
-   FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
-   FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"

diff --git a/media-libs/freetype/freetype-2.12.0-r1.ebuild b/media-libs/freetype/freetype-2.12.0-r1.ebuild
deleted file mode 100644
index 51df8e5fb2dd..000000000000
--- a/media-libs/freetype/freetype-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,261 +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 ~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 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=(
-	"${FILESDIR}/${PN}-2.12.0-librsvg_automagic.patch"
-
-	# https://bugs.gentoo.org/836898
-	"${FILESDIR}/${P}-cffgload_segfault_fix.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://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
-
-	# 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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2022-04-16 20:55 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2022-04-16 20:55 UTC (permalink / raw
  To: gentoo-commits

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?= <mgorny@gentoo.org>
-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?= <drott@chromium.org>
-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 <wl@gnu.org>
-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 <apodtele@gmail.com>
-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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2021-12-03 10:21 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2021-12-03 10:21 UTC (permalink / raw
  To: gentoo-commits

commit:     906bde8bb4072b5634c0f0759a4662b00eb09b6c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 10:19:36 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec  3 10:21:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906bde8b

media-libs/freetype: Removed old

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/freetype/Manifest                       |   3 -
 .../freetype-2.10.4-dont_hardcode_libtool.patch    |  42 ----
 .../files/freetype-2.10.4-slibtool_build_fix.patch |  40 ----
 .../files/ft2demos-2.10.4-install_target.patch     |  58 -----
 media-libs/freetype/freetype-2.10.4.ebuild         | 237 ---------------------
 5 files changed, 380 deletions(-)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 709c6b5ef4ba..6f1f0ea25bee 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,10 +1,7 @@
-DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 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-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
 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 ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
 DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
 DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5

diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
deleted file mode 100644
index 310b5aaca935..000000000000
--- a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:37 -0700
-Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code
- `libtool`.
-
----
- Makefile     |    3 +--
- mac/Makefile |    3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 810142f..949402f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -165,8 +165,7 @@ else
- 
-   ifeq ($(PLATFORM),unix)
-     override CC = $(CCraw)
--    LINK_CMD    = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
--                  --mode=link $(CC) \
-+    LINK_CMD    = $(LIBTOOL) --mode=link $(CC) \
-                   $(subst /,$(COMPILER_SEP),$(LDFLAGS))
-     LINK_LIBS   = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
-   else
-diff --git a/mac/Makefile b/mac/Makefile
-index 73ae99c..52038a4 100644
---- a/mac/Makefile
-+++ b/mac/Makefile
-@@ -68,8 +68,7 @@ else
-   LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
- 
-   CC        = $(CCraw)
--  LINK_CMD  = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
--		--mode=link $(CC) \
-+  LINK_CMD  = $(LIBTOOL) --mode=link $(CC) \
- 		$(subst /,$(COMPILER_SEP),$(LDFLAGS))
-   ifeq ($(findstring CoreServices,$(LDFLAGS)),)
-     LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
--- 
-GitLab
-

diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
deleted file mode 100644
index 895a86c444d6..000000000000
--- a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:09 -0700
-Subject: [PATCH] [graph] Fix build with `slibtool`.
-
-* graph/rules.mk (GRAPH_LIB): Handle the case specially where
-`LIBTOOL` is defined.
-(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
----
- rules.mk |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/graph/rules.mk b/graph/rules.mk
-index 4903a38..a3f0de1 100644
---- a/graph/rules.mk
-+++ b/graph/rules.mk
-@@ -12,7 +12,6 @@
- 
- 
- GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
--GRAPH_LIB      := $(OBJ_DIR_2)/graph.$(SA)
- 
- GRAPH := $(TOP_DIR_2)/graph
- 
-@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O)   \
- # this value can be modified by the system-specific graphics drivers.
- #
- ifneq ($(LIBTOOL),)
--  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
-+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(A)
-+  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
-                                  -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- else
-+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(SA)
-   COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- endif
- 
--- 
-GitLab
-

diff --git a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
deleted file mode 100644
index f3d7f8de43e4..000000000000
--- a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 24 Mar 2021 09:04:41 -0700
-Subject: [PATCH] [build] Add an `install` target for binaries and man pages.
-
-* Makefile (MANPAGES): New variable.
-(install) <unix>: New target.
----
- Makefile |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 949402f..8352f61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -194,7 +194,7 @@ else
-                 $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
-                 $(GRAPH_LINK) $(MATH)
- 
--  .PHONY: exes clean distclean
-+  .PHONY: exes clean distclean install
- 
- 
-   ###################################################################
-@@ -317,6 +317,11 @@ else
-   # EXES += fttimer
-   # EXES += testname
- 
-+  # Not all demo programs have a man page; we thus check for existence in a
-+  # loop.
-+  #
-+  MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1))
-+
-   exes: $(EXES:%=$(BIN_DIR_2)/%$E)
- 
- 
-@@ -567,6 +572,18 @@ else
-                         $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
- 	  $(LINK_NEW)
- 
-+  ifeq ($(PLATFORM),unix)
-+    install: exes
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \
-+                             $(DESTDIR)$(mandir)/man1
-+	    $(foreach bin,$(EXES), \
-+              $(LIBTOOL) --mode=install \
-+                $(INSTALL) $(BIN_DIR_2)/$(bin) \
-+                           $(DESTDIR)$(bindir)/$(bin);)
-+	    $(foreach man,$(MANPAGES), \
-+              $(INSTALL) $(man) \
-+                         $(DESTDIR)$(mandir)/man1/$(notdir $(man));)
-+  endif
- endif
- 
- 
--- 
-GitLab
-

diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
deleted file mode 100644
index 4bec88e1dd43..000000000000
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist 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 )"
-	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"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-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
-)
-
-_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}
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		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
-
-	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
-
-		# Taken from upstream (https://bugs.gentoo.org/775881)
-		eapply "${FILESDIR}/${P}-slibtool_build_fix.patch"
-		eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch"
-		eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch"
-		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
-
-	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}" -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2021-08-18 21:25 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2021-08-18 21:25 UTC (permalink / raw
  To: gentoo-commits

commit:     5eb832f8fea3b4ef1a147b3fa778f3e5c88ee887
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 21:24:37 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 21:25:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb832f8

media-libs/freetype: Another feature backport

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../freetype-2.11.0-COLR_missing_blend_mode.patch  | 58 ++++++++++++++++++++++
 media-libs/freetype/freetype-2.11.0-r1.ebuild      |  1 +
 2 files changed, 59 insertions(+)

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
new file mode 100644
index 00000000000..af24a09ef21
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch
@@ -0,0 +1,58 @@
+From e40ae7569aa4ef591f66ff9066df2f91de75bb77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
+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/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild
index 818649d695a..32c9c6179c6 100644
--- a/media-libs/freetype/freetype-2.11.0-r1.ebuild
+++ b/media-libs/freetype/freetype-2.11.0-r1.ebuild
@@ -48,6 +48,7 @@ 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() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2021-03-30 20:37 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2021-03-30 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1bd791dae28b9af2b3e933939335a53fa303cfc9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 20:37:20 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 20:37:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd791da

media-libs/freetype: Fixed build with sys-devel/slibtool

Closes: https://bugs.gentoo.org/775881
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../freetype-2.10.4-dont_hardcode_libtool.patch    | 42 ++++++++++++++++
 .../files/freetype-2.10.4-slibtool_build_fix.patch | 40 +++++++++++++++
 .../files/ft2demos-2.10.4-install_target.patch     | 58 ++++++++++++++++++++++
 media-libs/freetype/freetype-2.10.4.ebuild         | 16 +++---
 4 files changed, 148 insertions(+), 8 deletions(-)

diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
new file mode 100644
index 00000000000..310b5aaca93
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
@@ -0,0 +1,42 @@
+From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 22 Mar 2021 16:15:37 -0700
+Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code
+ `libtool`.
+
+---
+ Makefile     |    3 +--
+ mac/Makefile |    3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 810142f..949402f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -165,8 +165,7 @@ else
+ 
+   ifeq ($(PLATFORM),unix)
+     override CC = $(CCraw)
+-    LINK_CMD    = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
+-                  --mode=link $(CC) \
++    LINK_CMD    = $(LIBTOOL) --mode=link $(CC) \
+                   $(subst /,$(COMPILER_SEP),$(LDFLAGS))
+     LINK_LIBS   = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
+   else
+diff --git a/mac/Makefile b/mac/Makefile
+index 73ae99c..52038a4 100644
+--- a/mac/Makefile
++++ b/mac/Makefile
+@@ -68,8 +68,7 @@ else
+   LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
+ 
+   CC        = $(CCraw)
+-  LINK_CMD  = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
+-		--mode=link $(CC) \
++  LINK_CMD  = $(LIBTOOL) --mode=link $(CC) \
+ 		$(subst /,$(COMPILER_SEP),$(LDFLAGS))
+   ifeq ($(findstring CoreServices,$(LDFLAGS)),)
+     LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
+-- 
+GitLab
+

diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
new file mode 100644
index 00000000000..895a86c444d
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
@@ -0,0 +1,40 @@
+From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 22 Mar 2021 16:15:09 -0700
+Subject: [PATCH] [graph] Fix build with `slibtool`.
+
+* graph/rules.mk (GRAPH_LIB): Handle the case specially where
+`LIBTOOL` is defined.
+(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
+---
+ rules.mk |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/graph/rules.mk b/graph/rules.mk
+index 4903a38..a3f0de1 100644
+--- a/graph/rules.mk
++++ b/graph/rules.mk
+@@ -12,7 +12,6 @@
+ 
+ 
+ GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
+-GRAPH_LIB      := $(OBJ_DIR_2)/graph.$(SA)
+ 
+ GRAPH := $(TOP_DIR_2)/graph
+ 
+@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O)   \
+ # this value can be modified by the system-specific graphics drivers.
+ #
+ ifneq ($(LIBTOOL),)
+-  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
++  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(A)
++  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
+                                  -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
+ else
++  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(SA)
+   COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
+ endif
+ 
+-- 
+GitLab
+

diff --git a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
new file mode 100644
index 00000000000..f3d7f8de43e
--- /dev/null
+++ b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
@@ -0,0 +1,58 @@
+From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 24 Mar 2021 09:04:41 -0700
+Subject: [PATCH] [build] Add an `install` target for binaries and man pages.
+
+* Makefile (MANPAGES): New variable.
+(install) <unix>: New target.
+---
+ Makefile |   19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 949402f..8352f61 100644
+--- a/Makefile
++++ b/Makefile
+@@ -194,7 +194,7 @@ else
+                 $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
+                 $(GRAPH_LINK) $(MATH)
+ 
+-  .PHONY: exes clean distclean
++  .PHONY: exes clean distclean install
+ 
+ 
+   ###################################################################
+@@ -317,6 +317,11 @@ else
+   # EXES += fttimer
+   # EXES += testname
+ 
++  # Not all demo programs have a man page; we thus check for existence in a
++  # loop.
++  #
++  MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1))
++
+   exes: $(EXES:%=$(BIN_DIR_2)/%$E)
+ 
+ 
+@@ -567,6 +572,18 @@ else
+                         $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
+ 	  $(LINK_NEW)
+ 
++  ifeq ($(PLATFORM),unix)
++    install: exes
++	    $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \
++                             $(DESTDIR)$(mandir)/man1
++	    $(foreach bin,$(EXES), \
++              $(LIBTOOL) --mode=install \
++                $(INSTALL) $(BIN_DIR_2)/$(bin) \
++                           $(DESTDIR)$(bindir)/$(bin);)
++	    $(foreach man,$(MANPAGES), \
++              $(INSTALL) $(man) \
++                         $(DESTDIR)$(mandir)/man1/$(notdir $(man));)
++  endif
+ endif
+ 
+ 
+-- 
+GitLab
+

diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 6ede5206ae8..2a38b5388be 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -148,6 +148,11 @@ src_prepare() {
 		if ! use X; then
 			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
 		fi
+
+		# Taken from upstream (https://bugs.gentoo.org/775881)
+		eapply "${FILESDIR}/${P}-slibtool_build_fix.patch"
+		eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch"
+		eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch"
 		cd "${S}" || die
 	fi
 
@@ -204,15 +209,10 @@ multilib_src_compile() {
 multilib_src_install() {
 	default
 
-	if multilib_is_native_abi && use utils; then
+	if multilib_is_native_abi && use utils ; then
 		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		dodir /usr/bin #654780
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
-				"${ED}"/usr/bin || die
-		done
+		emake DESTDIR="${D}" FT2DEMOS=1 \
+			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2020-10-20  7:05 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-10-20  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d93a975c694a048359086224a27dba08d4633d23
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 07:04:33 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:04:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93a975c

media-libs/freetype: Security bump to version 2.10.4. Removed old

Bug: https://bugs.gentoo.org/750275
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/freetype/Manifest                       |  3 ++
 .../files/freetype-2.10.3-CVE-2020-15999.patch     | 51 ----------------------
 ...ype-2.10.3-r1.ebuild => freetype-2.10.4.ebuild} |  1 -
 3 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 0576f7b5218..cb7d28558e6 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,9 @@
 DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
 DIST freetype-2.10.3.tar.xz 2416752 BLAKE2B 8ce360c07777ad5b031ff7a840ef0cec95f358e764897f1aea9e8fd40a21e8bada3610943dc70b279856116396e6703b5127a4d672fb6e0dc8e5fe7f9233265e SHA512 3f9d1a44cdae51ec4b13116aba5af1730e6be46132ddd9e49486e8d681b61756baa9897daaf0f06e79f00f2db0e57e0fa66d27f44d65735da1167d5b3c170373
+DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
 DIST freetype-doc-2.10.3.tar.xz 2079036 BLAKE2B fca0915a5f268ce4d5205822d712b451f73d891e00518b3db0dd7c431fd7bd6544fa36fc374344c94f43d731fe7a1076724c3fdd42c8143647aa5763b4736556 SHA512 135ae51706197d1bd208cb48d8d1881c14aeee5283dbdab88a7fa6864aed888613df43bd3deb24ff530fa767f94fe997f97dee10bf2be7763231211bf7d5225f
+DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
 DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
 DIST ft2demos-2.10.3.tar.xz 235388 BLAKE2B c1c7e9d61fde441b2cc107a3ad8f1499c03ce8219a54b2bdc4ab7168a0d61a6c83c7e6e3d2de6a8ed0f09b29c398708618e4683d5ed24d6e8ae7505b8920770f SHA512 860fbeefd70caa4aa9483d90df5c3376ee2bef8fe93ab26010c4ca4f95cfd281870da461e2f335f42d3e6d2007f8e46c99d7834d2177b7806a2d92422ed08b41
+DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8

diff --git a/media-libs/freetype/files/freetype-2.10.3-CVE-2020-15999.patch b/media-libs/freetype/files/freetype-2.10.3-CVE-2020-15999.patch
deleted file mode 100644
index 215b03b2d3d..00000000000
--- a/media-libs/freetype/files/freetype-2.10.3-CVE-2020-15999.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://git.savannah.nongnu.org/cgit/freetype/freetype2.git/commit/?id=a3bab162b2ae616074c8877a04556932998aeacd
-https://bugs.gentoo.org/750275
-----
-From a3bab162b2ae616074c8877a04556932998aeacd Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Mon, 19 Oct 2020 23:45:28 +0200
-Subject: [sfnt] Fix heap buffer overflow (#59308).
-
-This is CVE-2020-15999.
-
-* src/sfnt/pngshim.c (Load_SBit_Png): Test bitmap size earlier.
----
- ChangeLog          |  8 ++++++++
- src/sfnt/pngshim.c | 14 +++++++-------
- 2 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
-index 2e64e5846..f55016122 100644
---- a/src/sfnt/pngshim.c
-+++ b/src/sfnt/pngshim.c
-@@ -332,6 +332,13 @@
- 
-     if ( populate_map_and_metrics )
-     {
-+      /* reject too large bitmaps similarly to the rasterizer */
-+      if ( imgHeight > 0x7FFF || imgWidth > 0x7FFF )
-+      {
-+        error = FT_THROW( Array_Too_Large );
-+        goto DestroyExit;
-+      }
-+
-       metrics->width  = (FT_UShort)imgWidth;
-       metrics->height = (FT_UShort)imgHeight;
- 
-@@ -340,13 +347,6 @@
-       map->pixel_mode = FT_PIXEL_MODE_BGRA;
-       map->pitch      = (int)( map->width * 4 );
-       map->num_grays  = 256;
--
--      /* reject too large bitmaps similarly to the rasterizer */
--      if ( map->rows > 0x7FFF || map->width > 0x7FFF )
--      {
--        error = FT_THROW( Array_Too_Large );
--        goto DestroyExit;
--      }
-     }
- 
-     /* convert palette/gray image to rgb */
--- 
-cgit v1.2.1
-

diff --git a/media-libs/freetype/freetype-2.10.3-r1.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
similarity index 99%
rename from media-libs/freetype/freetype-2.10.3-r1.ebuild
rename to media-libs/freetype/freetype-2.10.4.ebuild
index 1f0bb65321a..b8b52e17acc 100644
--- a/media-libs/freetype/freetype-2.10.3-r1.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -47,7 +47,6 @@ PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-	"${FILESDIR}"/${PN}-2.10.3-CVE-2020-15999.patch # 750275
 )
 
 _egit_repo_handler() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2020-10-11  7:24 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-10-11  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     09600e1de936bdf51f9c9d4ace1593d740d65e45
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 07:03:28 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 07:24:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09600e1d

media-libs/freetype: Bump to version 2.10.3

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/freetype/Manifest                       |   3 +
 .../files/freetype-2.10.3-sizeof-types.patch       |  31 +++
 media-libs/freetype/freetype-2.10.3.ebuild         | 242 +++++++++++++++++++++
 3 files changed, 276 insertions(+)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 4b09ea03443..873a0ecf616 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,9 +1,12 @@
 DIST freetype-2.10.1.tar.xz 2378784 BLAKE2B 7c177d3ca9ad923dc9534719529686c4242d87d85bfbc32fa8a12d0be87aceb4960ec84b84e433413312de17ac24a8ed2a9d092efa25a39108d28e2051ada574 SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650
 DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
+DIST freetype-2.10.3.tar.xz 2416752 BLAKE2B 8ce360c07777ad5b031ff7a840ef0cec95f358e764897f1aea9e8fd40a21e8bada3610943dc70b279856116396e6703b5127a4d672fb6e0dc8e5fe7f9233265e SHA512 3f9d1a44cdae51ec4b13116aba5af1730e6be46132ddd9e49486e8d681b61756baa9897daaf0f06e79f00f2db0e57e0fa66d27f44d65735da1167d5b3c170373
 DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
 DIST freetype-doc-2.10.1.tar.xz 2079092 BLAKE2B 7d2b8ccdfeba71f1dab57f31cfb96a21afbf628ad329f798e9ac25f6e57cc662db67040a9f7c63df2d43b1c0a169c37ca0cd82bfa2d95ef382b16066859dc5b3 SHA512 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e
 DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
+DIST freetype-doc-2.10.3.tar.xz 2079036 BLAKE2B fca0915a5f268ce4d5205822d712b451f73d891e00518b3db0dd7c431fd7bd6544fa36fc374344c94f43d731fe7a1076724c3fdd42c8143647aa5763b4736556 SHA512 135ae51706197d1bd208cb48d8d1881c14aeee5283dbdab88a7fa6864aed888613df43bd3deb24ff530fa767f94fe997f97dee10bf2be7763231211bf7d5225f
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
 DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142
 DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
+DIST ft2demos-2.10.3.tar.xz 235388 BLAKE2B c1c7e9d61fde441b2cc107a3ad8f1499c03ce8219a54b2bdc4ab7168a0d61a6c83c7e6e3d2de6a8ed0f09b29c398708618e4683d5ed24d6e8ae7505b8920770f SHA512 860fbeefd70caa4aa9483d90df5c3376ee2bef8fe93ab26010c4ca4f95cfd281870da461e2f335f42d3e6d2007f8e46c99d7834d2177b7806a2d92422ed08b41
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46

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
new file mode 100644
index 00000000000..ea02a15df11
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
@@ -0,0 +1,31 @@
+From 56e6ee69d298c0d150e2b76d2cfa2306e901df40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+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/freetype-2.10.3.ebuild b/media-libs/freetype/freetype-2.10.3.ebuild
new file mode 100644
index 00000000000..b8b52e17acc
--- /dev/null
+++ b/media-libs/freetype/freetype-2.10.3.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff bindist 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 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+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
+"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
+)
+
+_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}
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# inspired by shipped autogen.sh script
+		eval $(sed -nf version.sed include/freetype/freetype.h)
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		eautoheader() { return 0 ; }
+		AT_M4DIR="." eautoreconf
+		unset freetype_major freetype_minor freetype_patch
+		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
+
+	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=(
+		--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
+
+	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
+		dodir /usr/bin #654780
+		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/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}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2020-10-11  7:24 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-10-11  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     04dfa3b02bc59645281e2ef3d29f75f3e5935eaf
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 07:06:27 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 07:24:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04dfa3b0

media-libs/freetype: Removed old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/freetype/Manifest                       |   6 -
 .../freetype/files/freetype-2.7-enable-valid.patch |  20 --
 media-libs/freetype/freetype-2.10.1.ebuild         | 240 ---------------------
 media-libs/freetype/freetype-2.9.1-r3.ebuild       | 237 --------------------
 media-libs/freetype/freetype-2.9.1-r4.ebuild       | 237 --------------------
 5 files changed, 740 deletions(-)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 873a0ecf616..0576f7b5218 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,12 +1,6 @@
-DIST freetype-2.10.1.tar.xz 2378784 BLAKE2B 7c177d3ca9ad923dc9534719529686c4242d87d85bfbc32fa8a12d0be87aceb4960ec84b84e433413312de17ac24a8ed2a9d092efa25a39108d28e2051ada574 SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650
 DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
 DIST freetype-2.10.3.tar.xz 2416752 BLAKE2B 8ce360c07777ad5b031ff7a840ef0cec95f358e764897f1aea9e8fd40a21e8bada3610943dc70b279856116396e6703b5127a4d672fb6e0dc8e5fe7f9233265e SHA512 3f9d1a44cdae51ec4b13116aba5af1730e6be46132ddd9e49486e8d681b61756baa9897daaf0f06e79f00f2db0e57e0fa66d27f44d65735da1167d5b3c170373
-DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
-DIST freetype-doc-2.10.1.tar.xz 2079092 BLAKE2B 7d2b8ccdfeba71f1dab57f31cfb96a21afbf628ad329f798e9ac25f6e57cc662db67040a9f7c63df2d43b1c0a169c37ca0cd82bfa2d95ef382b16066859dc5b3 SHA512 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e
 DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
 DIST freetype-doc-2.10.3.tar.xz 2079036 BLAKE2B fca0915a5f268ce4d5205822d712b451f73d891e00518b3db0dd7c431fd7bd6544fa36fc374344c94f43d731fe7a1076724c3fdd42c8143647aa5763b4736556 SHA512 135ae51706197d1bd208cb48d8d1881c14aeee5283dbdab88a7fa6864aed888613df43bd3deb24ff530fa767f94fe997f97dee10bf2be7763231211bf7d5225f
-DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
-DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142
 DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
 DIST ft2demos-2.10.3.tar.xz 235388 BLAKE2B c1c7e9d61fde441b2cc107a3ad8f1499c03ce8219a54b2bdc4ab7168a0d61a6c83c7e6e3d2de6a8ed0f09b29c398708618e4683d5ed24d6e8ae7505b8920770f SHA512 860fbeefd70caa4aa9483d90df5c3376ee2bef8fe93ab26010c4ca4f95cfd281870da461e2f335f42d3e6d2007f8e46c99d7834d2177b7806a2d92422ed08b41
-DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46

diff --git a/media-libs/freetype/files/freetype-2.7-enable-valid.patch b/media-libs/freetype/files/freetype-2.7-enable-valid.patch
deleted file mode 100644
index 76600aeb162..00000000000
--- a/media-libs/freetype/files/freetype-2.7-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.7/modules.cfg
-+++ freetype-2.7/modules.cfg
-@@ -120,7 +120,7 @@
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
- 
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -143,7 +143,7 @@
- # OpenType table validation.  Needs ftotval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #

diff --git a/media-libs/freetype/freetype-2.10.1.ebuild b/media-libs/freetype/freetype-2.10.1.ebuild
deleted file mode 100644
index d6f5e68744d..00000000000
--- a/media-libs/freetype/freetype-2.10.1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist 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 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${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
-"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-)
-
-_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}
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		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
-
-	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=(
-		--disable-freetype-config
-		--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)"
-	)
-
-	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
-
-	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
-		dodir /usr/bin #654780
-		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/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}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}

diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
deleted file mode 100644
index a44767d97c5..00000000000
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	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 )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${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}
-	virtual/pkgconfig"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	# This is the same as the 01 patch from infinality
-	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
-
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-)
-
-_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 fetch
-}
-
-src_unpack() {
-	_egit_repo_handler unpack
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	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
-
-	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-freetype-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)"
-	)
-
-	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
-
-	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
-		dodir /usr/bin #654780
-		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/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}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}

diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
deleted file mode 100644
index 159d8a07550..00000000000
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	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 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${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}
-	virtual/pkgconfig"
-PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
-
-PATCHES=(
-	# This is the same as the 01 patch from infinality
-	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
-
-	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
-)
-
-_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 fetch
-}
-
-src_unpack() {
-	_egit_repo_handler unpack
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		eautoheader() { return 0 ; }
-		AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	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
-
-	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=(
-		--disable-freetype-config
-		--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)"
-	)
-
-	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
-
-	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
-		dodir /usr/bin #654780
-		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/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}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2016-09-08 18:09 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2016-09-08 18:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1507c77b241ae9972879e8b095bd627e80a58c09
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 18:09:00 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 18:09:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1507c77b

media-libs/freetype: Bump to version 2.7

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/freetype/Manifest                       |   3 +
 .../freetype/files/freetype-2.7-enable-valid.patch |  20 +++
 media-libs/freetype/freetype-2.7.ebuild            | 177 +++++++++++++++++++++
 3 files changed, 200 insertions(+)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 189e7a4..13c6872 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -3,9 +3,12 @@ DIST freetype-2.5.5-infinality-patches.tar.xz 24380 SHA256 6b7bc373b068c71feca2e
 DIST freetype-2.5.5.tar.bz2 1714529 SHA256 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9 SHA512 1fc72d24da1744a6a5faf3338e49912c81ce83f30def1e80a2a15b50e7f83893a4fe24a70ef88b65ecc217bed1c15d85804c364eba221b35e25531c727fe8559 WHIRLPOOL 57cf0f020cda6a66cfe8e2a30e1e997c0fd7f97bdaed38da65cce0b360fcc60cfdf1ba0724c1745668ae3f80743052e135edb8356dff4c90365caa6262d59158
 DIST freetype-2.6.3.tar.bz2 1753083 SHA256 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2 SHA512 e1f9018835fc88beeb4479537b59f866c52393ae18d24a1e0710a464cf948ab02b35c2c6043bc20c1db3a04871ee4eb0bb1d210550c0ea2780c8b1aea98fbf0d WHIRLPOOL e17e87fe7b821730da13b1a54073fd0314025e3e15a41b10b5ece2731c8152c4d8dbe1fb7f26593794d70f15f6dfd70582678d48a8f068cec865f821eb3847a0
 DIST freetype-2.6.5.tar.bz2 1779603 SHA256 e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0 SHA512 d60f057e12992b4dccd7d5e232bda5c344e6ed0d74362032fbbc52526bac42d600fe0aa04c6442a9502a27a88f5d5155fb42e723531127400ccfce0d1911487f WHIRLPOOL 3cfbbe407ee024ff939469aa2b82b764fe89b1ba4fc7edcdd537e9ad81b3ea6a8fe807e2d5fdb80ec47de2f66cf3f28b5e45320c84a84ea446acbf6c2966cccb
+DIST freetype-2.7.tar.bz2 1789896 SHA256 d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48 SHA512 cd5bcde276d6d59379d9c60a90095be59b0692ec8fd2817aa44ff80ebb84840e8a72be2cfbbbcf7e13258026fa691f28c2673f03c3a3961a859900e61a62d761 WHIRLPOOL 74972198e66cb30465bc1ce40c3e394bae07e194f1ddbc4024e7969c52def6ffd255d88279f77a610c16bbac618c90c3a296d37a981e3048d94ed0135a2cdd5c
 DIST freetype-doc-2.5.5.tar.bz2 108133 SHA256 68becbae3578a8101e9f3c55f10e435fb75535011d3f7a523719371e86e368e7 SHA512 0e2455433f72766ec88275d2e53e49630457579a83ca491697bb5ce12196ee964618d1af86956651557d34e8ea1d57f75f69e0d60ef90e943509bc571370fb64 WHIRLPOOL 28d13ae3ce9bc3fb278df9a963cef3622672fa288fc0fd654e874054bedccd8510a3dcf7636ea2ec107b5299984742607d2a9436d5e473202856e27bf262655f
 DIST freetype-doc-2.6.3.tar.bz2 5367900 SHA256 28b7cb0b1ff3962d386c54cdffd3891d2126292f57b4ea9ad0467f07cf68de7d SHA512 7731d96543f73ace8afc4b5ff2148c32a8dacbf01a976a6870705f73b45dfe1429ffa94406cdfc83b163b039c4d375c0c553a7d7aaad659a87079f357e6599cc WHIRLPOOL 71b01f8d5daf8e93efab5453f198d1790365fd010b5a137f4f34e93f6bc03a6a644900b92b8263973248954895c73e70cad64fe50b09bb4042627182299a5a1c
 DIST freetype-doc-2.6.5.tar.bz2 1932398 SHA256 cb9cd73c3a713138e690a634608ec7b64ff645f9a71ac6645804b18e38be49e9 SHA512 1d2affa07f34c6486f1738141b428256f1d44bc0d166c74e9884caeeecdf3204164542e9bbc1c0eba6ff605f41d6022068546da64aee7859b72636bcd72fff00 WHIRLPOOL 90499d7ffdfe079dc058974e9d89a18a35c011244ea6d6003e8f445af579430910331fad2c6c7f4cc5ff318cf8582d8b30a32f878a4b8e4e5723e1b02025a396
+DIST freetype-doc-2.7.tar.bz2 1935798 SHA256 8440b7e576ccbe840051c162419a39083627a4de0c7d15fd20220736c03aac66 SHA512 07d5aab0c81369c8ab9d463a279b73a8189f9ab120733b31da1ad89faf01e00c9bb751af0ecee73517a6aa734f7b66a970e51767bf4e9f64eca5f35ba03a4ad8 WHIRLPOOL 26d3d2bef648a02856644de707f0f3b9c59bd912840a1d8b3d8c16867f51fb6d5d333bda22a0a880f4a6dae28f29483efcd863a41d6764a4a7b6bf1c657f6dea
 DIST ft2demos-2.5.5.tar.bz2 182006 SHA256 b87c7deb5d9b1fddb8520c091a5491cc63ecac4de25139e1da38aebee82195ea SHA512 c6e1855f2315665e39a894ecfcb65f8546de435c1dada0ea0a6665a1e3ef22331d6949cd9261dfb6b68e653631d4c2e74f8ea31b53b40e46f44ab4dae38e368b WHIRLPOOL 55d6add5e3fac008a39231e3805e151a5a9b7cafb6ef970e546d96d3fa338a6a4a744aeb59ea04804312164aedd5e5a21e19773dbf5c42a1acfc42d283d90930
 DIST ft2demos-2.6.3.tar.bz2 193412 SHA256 b076ac52465e912d035f111ede78b88bf3dd186f91a56a54ff83ffdf862e84e4 SHA512 1f23f9ab0bd59a06b8fd223bcc335ffba064477abee74d33308ddc28eb41e4ccf3728a52c36d4cab3995be695b56e1e099c2889f04e0835ba242b2938c5d2e78 WHIRLPOOL 1246985eca92e2e4d1b618d633602fc4114a69c1a8d715c51a5e96c17b3119fb3a254a577c876ad8ba9e2871bf59f4bd67f6721a706b3706a0a532728723f6a4
 DIST ft2demos-2.6.5.tar.bz2 216722 SHA256 568a8f3a6301189a881d2f7ec95da280d20c862de94d81815341870e380b00e6 SHA512 1b950254588835c4f797a3cf45034af714676e6b2a8415ee8fa860bab7e284c3833675efc84167a90bed29dc0dc2079b22a513cfb6642ba9b5cbc84f1bc4d30d WHIRLPOOL 64780f2ca5c1fe64f1e25f18297c7761bca7b4e9defa0ef823376037f99f5c270f875efd8052f372af3b6cf0f104db91cacad957691df89818404a17ff3d8fb3
+DIST ft2demos-2.7.tar.bz2 218381 SHA256 0865b71dd379605bc19396b8f9a4ee8bab436f44ea55299784a20ef0ff95d9c8 SHA512 69243d2a0bc92d62f7535d41d2f8c6f2e801b8e916c7f6666178c8276e4515fa66bcfe55a3d8b02ea2b5391fc444ded564f6646fac9b2b75308054b34832cb01 WHIRLPOOL 3f150c8c8711fb67f08eed18100bc865b11f32d5aed43902e087868ca09bd836bc7ec40501939214f3e5d0580b7a43c79260828ae9f3bb8438ca3d734535f675

diff --git a/media-libs/freetype/files/freetype-2.7-enable-valid.patch b/media-libs/freetype/files/freetype-2.7-enable-valid.patch
new file mode 100644
index 00000000..76600ae
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.7-enable-valid.patch
@@ -0,0 +1,20 @@
+--- freetype-2.7/modules.cfg
++++ freetype-2.7/modules.cfg
+@@ -120,7 +120,7 @@
+ # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -143,7 +143,7 @@
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #

diff --git a/media-libs/freetype/freetype-2.7.ebuild b/media-libs/freetype/freetype-2.7.ebuild
new file mode 100644
index 00000000..61e4991
--- /dev/null
+++ b/media-libs/freetype/freetype-2.7.ebuild
@@ -0,0 +1,177 @@
+# 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 )"
+
+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 +cleartype_hinting 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 )"
+
+REQUIRED_USE="?? ( cleartype_hinting infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-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
+		# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	fi
+
+	if use cleartype_hinting; then
+		# Will be the new default for >=freetype-2.7.0
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	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/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 use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	prune_libtool_files --all
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
@ 2015-10-07 18:43 Mike Frysinger
  0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger @ 2015-10-07 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ae62b66d2857c70d7c0437438f30f63555edb073
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  7 18:36:23 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 18:43:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae62b66d

media-libs/freetype: add upstream fix for bad shifts w/some bad fonts

 .../freetype/files/freetype-2.6.1-bad-shift.patch  |  50 +++++++
 media-libs/freetype/freetype-2.6.1-r1.ebuild       | 163 +++++++++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
new file mode 100644
index 0000000..c361baf
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch
@@ -0,0 +1,50 @@
+taken from upstream
+
+http://savannah.nongnu.org/bugs/?func=detailitem&item_id=46118
+
+From 30fe5e762e062612fdf4b56b50d813525a5aa311 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl@gnu.org>
+Date: Sun, 4 Oct 2015 13:08:08 +0200
+Subject: [PATCH] [base] Replace left shifts with multiplication (#46118).
+
+* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.
+---
+ ChangeLog          |  6 ++++++
+ src/base/ftglyph.c | 14 +++++++-------
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
+index cb7fc37..2778743 100644
+--- a/src/base/ftglyph.c
++++ b/src/base/ftglyph.c
+@@ -125,10 +125,10 @@
+     FT_BitmapGlyph  glyph = (FT_BitmapGlyph)bitmap_glyph;
+ 
+ 
+-    cbox->xMin = glyph->left << 6;
+-    cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 );
+-    cbox->yMax = glyph->top << 6;
+-    cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 );
++    cbox->xMin = glyph->left * 64;
++    cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 );
++    cbox->yMax = glyph->top * 64;
++    cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 );
+   }
+ 
+ 
+@@ -403,9 +403,9 @@
+     if ( error )
+       goto Exit;
+ 
+-    /* copy advance while converting it to 16.16 format */
+-    glyph->advance.x = slot->advance.x << 10;
+-    glyph->advance.y = slot->advance.y << 10;
++    /* copy advance while converting 26.6 to 16.16 format */
++    glyph->advance.x = slot->advance.x * 1024;
++    glyph->advance.y = slot->advance.y * 1024;
+ 
+     /* now import the image from the glyph slot */
+     error = clazz->glyph_init( glyph, slot );
+-- 
+2.5.2
+

diff --git a/media-libs/freetype/freetype-2.6.1-r1.ebuild b/media-libs/freetype/freetype-2.6.1-r1.ebuild
new file mode 100644
index 0000000..de89f39
--- /dev/null
+++ b/media-libs/freetype/freetype-2.6.1-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-multilib flag-o-matic multilib toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6-2015.10.04.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 )"
+
+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"
+	}
+
+	# This is the same as the 01 patch from infinality
+	epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+
+	if use infinality; then
+		epatch "${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
+
+	epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+	epatch "${FILESDIR}"/${PN}-2.6.1-bad-shift.patch
+
+	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
+
+	autotools-utils_src_prepare
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--enable-biarch-config
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	autotools-utils_src_configure
+}
+
+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}
+	use doc && dohtml -r docs/*
+
+	prune_libtool_files --all
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-12-01  0:11 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-18  7:36 [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2023-12-01  0:11 Matt Turner
2022-11-10  7:13 Sam James
2022-08-17 16:21 Matt Turner
2022-04-16 20:55 Lars Wendler
2021-12-03 10:21 Lars Wendler
2021-08-18 21:25 Lars Wendler
2021-03-30 20:37 Lars Wendler
2020-10-20  7:05 Lars Wendler
2020-10-11  7:24 Lars Wendler
2020-10-11  7:24 Lars Wendler
2016-09-08 18:09 Lars Wendler
2015-10-07 18:43 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox