[vcglib] update to 2021.10

ports/vcglib/consume-vcpkg-eigen3.patch

@@ -1,96 +1,83 @@
-diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h
-index 5b9d858..f091b4b 100644
---- a/vcg/complex/algorithms/curve_on_manifold.h
-+++ b/vcg/complex/algorithms/curve_on_manifold.h
-@@ -36,7 +36,7 @@
- #include <vcg/space/index/kdtree/kdtree.h>
- #include <vcg/math/histogram.h>
- #include<vcg/space/distance3.h>
--#include<eigenlib/Eigen/Core>
-+#include<eigen3/Eigen/Core>
- #include <vcg/complex/algorithms/attribute_seam.h>
- #include <wrap/io_trimesh/export_ply.h>
-
 diff --git a/vcg/complex/algorithms/harmonic.h b/vcg/complex/algorithms/harmonic.h
-index d004d7b..13d5167 100644
+index 2c83d10..7cbafd4 100644
 --- a/vcg/complex/algorithms/harmonic.h
 +++ b/vcg/complex/algorithms/harmonic.h
 @@ -24,7 +24,7 @@
  #define __VCGLIB_HARMONIC_FIELD
 
  #include <vcg/complex/complex.h>
--#include <eigenlib/Eigen/Sparse>
+-#include <Eigen/Sparse>
 +#include <eigen3/Eigen/Sparse>
 
  namespace vcg {
  namespace tri {
 diff --git a/vcg/complex/algorithms/implicit_smooth.h b/vcg/complex/algorithms/implicit_smooth.h
-index 2e1e24f..76311e2 100644
+index 1d0e3f4..76311e2 100644
 --- a/vcg/complex/algorithms/implicit_smooth.h
 +++ b/vcg/complex/algorithms/implicit_smooth.h
 @@ -23,7 +23,7 @@
  #ifndef __VCG_IMPLICIT_SMOOTHER
  #define __VCG_IMPLICIT_SMOOTHER
 
--#include <eigenlib/Eigen/Sparse>
+-#include <Eigen/Sparse>
 +#include <eigen3/Eigen/Sparse>
  #include <vcg/complex/algorithms/mesh_to_matrix.h>
  #include <vcg/complex/algorithms/update/quality.h>
  #include <vcg/complex/algorithms/smooth.h>
 diff --git a/vcg/complex/algorithms/inertia.h b/vcg/complex/algorithms/inertia.h
-index 41b5a29..f25d6f9 100644
+index b2b6822..ec8b688 100644
 --- a/vcg/complex/algorithms/inertia.h
 +++ b/vcg/complex/algorithms/inertia.h
 @@ -24,8 +24,8 @@
  #define _VCG_INERTIA_
 
 
--#include <eigenlib/Eigen/Core>
--#include <eigenlib/Eigen/Eigenvalues>
+-#include <Eigen/Core>
+-#include <Eigen/Eigenvalues>
 +#include <eigen3/Eigen/Core>
 +#include <eigen3/Eigen/Eigenvalues>
  #include <vcg/complex/algorithms/update/normal.h>
 
  namespace vcg
 diff --git a/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcg/complex/algorithms/parametrization/poisson_solver.h
-index cf5c36d..3b8f1a5 100644
+index 941ba11..6b34072 100644
 --- a/vcg/complex/algorithms/parametrization/poisson_solver.h
 +++ b/vcg/complex/algorithms/parametrization/poisson_solver.h
 @@ -24,7 +24,7 @@
  #ifndef VCG_POISSON_SOLVER
  #define VCG_POISSON_SOLVER
 
--#include <eigenlib/Eigen/Sparse>
+-#include <Eigen/Sparse>
 +#include <eigen3/Eigen/Sparse>
 
  #include <vcg/complex/algorithms/clean.h>
- #include <vcg/complex/algorithms/update/bounding.h>
+ #include <vcg/complex/algorithms/parametrization/distortion.h>
 diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h
-index 441121b..0a96146 100644
+index 5b9a536..2326d65 100644
 --- a/vcg/complex/algorithms/update/curvature.h
 +++ b/vcg/complex/algorithms/update/curvature.h
-@@ -32,7 +32,7 @@
+@@ -30,7 +30,7 @@
  #include <vcg/complex/algorithms/point_sampling.h>
  #include <vcg/complex/algorithms/intersection.h>
  #include <vcg/complex/algorithms/inertia.h>
--#include <eigenlib/Eigen/Core>
+-#include <Eigen/Core>
 +#include <eigen3/Eigen/Core>
 
  namespace vcg {
  namespace tri {
 diff --git a/vcg/complex/algorithms/update/curvature_fitting.h b/vcg/complex/algorithms/update/curvature_fitting.h
-index b2b8c63..ab04b6b 100644
+index 9de9fe3..e06c592 100644
 --- a/vcg/complex/algorithms/update/curvature_fitting.h
 +++ b/vcg/complex/algorithms/update/curvature_fitting.h
 @@ -38,11 +38,11 @@
  #include <vcg/complex/algorithms/inertia.h>
  #include <vcg/complex/algorithms/nring.h>
 
--#include <eigenlib/Eigen/Core>
--#include <eigenlib/Eigen/QR>
--#include <eigenlib/Eigen/LU>
--#include <eigenlib/Eigen/SVD>
--#include <eigenlib/Eigen/Eigenvalues>
+-#include <Eigen/Core>
+-#include <Eigen/QR>
+-#include <Eigen/LU>
+-#include <Eigen/SVD>
+-#include <Eigen/Eigenvalues>
 +#include <eigen3/Eigen/Core>
 +#include <eigen3/Eigen/QR>
 +#include <eigen3/Eigen/LU>
@@ -100,17 +87,17 @@ index b2b8c63..ab04b6b 100644
 
  namespace vcg {
 diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h
-index bd2c94f..fd837d7 100644
+index d159864..91287e2 100644
 --- a/vcg/complex/algorithms/update/fitmaps.h
 +++ b/vcg/complex/algorithms/update/fitmaps.h
-@@ -34,10 +34,10 @@
+@@ -33,10 +33,10 @@
  #include <vcg/complex/algorithms/update/bounding.h>
  #include "vcg/complex/algorithms/update/curvature_fitting.h"
 
--#include <eigenlib/Eigen/Core>
--#include <eigenlib/Eigen/QR>
--#include <eigenlib/Eigen/LU>
--#include <eigenlib/Eigen/SVD>
+-#include <Eigen/Core>
+-#include <Eigen/QR>
+-#include <Eigen/LU>
+-#include <Eigen/SVD>
 +#include <eigen3/Eigen/Core>
 +#include <eigen3/Eigen/QR>
 +#include <eigen3/Eigen/LU>
@@ -138,87 +125,87 @@ index 5cae402..81f32ff 100644
  // add support for unsigned char and short int
  namespace Eigen {
 diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h
-index a138e57..5291e0e 100644
+index 9bcc0e3..a79c1e3 100644
 --- a/vcg/math/matrix44.h
 +++ b/vcg/math/matrix44.h
-@@ -30,8 +30,8 @@
- #include <vcg/space/point4.h>
+@@ -31,8 +31,8 @@
  #include <vector>
+ #include <array>
  #include <iostream>
--#include <eigenlib/Eigen/Core>
--#include <eigenlib/Eigen/LU>
+-#include <Eigen/Core>
+-#include <Eigen/LU>
 +#include <eigen3/Eigen/Core>
 +#include <eigen3/Eigen/LU>
 
  namespace vcg {
 
 diff --git a/vcg/math/polar_decomposition.h b/vcg/math/polar_decomposition.h
-index deabf86..bd725d1 100644
+index 7d4f03e..bd725d1 100644
 --- a/vcg/math/polar_decomposition.h
 +++ b/vcg/math/polar_decomposition.h
 @@ -26,8 +26,8 @@
 
  #include <vcg/math/matrix33.h>
  #include <vcg/math/matrix44.h>
--#include <eigenlib/Eigen/Dense>
--#include <eigenlib/Eigen/SVD>
+-#include <Eigen/Dense>
+-#include <Eigen/SVD>
 +#include <eigen3/Eigen/Dense>
 +#include <eigen3/Eigen/SVD>
 
  namespace vcg{
 
 diff --git a/vcg/math/quadric.h b/vcg/math/quadric.h
-index 8522056..99a9de1 100644
+index 0f4865b..8bfa5cd 100644
 --- a/vcg/math/quadric.h
 +++ b/vcg/math/quadric.h
 @@ -26,7 +26,7 @@
  #include <vcg/space/point3.h>
  #include <vcg/space/plane3.h>
  #include <vcg/math/matrix33.h>
--#include <eigenlib/Eigen/Core>
+-#include <Eigen/Core>
 +#include <eigen3/Eigen/Core>
 
  namespace vcg {
  namespace math {
 diff --git a/vcg/space/fitting3.h b/vcg/space/fitting3.h
-index e9e238a..6861969 100644
+index 69b8fe1..6861969 100644
 --- a/vcg/space/fitting3.h
 +++ b/vcg/space/fitting3.h
 @@ -29,8 +29,8 @@
  #include <vcg/math/matrix44.h>
  #include <vcg/math/matrix33.h>
 
--#include <eigenlib/Eigen/Core>
--#include <eigenlib/Eigen/Eigenvalues>
+-#include <Eigen/Core>
+-#include <Eigen/Eigenvalues>
 +#include <eigen3/Eigen/Core>
 +#include <eigen3/Eigen/Eigenvalues>
 
  namespace vcg {
 
 diff --git a/vcg/space/point_matching.h b/vcg/space/point_matching.h
-index e9ac0ff..c6ff376 100644
+index 8d99fb8..e597022 100644
 --- a/vcg/space/point_matching.h
 +++ b/vcg/space/point_matching.h
 @@ -27,8 +27,8 @@
  #include <vcg/math/quaternion.h>
  #include <vcg/math/matrix44.h>
 
--#include <eigenlib/Eigen/Dense>
--#include <eigenlib/Eigen/Eigenvalues>
+-#include <Eigen/Dense>
+-#include <Eigen/Eigenvalues>
 +#include <eigen3/Eigen/Dense>
 +#include <eigen3/Eigen/Eigenvalues>
  #include  <iostream>
 
  namespace vcg
 diff --git a/wrap/igl/smooth_field.h b/wrap/igl/smooth_field.h
-index e1208cf..a403d54 100644
+index 9629a88..01fca17 100644
 --- a/wrap/igl/smooth_field.h
 +++ b/wrap/igl/smooth_field.h
 @@ -25,7 +25,7 @@
  #define SMOOTHER_FIELD_H
 
  //eigen stuff
--#include <eigenlib/Eigen/Sparse>
+-#include <Eigen/Sparse>
 +#include <eigen3/Eigen/Sparse>
 
  //vcg stuff

ports/vcglib/portfile.cmake

@@ -1,13 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cnr-isti-vclab/vcglib
-    REF v1.0.1
-    SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
-    PATCHES consume-vcpkg-eigen3.patch
+    REF 38c3a410b168975de719f91d4a9325fb4edbb3ae #2021.10
+    SHA512 20285bd73927a47a52757d90f34a9d02f4206872f319e3ec1386d35c1c42888df47e3da321b05eca60b6cd1121e06d12ef7d1897ce2770dc54ddfb3929ed90b5
+    PATCHES
+        consume-vcpkg-eigen3.patch
     )
 
-configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vcglib/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/vcglib/copyright" COPYONLY)
 
-file(COPY ${SOURCE_PATH}/vcg/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/vcg)
-file(COPY ${SOURCE_PATH}/wrap/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wrap)
-file(COPY ${SOURCE_PATH}/img/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/img)
+file(COPY "${SOURCE_PATH}/vcg/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vcg")
+file(COPY "${SOURCE_PATH}/wrap/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/wrap")
+file(COPY "${SOURCE_PATH}/img/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/img")

ports/vcglib/vcpkg.json

@@ -1,9 +1,18 @@
 {
   "name": "vcglib",
-  "version-string": "1.0.1",
-  "port-version": 1,
+  "version-string": "2021.10",
   "description": "library for manipulation, processing, cleaning, simplifying triangle meshes.",
+  "homepage": "https://github.com/cnr-isti-vclab/vcglib",
   "dependencies": [
-    "eigen3"
+    "eigen3",
+    "pe-parse",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

versions/baseline.json

@@ -6793,8 +6793,8 @@
       "port-version": 1
     },
     "vcglib": {
-      "baseline": "1.0.1",
-      "port-version": 1
+      "baseline": "2021.10",
+      "port-version": 0
     },
     "vcpkg-cmake": {
       "baseline": "2021-09-13",

versions/v-/vcglib.json

@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "4ed58c0ed176662ca418315c77fb0137c2cf7769",
-      "version-string": "1.0.1",
-      "port-version": 1
+      "git-tree": "de1e4b87298b5cd07c58ea1401b088dfb7309b77",
+      "version-string": "2021.10",
+      "port-version": 0
     },
     {
       "git-tree": "18b77419728670df6316365979f59919168b9ee2",