pool/PDAL
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1187362 from Application:Geo

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1187362
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PDAL?expand=0&rev=5
This commit is contained in:
Ana Guerrero 2024-07-15 17:48:38 +00:00 committed by Git OBS Bridge
commit 95e4a43b62
7 changed files with 107 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PDAL-2.5.6-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c7c4570ef518942299479cc4077e0c657ec5b5174daf465415de947a1d3eb99
size 87001744

1
PDAL-2.5.6-src.tar.bz2.md5
View File

@ -1 +0,0 @@
728a54d18a4a47bf70dd5d45b26e2882 PDAL-2.5.6-src.tar.bz2

3
PDAL-2.7.2-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f6ae0f3dc012b19c70dde2361799ecac0cdcbeb9cad5cfd96313c9fdc8608f32
size 87431434

1
PDAL-2.7.2-src.tar.bz2.md5 Normal file
View File

@ -0,0 +1 @@
d7158d5e99c15b8e4ea7730aad04341b PDAL-2.7.2-src.tar.bz2

6
PDAL.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 12 17:44:23 UTC 2024 - Enno Tensing <tenno+suse@suij.in>
- Update to 2.7.2
* https://github.com/PDAL/PDAL/compare/2.5.6...2.7.2
-------------------------------------------------------------------
Fri Mar 1 10:53:46 UTC 2024 - Martin Pluskal <mpluskal@suse.com>

35
PDAL.spec
View File

@ -17,11 +17,11 @@
#
%define soname 15
%define sovers 15.6.0
%define soname 17
%define sovers 17.1.0
%define lname pdal
Name: PDAL
Version: 2.5.6
Version: 2.7.2
Release: 0
Summary: Point Data Abstraction Library (GDAL for point cloud data)
# The code is licensed BSD except for:
@ -222,6 +222,11 @@ export CXX=g++-12
%install
%cmake_install
# No executable hpp-Files
find %{buildroot} -type f -name "*.hpp" -executable -exec chmod -x '{}' \;
# No executable cmake-Files
find %{buildroot} -type f -name "*.cmake" -executable -exec chmod -x '{}' \;
#No .la lib
find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
@ -244,18 +249,20 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC
%check
## test the compiled code (see doc/project/testing.rst)
# A custom timeout of 60s is set. This avoids having tests timeout after the default
# timeout (about 20 minutes)
# we skip tests for selected architectures which need upstream fixes
%ifarch armv7hl aarch64 ppc64le s390x
%ctest --output-on-failure || true
%ctest --output-on-failure --timeout 60 || true
%else
## we skip the PG test (BUILD_PGPOINTCLOUD_TESTS:BOOL=OFF):
# PGUSER=pdal PGPASSWORD=password PGHOST=localhost PGPORT=5432 ctest -V
%ifarch i686
# https://github.com/PDAL/PDAL/issues/3501 should work with PROJ 8.2 and gdal 3.2.3.
%ctest || :
%ctest --timeout 60 || :
%else
# https://github.com/PDAL/PDAL/issues/3501
%ctest || :
%ctest --timeout 60 || :
%endif
%endif
@ -270,17 +277,15 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC
%files -n lib%{name}%{soname}
%license LICENSE.txt
%doc AUTHORS.txt README.md RELEASENOTES.txt
%{_libdir}/libpdal_base.so.%{sovers}
%{_libdir}/libpdal_base.so.%{soname}
%{_libdir}/libpdalcpp.so.%{soname}
%{_libdir}/libpdalcpp.so.%{sovers}
# Plugins
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.%{sovers}
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.%{soname}
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.%{sovers}
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.%{sovers}
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.%{soname}
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.%{sovers}
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.%{sovers}
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.%{soname}
%{_libdir}/libpdal_util.so.%{sovers}
%{_libdir}/libpdal_util.so.%{soname}
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.%{sovers}
%files bash-completion
%dir %{_datadir}/bash-completion
@ -291,12 +296,10 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC
%license LICENSE.txt
%doc AUTHORS.txt README.md CONTRIBUTING.md
%{_includedir}/pdal
%{_libdir}/libpdal_base.so
%{_libdir}/libpdalcpp.so
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so
%{_libdir}/libpdal_util.so
%{_libdir}/libpdalcpp.so
%{_libdir}/pkgconfig/pdal.pc
%{_libdir}/cmake/PDAL
%{_bindir}/pdal-config

