[vcpkg baseline][paraview] Fix linux build (#12144)

5 files changed, 29 insertions, 110 deletions

diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL
index 5f1631462..56aa3cbaa 100644
--- a/ports/paraview/CONTROL
+++ b/ports/paraview/CONTROL
@@ -1,8 +1,8 @@
 Source: paraview

-Version: 5.8.0-1

+Version: 5.8.0-2

 Homepage: https://www.paraview.org/

 Description: VTK-based Data Analysis and Visualization Application

-Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm

+Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm, embree3(linux)

 

 Feature: vtkm

 Description: enables vtkm for the build of paraview

@@ -20,6 +20,9 @@ Feature: mpi
 Description: enables cuda within paraview

 Build-Depends: hdf5[core,parallel], vtk[core, mpi]

 

+Feature: tools

+Description: Build paraview tools

+

 Feature: all_modules

 Description: enables the build of all paraview modules

 Build-Depends: gdal, pdal, ffmpeg, laszip

diff --git a/ports/paraview/add-tools-option.patch b/ports/paraview/add-tools-option.patch
new file mode 100644
index 000000000..86ba2c5a6
--- /dev/null
+++ b/ports/paraview/add-tools-option.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b33b25..10cadda 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -730,7 +730,10 @@ if (PARAVIEW_ENABLE_WEB)
+     @ONLY)
+ endif ()
+ 
++option(PARAVIEW_BUILD_TOOLS "Build paraview tools" OFF)
++if (PARAVIEW_BUILD_TOOLS)
+ add_subdirectory(Clients)
++endif()
+ 
+ if (PARAVIEW_USE_PYTHON)
+   add_subdirectory(Wrapping/Python)
diff --git a/ports/paraview/fix-using-hdf5.patch b/ports/paraview/fix-using-hdf5.patch
deleted file mode 100644
index 7d547e77e..000000000
--- a/ports/paraview/fix-using-hdf5.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/databases/readers/M3DC1/avtM3DC1FileFormat.C b/databases/readers/M3DC1/avtM3DC1FileFormat.C

-index 642be7e..d044b87 100644

---- a/databases/readers/M3DC1/avtM3DC1FileFormat.C

-+++ b/databases/readers/M3DC1/avtM3DC1FileFormat.C

