From 4e17c76d9fa4e73b4881d7aed529328e87b02565 Mon Sep 17 00:00:00 2001 From: Kevin Lu <6320810+kevinlul@users.noreply.github.com> Date: Wed, 8 Jul 2020 18:25:27 -0400 Subject: [PATCH] [freetype] Update to 2.10.2 (#11846) * [freetype] Update to 2.10.2 * Remove unneeded shared/static configuration * [freetype] No need to pass BUILD_SHARED_LIBS. Always avoid detecting harfbuzz (to avoid cycles). Co-authored-by: wangli28 Co-authored-by: Robert Schumacher --- .../0002-Add-CONFIG_INSTALL_PATH-option.patch | 10 +++++----- ports/freetype/0005-Fix-DLL-EXPORTS.patch | 14 -------------- ports/freetype/CONTROL | 3 ++- ports/freetype/portfile.cmake | 19 +++---------------- 4 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 ports/freetype/0005-Fix-DLL-EXPORTS.patch diff --git a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch index 65f9631ca..1120cd096 100644 --- a/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch +++ b/ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch @@ -1,22 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a418c44..db48e9f 100644 +index c00902521..b24508654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -156,6 +156,8 @@ option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF) - option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF) +@@ -176,6 +176,8 @@ option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF) option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF) + option(FT_WITH_BROTLI "Support compressed WOFF2 fonts." OFF) +# vcpkg config install path +option(CONFIG_INSTALL_PATH "location to install cmake config files" lib/cmake/freetype) # Disallow in-source builds if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") -@@ -488,7 +490,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) +@@ -559,7 +561,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) COMPONENT libraries) install( EXPORT freetype-targets - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype -+ DESTINATION ${CONFIG_INSTALL_PATH} ++ DESTINATION ${CONFIG_INSTALL_PATH} FILE freetype-config.cmake COMPONENT headers) endif () diff --git a/ports/freetype/0005-Fix-DLL-EXPORTS.patch b/ports/freetype/0005-Fix-DLL-EXPORTS.patch deleted file mode 100644 index 7ea02bbed..000000000 --- a/ports/freetype/0005-Fix-DLL-EXPORTS.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ede5daf..46c1e55 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -151,6 +151,9 @@ set(LIBRARY_SOVERSION "6") - # optionally found anyway. Use `-DCMAKE_DISABLE_FIND_PACKAGE_x=TRUE` to disable - # searching for a packge entirely (x is the CMake package name, so "BZip2" - # instead of "BZIP2"). -+if (ENABLE_DLL_EXPORT) -+ ADD_DEFINITIONS(-DDLL_EXPORT) -+endif() - option(FT_WITH_ZLIB "Use system zlib instead of internal library." OFF) - option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF) - option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF) diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 8503efed4..7ba2032bf 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,5 +1,6 @@ Source: freetype -Version: 2.10.1-6 +Version: 2.10.2 +Port-Version: 1 Build-Depends: zlib Homepage: https://www.freetype.org/ Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 9dcf76fa1..eddc993da 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,8 +1,8 @@ -set(FT_VERSION 2.10.1) +set(FT_VERSION 2.10.2) vcpkg_download_distfile(ARCHIVE URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.xz" "https://downloads.sourceforge.net/project/freetype/freetype2/${FT_VERSION}/freetype-${FT_VERSION}.tar.xz" FILENAME "freetype-${FT_VERSION}.tar.xz" - SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 + SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa ) vcpkg_extract_source_archive_ex( @@ -13,7 +13,6 @@ vcpkg_extract_source_archive_ex( 0001-Fix-install-command.patch 0002-Add-CONFIG_INSTALL_PATH-option.patch 0003-Fix-UWP.patch - 0005-Fix-DLL-EXPORTS.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,17 +24,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS png CMAKE_DISABLE_FIND_PACKAGE_PNG ) -if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") - set(ENABLE_DLL_EXPORT OFF) -else() - set(ENABLE_DLL_EXPORT ON) -endif() - -set(OPTIONS) -if (NOT VCPKG_TARGET_IS_WINDOWS) - list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=ON) -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -43,8 +31,7 @@ vcpkg_configure_cmake( -DCONFIG_INSTALL_PATH=share/freetype -DFT_WITH_ZLIB=ON # Force system zlib. ${FEATURE_OPTIONS} - -DENABLE_DLL_EXPORT=${ENABLE_DLL_EXPORT} - ${OPTIONS} + -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=ON ) vcpkg_install_cmake()