diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-26 02:11:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 11:11:17 -0700 |
| commit | 1f0db1f06a77be25ddc9185cca23230d2e60aecb (patch) | |
| tree | b434b8cdd6ee237b1f5d05bae42b94725a169214 /ports/vtk | |
| parent | 70ab27fcad50241d72e0fe235ec4012f0ce7551e (diff) | |
| download | vcpkg-1f0db1f06a77be25ddc9185cca23230d2e60aecb.tar.gz vcpkg-1f0db1f06a77be25ddc9185cca23230d2e60aecb.zip | |
[vcpkg baseline] Fix baseline errors (#12067)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-using-hdf5.patch | 22 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 412869822..0e494fe6d 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 9.0-3 +Version: 9.0-4 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-using-hdf5.patch b/ports/vtk/fix-using-hdf5.patch new file mode 100644 index 000000000..834ab15e9 --- /dev/null +++ b/ports/vtk/fix-using-hdf5.patch @@ -0,0 +1,22 @@ +diff --git a/ThirdParty/h5part/vtkh5part/src/H5Part.c b/ThirdParty/h5part/vtkh5part/src/H5Part.c +index 228d246..41af04d 100644 +--- a/ThirdParty/h5part/vtkh5part/src/H5Part.c ++++ b/ThirdParty/h5part/vtkh5part/src/H5Part.c +@@ -2092,7 +2092,7 @@ _H5Part_iteration_operator2 ( + case H5L_TYPE_HARD: { + + H5O_info_t objinfo; +- if( H5Oget_info_by_name( group_id, member_name, &objinfo, H5P_DEFAULT ) < 0 ) { ++ if( H5Oget_info_by_name1( group_id, member_name, &objinfo, H5P_DEFAULT ) < 0 ) { + return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name ); + } + +@@ -2142,7 +2142,7 @@ _H5Part_iteration_operator2 ( + if ( obj_id < 0 ) { + return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name ); + } +- else if ( H5Oget_info ( obj_id, &objinfo ) < 0 ) { ++ else if ( H5Oget_info1 ( obj_id, &objinfo ) < 0 ) { + return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name ); + } + else { diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index ecc9176ce..09c997f7a 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -101,6 +101,7 @@ vcpkg_from_github( pythonwrapper.patch # Required by ParaView to Wrap required classes NoUndefDebug.patch # Required to link against correct Python library depending on build type. python_debug.patch + fix-using-hdf5.patch # Last patch TODO: Patch out internal loguru ) |