-@@ -2051,10 +2051,10 @@ avtM3DC1FileFormat::linkIterator(hid_t locId, const char* name,

-   switch (linfo->type) {

-     case H5L_TYPE_HARD: {

- 

--      H5O_info_t objinfo;

-+      H5O_info1_t objinfo;

- 

-       /* Stat the object */

--      if(H5Oget_info_by_name(locId, name, &objinfo, H5P_DEFAULT) < 0) {

-+      if(H5Oget_info_by_name1(locId, name, &objinfo, H5P_DEFAULT) < 0) {

-         debug5 << "visitLinks() - unable to open object with name " <<name <<std::endl;

-         debug5 << "visitLinks() - this object and all children will be dropped." <<std::endl;

-         return 0;

-@@ -2103,7 +2103,7 @@ avtM3DC1FileFormat::linkIterator(hid_t locId, const char* name,

-       targbuf = NULL;

-       

-       // Get info of the linked object.

--      H5O_info_t objinfo;

-+      H5O_info1_t objinfo;

-       hid_t obj_id = H5Oopen(locId, name, H5P_DEFAULT);

-       

-       if (obj_id < 0) {

-@@ -2113,7 +2113,7 @@ avtM3DC1FileFormat::linkIterator(hid_t locId, const char* name,

-       }

- 

-       //Test-open the linked object

--      if (H5Oget_info (obj_id, &objinfo) < 0) {

-+      if (H5Oget_info1(obj_id, &objinfo) < 0) {

-         debug5 << "visitLinks() - unable to open external object " <<name <<std::endl;

-         debug5 << "visitLinks() - this object and all children will be dropped." <<std::endl;

-         return 0;

-diff --git a/databases/readers/Pixie/avtPixieFileFormat.C b/databases/readers/Pixie/avtPixieFileFormat.C

-index 6532b4e..ff56604 100644

---- a/databases/readers/Pixie/avtPixieFileFormat.C

-+++ b/databases/readers/Pixie/avtPixieFileFormat.C

-@@ -1979,10 +1979,10 @@ avtPixieFileFormat::VisitLinks(hid_t locId, const char* name,

-   switch (linfo->type) {

-     case H5L_TYPE_HARD: {

- 

--      H5O_info_t objinfo;

-+      H5O_info1_t objinfo;

- 

-       /* Stat the object */

--      if(H5Oget_info_by_name(locId, name, &objinfo, H5P_DEFAULT) < 0) {

-+      if(H5Oget_info_by_name1(locId, name, &objinfo, H5P_DEFAULT) < 0) {

-         debug5 << "visitLinks() - unable to open object with name " <<name <<std::endl;

-         debug5 << "visitLinks() - this object and all children will be dropped." <<std::endl;

-         return 0;

-@@ -2031,7 +2031,7 @@ avtPixieFileFormat::VisitLinks(hid_t locId, const char* name,

-       targbuf = NULL;

-       

-       // Get info of the linked object.

--      H5O_info_t objinfo;

-+      H5O_info1_t objinfo;

-       hid_t obj_id = H5Oopen(locId, name, H5P_DEFAULT);

-       

-       if (obj_id < 0) {

-@@ -2041,7 +2041,7 @@ avtPixieFileFormat::VisitLinks(hid_t locId, const char* name,

-       }

- 

-       //Test-open the linked object

--      if (H5Oget_info (obj_id, &objinfo) < 0) {

-+      if (H5Oget_info1(obj_id, &objinfo) < 0) {

-         debug5 << "visitLinks() - unable to open external object " <<name <<std::endl;

-         debug5 << "visitLinks() - this object and all children will be dropped." <<std::endl;

-         return 0;

-diff --git a/databases/readers/Vs/VsFilter.C b/databases/readers/Vs/VsFilter.C

-index c6caba6..b95f424 100644

---- a/databases/readers/Vs/VsFilter.C

-+++ b/databases/readers/Vs/VsFilter.C

-@@ -60,10 +60,10 @@ int VsFilter::visitLinks(hid_t locId, const char* name,

-   switch (linfo->type) {

-     case H5L_TYPE_HARD: {

- 

--      H5O_info_t objinfo;

-+      H5O_info1_t objinfo;

- 

-       /* Stat the object */

--      if(H5Oget_info_by_name(locId, name, &objinfo, H5P_DEFAULT) < 0) {

-+      if(H5Oget_info_by_name1(locId, name, &objinfo, H5P_DEFAULT) < 0) {

-         VsLog::errorLog() <<"VsFilter::visitLinks() - unable to open object with name " <<name <<std::endl;

-         VsLog::errorLog() <<"VsFilter::visitLinks() - this object and all children will be dropped." <<std::endl;

-         return 0;

-@@ -112,7 +112,7 @@ int VsFilter::visitLinks(hid_t locId, const char* name,

-       targbuf = NULL;

-       

-       // Get info of the linked object.

--      H5O_info_t objinfo;

-+      H5O_info1_t objinfo;

- #ifndef H5_USE_16_API

-       hid_t obj_id = H5Oopen(locId, name, H5P_DEFAULT);

- #else

-@@ -126,7 +126,7 @@ int VsFilter::visitLinks(hid_t locId, const char* name,

-       }

- 

-       //Test-open the linked object

--      if (H5Oget_info (obj_id, &objinfo) < 0) {

-+      if (H5Oget_info1(obj_id, &objinfo) < 0) {

-         VsLog::errorLog() <<"VsFilter::visitLinks() - unable to open external object " <<name <<std::endl;

-         VsLog::errorLog() <<"VsFilter::visitLinks() - this object and all children will be dropped." <<std::endl;

-         return 0;

diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake
index 4e706453c..7da8d3bb4 100644
--- a/ports/paraview/portfile.cmake
+++ b/ports/paraview/portfile.cmake
@@ -1,11 +1,16 @@
 set(VERSION 5.8)

 

+if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_OSX)

+    mesage(FATAL_ERROR "Feature tools are currently not supported.")

+endif()

+

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

     "cuda"         PARAVIEW_USE_CUDA            #untested; probably only affects internal VTK build so it does nothing here

     "all_modules"  PARAVIEW_BUILD_ALL_MODULES   #untested

     "mpi"          PARAVIEW_USE_MPI             #untested

     "vtkm"         PARAVIEW_USE_VTKM

     "python"       PARAVIEW_USE_PYTHON

+    "tools"        PARAVIEW_BUILD_TOOLS

 )

 

 vcpkg_from_github(

@@ -22,6 +27,7 @@ vcpkg_from_github(
         qt_static_plugins.patch # Remove with Qt version > 5.14

         python_include.patch

         python_wrapper.patch

+        add-tools-option.patch

 )

 

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

@@ -40,7 +46,6 @@ vcpkg_from_gitlab(
     SHA512 6d2c1d6e1cd345547926938451755e7a8be5dabd89e18a2ceb419db16c5b29f354554a5130eb365b7e522d655370fd4766953813ff530c06e4851fe26104ce58

     PATCHES

         VisIt_Build.patch

-        fix-using-hdf5.patch

         #removeunusedsymbols.patch # These also get remove in master of ParaView

         ${VisItPatches}

 )

@@ -66,6 +71,9 @@ if("python" IN_LIST FEATURES)
     #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages

 endif()

 

+string(APPEND VCPKG_C_FLAGS " -DH5_USE_110_API")

+string(APPEND VCPKG_CXX_FLAGS " -DH5_USE_110_API")

+

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA # Disable this option if project cannot be built with Ninja

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index e1cf3fa9f..e77a6c4cd 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1377,8 +1377,6 @@ pangomm:x64-osx=fail
 pangomm:x64-windows=ignore

 pangomm:x86-windows=ignore

 pangomm:arm64-windows=fail

-# Missing symbols will, probably fix itself with Qt >= 5.15

-paraview:x64-osx=fail

 parmetis:x64-linux=fail

 parmetis:x64-osx=fail

 pcre2:arm-uwp=fail