Date: Sat, 29 Oct 2016 08:53:15 +0000 From: bugzilla-noreply@freebsd.org To: gnome@FreeBSD.org Subject: [Bug 211201] print/freetype2: update to 2.7, add V40 code Message-ID: <bug-211201-6497-NoK8O1ziUD@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-211201-6497@https.bugs.freebsd.org/bugzilla/> References: <bug-211201-6497@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D211201 lightside <lightside@gmx.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kwm@FreeBSD.org --- Comment #56 from lightside <lightside@gmx.com> --- (In reply to comment #55) > Can we avoid the complexity in this case? > It'd even be 4 lines shorter. What you proposed is the same complexity, but with static variant, which may require to extend number of checks (2^n - 1, where n is 2 currently) for options, in case of more modes. For three options (1, 2, 4), for example: (1; 2; 4; 1, 2; 1, 4; 2, 4; 1, 2,= 4) -8<-- .if ${PORT_OPTIONS:MV38} && ${PORT_OPTIONS:MV40} && ${PORT_OPTIONS:MV4X} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D7 .elif ${PORT_OPTIONS:MV40} && ${PORT_OPTIONS:MV4X} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D6 .elif ${PORT_OPTIONS:MV38} && ${PORT_OPTIONS:MV4X} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D5 .elif ${PORT_OPTIONS:MV4X} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D4 .elif ${PORT_OPTIONS:MV38} && ${PORT_OPTIONS:MV40} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D3 .elif ${PORT_OPTIONS:MV40} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D2 .elif ${PORT_OPTIONS:MV38} CFLAGS+=3D -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3D1 .endif -->8- where for proposed case in attachment #175507: -8<-- V4X_VARS=3D SUBPIXEL_HINTING_MODE+=3D4 -->8- (In reply to comment #55) > post-patch: > # warning: 'TT_CONFIG_OPTION_SUBPIXEL_HINTING' macro redefined [-Wmacro-= redefined] > @${REINPLACE_CMD} -e '/^#define TT_CONFIG_OPTION_SUBPIXEL_HINTING/d' \ > ${WRKSRC}/include/freetype/config/ftoption.h Moreover, you proposed to use CFLAGS and remove related define from ftoptio= n.h file. The warning shows where your approach is wrong. Even on Gentoo Linux, while using some of your proposed methods, they decide to patch ftoption.h = file directly: https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/freetype/freetype= -2.7-r2.ebuild?id=3D838c92297214d6330844df0b15ba61c33c27c430#n69 > - Don't use SED when modifying in-place > - Make backup suffix a bit more verbose than just one confusing letter This is not justified. The reason to use ${SED} instead of ${REINPLACE_CMD} with different backup extension (i.e. -i '.d.bak') is following: -8<-- % make -C /usr/ports/print/freetype -V REINPLACE_CMD /usr/bin/sed -i.bak % make -C /usr/ports/print/freetype -V SED /usr/bin/sed -->8- (In reply to comment #55) > - Use "-e" option to split commands rather than ";" to avoid tracking ope= n quotes This is just your preference, in my opinion. It also works with ";". (In reply to comment #55) > Resuming review. I'm uneasy to land this per timeout I guess, better to ask someone from gnome@ team about this, e.g. kwm@, whic= h is active, based on commit in ports r424830. CC: kwm. --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-211201-6497-NoK8O1ziUD>