diff options
| author | Kevin Lu <6320810+kevinlul@users.noreply.github.com> | 2020-12-29 19:05:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 16:05:56 -0800 |
| commit | 21872f70f5a18d9a52a733e49bfff7324cf6f2d9 (patch) | |
| tree | 912476aee43ab715bccc14a7ebbbb1148a31f916 /ports/vtk | |
| parent | a5db2166414e22148510e45d211ededf845648a8 (diff) | |
| download | vcpkg-21872f70f5a18d9a52a733e49bfff7324cf6f2d9.tar.gz vcpkg-21872f70f5a18d9a52a733e49bfff7324cf6f2d9.zip | |
[freetype] Update to 2.10.4 (#15334)
* bump version sha
* update patches
* [vtk] upstream patch for freetype 2.10.4
https://discourse.vtk.org/t/building-opencascade-7-5-0-with-vtk-9-0-1
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-freetype.patch | 26 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index edbe3cc93..feceb9d01 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,6 +1,6 @@ Source: vtk Version: 9.0.1 -Port-Version: 2 +Port-Version: 3 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2 diff --git a/ports/vtk/fix-freetype.patch b/ports/vtk/fix-freetype.patch new file mode 100644 index 000000000..aaaf35174 --- /dev/null +++ b/ports/vtk/fix-freetype.patch @@ -0,0 +1,26 @@ +diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx +index c54289dc..e6d9b14f 100644 +--- a/Rendering/FreeType/vtkFreeTypeTools.cxx ++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx +@@ -378,7 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() + } + + //---------------------------------------------------------------------------- +-FT_CALLBACK_DEF(FT_Error) ++FT_Error + vtkFreeTypeToolsFaceRequester( + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + { +diff --git a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +index 5c1908cf..41ed97e7 100644 +--- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx ++++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +@@ -29,7 +29,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools); + namespace + { + // The FreeType face requester callback: +-FT_CALLBACK_DEF(FT_Error) ++static FT_Error + vtkFontConfigFreeTypeToolsFaceRequester( + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + { diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index c3ebfbe6e..cd403bcb6 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -129,6 +129,7 @@ vcpkg_from_github( module-name-mangling.patch # Last patch TODO: Patch out internal loguru FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat + fix-freetype.patch # Should be fixed next version, !7367 + !7434 ) # ============================================================================= |