From eeb683d5a00ca26f6fd1dbe32138f9c3292b1f8a Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 27 Mar 2022 21:45:50 +0200 Subject: [PATCH] New upstream version PDAL-2.4.0 (BZ #2068605) --- .gitignore | 1 + PDAL.spec | 24 ++-- PDAL_sphinxconf.patch | 6 +- PDAL_unbundle.patch | 271 +++++++++++++----------------------------- sources | 2 +- 5 files changed, 102 insertions(+), 202 deletions(-) diff --git a/.gitignore b/.gitignore index a70aea5..c2f1eb0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /PDAL-2.1.0-src.tar.gz /PDAL-2.2.0-src.tar.gz /PDAL-2.3.0-src.tar.gz +/PDAL-2.4.0-src.tar.gz diff --git a/PDAL.spec b/PDAL.spec index 4320a50..34a7ef0 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -1,8 +1,10 @@ +%global __cmake_in_source_build 1 + Summary: Point Data Abstraction Library Name: PDAL # NOTE: Re-verifiy test exclusions in %%check when updating -Version: 2.3.0 -Release: 6%{?dist} +Version: 2.4.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 @@ -46,7 +48,6 @@ BuildRequires: geos-devel BuildRequires: gtest-devel BuildRequires: hdf5-devel BuildRequires: jsoncpp-devel -BuildRequires: laszip-devel BuildRequires: libgeotiff-devel BuildRequires: libpq-devel BuildRequires: libxml2-devel @@ -102,7 +103,6 @@ using PCL’s techniques. %package devel Summary: PDAL development header files and libraries Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: laszip-devel %description devel The pdal-devel package contains the header files and libraries needed to @@ -149,7 +149,7 @@ rm -rf vendor/{eigen,gtest,pdalboost} -D GEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \ -D BUILD_PGPOINTCLOUD_TESTS:BOOL=OFF \ -D WITH_COMPLETION=ON \ - -D WITH_LASZIP=ON \ + -D WITH_LAZPERF=ON \ -D WITH_TESTS=ON \ -D PDAL_HAVE_LIBGEOTIFF=ON \ -D PDAL_HAVE_LIBXML2=ON \ @@ -211,11 +211,11 @@ sphinx-build -b html . build/html %license LICENSE.txt %license vendor/arbiter/LICENSE %license plugins/e57/libE57Format/LICENSE.md -%{_libdir}/libpdal_base.so.13* -%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.13* -%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.13* -%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.13* -%{_libdir}/libpdal_util.so.13* +%{_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* %files devel %{_bindir}/pdal-config @@ -241,6 +241,10 @@ sphinx-build -b html . build/html %license LICENSE.txt %changelog +* Sat Mar 26 2022 Markus Neteler 2.4.0-1 +- new upstream version +- removed laszip requirement as lasperf is now used + * Wed Jan 19 2022 Fedora Release Engineering - 2.3.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/PDAL_sphinxconf.patch b/PDAL_sphinxconf.patch index f3ff3ad..2e2c4b8 100644 --- a/PDAL_sphinxconf.patch +++ b/PDAL_sphinxconf.patch @@ -1,8 +1,8 @@ ---- PDAL-2.2.0-src/doc/conf.py.orig 2021-01-28 17:38:42.806368389 +0100 -+++ PDAL-2.2.0-src/doc/conf.py 2021-01-28 17:39:31.006941263 +0100 +--- PDAL-2.4.0-src/doc/conf.py.orig 2022-03-27 14:50:08.898634513 +0200 ++++ PDAL-2.4.0-src/doc/conf.py 2022-03-27 14:50:11.661626851 +0200 @@ -58,6 +58,7 @@ extensions = ['breathe', 'sphinx.ext.aut 'sphinx.ext.mathjax', 'sphinx.ext.intersphinx', - 'sphinxcontrib.bibtex', 'embed','sphinxcontrib.spelling'] + 'sphinxcontrib.bibtex', 'embed'] +bibtex_bibfiles = ['bibliography.bib'] diff --git a/PDAL_unbundle.patch b/PDAL_unbundle.patch index d63f4c0..93f3b7f 100644 --- a/PDAL_unbundle.patch +++ b/PDAL_unbundle.patch @@ -1,16 +1,7 @@ -diff -rupN --no-dereference PDAL-2.3.0-src/CMakeLists.txt PDAL-2.3.0-src-new/CMakeLists.txt ---- PDAL-2.3.0-src/CMakeLists.txt 2021-05-28 02:52:50.000000000 +0200 -+++ PDAL-2.3.0-src-new/CMakeLists.txt 2021-05-30 18:15:36.550836913 +0200 -@@ -67,7 +67,6 @@ else() - endif() - set(PDAL_LIB_NAME pdalcpp) - set(PDAL_UTIL_LIB_NAME pdal_util) --set(PDAL_BOOST_LIB_NAME pdal_boost) - set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan) - set(PDAL_TEST_SUPPORT_OBJS pdal_test_support) - -@@ -141,6 +140,9 @@ include(${PDAL_CMAKE_DIR}/arbiter.cmake) - include(${PDAL_CMAKE_DIR}/nlohmann.cmake) +--- PDAL-2.4.0-src/CMakeLists.txt 2022-03-25 18:55:21.000000000 +0100 ++++ ../CMakeLists.txt 2022-03-27 13:51:58.606041270 +0200 +@@ -138,6 +138,9 @@ include(${PDAL_CMAKE_DIR}/nlohmann.cmake + include(${PDAL_CMAKE_DIR}/lazperf.cmake) include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional +find_package(PkgConfig REQUIRED) @@ -19,195 +10,29 @@ diff -rupN --no-dereference PDAL-2.3.0-src/CMakeLists.txt PDAL-2.3.0-src-new/CMa #------------------------------------------------------------------------------ # generate the pdal_features.hpp header #------------------------------------------------------------------------------ -@@ -179,13 +181,10 @@ endif() - +@@ -173,7 +176,6 @@ endif() add_subdirectory(plugins) --#include_directories(vendor/pdalboost) if (WITH_TESTS) - include (${PDAL_CMAKE_DIR}/gtest.cmake) add_subdirectory(test) endif() add_subdirectory(dimbuilder) --add_subdirectory(vendor/pdalboost) - add_subdirectory(vendor/arbiter) - add_subdirectory(vendor/kazhdan) - add_subdirectory(pdal/util) -@@ -267,13 +266,12 @@ target_include_directories(${PDAL_BASE_L +@@ -254,11 +256,11 @@ target_include_directories(${PDAL_BASE_L ${ROOT_DIR} ${PROJECT_BINARY_DIR}/include ${PDAL_VENDOR_DIR} - ${PDAL_VENDOR_DIR}/eigen -- ${PDAL_VENDOR_DIR}/pdalboost ${LIBXML2_INCLUDE_DIR} ${ZSTD_INCLUDE_DIRS} ${NLOHMANN_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} - ${LASZIP_INCLUDE_DIR} + ${EIGEN_INCLUDE_DIRS} ) target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE -diff -rupN --no-dereference PDAL-2.3.0-src/pdal/util/CMakeLists.txt PDAL-2.3.0-src-new/pdal/util/CMakeLists.txt ---- PDAL-2.3.0-src/pdal/util/CMakeLists.txt 2021-05-28 02:52:49.000000000 +0200 -+++ PDAL-2.3.0-src-new/pdal/util/CMakeLists.txt 2021-05-30 18:15:36.550836913 +0200 -@@ -36,7 +36,7 @@ PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NA - target_link_libraries(${PDAL_UTIL_LIB_NAME} - PRIVATE - ${BACKTRACE_LIBRARIES} -- ${PDAL_BOOST_LIB_NAME} -+ boost_filesystem - ${CMAKE_DL_LIBS} - ${CMAKE_THREAD_LIBS_INIT} - ) -diff -rupN --no-dereference PDAL-2.3.0-src/pdal/util/FileUtils.cpp PDAL-2.3.0-src-new/pdal/util/FileUtils.cpp ---- PDAL-2.3.0-src/pdal/util/FileUtils.cpp 2021-05-28 02:52:49.000000000 +0200 -+++ PDAL-2.3.0-src-new/pdal/util/FileUtils.cpp 2021-05-30 18:23:42.168278294 +0200 -@@ -167,25 +167,25 @@ std::ostream *openExisting(const std::st - bool directoryExists(const std::string& dirname) - { - //ABELL - Seems we should be calling is_directory -- return pdalboost::filesystem::exists(toNative(dirname)); -+ return boost::filesystem::exists(toNative(dirname)); - } - - - bool createDirectory(const std::string& dirname) - { -- return pdalboost::filesystem::create_directory(toNative(dirname)); -+ return boost::filesystem::create_directory(toNative(dirname)); - } - - - bool createDirectories(const std::string& dirname) - { -- return pdalboost::filesystem::create_directories(toNative(dirname)); -+ return boost::filesystem::create_directories(toNative(dirname)); - } - - - void deleteDirectory(const std::string& dirname) - { -- pdalboost::filesystem::remove_all(toNative(dirname)); -+ boost::filesystem::remove_all(toNative(dirname)); - } - - -@@ -195,15 +195,15 @@ std::vector directoryList(c - - try - { -- pdalboost::filesystem::directory_iterator it(dir); -- pdalboost::filesystem::directory_iterator end; -+ boost::filesystem::directory_iterator it(dir); -+ boost::filesystem::directory_iterator end; - while (it != end) - { - files.push_back(it->path().string()); - it++; - } - } -- catch (pdalboost::filesystem::filesystem_error&) -+ catch (boost::filesystem::filesystem_error&) - { - files.clear(); - } -@@ -243,13 +243,13 @@ void closeFile(std::istream* in) - - bool deleteFile(const std::string& file) - { -- return pdalboost::filesystem::remove(toNative(file)); -+ return boost::filesystem::remove(toNative(file)); - } - - - void renameFile(const std::string& dest, const std::string& src) - { -- pdalboost::filesystem::rename(toNative(src), toNative(dest)); -+ boost::filesystem::rename(toNative(src), toNative(dest)); - } - - -@@ -260,9 +260,9 @@ bool fileExists(const std::string& name) - - try - { -- return pdalboost::filesystem::exists(toNative(name)); -+ return boost::filesystem::exists(toNative(name)); - } -- catch (pdalboost::filesystem::filesystem_error&) -+ catch (boost::filesystem::filesystem_error&) - { - } - return false; -@@ -272,8 +272,8 @@ bool fileExists(const std::string& name) - /// \return 0 on error or invalid file type. - uintmax_t fileSize(const std::string& file) - { -- pdalboost::system::error_code ec; -- uintmax_t size = pdalboost::filesystem::file_size(toNative(file), ec); -+ boost::system::error_code ec; -+ uintmax_t size = boost::filesystem::file_size(toNative(file), ec); - if (ec) - size = 0; - return size; -@@ -297,7 +297,7 @@ std::string readFileIntoString(const std - - std::string getcwd() - { -- const pdalboost::filesystem::path p = pdalboost::filesystem::current_path(); -+ const boost::filesystem::path p = boost::filesystem::current_path(); - return addTrailingSlash(p.string()); - } - -@@ -327,7 +327,7 @@ std::string toCanonicalPath(std::string - // otherwise, make it absolute (relative to current working dir) and return that - std::string toAbsolutePath(const std::string& filename) - { -- return pdalboost::filesystem::absolute(toNative(filename)).string(); -+ return boost::filesystem::absolute(toNative(filename)).string(); - } - - -@@ -339,7 +339,7 @@ std::string toAbsolutePath(const std::st - std::string toAbsolutePath(const std::string& filename, const std::string base) - { - const std::string newbase = toAbsolutePath(base); -- return pdalboost::filesystem::absolute(toNative(filename), -+ return boost::filesystem::absolute(toNative(filename), - toNative(newbase)).string(); - } - -@@ -362,8 +362,8 @@ std::string getFilename(const std::strin - // Get the directory part of a filename. - std::string getDirectory(const std::string& path) - { -- const pdalboost::filesystem::path dir = -- pdalboost::filesystem::path(toNative(path)).parent_path(); -+ const boost::filesystem::path dir = -+ boost::filesystem::path(toNative(path)).parent_path(); - return addTrailingSlash(dir.string()); - } - -@@ -384,13 +384,13 @@ std::string stem(const std::string& path - // Determine if the path represents a directory. - bool isDirectory(const std::string& path) - { -- return pdalboost::filesystem::is_directory(toNative(path)); -+ return boost::filesystem::is_directory(toNative(path)); - } - - // Determine if the path is an absolute path - bool isAbsolutePath(const std::string& path) - { -- return pdalboost::filesystem::path(toNative(path)).is_absolute(); -+ return boost::filesystem::path(toNative(path)).is_absolute(); - } - - -diff -rupN --no-dereference PDAL-2.3.0-src/test/unit/CMakeLists.txt PDAL-2.3.0-src-new/test/unit/CMakeLists.txt ---- PDAL-2.3.0-src/test/unit/CMakeLists.txt 2021-05-28 02:52:49.000000000 +0200 -+++ PDAL-2.3.0-src-new/test/unit/CMakeLists.txt 2021-05-30 18:15:36.551836918 +0200 +--- PDAL-2.4.0-src/test/unit/CMakeLists.txt.orig 2022-03-27 19:30:59.425426807 +0200 ++++ PDAL-2.4.0-src/test/unit/CMakeLists.txt 2022-03-27 19:33:02.308343645 +0200 @@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test ${PDAL_SRC_DIR}/private/MathUtils.cpp @@ -235,7 +60,7 @@ diff -rupN --no-dereference PDAL-2.3.0-src/test/unit/CMakeLists.txt PDAL-2.3.0-s ) PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp) -@@ -189,13 +189,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test +@@ -190,13 +190,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test FILES io/PcdReaderTest.cpp INCLUDES @@ -251,7 +76,7 @@ diff -rupN --no-dereference PDAL-2.3.0-src/test/unit/CMakeLists.txt PDAL-2.3.0-s ) PDAL_ADD_TEST(pdal_io_ply_reader_test FILES -@@ -231,7 +231,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test +@@ -233,7 +233,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test filters/ChipperTest.cpp INCLUDES ${NLOHMANN_INCLUDE_DIR} @@ -260,7 +85,7 @@ diff -rupN --no-dereference PDAL-2.3.0-src/test/unit/CMakeLists.txt PDAL-2.3.0-s ) PDAL_ADD_TEST(pdal_filters_nndistance_test FILES -@@ -282,7 +282,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test +@@ -284,7 +284,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test FILES filters/IcpFilterTest.cpp INCLUDES @@ -269,7 +94,7 @@ diff -rupN --no-dereference PDAL-2.3.0-src/test/unit/CMakeLists.txt PDAL-2.3.0-s ) PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp) PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp) -@@ -303,7 +303,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test +@@ -305,7 +305,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test FILES filters/PlaneFitFilterTest.cpp INCLUDES @@ -278,7 +103,7 @@ diff -rupN --no-dereference PDAL-2.3.0-src/test/unit/CMakeLists.txt PDAL-2.3.0-s PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp) PDAL_ADD_TEST(pdal_filters_reprojection_test FILES filters/ReprojectionFilterTest.cpp) -@@ -328,7 +328,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test +@@ -330,7 +330,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test FILES filters/SplitterTest.cpp INCLUDES @@ -287,3 +112,73 @@ diff -rupN --no-dereference PDAL-2.3.0-src/test/unit/CMakeLists.txt PDAL-2.3.0-s PDAL_ADD_TEST(pdal_filters_stats_test FILES filters/StatsFilterTest.cpp) PDAL_ADD_TEST(pdal_filters_transformation_test FILES filters/TransformationFilterTest.cpp) +--- PDAL-2.4.0-src/plugins/i3s/CMakeLists.txt.orig 2022-03-27 19:30:53.969430980 +0200 ++++ PDAL-2.4.0-src/plugins/i3s/CMakeLists.txt 2022-03-27 19:33:02.320343643 +0200 +@@ -20,7 +20,7 @@ PDAL_ADD_PLUGIN(i3s_reader_libname reade + 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} + ) + + if (BUILD_I3S_TESTS) +--- PDAL-2.4.0-src/plugins/teaser/CMakeLists.txt.orig 2022-03-27 19:30:47.308436078 +0200 ++++ PDAL-2.4.0-src/plugins/teaser/CMakeLists.txt 2022-03-27 19:33:02.324343642 +0200 +@@ -63,6 +63,6 @@ if (WITH_TESTS) + LINK_WITH + ${filter_libname} + INCLUDES +- "${PDAL_VENDOR_DIR}/eigen" ++ "${EIGEN_INCLUDE_DIRS}" + ) + endif() +--- PDAL-2.4.0-src/plugins/cpd/CMakeLists.txt.orig 2022-03-27 19:30:41.907440213 +0200 ++++ PDAL-2.4.0-src/plugins/cpd/CMakeLists.txt 2022-03-27 19:33:02.329343641 +0200 +@@ -4,7 +4,7 @@ find_package(Cpd ${Cpd_VERSION} REQUIRED + option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND}) + + set(files filters/CpdFilter.cpp) +-set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${PDAL_VENDOR_DIR}/eigen") ++set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${EIGEN_INCLUDE_DIRS}") + + PDAL_ADD_PLUGIN(filter_libname filter cpd + FILES +--- PDAL-2.4.0-src/plugins/rdb/CMakeLists.txt.orig 2022-03-27 19:30:36.014444722 +0200 ++++ PDAL-2.4.0-src/plugins/rdb/CMakeLists.txt 2022-03-27 19:33:02.333343640 +0200 +@@ -27,7 +27,7 @@ PDAL_ADD_PLUGIN(libname reader rdb + ${RDB_INCLUDE_CPP_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/") + +@@ -55,7 +55,7 @@ if (BUILD_RDBLIB_TESTS) + ${PROJECT_BINARY_DIR}/plugins/rdb/test + ${PROJECT_SOURCE_DIR}/plugins/rdb/io + ${RDB_INCLUDE_CPP_DIR} +- ${PDAL_VENDOR_DIR}/eigen ++ ${EIGEN_INCLUDE_DIRS} + + ) + endif() diff --git a/sources b/sources index b9d043f..f69db51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PDAL-2.3.0-src.tar.gz) = 9de87de7370175e76b95d3ec08667eb28b90a63eed8133f144427ff931e575d1f37aa13496f12054577539ee552458475dd054bcbdedfabe52eb0e32c4483d05 +SHA512 (PDAL-2.4.0-src.tar.gz) = 655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623