rpms
/
PDAL
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.5.0

This commit is contained in:
Sandro Mani 2023-01-14 19:17:43 +01:00
parent 75394c18f2
commit 40b0dc7dff
6 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/PDAL-2.4.1-src.tar.gz
/PDAL-2.4.2-src.tar.gz
/PDAL-2.4.3-src.tar.gz
/PDAL-2.5.0-src.tar.gz

17
PDAL.spec
View File

@ -8,8 +8,8 @@
Summary: Point Data Abstraction Library
Name: PDAL
# NOTE: Re-verifiy test exclusions in %%check when updating
Version: 2.4.3
Release: 3%{?dist}
Version: 2.5.0
Release: 1%{?dist}
# The code is licensed BSD except for:
# - filters/private/csf/* and plugins/i3s/lepcc/* are ASL 2.0
# - vendor/arbiter/*, plugins/nitf/io/nitflib.h and plugins/oci/io/OciWrapper.* are Expat/MIT
@ -216,11 +216,11 @@ sphinx-build -b html . build/html
%license LICENSE.txt
%license vendor/arbiter/LICENSE
%license plugins/e57/libE57Format/LICENSE.md
%{_libdir}/libpdal_base.so.14*
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.14*
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.14*
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.14*
%{_libdir}/libpdal_util.so.14*
%{_libdir}/libpdal_base.so.15*
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.15*
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.15*
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.15*
%{_libdir}/libpdal_util.so.15*
%files devel
%{_bindir}/pdal-config
@ -246,6 +246,9 @@ sphinx-build -b html . build/html
%license LICENSE.txt
%changelog
* Sat Jan 14 2023 Sandro Mani <manisandro@gmail.com> - 2.5.0-1
- Update to 2.5.0
* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 2.4.3-3
- Rebuild (gdal)

6
PDAL_sphinxconf.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference PDAL-2.4.2-src/doc/conf.py PDAL-2.4.2-src-new/doc/conf.py
--- PDAL-2.4.2-src/doc/conf.py 2022-06-06 20:04:01.000000000 +0200
+++ PDAL-2.4.2-src-new/doc/conf.py 2022-06-07 08:49:14.420039447 +0200
diff -rupN --no-dereference PDAL-2.5.0-src/doc/conf.py PDAL-2.5.0-src-new/doc/conf.py
--- PDAL-2.5.0-src/doc/conf.py 2023-01-13 18:18:05.000000000 +0100
+++ PDAL-2.5.0-src-new/doc/conf.py 2023-01-14 11:03:18.529434786 +0100
@@ -58,6 +58,7 @@ extensions = ['breathe', 'sphinx.ext.aut
'sphinx.ext.mathjax', 'sphinx.ext.intersphinx',
'sphinxcontrib.bibtex', 'embed']

6
PDAL_tests.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference PDAL-2.4.2-src/cmake/macros.cmake PDAL-2.4.2-src-new/cmake/macros.cmake
--- PDAL-2.4.2-src/cmake/macros.cmake 2022-06-06 20:04:01.000000000 +0200
+++ PDAL-2.4.2-src-new/cmake/macros.cmake 2022-06-07 08:49:14.207039443 +0200
diff -rupN --no-dereference PDAL-2.5.0-src/cmake/macros.cmake PDAL-2.5.0-src-new/cmake/macros.cmake
--- PDAL-2.5.0-src/cmake/macros.cmake 2023-01-13 18:18:05.000000000 +0100
+++ PDAL-2.5.0-src-new/cmake/macros.cmake 2023-01-14 11:03:18.227509621 +0100
@@ -228,6 +228,6 @@ macro(PDAL_ADD_TEST _name)
"PDAL_DRIVER_PATH=${PROJECT_BINARY_DIR}/bin")
else()

70
PDAL_unbundle.patch
View File

