[ITK] update to v5.2.1

ports/itk/portfile.cmake

@@ -3,19 +3,17 @@ vcpkg_buildpath_length_warning(37)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO InsightSoftwareConsortium/ITK
-    REF d3286c9cc04ba16cc8f73de9a98fbcd7c02f3c7b
-    SHA512 c358449870d580aeb10e32f8be0ca39e8a76d8dc06fda973788fafb5971333e546611c399190be49d40f5f3c18a1105d9699eef271a560aff25ce168a396926e
+    REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1
+    SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2
     HEAD_REF master
     PATCHES
-        hdf5.patch
         double-conversion.patch
         openjpeg.patch
         openjpeg2.patch
         var_libraries.patch
         wrapping.patch
         python_gpu_wrapping.patch
         opencl.patch
-        cufftw.patch
         use-the-lrintf-intrinsic.patch
 )
 
@@ -194,9 +192,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE "${CURRENT_PACKAGES_DIR}/include/ITK-5.1/vcl_where_root_dir.h")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/include/ITK-5.3/vcl_where_root_dir.h")
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/itk/python_gpu_wrapping.patch

@@ -1,41 +1,19 @@
-diff --git a/CMake/itkOpenCL.cmake b/CMake/itkOpenCL.cmake
-index 0ccbe144d..fa381524f 100644
---- a/CMake/itkOpenCL.cmake	
-+++ b/CMake/itkOpenCL.cmake
-@@ -48,7 +48,7 @@ if(ITK_USE_GPU)
-                       )
-     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}
-                                 PROPERTIES GENERATED ON)
--    set(${SRC_VAR} ${${SRC_VAR}} ${OUTPUT_FILE})
-+    set(${SRC_VAR} ${${SRC_VAR}} ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE})
-   endmacro()
-
-   macro(write_gpu_kernels GPUKernels GPU_SRC)
 diff --git a/Modules/Core/Common/include/itkMacro.h b/Modules/Core/Common/include/itkMacro.h
-index 1816f722a..3a6a8aee5 100644
---- a/Modules/Core/Common/include/itkMacro.h	
+index 7d2072af..44fb5246 100644
+--- a/Modules/Core/Common/include/itkMacro.h
 +++ b/Modules/Core/Common/include/itkMacro.h
-@@ -1141,7 +1141,7 @@ compilers.
- #define itkGetVectorMacro(name, type, count)                                                                           \
-   virtual type * Get##name() const { return this->m_##name; }
+@@ -1212,7 +1212,7 @@ compilers.
+   virtual type * Get##name() const { return this->m_##name; } \
+   ITK_MACROEND_NOOP_STATEMENT
 
 -/**\def itkGPUKernelClassMacro
 +/**\def class itkGPUKernelClassMacro
   * Construct a non-templatized helper class that
   * provides the GPU kernel source code as a const char*
   */
