Date: Sun, 30 Jul 2023 15:19:31 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 09010f6a0e2f - main - print/freetype2: Update to 2.13.1 Message-ID: <202307301519.36UFJV4D040367@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=09010f6a0e2f7d0323922647b2a2b7eafd6467b0 commit 09010f6a0e2f7d0323922647b2a2b7eafd6467b0 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-07-30 15:15:05 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-07-30 15:15:09 +0000 print/freetype2: Update to 2.13.1 * Remove SUBPIXEL_HINTING option, V38 is removed upstream leaving V40 as the only option available * Remove FIX_SIZE_METRICS, code around it has changed and no other distro keeps this option around PR: 272303 Reviewed by: desktop (tcberner) Sponsored by: Blinkinblox Exp-run by: antoine --- print/freetype2/Makefile | 16 +------- print/freetype2/distinfo | 6 +-- .../files/extra-patch-fix_size_metrics.diff | 46 ---------------------- print/freetype2/pkg-plist | 2 +- 4 files changed, 6 insertions(+), 64 deletions(-) diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index fee4f9e259cc..f0f2f7d5976c 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -1,6 +1,5 @@ PORTNAME= freetype2 -DISTVERSION= 2.12.1 -PORTREVISION= 2 +DISTVERSION= 2.13.1 CATEGORIES= print MASTER_SITES= SAVANNAH/${PORTNAME:S/2//} \ SF/freetype/${PORTNAME}/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ @@ -40,11 +39,8 @@ OPTIONS_SUB= yes OPTIONS_SINGLE= RENDERING OPTIONS_SINGLE_RENDERING= LCD_FILTERING LCD_RENDERING -OPTIONS_GROUP= SUBPIXEL_HINTING -OPTIONS_GROUP_SUBPIXEL_HINTING= V38 V40 - OPTIONS_RADIO= SIZE_METRICS_CHOICE -OPTIONS_RADIO_SIZE_METRICS_CHOICE= FIX_SIZE_METRICS TT_SIZE_METRICS +OPTIONS_RADIO_SIZE_METRICS_CHOICE= TT_SIZE_METRICS LONG_PCF_NAMES_DESC= Enable long PCF family names TABLE_VALIDATION_DESC= TrueType GX/AAT and OpenType table validation @@ -52,10 +48,7 @@ RENDERING_DESC= Rendering technology LCD_FILTERING_DESC= Subpixel rendering (patented) LCD_RENDERING_DESC= Harmony LCD rendering SUBPIXEL_HINTING_DESC= Subpixel hinting support -V38_DESC= v38 mode (Infinality code) -V40_DESC= v40 mode (minimal code, a.k.a. ClearType hinting, faster) SIZE_METRICS_CHOICE_DESC= Size metrics for TrueType fonts -FIX_SIZE_METRICS_DESC= Fix metrics on size request for scalable fonts (alternative method) TT_SIZE_METRICS_DESC= TrueType-like size metrics for 'light' auto-hinting BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli @@ -68,11 +61,6 @@ PNG_CMAKE_BOOL_OFF= FT_DISABLE_PNG LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING -V38_VARS= SUBPIXEL_HINTING_MODE+=1 -V40_VARS= SUBPIXEL_HINTING_MODE+=2 - -FIX_SIZE_METRICS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-fix_size_metrics.diff - .include <bsd.port.pre.mk> SELECTED_MODE= \ diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo index 3621d502371a..1376f2869e6f 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652980561 -SHA256 (freetype-2.12.1.tar.xz) = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f -SIZE (freetype-2.12.1.tar.xz) = 2471916 +TIMESTAMP = 1687817819 +SHA256 (freetype-2.13.1.tar.xz) = ea67e3b019b1104d1667aa274f5dc307d8cbd606b399bc32df308a77f1a564bf +SIZE (freetype-2.13.1.tar.xz) = 2508168 diff --git a/print/freetype2/files/extra-patch-fix_size_metrics.diff b/print/freetype2/files/extra-patch-fix_size_metrics.diff deleted file mode 100644 index 41c6ae399d55..000000000000 --- a/print/freetype2/files/extra-patch-fix_size_metrics.diff +++ /dev/null @@ -1,46 +0,0 @@ -# Fix metrics on size request for scalable fonts. -# Based on b0962ac34e66052ccfee7996e5468f30d4bd5a72 commit with changes for new version. -# Reverts bcc74f4dafee25ea89f1d3144646cba7e30f9908 commit for src/truetype/ttdriver.c file. -# Adapts 8ab08cff63eeb23b6c9f2c4470ae9809f2acf244 commit for src/truetype/ttobjs.c file. - ---- src/truetype/ttdriver.c.orig 2017-04-29 04:38:17 UTC -+++ src/truetype/ttdriver.c -@@ -357,6 +357,8 @@ - if ( FT_IS_SCALABLE( size->face ) ) - { - error = tt_size_reset( ttsize, 0 ); -+ if ( !error ) -+ ttsize->root.metrics = *ttsize->metrics; - - #ifdef TT_USE_BYTECODE_INTERPRETER - /* for the `MPS' bytecode instruction we need the point size */ ---- src/truetype/ttobjs.c.orig 2017-05-07 11:05:56 UTC -+++ src/truetype/ttobjs.c -@@ -1262,6 +1262,13 @@ - /* */ - if ( face->header.Flags & 8 ) - { -+ if ( !only_height ) -+ { -+ size_metrics->x_scale = FT_DivFix( size_metrics->x_ppem << 6, -+ face->root.units_per_EM ); -+ size_metrics->y_scale = FT_DivFix( size_metrics->y_ppem << 6, -+ face->root.units_per_EM ); -+ } - /* the TT spec always asks for ROUND, not FLOOR or CEIL */ - size_metrics->ascender = FT_PIX_ROUND( - FT_MulFix( face->root.ascender, -@@ -1283,11 +1290,12 @@ - { - /* base scaling values on integer ppem values, */ - /* as mandated by the TrueType specification */ -+/* - size_metrics->x_scale = FT_DivFix( size_metrics->x_ppem << 6, - face->root.units_per_EM ); - size_metrics->y_scale = FT_DivFix( size_metrics->y_ppem << 6, - face->root.units_per_EM ); -- -+*/ - size_metrics->max_advance = FT_PIX_ROUND( - FT_MulFix( face->root.max_advance_width, - size_metrics->x_scale ) ); diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist index 7993dcdbed10..4789e0d9b8a6 100644 --- a/print/freetype2/pkg-plist +++ b/print/freetype2/pkg-plist @@ -60,5 +60,5 @@ lib/cmake/freetype/freetype-config-version.cmake lib/cmake/freetype/freetype-config.cmake lib/libfreetype.so lib/libfreetype.so.6 -lib/libfreetype.so.6.18.3 +lib/libfreetype.so.6.20.0 libdata/pkgconfig/freetype2.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307301519.36UFJV4D040367>