commit: 4b33d5da945a0200bf4debdc54ef4d39d3280fb6 Author: Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name> AuthorDate: Tue Aug 15 00:58:14 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <gentoo <AT> mattwhitlock.name> Closes: https://github.com/gentoo/gentoo/pull/32313 Signed-off-by: Sam James <sam <AT> 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"
