2025-02-27T13:42:38+0000 Stuart Henderson <stu@spacehopper.org>:
> On 2025/02/27 12:59, Theo Buehler wrote:
> > On Thu, Feb 27, 2025 at 11:47:58AM +0000, Stuart Henderson wrote:
> > > On 2025/02/27 10:44, Johannes Thyssen Tishman wrote:
> > > > On a side note, I can enable the visualization subsystem now that we
> > > > have vtk and leave those subsystems that are disabled by default
> > > > disabled. tb@, what do you think? I opted for leaving it out initially
> > > > as it is not needed by FreeCAD.
> > >
> > > fwiw, I would tend to leave it out unless something needs it.
> >
> > +1
>
> The update is basically OK with me.
>
> > > > +BUILD_DEPENDS = devel/cjson \
> > >
> > > something smells off here; it's a shared library, no "header-only
> > > library" option, so why is this just a BDEP and not linked by anything?
> > >
> >
> > It seems it's only needed by something called outofcore, which doesn't
> > seem to be built because it depends on Boost filesystem and the cmake
> > configure step can't find it for some reason.
>
> I don't think the BUILD_DEPENDS is needed.
>
> To be sure, I've tried building with the bundled copy removed, and also
> tested with cjson installed during configure / removed during build, and
> everything seems happy.
>
> I would prefer it not to be listed as BDEP if not really used; if
> something changes and it does start to get picked up for some reason,
> I'd prefer to have a chance of the build failing so we'd be more likely
> to notice, and could then add LIB_DEPENDS/WANTLIB and avoid broken
> packages.
Right, devel/cjson is indeed not needed as the 'outofcore' subsystem is
disabled. Nice catch, thank you. I have removed the BDEP now.
> Perhaps consider this to make absolutely sure the bundled copy doesn't
> get used?
>
> post-extract:
> rm ${WRKSRC}/outofcore/src/cJSON.cpp
I don't think this is necessary because the bundled copy is only used by
the 'outofcore' subsystem, which is not only disabled because Boost
filesystem is not found, but also because it requires the
'visualization' module which I've manually disabled by not enabling vtk
support.
Index: graphics/pcl/Makefile
===================================================================
RCS file: /cvs/ports/graphics/pcl/Makefile,v
diff -u -p -r1.5 Makefile
--- graphics/pcl/Makefile 24 Feb 2025 19:39:18 -0000 1.5
+++ graphics/pcl/Makefile 27 Feb 2025 16:16:12 -0000
@@ -3,30 +3,18 @@ ONLY_FOR_ARCHS = ${LP64_ARCHS}
COMMENT = image and point cloud processing library
-V = 1.14.1
+V = 1.15.0
PKGNAME = pcl-${V}
-REVISION = 1
DIST_TUPLE += github PointCloudLibrary pcl ${PKGNAME} .
DIST_TUPLE += github google googletest v1.15.2 ../gtest_dist
-SHARED_LIBS += pcl_common 0.0 # 0.0
-SHARED_LIBS += pcl_features 0.0 # 0.0
-SHARED_LIBS += pcl_filters 0.0 # 0.0
-SHARED_LIBS += pcl_io 0.0 # 0.0
-SHARED_LIBS += pcl_io_ply 0.0 # 0.0
-SHARED_LIBS += pcl_kdtree 0.0 # 0.0
-SHARED_LIBS += pcl_keypoints 0.0 # 0.0
-SHARED_LIBS += pcl_ml 0.0 # 0.0
-SHARED_LIBS += pcl_octree 0.0 # 0.0
-SHARED_LIBS += pcl_recognition 0.0 # 0.0
-SHARED_LIBS += pcl_registration 0.0 # 0.0
-SHARED_LIBS += pcl_sample_consensus 0.0 # 0.0
-SHARED_LIBS += pcl_search 0.0 # 0.0
-SHARED_LIBS += pcl_segmentation 0.0 # 0.0
-SHARED_LIBS += pcl_stereo 0.0 # 0.0
-SHARED_LIBS += pcl_surface 0.0 # 0.0
-SHARED_LIBS += pcl_tracking 0.0 # 0.0
+.for LIB in pcl_common pcl_features pcl_filters pcl_io pcl_io_ply pcl_kdtree \
+ pcl_keypoints pcl_ml pcl_octree pcl_recognition pcl_registration \
+ pcl_sample_consensus pcl_search pcl_segmentation pcl_stereo \
+ pcl_surface pcl_tracking
+SHARED_LIBS += ${LIB} 1.0 # 0.0
+.endfor
CATEGORIES = graphics
HOMEPAGE = https://pointclouds.org/
@@ -35,9 +23,8 @@ MAINTAINER = Johannes Thyssen Tishman <
# BSD 3-clause
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} boost_filesystem-mt boost_iostreams-mt
-WANTLIB += boost_regex-mt c flann_cpp lz4 m pcap png qhull_r usb-1.0
-WANTLIB += z
+WANTLIB += ${COMPILER_LIBCXX} boost_iostreams-mt boost_regex-mt
+WANTLIB += c flann_cpp lz4 m pcap png qhull_r usb-1.0 z
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
@@ -45,9 +32,7 @@ MODULES = devel/cmake
PCLVER = pcl-${V:R}
SUBST_VARS += PCLVER
-BUILD_DEPENDS = graphics/freeglut \
- graphics/glew \
- math/eigen3 \
+BUILD_DEPENDS = math/eigen3 \
x11/xkbcommon
LIB_DEPENDS = devel/boost \
@@ -56,11 +41,15 @@ LIB_DEPENDS = devel/boost \
math/flann \
math/qhull
+# OpenGL, freeglut and GLEW are only needed by subsystems that are either
+# disabled by default (apps, simulation) or due to an external dependency
+# (visualization --> WITH_VTK=OFF).
+# https://github.com/PointCloudLibrary/pcl/issues/2641
CONFIGURE_ARGS = -DWITH_LIBUSB=ON \
- -DWITH_OPENGL=ON \
-DWITH_PCAP=ON \
-DWITH_PNG=ON \
-DWITH_QHULL=ON \
+ -DWITH_OPENGL=OFF \
-DWITH_OPENMP=OFF \
-DWITH_CUDA=OFF \
-DWITH_VTK=OFF \
@@ -73,7 +62,8 @@ CONFIGURE_ARGS = -DWITH_LIBUSB=ON \
-DWITH_RSSDK2=OFF \
-DWITH_QT=OFF \
-DWITH_DOCS=OFF \
- -DBUILD_global_tests=ON
+ -DBUILD_global_tests=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
# GTest's source is needed for tests
GTEST_WRKSRC = ${WRKDIR}/gtest_dist/googletest
Index: graphics/pcl/distinfo
===================================================================
RCS file: /cvs/ports/graphics/pcl/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- graphics/pcl/distinfo 27 Dec 2024 16:13:02 -0000 1.1.1.1
+++ graphics/pcl/distinfo 27 Feb 2025 16:16:12 -0000
@@ -1,4 +1,4 @@
-SHA256 (PointCloudLibrary-pcl-pcl-1.14.1.tar.gz) = XcXglQlkT3A96aP7dtmassxn71Pq9WN9ssbIuTOyivY=
+SHA256 (PointCloudLibrary-pcl-pcl-1.15.0.tar.gz) = 6QyYHCHonEUgHFCD24MI4JnzTBeC+S/WWgpOsLcsb78=
SHA256 (google-googletest-v1.15.2.tar.gz) = e0K01u1IgQxTYsJloX+uvpDcI3PIheUhZDnTeSfwKSY=
-SIZE (PointCloudLibrary-pcl-pcl-1.14.1.tar.gz) = 68672885
+SIZE (PointCloudLibrary-pcl-pcl-1.15.0.tar.gz) = 68683056
SIZE (google-googletest-v1.15.2.tar.gz) = 872667
Index: graphics/pcl/patches/patch-cmake_pcl_find_boost_cmake
===================================================================
RCS file: graphics/pcl/patches/patch-cmake_pcl_find_boost_cmake
diff -N graphics/pcl/patches/patch-cmake_pcl_find_boost_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/pcl/patches/patch-cmake_pcl_find_boost_cmake 27 Feb 2025 16:16:12 -0000
@@ -0,0 +1,16 @@
+Our devel/boost does not include a BoostConfig.cmake file.
+
+Index: cmake/pcl_find_boost.cmake
+--- cmake/pcl_find_boost.cmake.orig
++++ cmake/pcl_find_boost.cmake
+@@ -25,8 +25,8 @@ else()
+ set(BOOST_REQUIRED_MODULES iostreams system)
+ endif()
+
+-find_package(Boost 1.71.0 QUIET COMPONENTS ${BOOST_OPTIONAL_MODULES} CONFIG)
+-find_package(Boost 1.71.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_MODULES} CONFIG)
++find_package(Boost 1.71.0 QUIET COMPONENTS ${BOOST_OPTIONAL_MODULES})
++find_package(Boost 1.71.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_MODULES})
+
+ if(Boost_FOUND)
+ set(BOOST_FOUND TRUE)
Index: graphics/pcl/patches/patch-common_include_pcl_pcl_macros_h
===================================================================
RCS file: /cvs/ports/graphics/pcl/patches/patch-common_include_pcl_pcl_macros_h,v
diff -u -p -r1.1.1.1 patch-common_include_pcl_pcl_macros_h
--- graphics/pcl/patches/patch-common_include_pcl_pcl_macros_h 27 Dec 2024 16:13:02 -0000 1.1.1.1
+++ graphics/pcl/patches/patch-common_include_pcl_pcl_macros_h 27 Feb 2025 16:16:12 -0000
@@ -1,7 +1,7 @@
Index: common/include/pcl/pcl_macros.h
--- common/include/pcl/pcl_macros.h.orig
+++ common/include/pcl/pcl_macros.h
-@@ -363,7 +363,7 @@ pcl_round (float number)
+@@ -368,7 +368,7 @@ pcl_round (float number)
#define FREEBSD_MALLOC_ALIGNED 0
No comments:
Post a Comment