diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2016-09-30 11:48:24 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2016-09-30 16:16:13 -0400 |
| commit | 838c92297214d6330844df0b15ba61c33c27c430 (patch) | |
| tree | 34adfb5e8155c0776b3b45b83315eed24289b296 /media-libs | |
| parent | dev-lang/crystal: bump up to 0.19.3 (diff) | |
| download | gentoo-838c92297214d6330844df0b15ba61c33c27c430.tar.gz gentoo-838c92297214d6330844df0b15ba61c33c27c430.tar.bz2 gentoo-838c92297214d6330844df0b15ba61c33c27c430.zip | |
media-libs/freetype: avoid redefining TT_CONFIG_OPTION_SUBPIXEL_HINTING
Adjust the enable_option function to remvoe comments instead of appending an
additional line. This should resolve a build failure in sys-boot/grub.
Also allow both cleartype and infinality to be enabled simultaneously, as
documented in ftoption.h.
Bug: https://bugs.gentoo.org/595558
Package-Manager: portage-2.3.1_p4_p550764
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/freetype/freetype-2.7-r2.ebuild (renamed from media-libs/freetype/freetype-2.7-r1.ebuild) | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/media-libs/freetype/freetype-2.7-r1.ebuild b/media-libs/freetype/freetype-2.7-r2.ebuild index c7c0aaf9d997..8650a681ed85 100644 --- a/media-libs/freetype/freetype-2.7-r1.ebuild +++ b/media-libs/freetype/freetype-2.7-r2.ebuild @@ -41,8 +41,6 @@ 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 @@ -52,27 +50,28 @@ PATCHES=( src_prepare() { enable_option() { - sed -i -e "/#define $1/a #define $1" \ + 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:$:*/: }" \ + 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 + # 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 - # Will be the new default for >=freetype-2.7.0 enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" - else - disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" fi if ! use bindist; then |