142
PDAL_unbundle.patch
View File

@ -1,8 +1,9 @@
diff -rupN --no-dereference PDAL-2.5.6-src/CMakeLists.txt PDAL-2.5.6-src-new/CMakeLists.txt
--- PDAL-2.5.6-src/CMakeLists.txt 2023-08-18 17:30:06.000000000 +0200
+++ PDAL-2.5.6-src-new/CMakeLists.txt 2023-08-19 19:00:10.778908135 +0200
@@ -140,6 +140,9 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e18fab718..98ecbd76e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,9 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
include(${PDAL_CMAKE_DIR}/gcs.cmake) # Optional
include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
+find_package(PkgConfig REQUIRED)
@ -11,7 +12,7 @@ diff -rupN --no-dereference PDAL-2.5.6-src/CMakeLists.txt PDAL-2.5.6-src-new/CMa
#------------------------------------------------------------------------------
# generate the pdal_features.hpp header
#------------------------------------------------------------------------------
@@ -175,7 +178,6 @@ endif()
@@ -153,7 +156,6 @@ endif()
add_subdirectory(plugins)
if (WITH_TESTS)
@ -19,19 +20,20 @@ diff -rupN --no-dereference PDAL-2.5.6-src/CMakeLists.txt PDAL-2.5.6-src-new/CMa
add_subdirectory(test)
endif()
add_subdirectory(dimbuilder)
@@ -258,7 +260,7 @@ target_include_directories(${PDAL_BASE_L
${ROOT_DIR}
${PROJECT_BINARY_DIR}/include
${PDAL_VENDOR_DIR}
@@ -219,7 +221,7 @@ add_library(PDAL::PDAL ALIAS ${PDAL_LIB_NAME})
#
target_include_directories(${PDAL_LIB_NAME}
SYSTEM BEFORE PRIVATE
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${ZSTD_INCLUDE_DIRS}
${NLOHMANN_INCLUDE_DIR}
diff -rupN --no-dereference PDAL-2.5.6-src/plugins/cpd/CMakeLists.txt PDAL-2.5.6-src-new/plugins/cpd/CMakeLists.txt
--- PDAL-2.5.6-src/plugins/cpd/CMakeLists.txt 2023-08-18 17:30:06.000000000 +0200
+++ PDAL-2.5.6-src-new/plugins/cpd/CMakeLists.txt 2023-08-19 19:00:10.778908135 +0200
@@ -4,7 +4,7 @@ find_package(Cpd ${Cpd_VERSION} REQUIRED
+ ${EIGEN_INCLUDE_DIRS}
${PDAL_VENDOR_DIR}/kazhdan
${PDAL_VENDOR_DIR}/h3/include
)
diff --git a/plugins/cpd/CMakeLists.txt b/plugins/cpd/CMakeLists.txt
index ba85e27a7..dcf936502 100644
--- a/plugins/cpd/CMakeLists.txt
+++ b/plugins/cpd/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(Fgt REQUIRED CONFIG)
option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND})
set(files filters/CpdFilter.cpp)
@ -40,71 +42,65 @@ diff -rupN --no-dereference PDAL-2.5.6-src/plugins/cpd/CMakeLists.txt PDAL-2.5.6
PDAL_ADD_PLUGIN(filter_libname filter cpd
FILES
diff -rupN --no-dereference PDAL-2.5.6-src/plugins/i3s/CMakeLists.txt PDAL-2.5.6-src-new/plugins/i3s/CMakeLists.txt
--- PDAL-2.5.6-src/plugins/i3s/CMakeLists.txt 2023-08-18 17:30:06.000000000 +0200
+++ PDAL-2.5.6-src-new/plugins/i3s/CMakeLists.txt 2023-08-19 19:00:10.779908111 +0200
@@ -20,7 +20,7 @@ PDAL_ADD_PLUGIN(i3s_reader_libname reade
@@ -22,7 +22,7 @@ PDAL_ADD_PLUGIN(filter_libname filter cpd
Cpd::Library-C++
${PDAL_LIBRARIES}
INCLUDES
${NLOHMANN_INCLUDE_DIR}
${PDAL_VENDOR_DIR}
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
)
target_compile_definitions(${i3s_reader_libname}
PRIVATE
@@ -41,7 +41,7 @@ PDAL_ADD_PLUGIN(slpk_reader_libname read
INCLUDES
${NLOHMANN_INCLUDE_DIR}
${PDAL_VENDOR_DIR}
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
)
target_compile_definitions(${slpk_reader_libname}
PRIVATE
@@ -61,7 +61,7 @@ if (WITH_TESTS)
${PDAL_SRC_DIR}/private/MathUtils.cpp
INCLUDES
${NLOHMANN_INCLUDE_DIR}
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
${CMAKE_CURRENT_LIST_DIR}
)
if (BUILD_I3S_TESTS)
diff -rupN --no-dereference PDAL-2.5.6-src/plugins/rdb/CMakeLists.txt PDAL-2.5.6-src-new/plugins/rdb/CMakeLists.txt
--- PDAL-2.5.6-src/plugins/rdb/CMakeLists.txt 2023-08-18 17:30:06.000000000 +0200
+++ PDAL-2.5.6-src-new/plugins/rdb/CMakeLists.txt 2023-08-19 19:00:10.779908111 +0200
@@ -28,7 +28,7 @@ PDAL_ADD_PLUGIN(libname reader rdb
diff --git a/plugins/rdb/CMakeLists.txt b/plugins/rdb/CMakeLists.txt
index 0ddb9a24e..49a74a3e8 100644
--- a/plugins/rdb/CMakeLists.txt
+++ b/plugins/rdb/CMakeLists.txt
@@ -25,7 +25,6 @@ PDAL_ADD_PLUGIN(libname reader rdb
${RDB_INCLUDE_C_DIR}
${PDAL_INCLUDE_DIRS}
)
-target_include_directories(${libname} PRIVATE "${PDAL_VENDOR_DIR}/eigen")
+target_include_directories(${libname} PRIVATE "${EIGEN_INCLUDE_DIRS}")
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/nlohmann/")
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/eigen/")
@@ -57,7 +57,7 @@ if (BUILD_RDBLIB_TESTS)
@@ -54,7 +53,7 @@ if (BUILD_RDBLIB_TESTS)
${PROJECT_SOURCE_DIR}/plugins/rdb/io
${RDB_INCLUDE_CPP_DIR}
${RDB_INCLUDE_C_DIR}
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
+ ${EIGEN_INCLUDE_DIRS}
)
endif()
diff -rupN --no-dereference PDAL-2.5.6-src/plugins/teaser/CMakeLists.txt PDAL-2.5.6-src-new/plugins/teaser/CMakeLists.txt
--- PDAL-2.5.6-src/plugins/teaser/CMakeLists.txt 2023-08-18 17:30:06.000000000 +0200
+++ PDAL-2.5.6-src-new/plugins/teaser/CMakeLists.txt 2023-08-19 19:00:10.779908111 +0200
@@ -63,6 +63,6 @@ if (WITH_TESTS)
diff --git a/plugins/teaser/CMakeLists.txt b/plugins/teaser/CMakeLists.txt
index cb1cb0e4e..c4017cab8 100644
--- a/plugins/teaser/CMakeLists.txt
+++ b/plugins/teaser/CMakeLists.txt
@@ -67,6 +67,6 @@ if (WITH_TESTS)
LINK_WITH
${filter_libname}
INCLUDES
- "${PDAL_VENDOR_DIR}/eigen"
+ "${EIGEN_INCLUDE_DIRS}"
+ ${EIGEN_INCLUDE_DIRS}
)
endif()
diff -rupN --no-dereference PDAL-2.5.6-src/test/unit/CMakeLists.txt PDAL-2.5.6-src-new/test/unit/CMakeLists.txt
--- PDAL-2.5.6-src/test/unit/CMakeLists.txt 2023-08-18 17:30:06.000000000 +0200
+++ PDAL-2.5.6-src-new/test/unit/CMakeLists.txt 2023-08-19 19:00:10.780908088 +0200
diff --git a/plugins/trajectory/CMakeLists.txt b/plugins/trajectory/CMakeLists.txt
index 31fc9942f..6ec207d95 100644
--- a/plugins/trajectory/CMakeLists.txt
+++ b/plugins/trajectory/CMakeLists.txt
@@ -18,7 +18,7 @@ PDAL_ADD_PLUGIN(libname filter trajectory
${CERES_LIBRARIES}
${PDAL_LIBRARIES}
INCLUDES
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
)
if (WITH_TRAJECTORY_TEST)
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 7ac5a1ede..a7e3bedd2 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test
${PDAL_SRC_DIR}/private/MathUtils.cpp
@ -123,7 +119,16 @@ diff -rupN --no-dereference PDAL-2.5.6-src/test/unit/CMakeLists.txt PDAL-2.5.6-s
)
PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp)
PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp)
@@ -77,7 +77,7 @@ PDAL_ADD_TEST(pdal_point_view_test
@@ -52,7 +52,7 @@ PDAL_ADD_TEST(pdal_math_utils_test
MathUtilsTest.cpp
${PDAL_SRC_DIR}/private/MathUtils.cpp
INCLUDES
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
)
PDAL_ADD_TEST(pdal_metadata_test FILES MetadataTest.cpp)
PDAL_ADD_TEST(pdal_oldpclblock_test FILES OldPCLBlockTest.cpp)
@@ -84,7 +84,7 @@ PDAL_ADD_TEST(pdal_point_view_test
FILES
PointViewTest.cpp
INCLUDES
@ -132,7 +137,7 @@ diff -rupN --no-dereference PDAL-2.5.6-src/test/unit/CMakeLists.txt PDAL-2.5.6-s
)
PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp)
@@ -212,13 +212,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
@@ -227,13 +227,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
FILES
io/PcdReaderTest.cpp
INCLUDES
@ -148,7 +153,16 @@ diff -rupN --no-dereference PDAL-2.5.6-src/test/unit/CMakeLists.txt PDAL-2.5.6-s
)
PDAL_ADD_TEST(pdal_io_ply_reader_test
FILES
@@ -257,7 +257,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
@@ -279,7 +279,7 @@ PDAL_ADD_TEST(pdal_i3s_obb_test
INCLUDES
${NLOHMANN_INCLUDE_DIR}
${PDAL_INCLUDE_DIR}
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
)
if (BUILD_I3S_TESTS)
@@ -300,7 +300,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
filters/ChipperTest.cpp
INCLUDES
${NLOHMANN_INCLUDE_DIR}
@ -157,7 +171,7 @@ diff -rupN --no-dereference PDAL-2.5.6-src/test/unit/CMakeLists.txt PDAL-2.5.6-s
)
PDAL_ADD_TEST(pdal_filters_nndistance_test
FILES
@@ -316,7 +316,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
@@ -359,7 +359,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
FILES
filters/IcpFilterTest.cpp
INCLUDES
@ -166,7 +180,7 @@ diff -rupN --no-dereference PDAL-2.5.6-src/test/unit/CMakeLists.txt PDAL-2.5.6-s
)
PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp)
PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp)
@@ -337,7 +337,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
@@ -380,7 +380,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
FILES
filters/PlaneFitFilterTest.cpp
INCLUDES
@ -175,7 +189,7 @@ diff -rupN --no-dereference PDAL-2.5.6-src/test/unit/CMakeLists.txt PDAL-2.5.6-s
PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp)
PDAL_ADD_TEST(pdal_filters_reprojection_test FILES
filters/ReprojectionFilterTest.cpp)
@@ -363,7 +363,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
@@ -408,7 +408,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
FILES
filters/SplitterTest.cpp
INCLUDES