Merge pull request #61 from thexai/freetype-2.14.2

Bump freetype to 2.14.2

Author: thexai

CMakeLists.txt

@@ -194,14 +194,14 @@ ExternalProject_Add(miniwdk
 
 ExternalProject_Add(freetype
     DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
-    URL https://mirrors.kodi.tv/build-deps/sources/freetype-2.14.1.tar.xz
-    URL_HASH SHA256=32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc
+    URL https://sourceforge.net/projects/freetype/files/freetype2/2.14.2/freetype-2.14.2.tar.xz
+    URL_HASH SHA256=4b62dcab4c920a1a860369933221814362e699e26f55792516d671e6ff55b5e1
     PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
     CMAKE_ARGS
         ${ADDITIONAL_ARGS}
         -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
 )
-add_dependency_project_package(freetype 2.14.1)
+add_dependency_project_package(freetype 2.14.2)
 
 ExternalProject_Add(fstrcmp
     DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
@@ -514,7 +514,7 @@ add_dependency_project_package(libjpeg-turbo 3.1.3)
 ExternalProject_Add(pillow
     DEPENDS freetype libjpeg-turbo python zlib
     GIT_REPOSITORY https://github.com/thexai/Pillow
-    GIT_TAG adb6ed96fc250f6ebad0cb6cbd10bba84619f160
+    GIT_TAG e1cfac60729fc5600e4ef7f0076b539959caa5b6
     GIT_SHALLOW ON
     CMAKE_ARGS
         ${ADDITIONAL_ARGS}

patches/freetype.diff

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ce70f6b5e..6113a79e9 100644
+index 9a9b1db9a..1302243af 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -495,10 +495,30 @@ target_compile_definitions(
@@ -33,104 +33,21 @@ index ce70f6b5e..6113a79e9 100644
  else ()
    # Windows handles exports with DLL_EXPORT defined above.
    set_target_properties(freetype PROPERTIES
-@@ -515,7 +535,7 @@ endif ()
- target_include_directories(
-   freetype
-     PUBLIC
--      $<INSTALL_INTERFACE:include/freetype2>
-+      $<INSTALL_INTERFACE:include>
-       $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-     PRIVATE
-@@ -591,7 +611,7 @@ if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
-   install(
-     # Note the trailing slash in the argument to `DIRECTORY'!
-     DIRECTORY ${PROJECT_SOURCE_DIR}/include/
--      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2
-+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-       COMPONENT headers
-       PATTERN "internal" EXCLUDE
-       PATTERN "ftconfig.h" EXCLUDE
-@@ -599,7 +619,7 @@ if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
-   install(
-     FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
-           ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h
--      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config
-+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype/config
-       COMPONENT headers)
- endif ()
- 
-@@ -640,7 +660,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-             FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-   endif ()
- 
--  set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
-+  set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype.pc")
-   if (EXISTS "${FREETYPE2_PC_IN_NAME}")
-     file(READ "${FREETYPE2_PC_IN_NAME}" ORIGINAL_FREETYPE2_PC_IN)
-   else ()
-@@ -651,7 +671,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-   endif ()
- 
-   install(
--    FILES ${PROJECT_BINARY_DIR}/freetype2.pc
-+    FILES ${PROJECT_BINARY_DIR}/freetype.pc
+@@ -655,6 +675,17 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
      COMPONENT pkgconfig)
 
-@@ -662,22 +682,41 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-     COMPATIBILITY SameMajorVersion)
- 
-   install(
--    TARGETS freetype freetype-interface
--      EXPORT freetype-targets
-+    TARGETS freetype
-+      EXPORT freetype
-       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-       FRAMEWORK DESTINATION Library/Frameworks
-       COMPONENT libraries)
-   install(
--    EXPORT freetype-targets
-+    EXPORT freetype
-       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
--      FILE freetype-config.cmake
-       COMPONENT headers)
-+
-+  install(FILES
-+    cmake/freetype-config.cmake
-+    ${CMAKE_CURRENT_BINARY_DIR}/freetype-config-version.cmake
-+    DESTINATION lib/cmake/freetype)
-+
 +  install(
 +    FILES ${PROJECT_BINARY_DIR}/RelWithDebInfo/freetype.pdb
 +    DESTINATION lib
 +    CONFIGURATIONS RelWithDebInfo
 +  )
-   install(
--    FILES ${PROJECT_BINARY_DIR}/freetype-config-version.cmake
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
--    COMPONENT headers)
++  install(
 +    FILES ${PROJECT_BINARY_DIR}/Debug/freetyped.pdb
 +    DESTINATION lib
 +    CONFIGURATIONS Debug
 +  )
-+  install(EXPORT ${PROJECT_NAME}
-+  FILE
-+    ${PROJECT_NAME}.cmake
-+  NAMESPACE
-+    ${PROJECT_NAME}::
-+  DESTINATION
-+    lib/cmake/${PROJECT_NAME}
-+)
- endif ()
- 
- 
-diff --git a/cmake/freetype-config.cmake b/cmake/freetype-config.cmake
-new file mode 100644
-index 000000000..1390d3ea2
---- /dev/null
-+++ b/cmake/freetype-config.cmake
-@@ -0,0 +1 @@
-+include(${CMAKE_CURRENT_LIST_DIR}/freetype.cmake)
++
+   include(CMakePackageConfigHelpers)
+   write_basic_package_version_file(
+     ${PROJECT_BINARY_DIR}/freetype-config-version.cmake