@ -1,9 +1,9 @@
diff -rupN --no-dereference PDAL-2.4.2-src/CMakeLists.txt PDAL-2.4.2-src-new/CMakeLists.txt
--- PDAL-2.4.2-src/CMakeLists.txt 2022-06-06 20:04:04.000000000 +0200
+++ PDAL-2.4.2-src-new/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
@@ -138,6 +138,9 @@ include(${PDAL_CMAKE_DIR}/nlohmann.cmake
include(${PDAL_CMAKE_DIR}/lazperf.cmake)
diff -rupN --no-dereference PDAL-2.5.0-src/CMakeLists.txt PDAL-2.5.0-src-new/CMakeLists.txt
--- PDAL-2.5.0-src/CMakeLists.txt 2023-01-13 18:18:05.000000000 +0100
+++ PDAL-2.5.0-src-new/CMakeLists.txt 2023-01-14 11:03:17.875597125 +0100
@@ -140,6 +140,9 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional
include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
+find_package(PkgConfig REQUIRED)
+PKG_CHECK_MODULES(EIGEN REQUIRED eigen3)
@ -11,7 +11,7 @@ diff -rupN --no-dereference PDAL-2.4.2-src/CMakeLists.txt PDAL-2.4.2-src-new/CMa
#------------------------------------------------------------------------------
# generate the pdal_features.hpp header
#------------------------------------------------------------------------------
@@ -173,7 +176,6 @@ endif()
@@ -175,7 +178,6 @@ endif()
add_subdirectory(plugins)
if (WITH_TESTS)
@ -19,22 +19,18 @@ diff -rupN --no-dereference PDAL-2.4.2-src/CMakeLists.txt PDAL-2.4.2-src-new/CMa
add_subdirectory(test)
endif()
add_subdirectory(dimbuilder)
@@ -254,11 +256,11 @@ target_include_directories(${PDAL_BASE_L
@@ -258,7 +260,7 @@ target_include_directories(${PDAL_BASE_L
${ROOT_DIR}
${PROJECT_BINARY_DIR}/include
${PDAL_VENDOR_DIR}
- ${PDAL_VENDOR_DIR}/eigen
+ ${EIGEN_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${ZSTD_INCLUDE_DIRS}
${NLOHMANN_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
+ ${EIGEN_INCLUDE_DIRS}
)
target_link_libraries(${PDAL_BASE_LIB_NAME}
PRIVATE
diff -rupN --no-dereference PDAL-2.4.2-src/plugins/cpd/CMakeLists.txt PDAL-2.4.2-src-new/plugins/cpd/CMakeLists.txt
--- PDAL-2.4.2-src/plugins/cpd/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
+++ PDAL-2.4.2-src-new/plugins/cpd/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
diff -rupN --no-dereference PDAL-2.5.0-src/plugins/cpd/CMakeLists.txt PDAL-2.5.0-src-new/plugins/cpd/CMakeLists.txt
--- PDAL-2.5.0-src/plugins/cpd/CMakeLists.txt 2023-01-13 18:18:05.000000000 +0100
+++ PDAL-2.5.0-src-new/plugins/cpd/CMakeLists.txt 2023-01-14 11:03:17.875597125 +0100
@@ -4,7 +4,7 @@ find_package(Cpd ${Cpd_VERSION} REQUIRED
option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND})
@ -44,9 +40,9 @@ diff -rupN --no-dereference PDAL-2.4.2-src/plugins/cpd/CMakeLists.txt PDAL-2.4.2
PDAL_ADD_PLUGIN(filter_libname filter cpd
FILES
diff -rupN --no-dereference PDAL-2.4.2-src/plugins/i3s/CMakeLists.txt PDAL-2.4.2-src-new/plugins/i3s/CMakeLists.txt
--- PDAL-2.4.2-src/plugins/i3s/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
+++ PDAL-2.4.2-src-new/plugins/i3s/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
diff -rupN --no-dereference PDAL-2.5.0-src/plugins/i3s/CMakeLists.txt PDAL-2.5.0-src-new/plugins/i3s/CMakeLists.txt
--- PDAL-2.5.0-src/plugins/i3s/CMakeLists.txt 2023-01-13 18:18:05.000000000 +0100
+++ PDAL-2.5.0-src-new/plugins/i3s/CMakeLists.txt 2023-01-14 11:03:17.875597125 +0100
@@ -20,7 +20,7 @@ PDAL_ADD_PLUGIN(i3s_reader_libname reade
INCLUDES
${NLOHMANN_INCLUDE_DIR}
@ -74,11 +70,11 @@ diff -rupN --no-dereference PDAL-2.4.2-src/plugins/i3s/CMakeLists.txt PDAL-2.4.2
)
if (BUILD_I3S_TESTS)
diff -rupN --no-dereference PDAL-2.4.2-src/plugins/rdb/CMakeLists.txt PDAL-2.4.2-src-new/plugins/rdb/CMakeLists.txt
--- PDAL-2.4.2-src/plugins/rdb/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
+++ PDAL-2.4.2-src-new/plugins/rdb/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
@@ -27,7 +27,7 @@ PDAL_ADD_PLUGIN(libname reader rdb
${RDB_INCLUDE_CPP_DIR}
diff -rupN --no-dereference PDAL-2.5.0-src/plugins/rdb/CMakeLists.txt PDAL-2.5.0-src-new/plugins/rdb/CMakeLists.txt
--- PDAL-2.5.0-src/plugins/rdb/CMakeLists.txt 2023-01-13 18:18:05.000000000 +0100
+++ PDAL-2.5.0-src-new/plugins/rdb/CMakeLists.txt 2023-01-14 11:03:17.876596875 +0100
@@ -28,7 +28,7 @@ PDAL_ADD_PLUGIN(libname reader rdb
${RDB_INCLUDE_C_DIR}
${PDAL_INCLUDE_DIRS}
)
-target_include_directories(${libname} PRIVATE "${PDAL_VENDOR_DIR}/eigen")
@ -86,18 +82,18 @@ diff -rupN --no-dereference PDAL-2.4.2-src/plugins/rdb/CMakeLists.txt PDAL-2.4.2
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/nlohmann/")
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/eigen/")
@@ -55,7 +55,7 @@ if (BUILD_RDBLIB_TESTS)
${PROJECT_BINARY_DIR}/plugins/rdb/test
@@ -57,7 +57,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}
)
endif()
diff -rupN --no-dereference PDAL-2.4.2-src/plugins/teaser/CMakeLists.txt PDAL-2.4.2-src-new/plugins/teaser/CMakeLists.txt
--- PDAL-2.4.2-src/plugins/teaser/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
+++ PDAL-2.4.2-src-new/plugins/teaser/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
diff -rupN --no-dereference PDAL-2.5.0-src/plugins/teaser/CMakeLists.txt PDAL-2.5.0-src-new/plugins/teaser/CMakeLists.txt
--- PDAL-2.5.0-src/plugins/teaser/CMakeLists.txt 2023-01-13 18:18:05.000000000 +0100
+++ PDAL-2.5.0-src-new/plugins/teaser/CMakeLists.txt 2023-01-14 11:03:17.876596875 +0100
@@ -63,6 +63,6 @@ if (WITH_TESTS)
LINK_WITH
${filter_libname}
@ -106,9 +102,9 @@ diff -rupN --no-dereference PDAL-2.4.2-src/plugins/teaser/CMakeLists.txt PDAL-2.
+ "${EIGEN_INCLUDE_DIRS}"
)
endif()
diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-src-new/test/unit/CMakeLists.txt
--- PDAL-2.4.2-src/test/unit/CMakeLists.txt 2022-06-06 20:04:02.000000000 +0200
+++ PDAL-2.4.2-src-new/test/unit/CMakeLists.txt 2022-06-07 08:49:13.993039438 +0200
diff -rupN --no-dereference PDAL-2.5.0-src/test/unit/CMakeLists.txt PDAL-2.5.0-src-new/test/unit/CMakeLists.txt
--- PDAL-2.5.0-src/test/unit/CMakeLists.txt 2023-01-13 18:18:06.000000000 +0100
+++ PDAL-2.5.0-src-new/test/unit/CMakeLists.txt 2023-01-14 11:03:17.876596875 +0100
@@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test
${PDAL_SRC_DIR}/private/MathUtils.cpp
@ -127,7 +123,7 @@ diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-s
)
PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp)
PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp)
@@ -70,7 +70,7 @@ PDAL_ADD_TEST(pdal_point_view_test
@@ -77,7 +77,7 @@ PDAL_ADD_TEST(pdal_point_view_test
FILES
PointViewTest.cpp
INCLUDES
@ -136,7 +132,7 @@ diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-s
)
PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp)
@@ -190,13 +190,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
@@ -212,13 +212,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
FILES
io/PcdReaderTest.cpp
INCLUDES
@ -152,7 +148,7 @@ diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-s
)
PDAL_ADD_TEST(pdal_io_ply_reader_test
FILES
@@ -233,7 +233,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
@@ -257,7 +257,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
filters/ChipperTest.cpp
INCLUDES
${NLOHMANN_INCLUDE_DIR}
@ -161,7 +157,7 @@ diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-s
)
PDAL_ADD_TEST(pdal_filters_nndistance_test
FILES
@@ -284,7 +284,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
@@ -316,7 +316,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
FILES
filters/IcpFilterTest.cpp
INCLUDES
@ -170,7 +166,7 @@ diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-s
)
PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp)
PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp)
@@ -305,7 +305,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
@@ -337,7 +337,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
FILES
filters/PlaneFitFilterTest.cpp
INCLUDES
@ -179,7 +175,7 @@ diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-s
PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp)
PDAL_ADD_TEST(pdal_filters_reprojection_test FILES
filters/ReprojectionFilterTest.cpp)
@@ -330,7 +330,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
@@ -363,7 +363,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
FILES
filters/SplitterTest.cpp
INCLUDES

2
sources
View File

@ -1 +1 @@
SHA512 (PDAL-2.4.3-src.tar.gz) = ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386
SHA512 (PDAL-2.5.0-src.tar.gz) = 10545ad44efbb7a654d596d4a861a81177d61a602ff8425965def5dd99e1595a7873c741f99eefcd7ae5dc7f438b321b51399db3b33fb8eddf46bec8394472b4