-@@ -1150,7 +1150,7 @@ compilers.
-    * Workaround KWstyle bug \                                                                                          \
-    * \ingroup ITKCommon \                                                                                              \
-    */                                                                                                                  \
--  class kernel                                                                                                         \
-+  kernel                                                                                                         \
-   {                                                                                                                    \
-   public:                                                                                                              \
-     static const char *                                                                                                \
 diff --git a/Modules/Core/GPUCommon/include/itkGPUImageOps.h b/Modules/Core/GPUCommon/include/itkGPUImageOps.h
-index f4eb8f33b..fbdf3d757 100644
---- a/Modules/Core/GPUCommon/include/itkGPUImageOps.h	
+index 28403144..c5813397 100644
+--- a/Modules/Core/GPUCommon/include/itkGPUImageOps.h
 +++ b/Modules/Core/GPUCommon/include/itkGPUImageOps.h
 @@ -23,7 +23,7 @@
  namespace itk
@@ -47,8 +25,8 @@ index f4eb8f33b..fbdf3d757 100644
  /** \class GPUImageOps
   *
 diff --git a/Modules/Core/GPUCommon/include/itkGPUReduction.h b/Modules/Core/GPUCommon/include/itkGPUReduction.h
-index 524a5cd01..1b3ce91e9 100644
---- a/Modules/Core/GPUCommon/include/itkGPUReduction.h	
+index f01c7244..fec31b51 100644
+--- a/Modules/Core/GPUCommon/include/itkGPUReduction.h
 +++ b/Modules/Core/GPUCommon/include/itkGPUReduction.h
 @@ -26,7 +26,7 @@
  namespace itk
@@ -59,22 +37,9 @@ index 524a5cd01..1b3ce91e9 100644
 
  /**
   * \class GPUReduction
-diff --git a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h
-index 853801cec..2fccf0bc5 100644
---- a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h	
-+++ b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h
-@@ -24,7 +24,7 @@
- namespace itk
- {
- /** Create a helper GPU Kernel class for GPUDenseFiniteDifferenceImageFilter */
--itkGPUKernelClassMacro(GPUDenseFiniteDifferenceImageFilterKernel);
-+class ITKGPUFiniteDifference_EXPORT itkGPUKernelClassMacro(GPUDenseFiniteDifferenceImageFilterKernel);
-
- /**
-  * \class GPUDenseFiniteDifferenceImageFilter
 diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h
-index 4245ff914..1b21b709e 100644
---- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h	
+index c89eec7d..783c61ef 100644
+--- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h
 +++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h
 @@ -54,7 +54,7 @@ namespace itk
   */
@@ -86,8 +51,8 @@ index 4245ff914..1b21b709e 100644
  template <typename TImage>
  class ITK_TEMPLATE_EXPORT GPUGradientNDAnisotropicDiffusionFunction
 diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h
-index 305f6490e..d0d433080 100644
---- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h	
+index c44ac788..6e342b3c 100644
+--- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h
 +++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h
 @@ -32,7 +32,7 @@ namespace itk
   * */
@@ -99,8 +64,8 @@ index 305f6490e..d0d433080 100644
  template <typename TImage>
  class ITK_TEMPLATE_EXPORT GPUScalarAnisotropicDiffusionFunction : public GPUAnisotropicDiffusionFunction<TImage>
 diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h
-index 23530ac5c..e1b83f696 100644
---- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h	
+index 63e1a6d3..ab4bf3e7 100644
+--- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h
 +++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h
 @@ -29,7 +29,7 @@ namespace itk
  {
@@ -112,8 +77,8 @@ index 23530ac5c..e1b83f696 100644
  /** \class GPUCastImageFilter
   * \brief GPU version of CastImageFilter.
 diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h
-index c4adc2967..69aeac6db 100644
---- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h	
+index f43025ac..8bdced34 100644
+--- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h
 +++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h
 @@ -41,7 +41,7 @@ namespace itk
   */
@@ -125,8 +90,8 @@ index c4adc2967..69aeac6db 100644
  template <typename TInputImage,
            typename TOutputImage,
 diff --git a/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h b/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h
-index 57bc3ebb7..4ff98c665 100644
---- a/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h	
+index 50dabce0..487e61bd 100644
+--- a/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h
 +++ b/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h
 @@ -37,7 +37,7 @@ namespace itk
   */
@@ -138,8 +103,8 @@ index 57bc3ebb7..4ff98c665 100644
  template <typename TInputImage, typename TOutputImage>
  class ITK_TEMPLATE_EXPORT GPUMeanImageFilter
 diff --git a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h
-index 8d26dcfc5..613bc623f 100644
---- a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h	
+index ce6526db..48ad3b04 100644
+--- a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h
 +++ b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h
 @@ -85,7 +85,7 @@ private:
  } // end of namespace Functor
@@ -151,8 +116,8 @@ index 8d26dcfc5..613bc623f 100644
  /**
   * \class GPUBinaryThresholdImageFilter
 diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
-index 28b21d592..0b46e27b8 100644
---- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h	
+index 008ed396..ae3b0cb0 100644
+--- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
 +++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
 @@ -51,7 +51,7 @@ namespace itk
   * \ingroup ITKGPUPDEDeformableRegistration
@@ -164,8 +129,8 @@ index 28b21d592..0b46e27b8 100644
  template <typename TFixedImage, typename TMovingImage, typename TDisplacementField>
  class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFunction
 diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h
-index 93ab975ec..0afd84871 100644
---- a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h	
+index 13a00667..9f2a66ec 100644
+--- a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h
 +++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h
 @@ -73,7 +73,7 @@ namespace itk
   */

ports/itk/vcpkg.json

@@ -1,9 +1,9 @@
 {
   "name": "itk",
-  "version-semver": "5.1.0",
-  "port-version": 7,
+  "version": "5.2.1",
   "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.",
   "homepage": "https://github.com/InsightSoftwareConsortium/ITK",
+  "license": "Apache-2.0",
   "dependencies": [
     "double-conversion",
     "eigen3",

versions/baseline.json

@@ -2933,8 +2933,8 @@
       "port-version": 2
     },
     "itk": {
-      "baseline": "5.1.0",
-      "port-version": 7
+      "baseline": "5.2.1",
+      "port-version": 0
     },
     "itpp": {
       "baseline": "4.3.1",

versions/i-/itk.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8d67caa9e2fb41246a3baebbfaccc8f0aff51223",
+      "version": "5.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "ce0e8cb19f661a4bb4aabde6b87b7bca5025be9e",
       "version-semver": "5.1.0",