[qt5-base] Add zstd as a dependency (#12342)

* [qt5-base] add hidden optional not switchable zstd dependency. * [netcdf/paraview] correct embree3 dependency [paraview] make tools default feature for CI testing. * [paraview] fix typo and remove unnecessary flags * [paraview] add flags back into portfile * [vtk] add hdf5 api patch [paraview] remove hdf5 use flags from portfile [field3d] use flags instead of patching to fix hdf5. * [paraview] remove message on osx since it now works with qt 5.15 * [paraview] remove default feature and force CI features by a CI test port * [paraview|CI] back out python from CI testing for now * [qt5-base] add in the macos deployment target fix
microsoft · Aug 1, 2020 · f7fe9e3 · f7fe9e3
1 parent f7dcd67
commit f7fe9e3
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 22 deletions.
diff --git a/ports/field3d/0003_hdf5_api.patch b/ports/field3d/0003_hdf5_api.patch
@@ -2,12 +2,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index b57057f..e809880 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -35,6 +35,8 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.17 )
+@@ -35,6 +35,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.17 )
 
  PROJECT ( field3d )
 
-+add_definitions(-UH5_USE_112_API_DEFAULT)
-+add_definitions(-DH5_USE_110_API_DEFAULT)
++add_definitions(-DH5_USE_110_API)
  set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )
 
  FIND_PACKAGE (Doxygen)
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL
@@ -1,5 +1,6 @@
 Source: netcdf-c
-Version: 4.7.3-1
-Build-Depends: hdf5, curl
+Version: 4.7.3
+Port-Version: 2
+Build-Depends: hdf5, curl, embree3(linux)
 Homepage: https://github.com/Unidata/netcdf-c
 Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.
diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL
@@ -1,8 +1,9 @@
 Source: paraview
-Version: 5.8.0-2
+Version: 5.8.0
+Port-Version: 3
 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, embree3(linux)
+Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm
 
 Feature: vtkm
 Description: enables vtkm for the build of paraview

diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake
@@ -1,9 +1,5 @@
 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
@@ -65,13 +61,9 @@ if("python" IN_LIST FEATURES)
         -DPython3_FIND_REGISTRY=NEVER
         "-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by more than one feature
         )
-
     #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
@@ -82,15 +74,15 @@ vcpkg_configure_cmake(
         -DVTK_MODULE_ENABLE_ParaView_qttesting=YES
         -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF
         -DPARAVIEW_USE_QTHELP:BOOL=OFF
-        
+
         #A little bit of help in finding the boost headers
         "-DBoost_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include"
-    
+
         # Workarounds for CMake issues
         -DHAVE_SYS_TYPES_H=0    ## For some strange reason the test first succeeds and then fails the second time around
         -DWORDS_BIGENDIAN=0     ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. 
         ${ADDITIONAL_OPTIONS}
-       
+
         #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF
 )
 if(CMAKE_HOST_UNIX)
@@ -120,7 +112,7 @@ set(TOOLS   paraview
             smTestDriver
             vtkProcessXML
             vtkWrapClientServer)
-            
+
 foreach(tool ${TOOLS})
     # Remove debug tools
     set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})

diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
@@ -3,7 +3,7 @@ Version: 5.15.0
 Port-Version: 1
 Homepage: https://www.qt.io/
 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
-Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
+Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
 
 Feature: latest
 Description: Build latest qt version (5.15.0) instead of LTS (latest and LTS are currently the same)
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
@@ -186,7 +186,7 @@ set(RELEASE_OPTIONS
             "FREETYPE_LIBS=${FREETYPE_RELEASE_ALL}"
             "ICU_LIBS=${ICU_RELEASE}"
             "QMAKE_LIBS_PRIVATE+=${BZ2_RELEASE}"
-            "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}"            
+            "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}"
             )
 set(DEBUG_OPTIONS
             "LIBJPEG_LIBS=${JPEG_DEBUG}"
@@ -261,7 +261,7 @@ elseif(VCPKG_TARGET_IS_OSX)
         set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET})
         message(STATUS "Enviromnent OSX SDK Version: $ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET}")
         FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents)
-        string(REPLACE "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12" "QMAKE_MACOSX_DEPLOYMENT_TARGET = ${VCPKG_OSX_DEPLOYMENT_TARGET}" _tmp_contents ${_tmp_contents})
+        string(REPLACE "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13" "QMAKE_MACOSX_DEPLOYMENT_TARGET = ${VCPKG_OSX_DEPLOYMENT_TARGET}" _tmp_contents ${_tmp_contents})
         FILE(WRITE "${SOURCE_PATH}/mkspecs/common/macx.conf" ${_tmp_contents})
     endif()
     #list(APPEND QT_PLATFORM_CONFIGURE_OPTIONS HOST_PLATFORM ${TARGET_MKSPEC})

diff --git a/ports/vcpkg-ci-paraview/CONTROL b/ports/vcpkg-ci-paraview/CONTROL
@@ -0,0 +1,6 @@
+Source: vcpkg-ci-paraview
+Version: 1
+Port-Version: 1
+Homepage: https://github.com/microsoft/vcpkg
+Description: Port to force features of certain ports within CI
+Build-Depends: paraview[vtkm, tools]
diff --git a/ports/vcpkg-ci-paraview/portfile.cmake b/ports/vcpkg-ci-paraview/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/vtk/6811.patch b/ports/vtk/6811.patch
@@ -0,0 +1,26 @@
+From 34b9d59acb1688f4a9f38908760d5756a0e05ee4 Mon Sep 17 00:00:00 2001
+From: Julien Schueller <[email protected]>
+Date: Fri, 24 Apr 2020 08:28:23 -0400
+Subject: [PATCH] vtk_hdf5: Stick to 1.10.x API
+
+Closes #17866
+---
+ ThirdParty/hdf5/vtk_hdf5.h.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ThirdParty/hdf5/vtk_hdf5.h.in b/ThirdParty/hdf5/vtk_hdf5.h.in
+index 1d802937ba..c4738b2cbf 100644
+--- a/ThirdParty/hdf5/vtk_hdf5.h.in
++++ b/ThirdParty/hdf5/vtk_hdf5.h.in
+@@ -18,6 +18,8 @@
+ /* Use the hdf5 library configured for VTK.  */
+ #cmakedefine01 VTK_MODULE_USE_EXTERNAL_vtkhdf5
+
++#define H5_USE_110_API
++
+ #if VTK_MODULE_USE_EXTERNAL_vtkhdf5
+ #cmakedefine01 vtkhdf5_is_parallel
+ #if vtkhdf5_is_parallel
+-- 
+GitLab
+
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
@@ -109,6 +109,7 @@ vcpkg_from_github(
     SHA512 0efb1845053b6143e5ee7fa081b8be98f6825262c59051e88b2be02497e23362055067b2f811eff82e93eb194e5a9afd2a12e3878a252eb4011a5dab95127a6f
     HEAD_REF master
     PATCHES
+        6811.patch
         FindLZMA.patch    # Will be fixed in 9.1?
         FindLZ4.patch
         Findproj.patch