diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 93589bfff4f2..95083ef1f053 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -1,119 +1,119 @@ # Created by: jseger@FreeBSD.org PORTNAME= freetype2 -DISTVERSION= 2.12.0 +DISTVERSION= 2.12.1 CATEGORIES= print MASTER_SITES= SAVANNAH/${PORTNAME:S/2//} \ SF/freetype/${PORTNAME}/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ DISTNAME= ${PORTNAME:S/2//}-${DISTVERSION} 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= cmake cpe localbase pathfix pkgconfig tar:xz CPE_PRODUCT= freetype CPE_VENDOR= freetype USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS \ FT_REQUIRE_BZIP2 \ FT_REQUIRE_ZLIB \ FT_DISABLE_HARFBUZZ SUB_FILES= pkg-message PORTDOCS= CHANGES FTL.TXT formats.txt raster.txt reference OPTIONS_DEFINE= BROTLI DEBUG DOCS LONG_PCF_NAMES PNG TABLE_VALIDATION OPTIONS_DEFAULT= LCD_RENDERING LONG_PCF_NAMES PNG V40 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 LONG_PCF_NAMES_DESC= Enable long PCF family names TABLE_VALIDATION_DESC= TrueType GX/AAT and OpenType table validation 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 BROTLI_CMAKE_BOOL= FT_REQUIRE_BROTLI BROTLI_CMAKE_BOOL_OFF= FT_DISABLE_BROTLI PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL= FT_REQUIRE_PNG 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 SELECTED_MODE= \ r=0; \ for m in ${SUBPIXEL_HINTING_MODE}; \ do r=$$(($$r | $$m)); \ done; \ ${ECHO_CMD} $$r 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-install-DOCS-on: (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo index 909fccfe50dd..3621d502371a 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648812053 -SHA256 (freetype-2.12.0.tar.xz) = ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033 -SIZE (freetype-2.12.0.tar.xz) = 2340352 +TIMESTAMP = 1652980561 +SHA256 (freetype-2.12.1.tar.xz) = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f +SIZE (freetype-2.12.1.tar.xz) = 2471916 diff --git a/print/freetype2/files/patch-CMakeLists.txt b/print/freetype2/files/patch-CMakeLists.txt deleted file mode 100644 index 64d4245b83d1..000000000000 --- a/print/freetype2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -Backport of - https://gitlab.freedesktop.org/freetype/freetype/-/commit/385345037e04f9ee6ffc8b14318f1a079520c41d - ---- CMakeLists.txt.orig 2022-04-04 15:57:19 UTC -+++ CMakeLists.txt -@@ -497,8 +497,9 @@ endif () - ) - endif () - -- -+set(PKGCONFIG_REQUIRES "") - set(PKG_CONFIG_REQUIRED_PRIVATE "") -+set(PKGCONFIG_LIBS "-L\${libdir} -lfreetype") - set(PKG_CONFIG_LIBS_PRIVATE "") - - if (ZLIB_FOUND) -@@ -569,10 +570,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_AL - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) - string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}" - FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -- string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}" -- FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -- string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}" -- FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ if (BUILD_SHARED_LIBS) -+ string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES}" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" "${PKGCONFIG_REQUIRES_PRIVATE}" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS}" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" "${PKGCONFIG_LIBS_PRIVATE}" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ else () -+ string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES} ${PKGCONFIG_REQUIRES_PRIVATE}" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" "" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS} ${PKGCONFIG_LIBS_PRIVATE}" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" "" -+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) -+ endif () - - set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc") - if (EXISTS "${FREETYPE2_PC_IN_NAME}") diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist index 07f7fbb41d81..7993dcdbed10 100644 --- a/print/freetype2/pkg-plist +++ b/print/freetype2/pkg-plist @@ -1,64 +1,64 @@ include/freetype2/dlg/dlg.h include/freetype2/dlg/output.h 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/config/integer-types.h include/freetype2/freetype/config/mac-support.h include/freetype2/freetype/config/public-macros.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/ftdriver.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/ftlogging.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/ftparams.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/otsvg.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/cmake/freetype/freetype-config-%%CMAKE_BUILD_TYPE%%.cmake 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.2 +lib/libfreetype.so.6.18.3 libdata/pkgconfig/freetype2.pc