[pcl] Fix dependencies and build failures (#46378)

Co-authored-by: Yury Bura <yurybura@gmail.com>
This commit is contained in:
Kai Pastor 2025-07-14 07:25:28 +02:00 committed by GitHub
parent b75e821f77
commit e86ec03236
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 61 additions and 7 deletions

View File

@ -0,0 +1,12 @@
diff --git a/common/include/pcl/point_cloud.h b/common/include/pcl/point_cloud.h
index f7b63ba..d609eae 100644
--- a/common/include/pcl/point_cloud.h
+++ b/common/include/pcl/point_cloud.h
@@ -52,6 +52,7 @@
#include <pcl/types.h>
#include <pcl/console/print.h> // for PCL_WARN
+#include <cassert>
#include <utility>
#include <vector>

View File

@ -1,8 +1,19 @@
vcpkg_download_distfile(NO_GLU_PATCH
URLS https://github.com/PointCloudLibrary/pcl/pull/6253/commits/011905f3387e45b66828d81dacaafdde8893fdcb.patch?full_index=1
FILENAME fix-no-gluErrorString.patch
FILENAME PointCloudLibrary-fix-no-gluErrorString.patch
SHA512 8bf795a0c0da667bae38a3293643bd92817f30ab0f8a56b065bbb7cfa0b8f125210a317ee9cd868911b87546b1a05c322280f159802f820fef886109b938635b
)
vcpkg_download_distfile(NO_TRY_RUN_PATCH
URLS https://github.com/PointCloudLibrary/pcl/commit/575168bb72232cd820362aac7791227753489683.patch?full_index=1
FILENAME PointCloudLibrary-pcl-no-try-run.patch
SHA512 922de43bf04b3d990c5f9123b2e7f2148b54b612b7a1fe80df42ff734c7e55a9dd33cf4a6bb26207a381eda929da79b3e594eb5369a02cbf73c3767f4cf2eca0
)
vcpkg_download_distfile(NO_TRY_RUN_PATCH_2
URLS https://github.com/PointCloudLibrary/pcl/commit/39669c02e9c0e68861baf0a25886c85e6011a259.patch?full_index=1
FILENAME PointCloudLibrary-pcl-no-try-run_2.patch
SHA512 1cbcebce8657190ecac7f82539218b345a7978f213c13764fe83dc9c32a416b4ae7bc3f896d31ef2c6480c4a98f756f9df3493b9ae1dc5d5b42a00d9d3928bfc
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PointCloudLibrary/pcl
@ -11,12 +22,16 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
add-gcc-version-check.patch
"${NO_TRY_RUN_PATCH}"
"${NO_TRY_RUN_PATCH_2}"
fix-check-sse.patch
fix-numeric-literals-flag.patch
install-layout.patch
install-examples.patch
fix-clang-cl.patch
add-chrono-includes.patch
add-cassert.patch
rollback-1092d70.diff
"${NO_GLU_PATCH}"
)
@ -33,6 +48,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
cuda BUILD_CUDA
cuda BUILD_GPU
examples BUILD_examples
examples VCPKG_LOCK_FIND_PACKAGE_cJSON
libusb WITH_LIBUSB
opengl WITH_OPENGL
openni2 WITH_OPENNI2
@ -40,6 +56,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
qt WITH_QT
simulation BUILD_simulation
surface-on-nurbs BUILD_surface_on_nurbs
surface-on-nurbs VCPKG_LOCK_FIND_PACKAGE_ZLIB
tools BUILD_tools
visualization WITH_VTK
visualization BUILD_visualization
@ -70,6 +87,8 @@ vcpkg_cmake_configure(
-DWITH_QHULL=ON
-DWITH_RSSDK=OFF
-DWITH_RSSDK2=OFF
# Misc
-DVCPKG_LOCK_FIND_PACKAGE_ClangFormat=OFF
# FEATURES
${FEATURE_OPTIONS}
OPTIONS_DEBUG

View File

@ -0,0 +1,19 @@
diff --git a/filters/src/convolution.cpp b/filters/src/convolution.cpp
index 41ffd02..34eb3b5 100644
--- a/filters/src/convolution.cpp
+++ b/filters/src/convolution.cpp
@@ -189,5 +189,14 @@ Convolution<pcl::RGB, pcl::RGB>::convolveOneColDense(int i, int j)
result.b = static_cast<std::uint8_t>(b);
return (result);
}
+
+#ifndef PCL_NO_PRECOMPILE
+#include <pcl/impl/instantiate.hpp>
+#include <pcl/point_types.h>
+
+PCL_INSTANTIATE_PRODUCT(
+ Convolution, ((pcl::PointXYZRGB))((pcl::PointXYZRGB)))
+#endif // PCL_NO_PRECOMPILE
+
} // namespace filters
} // namespace pcl

View File

@ -1,7 +1,7 @@
{
"name": "pcl",
"version": "1.15.0",
"port-version": 2,
"port-version": 3,
"description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
"homepage": "https://github.com/PointCloudLibrary/pcl",
"license": "BSD-3-Clause",
@ -63,6 +63,7 @@
"description": "Build PCL examples",
"dependencies": [
"boost-format",
"cjson",
{
"name": "pcl",
"features": [

View File

@ -1617,16 +1617,13 @@ pcapplusplus:x64-uwp = cascade
pcapplusplus:x64-windows-static = cascade
pcapplusplus:x64-windows-static-md = cascade
pcapplusplus:x86-windows = cascade
pcl:arm64-uwp = cascade
pcl:x64-uwp = cascade
pcl[apps]:arm64-osx = cascade
pcl[apps,examples,openni2,pcap,qt,visualization,vtk]:arm64-windows = cascade
pcl[cuda](osx) = cascade
pcl[openni2]:arm64-osx = cascade
pcl[openni2,apps]:x64-linux = cascade
pcl[pcap]:x64-windows-static-md = cascade
pcl[pcap]:x86-windows = cascade
pcl[pcap,openni2,apps]:x64-windows-static = cascade
pcl(uwp) = cascade
pdal-c:arm64-uwp = cascade
pdal-c:arm64-windows = cascade
pdal-c:x64-uwp = cascade
@ -2174,6 +2171,7 @@ openvdb[ax] = feature-fails # ax requires llvm version <= 14. Work when using a
orange-math(linux) = fail # requires gcc15 or later
osgearth[tools](osx) = feature-fails # Undefined _NSSearchPathForDirectoriesInDomains
pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,pybind11,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304
pcl[opengl](android) = feature-fails
poco[core,mariadb,mysql] = options # You can not install mariadb and mysql at the same time
ppqsort[openmp](osx) = feature-fails # No openmp on osx
qt3d[animation] = options # is a requirement, see https://github.com/microsoft/vcpkg/issues/31336

View File

@ -7238,7 +7238,7 @@
},
"pcl": {
"baseline": "1.15.0",
"port-version": 2
"port-version": 3
},
"pcre": {
"baseline": "8.45",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "20c3ff926c56f492e9795a12c4a21bc396eca3c3",
"version": "1.15.0",
"port-version": 3
},
{
"git-tree": "c467cb23d16b1400ce91154ac42f7ca1031de534",
"version": "1.15.0",