Index: head/print/freetype2/Makefile =================================================================== --- head/print/freetype2/Makefile (revision 537497) +++ head/print/freetype2/Makefile (revision 537498) @@ -1,131 +1,133 @@ # Created by: jseger@FreeBSD.org # $FreeBSD$ PORTNAME= freetype2 -PORTVERSION= 2.10.1 +PORTVERSION= 2.10.2 CATEGORIES= print MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \ SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \ http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \ http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \ ftp://ftp.freetype.org/freetype/freetype2/ DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION} MAINTAINER= desktop@FreeBSD.org COMMENT= Free and portable TrueType font rendering engine LICENSE= FTL GPLv2+ LICENSE_COMB= dual LICENSE_NAME_FTL= The FreeType Project license LICENSE_FILE_FTL= ${WRKSRC}/docs/FTL.TXT LICENSE_FILE_GPLv2+ = ${WRKSRC}/docs/GPLv2.TXT LICENSE_PERMS_FTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cpe gmake libtool tar:xz MAKE_ENV= TOP="" USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-harfbuzz CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix SUB_FILES= pkg-message PORTDOCS= reference CHANGES formats.txt LICENSE.TXT raster.txt CPE_PRODUCT= freetype CPE_VENDOR= freetype -OPTIONS_DEFINE= CONFIG DEBUG DOCS LONG_PCF_NAMES PNG \ +OPTIONS_DEFINE= BROTLI CONFIG DEBUG DOCS LONG_PCF_NAMES PNG \ TABLE_VALIDATION OPTIONS_GROUP= SUBPIXEL_HINTING OPTIONS_GROUP_SUBPIXEL_HINTING= V38 V40 OPTIONS_SINGLE= RENDERING OPTIONS_SINGLE_RENDERING= LCD_FILTERING LCD_RENDERING OPTIONS_RADIO= SIZE_METRICS_CHOICE OPTIONS_RADIO_SIZE_METRICS_CHOICE= FIX_SIZE_METRICS TT_SIZE_METRICS OPTIONS_DEFAULT= CONFIG LCD_RENDERING LONG_PCF_NAMES V40 OPTIONS_SUB= yes +BROTLI_CONFIGURE_WITH= brotli +BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli CONFIG_DESC= Install freetype-config CONFIG_CONFIGURE_ENABLE=freetype-config PNG_DESC= Png compressed OpenType embedded bitmaps support PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= png TABLE_VALIDATION_DESC= TrueType GX/AAT and OpenType table validation SIZE_METRICS_CHOICE_DESC= Size metrics for TrueType fonts FIX_SIZE_METRICS_DESC= Fix metrics on size request for scalable fonts (alternative method) FIX_SIZE_METRICS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-fix_size_metrics.diff TT_SIZE_METRICS_DESC= TrueType-like size metrics for 'light' auto-hinting RENDERING_DESC= Rendering technology LCD_FILTERING_DESC?= Subpixel rendering (patented) LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING LCD_RENDERING_DESC= Harmony LCD rendering LONG_PCF_NAMES_DESC= Enable long PCF family names SUBPIXEL_HINTING_DESC= Subpixel hinting support V38_DESC= v38 mode (Infinality code) V38_VARS= SUBPIXEL_HINTING_MODE+=1 V40_DESC= v40 mode (minimal code, a.k.a. ClearType hinting, faster) V40_VARS= SUBPIXEL_HINTING_MODE+=2 .include SELECTED_MODE= \ r=0; \ for m in ${SUBPIXEL_HINTING_MODE}; \ do r=$$(($$r | $$m)); \ done; \ ${ECHO_CMD} $$r pre-patch: @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/builds/unix/install.mk post-patch: .if defined(SUBPIXEL_HINTING_MODE) @${REINPLACE_CMD} -i '.hinting.bak' \ -e 's|^\(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING\).*|\1 \ ${SELECTED_MODE:sh}|' \ ${WRKSRC}/include/freetype/config/ftoption.h .else @${REINPLACE_CMD} -i '.hinting.bak' \ -e 's|^\(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING.*\)|/* \1 */|' \ ${WRKSRC}/include/freetype/config/ftoption.h .endif post-patch-DEBUG-on: @${REINPLACE_CMD} -i '.debug.bak' \ -e 's|.*\(#define FT_DEBUG_LEVEL_TRACE\).*|\1|' \ -e 's|.*\(#define FT_DEBUG_MEMORY\).*|\1|' \ ${WRKSRC}/include/freetype/config/ftoption.h post-patch-LONG_PCF_NAMES-on: @${REINPLACE_CMD} -i '.names.bak' \ -e 's|.*\(#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES\).*|\1|' \ ${WRKSRC}/include/freetype/config/ftoption.h post-patch-TABLE_VALIDATION-on: @${REINPLACE_CMD} -e '/valid$$/s|#.*\(AUX_MODULES\)|\1|' \ ${WRKSRC}/modules.cfg post-patch-TT_SIZE_METRICS-on: @${REINPLACE_CMD} -i '.metrics.bak' \ -e 's|.*\(#define AF_CONFIG_OPTION_TT_SIZE_METRICS\).*|\1|' \ ${WRKSRC}/include/freetype/config/ftoption.h post-configure: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.* post-install-DOCS-on: (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/print/freetype2/distinfo =================================================================== --- head/print/freetype2/distinfo (revision 537497) +++ head/print/freetype2/distinfo (revision 537498) @@ -1,3 +1,3 @@ -TIMESTAMP = 1561996538 -SHA256 (freetype-2.10.1.tar.xz) = 16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f -SIZE (freetype-2.10.1.tar.xz) = 2378784 +TIMESTAMP = 1589001276 +SHA256 (freetype-2.10.2.tar.xz) = 1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b +SIZE (freetype-2.10.2.tar.xz) = 2404456 Index: head/print/freetype2/files/patch-2.10.1.diff =================================================================== --- head/print/freetype2/files/patch-2.10.1.diff (revision 537497) +++ head/print/freetype2/files/patch-2.10.1.diff (nonexistent) @@ -1,200 +0,0 @@ -# [psaux] (1/2) Handle fonts that use SEAC for ligatures (#56580). -# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=f2b64583cb2587373e126b06d8da9ac97b287681 -# [psaux] (2/2) Handle fonts that use SEAC for ligatures (#56580). -# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=05439f5cc69eaa3deaf3db52a7999af09a2c293a -# Properly handle phantom points for variation fonts (#56601). -# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=12e4307dc7b48c9a4a4fc3ac6c32220874ab18ec -# [sfnt, winfonts] Avoid memory leaks in case of error (#56587). -# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b110acba9e6f7e40314f0da5d249cb3cb3beeab8 - ---- src/psaux/psintrp.c.orig 2019-03-05 10:28:19 UTC -+++ src/psaux/psintrp.c -@@ -1433,6 +1433,13 @@ - lastError = error2; /* pass FreeType error through */ - goto exit; - } -+ -+ /* save the left bearing and width of the SEAC */ -+ /* glyph as they will be erased by the next load */ -+ -+ left_bearing = *decoder->builder.left_bearing; -+ advance = *decoder->builder.advance; -+ - cf2_interpT2CharString( font, - &component, - callbacks, -@@ -1443,11 +1450,14 @@ - &dummyWidth ); - cf2_freeT1SeacComponent( decoder, &component ); - -- /* save the left bearing and width of the base */ -- /* character as they will be erased by the next load */ -+ /* If the SEAC glyph doesn't have a (H)SBW of its */ -+ /* own use the values from the base glyph. */ - -- left_bearing = *decoder->builder.left_bearing; -- advance = *decoder->builder.advance; -+ if ( !haveWidth ) -+ { -+ left_bearing = *decoder->builder.left_bearing; -+ advance = *decoder->builder.advance; -+ } - - decoder->builder.left_bearing->x = 0; - decoder->builder.left_bearing->y = 0; -@@ -1473,8 +1483,8 @@ - &dummyWidth ); - cf2_freeT1SeacComponent( decoder, &component ); - -- /* restore the left side bearing and */ -- /* advance width of the base character */ -+ /* restore the left side bearing and advance width */ -+ /* of the SEAC glyph or base character (saved above) */ - - *decoder->builder.left_bearing = left_bearing; - *decoder->builder.advance = advance; ---- src/psaux/t1decode.c.orig 2019-02-23 09:06:07 UTC -+++ src/psaux/t1decode.c -@@ -367,6 +367,12 @@ - - FT_GlyphLoader_Prepare( decoder->builder.loader ); /* prepare loader */ - -+ /* save the left bearing and width of the SEAC */ -+ /* glyph as they will be erased by the next load */ -+ -+ left_bearing = decoder->builder.left_bearing; -+ advance = decoder->builder.advance; -+ - /* the seac operator must not be nested */ - decoder->seac = TRUE; - error = t1_decoder_parse_glyph( decoder, (FT_UInt)bchar_index ); -@@ -374,11 +380,14 @@ - if ( error ) - goto Exit; - -- /* save the left bearing and width of the base character */ -- /* as they will be erased by the next load. */ -+ /* If the SEAC glyph doesn't have a (H)SBW of its */ -+ /* own use the values from the base glyph. */ - -- left_bearing = decoder->builder.left_bearing; -- advance = decoder->builder.advance; -+ if ( decoder->builder.parse_state != T1_Parse_Have_Width ) -+ { -+ left_bearing = decoder->builder.left_bearing; -+ advance = decoder->builder.advance; -+ } - - decoder->builder.left_bearing.x = 0; - decoder->builder.left_bearing.y = 0; -@@ -396,8 +405,8 @@ - if ( error ) - goto Exit; - -- /* restore the left side bearing and */ -- /* advance width of the base character */ -+ /* restore the left side bearing and advance width */ -+ /* of the SEAC glyph or base character (saved above) */ - - decoder->builder.left_bearing = left_bearing; - decoder->builder.advance = advance; ---- src/sfnt/sfwoff.c.orig 2019-05-31 05:59:06 UTC -+++ src/sfnt/sfwoff.c -@@ -371,18 +371,18 @@ - sfnt + table->OrigOffset, &output_len, - stream->cursor, table->CompLength ); - if ( error ) -- goto Exit; -+ goto Exit1; - if ( output_len != table->OrigLength ) - { - FT_ERROR(( "woff_font_open: compressed table length mismatch\n" )); - error = FT_THROW( Invalid_Table ); -- goto Exit; -+ goto Exit1; - } - - #else /* !FT_CONFIG_OPTION_USE_ZLIB */ - - error = FT_THROW( Unimplemented_Feature ); -- goto Exit; -+ goto Exit1; - - #endif /* !FT_CONFIG_OPTION_USE_ZLIB */ - } -@@ -424,6 +424,10 @@ - } - - return error; -+ -+ Exit1: -+ FT_FRAME_EXIT(); -+ goto Exit; - } - - ---- src/truetype/ttgload.c.orig 2019-05-29 06:13:12 UTC -+++ src/truetype/ttgload.c -@@ -1102,9 +1102,16 @@ - } - - #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT -- /* if we have a HVAR table, `pp1' and/or `pp2' are already adjusted */ -- if ( !( loader->face->variation_support & TT_FACE_FLAG_VAR_HADVANCE ) || -- !IS_HINTED( loader->load_flags ) ) -+ /* if we have a HVAR table, `pp1' and/or `pp2' */ -+ /* are already adjusted but unscaled */ -+ if ( ( loader->face->variation_support & TT_FACE_FLAG_VAR_HADVANCE ) && -+ IS_HINTED( loader->load_flags ) ) -+ { -+ loader->pp1.x = FT_MulFix( loader->pp1.x, x_scale ); -+ loader->pp2.x = FT_MulFix( loader->pp2.x, x_scale ); -+ /* pp1.y and pp2.y are always zero */ -+ } -+ else - #endif - { - loader->pp1 = outline->points[n_points - 4]; -@@ -1112,9 +1119,17 @@ - } - - #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT -- /* if we have a VVAR table, `pp3' and/or `pp4' are already adjusted */ -- if ( !( loader->face->variation_support & TT_FACE_FLAG_VAR_VADVANCE ) || -- !IS_HINTED( loader->load_flags ) ) -+ /* if we have a VVAR table, `pp3' and/or `pp4' */ -+ /* are already adjusted but unscaled */ -+ if ( ( loader->face->variation_support & TT_FACE_FLAG_VAR_VADVANCE ) && -+ IS_HINTED( loader->load_flags ) ) -+ { -+ loader->pp3.x = FT_MulFix( loader->pp3.x, x_scale ); -+ loader->pp3.y = FT_MulFix( loader->pp3.y, y_scale ); -+ loader->pp4.x = FT_MulFix( loader->pp4.x, x_scale ); -+ loader->pp4.y = FT_MulFix( loader->pp4.y, y_scale ); -+ } -+ else - #endif - { - loader->pp3 = outline->points[n_points - 2]; ---- src/winfonts/winfnt.c.orig 2019-02-23 09:06:07 UTC -+++ src/winfonts/winfnt.c -@@ -331,7 +331,7 @@ - { - FT_TRACE2(( "invalid alignment shift count for resource data\n" )); - error = FT_THROW( Invalid_File_Format ); -- goto Exit; -+ goto Exit1; - } - - -@@ -597,6 +597,10 @@ - - Exit: - return error; -+ -+ Exit1: -+ FT_FRAME_EXIT(); -+ goto Exit; - } - - Property changes on: head/print/freetype2/files/patch-2.10.1.diff ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/print/freetype2/pkg-plist =================================================================== --- head/print/freetype2/pkg-plist (revision 537497) +++ head/print/freetype2/pkg-plist (revision 537498) @@ -1,58 +1,58 @@ %%CONFIG%%bin/freetype-config include/freetype2/freetype/config/ftconfig.h include/freetype2/freetype/config/ftheader.h include/freetype2/freetype/config/ftmodule.h include/freetype2/freetype/config/ftoption.h include/freetype2/freetype/config/ftstdlib.h include/freetype2/freetype/ftdriver.h include/freetype2/freetype/ftparams.h include/freetype2/freetype/freetype.h include/freetype2/freetype/ftadvanc.h include/freetype2/freetype/ftbbox.h include/freetype2/freetype/ftbdf.h include/freetype2/freetype/ftbitmap.h include/freetype2/freetype/ftbzip2.h include/freetype2/freetype/ftcache.h include/freetype2/freetype/ftchapters.h include/freetype2/freetype/ftcid.h include/freetype2/freetype/ftcolor.h include/freetype2/freetype/fterrdef.h include/freetype2/freetype/fterrors.h include/freetype2/freetype/ftfntfmt.h include/freetype2/freetype/ftgasp.h include/freetype2/freetype/ftglyph.h include/freetype2/freetype/ftgxval.h include/freetype2/freetype/ftgzip.h include/freetype2/freetype/ftimage.h include/freetype2/freetype/ftincrem.h include/freetype2/freetype/ftlcdfil.h include/freetype2/freetype/ftlist.h include/freetype2/freetype/ftlzw.h include/freetype2/freetype/ftmac.h include/freetype2/freetype/ftmm.h include/freetype2/freetype/ftmodapi.h include/freetype2/freetype/ftmoderr.h include/freetype2/freetype/ftotval.h include/freetype2/freetype/ftoutln.h include/freetype2/freetype/ftpfr.h include/freetype2/freetype/ftrender.h include/freetype2/freetype/ftsizes.h include/freetype2/freetype/ftsnames.h include/freetype2/freetype/ftstroke.h include/freetype2/freetype/ftsynth.h include/freetype2/freetype/ftsystem.h include/freetype2/freetype/fttrigon.h include/freetype2/freetype/fttypes.h include/freetype2/freetype/ftwinfnt.h include/freetype2/freetype/t1tables.h include/freetype2/freetype/ttnameid.h include/freetype2/freetype/tttables.h include/freetype2/freetype/tttags.h include/freetype2/ft2build.h lib/libfreetype.a lib/libfreetype.so lib/libfreetype.so.6 -lib/libfreetype.so.6.17.1 +lib/libfreetype.so.6.17.2 libdata/pkgconfig/freetype2.pc %%CONFIG%%man/man1/freetype-config.1.gz share/aclocal/freetype2.m4