Skip to content

[freetype] Update to 2.10.2 #11846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 4 commits into from
Jul 8, 2020
Merged

[freetype] Update to 2.10.2 #11846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
490b118
[freetype] Update to 2.10.2
kevinlul Jun 9, 2020
f09091e
Remove unneeded shared/static configuration
kevinlul Jun 12, 2020
45c7cd0
Merge branch 'master' of https://github.com/microsoft/vcpkg into free…
LilyWangL Jul 1, 2020
507edb7
[freetype] No need to pass BUILD_SHARED_LIBS. Always avoid detecting …
ras0219-msft Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ports/freetype/0002-Add-CONFIG_INSTALL_PATH-option.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ()
14 changes: 0 additions & 14 deletions ports/freetype/0005-Fix-DLL-EXPORTS.patch
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ports/freetype/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
19 changes: 3 additions & 16 deletions ports/freetype/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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
Expand All @@ -25,26 +24,14 @@ 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
OPTIONS
-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()
Expand Down