From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CECD115800A for ; Tue, 15 Aug 2023 05:18:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20F6B2BC02A; Tue, 15 Aug 2023 05:18:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BE0C2BC02A for ; Tue, 15 Aug 2023 05:18:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4782B335D6B for ; Tue, 15 Aug 2023 05:18:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 488B1FAF for ; Tue, 15 Aug 2023 05:18:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1692076635.4b33d5da945a0200bf4debdc54ef4d39d3280fb6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freetype/freetype-2.13.1-r1.ebuild media-libs/freetype/freetype-9999.ebuild X-VCS-Directories: media-libs/freetype/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4b33d5da945a0200bf4debdc54ef4d39d3280fb6 X-VCS-Branch: master Date: Tue, 15 Aug 2023 05:18:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 93433e3f-9cac-4238-b376-2a7d9590e549 X-Archives-Hash: 2333f1c39031876aebc239966dea5325 commit: 4b33d5da945a0200bf4debdc54ef4d39d3280fb6 Author: Matt Whitlock mattwhitlock name> AuthorDate: Tue Aug 15 00:58:14 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 15 05:17:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b33d5da media-libs/freetype: drop "infinality" USE flag Upstream have dropped support for the Infinality rasterizer as of release 2.13.1. Now the TT_CONFIG_OPTION_SUBPIXEL_HINTING macro is a boolean (i.e., defined or undefined) rather than a bitmap (0b00, 0b01, 0b10, or 0b11), so we tweak the relevant disable_option logic in the ebuild. See: https://sourceforge.net/projects/freetype/files/freetype2/2.13.1/ Closes: https://bugs.gentoo.org/909387 Signed-off-by: Matt Whitlock mattwhitlock.name> Closes: https://github.com/gentoo/gentoo/pull/32313 Signed-off-by: Sam James gentoo.org> .../{freetype-9999.ebuild => freetype-2.13.1-r1.ebuild} | 13 +++---------- media-libs/freetype/freetype-9999.ebuild | 13 +++---------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-2.13.1-r1.ebuild similarity index 93% copy from media-libs/freetype/freetype-9999.ebuild copy to media-libs/freetype/freetype-2.13.1-r1.ebuild index 2b7f8dd6715c..6f8fac775721 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-2.13.1-r1.ebuild @@ -28,7 +28,7 @@ fi LICENSE="|| ( FTL GPL-2+ )" SLOT="2" -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz infinality +png static-libs svg utils" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils" RDEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] @@ -137,15 +137,8 @@ src_prepare() { || die "unable to disable option $1" } - # Will be the new default for >=freetype-2.7.0 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - - if use infinality && use cleartype-hinting ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" - elif use infinality ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" - elif use cleartype-hinting ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + if ! use cleartype-hinting ; then + disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING fi # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 2b7f8dd6715c..6f8fac775721 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -28,7 +28,7 @@ fi LICENSE="|| ( FTL GPL-2+ )" SLOT="2" -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz infinality +png static-libs svg utils" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils" RDEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] @@ -137,15 +137,8 @@ src_prepare() { || die "unable to disable option $1" } - # Will be the new default for >=freetype-2.7.0 - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - - if use infinality && use cleartype-hinting ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" - elif use infinality ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" - elif use cleartype-hinting ; then - enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + if ! use cleartype-hinting ; then + disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING fi # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"