2025-02-26T20:21:45+0100 Theo Buehler <tb@theobuehler.org>:
> On Wed, Feb 26, 2025 at 05:54:44PM +0000, Johannes Thyssen Tishman wrote:
> > Please find below an update for graphics/pcl to version 1.15.0.
> >
> > Most patches were dropped as they were merged upstream. I checked all
> > SHARED_LIBS with check_sym for bumps, but I'd appreciate if someone
> > could help me double check. All tests are still passing.
>
> The bumping looks correct purely from looking at the check_sym output.
> There are too many headers to be confident about function signatures
> and struct changes, though: there was a lot of churn. Moreover, all
> these libraries depend on libpcl_common, which got a major bump.
>
> In practice, a binary linked against, say, libpcl_kdtree from pcl 1.14.1
> will no longer work with pcl 1.15.0 despite libpcl_kdtree not having any
> dynamic export changes itself. So there is no real benefit from avoiding
> a bump for libpcl_kdtree.
>
> In short, I would recommend doing the same you did with vtk and just
> give all the libraries the same version, in this case 1.0. This will
> save you a lot of time and headache and I see no downside to doing
> that, especially since there is no direct consumer of this port (yet).
Thanks for double checking tb. I bumped them all now as done with vtk.
New diff below.
> On aarch64 tests pass except for two that time out:
>
> The following tests FAILED:
> 83 - io_io (Timeout)
> 99 - a_recognition_ism_test (Timeout)
Do you have a more verbose log of these? I don't have an aarch64 machine
to test.
> One question: what happened to the dep on graphics/freeglut?
>
> If I see correctly, there's grabcut_2d that would depend on it
> but it is only built if GLUT_FOUND is set and nothing seems to be
> setting that.
Nice catch! I intended to prepend devel/cjson to the list (alphabetical
order) and removed graphics/freeglut by mistake. freeglut is searched
for due to WITH_OPENGL being set.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/pcl/Makefile,v
diff -u -p -r1.5 Makefile
--- Makefile 24 Feb 2025 19:39:18 -0000 1.5
+++ Makefile 26 Feb 2025 22:44: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,7 +32,8 @@ MODULES = devel/cmake
PCLVER = pcl-${V:R}
SUBST_VARS += PCLVER
-BUILD_DEPENDS = graphics/freeglut \
+BUILD_DEPENDS = devel/cjson \
+ graphics/freeglut \
graphics/glew \
math/eigen3 \
x11/xkbcommon
@@ -61,6 +49,7 @@ CONFIGURE_ARGS = -DWITH_LIBUSB=ON \
-DWITH_PCAP=ON \
-DWITH_PNG=ON \
-DWITH_QHULL=ON \
+ -DWITH_SYSTEM_CJSON=ON \
-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: distinfo
===================================================================
RCS file: /cvs/ports/graphics/pcl/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- distinfo 27 Dec 2024 16:13:02 -0000 1.1.1.1
+++ distinfo 26 Feb 2025 22:44: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: patches/patch-cmake_pcl_find_boost_cmake
===================================================================
RCS file: patches/patch-cmake_pcl_find_boost_cmake
diff -N patches/patch-cmake_pcl_find_boost_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_pcl_find_boost_cmake 26 Feb 2025 22:44: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: 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
--- patches/patch-common_include_pcl_pcl_macros_h 27 Dec 2024 16:13:02 -0000 1.1.1.1
+++ patches/patch-common_include_pcl_pcl_macros_h 26 Feb 2025 22:44: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