From 78d6c77fcbffe0525beb4fa2810f62c1aabbeb6c Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 18 Oct 2019 13:57:04 +0200 Subject: Upgrade to 5.0-beta1 --- ports/cgal/CONTROL | 2 +- ports/cgal/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 5d7879fe0..287358ebe 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 4.14-3 +Version: 5.0 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision Homepage: https://github.com/CGAL/cgal Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 1a006116d..bf883277d 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF releases/CGAL-4.14 - SHA512 c70b3ad475f6b2c03ecb540e195b4d26a709205c511b0c705dfddb5b14ef372453ce1d4d49ed342fcd21ba654dea793e91c058afae626276bfb3cfd72bccb382 + REF releases/CGAL-5.0-beta1 + SHA512 a51927d1371297d5db06ce77309a43b480582e42a64844e95cbd7fe7308952df8360ec0ec1a6044478162f0b261622789d3fc0a46834959421db50d02c5d6f98 HEAD_REF master PATCHES cgal_target_fix.patch -- cgit v1.2.3 From 1302ba6fa7797960e1a6cacee001fc4e67333c13 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 18 Oct 2019 13:59:24 +0200 Subject: Fix CONTROL version --- ports/cgal/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 287358ebe..525d6220a 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 5.0 +Version: 5.0-beta1-0.1 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision Homepage: https://github.com/CGAL/cgal Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. -- cgit v1.2.3 From f9a99f63170221467203069611941813de566969 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 18 Oct 2019 14:13:17 +0200 Subject: Add usage file --- ports/cgal/portfile.cmake | 1 + ports/cgal/usage | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 ports/cgal/usage diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index bf883277d..2988d1540 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -60,4 +60,5 @@ file( DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal ) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal) vcpkg_test_cmake(PACKAGE_NAME CGAL) diff --git a/ports/cgal/usage b/ports/cgal/usage new file mode 100644 index 000000000..eadb04977 --- /dev/null +++ b/ports/cgal/usage @@ -0,0 +1,4 @@ +The package cgal provides CMake targets: + + find_package(CGAL CONFIG REQUIRED) + target_link_libraries(main PRIVATE CGAL::CGAL) -- cgit v1.2.3 From 042011d52ffd9da60e9d2954942b8fe42d5288f9 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 18 Oct 2019 14:24:21 +0200 Subject: remove patch --- ports/cgal/cgal_target_fix.patch | 49 ---------------------------------------- ports/cgal/portfile.cmake | 2 -- 2 files changed, 51 deletions(-) delete mode 100644 ports/cgal/cgal_target_fix.patch diff --git a/ports/cgal/cgal_target_fix.patch b/ports/cgal/cgal_target_fix.patch deleted file mode 100644 index 2fa5155bb..000000000 --- a/ports/cgal/cgal_target_fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a0bfaee9ebed49fb65c93d7fb00a0c24c1898841 Mon Sep 17 00:00:00 2001 -From: Laurent Rineau -Date: Fri, 10 May 2019 17:31:17 +0200 -Subject: [PATCH 1/2] Consider CGAL as an imported target - ---- - Installation/lib/cmake/CGAL/CGALConfig.cmake | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake -index c2b0aed549d..08d757aad7f 100644 ---- a/Installation/lib/cmake/CGAL/CGALConfig.cmake -+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake -@@ -116,7 +116,11 @@ include(CGAL_setup_target_dependencies) - foreach(cgal_lib ${CGAL_LIBRARIES}) - set(WITH_${cgal_lib} TRUE) - if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib}) -- add_library(${cgal_lib} INTERFACE) -+ if(CGAL_BUILDING_LIBS) -+ add_library(${cgal_lib} INTERFACE) -+ else() -+ add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL) -+ endif() - if(NOT TARGET CGAL::${cgal_lib}) - add_library(CGAL::${cgal_lib} ALIAS ${cgal_lib}) - endif() - -From c2e8365303b97669fe50ea2427c9943049575be4 Mon Sep 17 00:00:00 2001 -From: Laurent Rineau -Date: Fri, 10 May 2019 17:47:58 +0200 -Subject: [PATCH 2/2] Actually, it can only work with CMake>=3.11 - ---- - Installation/lib/cmake/CGAL/CGALConfig.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake -index 08d757aad7f..8ef95a85c94 100644 ---- a/Installation/lib/cmake/CGAL/CGALConfig.cmake -+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake -@@ -116,7 +116,7 @@ include(CGAL_setup_target_dependencies) - foreach(cgal_lib ${CGAL_LIBRARIES}) - set(WITH_${cgal_lib} TRUE) - if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib}) -- if(CGAL_BUILDING_LIBS) -+ if(CGAL_BUILDING_LIBS OR CMAKE_VERSION VERSION_LESS "3.11") - add_library(${cgal_lib} INTERFACE) - else() - add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL) diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 2988d1540..2596b94a2 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -8,8 +8,6 @@ vcpkg_from_github( REF releases/CGAL-5.0-beta1 SHA512 a51927d1371297d5db06ce77309a43b480582e42a64844e95cbd7fe7308952df8360ec0ec1a6044478162f0b261622789d3fc0a46834959421db50d02c5d6f98 HEAD_REF master - PATCHES - cgal_target_fix.patch ) set(WITH_CGAL_Qt5 OFF) -- cgit v1.2.3 From 77c50e27ebb3c4c98d7610a9cd9b29293eb85d0c Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 21 Oct 2019 15:26:33 +0200 Subject: Add a patch for openmvs --- ports/openmvs/cgal-5.0.patch | 40 ++++++++++++++++++++++++++++++++++++++++ ports/openmvs/portfile.cmake | 1 + 2 files changed, 41 insertions(+) create mode 100755 ports/openmvs/cgal-5.0.patch diff --git a/ports/openmvs/cgal-5.0.patch b/ports/openmvs/cgal-5.0.patch new file mode 100755 index 000000000..042bf9dab --- /dev/null +++ b/ports/openmvs/cgal-5.0.patch @@ -0,0 +1,40 @@ +diff --git a/libs/MVS/DepthMap.cpp b/libs/MVS/DepthMap.cpp +index 12973ac..f6621f0 100644 +--- a/libs/MVS/DepthMap.cpp ++++ b/libs/MVS/DepthMap.cpp +@@ -1071,16 +1071,25 @@ void MVS::EstimatePointNormals(const ImageArr& images, PointCloud& pointcloud, i + // estimates normals direction; + // Note: pca_estimate_normals() requires an iterator over points + // as well as property maps to access each point's position and normal. +- #if CGAL_VERSION_NR < 1040800000 +- CGAL::pca_estimate_normals( +- #else +- CGAL::pca_estimate_normals( +- #endif +- pointvectors.begin(), pointvectors.end(), +- CGAL::First_of_pair_property_map(), +- CGAL::Second_of_pair_property_map(), +- numNeighbors +- ); ++ #if CGAL_VERSION_NR < 1041301000 ++ #if CGAL_VERSION_NR < 1040800000 ++ CGAL::pca_estimate_normals( ++ #else ++ CGAL::pca_estimate_normals( ++ #endif ++ pointvectors.begin(), pointvectors.end(), ++ CGAL::First_of_pair_property_map(), ++ CGAL::Second_of_pair_property_map(), ++ numNeighbors ++ ); ++ #else ++ CGAL::pca_estimate_normals( ++ pointvectors, ++ numNeighbors, ++ CGAL::parameters::point_map(CGAL::First_of_pair_property_map()) ++ .normal_map(CGAL::Second_of_pair_property_map()) ++ ); ++ #endif + // store the point normals + pointcloud.normals.Resize(pointcloud.points.GetSize()); + FOREACH(i, pointcloud.normals) { diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index 6eb30f6f8..eceb605b5 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES glfw3_target_compat.patch boost-1.71.patch + cgal-5.0.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 94d954ed44775ca8a9fca1ad5ac38d89406ce9a8 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 22 Oct 2019 13:59:22 +0200 Subject: Add boost-ptr-container to the list of dependences --- ports/cgal/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 525d6220a..52ae90a68 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,6 +1,6 @@ Source: cgal Version: 5.0-beta1-0.1 -Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision +Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision Homepage: https://github.com/CGAL/cgal Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. -- cgit v1.2.3 From 69570b65ac75261d35a73fdfec1a95d3e6ac5530 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 31 Oct 2019 17:57:53 +0100 Subject: upgrade to 5.0-beta2 --- ports/cgal/CONTROL | 2 +- ports/cgal/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 52ae90a68..532ef9cdb 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 5.0-beta1-0.1 +Version: 5.0-beta2-0.1 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision Homepage: https://github.com/CGAL/cgal Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 2596b94a2..f4a21ced9 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF releases/CGAL-5.0-beta1 - SHA512 a51927d1371297d5db06ce77309a43b480582e42a64844e95cbd7fe7308952df8360ec0ec1a6044478162f0b261622789d3fc0a46834959421db50d02c5d6f98 + REF releases/CGAL-5.0-beta2 + SHA512 99d686fb0e55a29181883c7c2921f862c8eff7d7532b2fad5106cd1ce5c9dff67a2249754608dc16e3f996770ed352fb1dcc1b09922b9c00da324d561d49da4a HEAD_REF master ) -- cgit v1.2.3 From a0f23077f630aa0ce97068b42325e3807f3c1060 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 12 Nov 2019 09:32:24 +0100 Subject: Upgrade to 5.0 --- ports/cgal/CONTROL | 2 +- ports/cgal/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 532ef9cdb..3f71a911a 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,5 +1,5 @@ Source: cgal -Version: 5.0-beta2-0.1 +Version: 5.0 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision Homepage: https://github.com/CGAL/cgal Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index f4a21ced9..d351af738 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF releases/CGAL-5.0-beta2 - SHA512 99d686fb0e55a29181883c7c2921f862c8eff7d7532b2fad5106cd1ce5c9dff67a2249754608dc16e3f996770ed352fb1dcc1b09922b9c00da324d561d49da4a + REF releases/CGAL-5.0 + SHA512 c7462f1f5ca1ef154a3a20ce4c1b63e544ad7e62ea0afb9aee99872402362fa2001a52740d62ac779e75f1354ad9c955a895f3cad12186e3b75d91f0f3452847 HEAD_REF master ) -- cgit v1.2.3 From 4ba67c9d63a2e1da30d8cb50958accb3b18d2c19 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 18 Nov 2019 09:18:02 +0100 Subject: Dummy commit to restart the CI tests. --- ports/cgal/usage | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/cgal/usage b/ports/cgal/usage index eadb04977..9ea12d70b 100644 --- a/ports/cgal/usage +++ b/ports/cgal/usage @@ -2,3 +2,4 @@ The package cgal provides CMake targets: find_package(CGAL CONFIG REQUIRED) target_link_libraries(main PRIVATE CGAL::CGAL) + -- cgit v1.2.3 From 0fe861eb07b419dacff6e05ce406db4f25f49fd0 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 22 Nov 2019 09:30:05 +0100 Subject: bump openmvs --- ports/openmvs/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openmvs/CONTROL b/ports/openmvs/CONTROL index 8efa8ff0a..1708205a8 100644 --- a/ports/openmvs/CONTROL +++ b/ports/openmvs/CONTROL @@ -1,4 +1,4 @@ Source: openmvs -Version: 1.0-2 +Version: 1.0-3 Description: OpenMVS: open Multi-View Stereo reconstruction library Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, ceres, opencv, cgal[core], glew, glfw3, vcglib -- cgit v1.2.3