diff --git a/PDAL-2.3.0-src.tar.bz2 b/PDAL-2.3.0-src.tar.bz2 deleted file mode 100644 index d424f88..0000000 --- a/PDAL-2.3.0-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63d8d4fee491675f0fa3dca58c26d57fb2afcaa37c24b10f595b3fbff174996e -size 107560748 diff --git a/PDAL-2.3.0-src.tar.bz2.md5 b/PDAL-2.3.0-src.tar.bz2.md5 deleted file mode 100644 index 2c119e4..0000000 --- a/PDAL-2.3.0-src.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -380082d7bd10ba75598527951e46b4cd PDAL-2.3.0-src.tar.bz2 diff --git a/PDAL-2.5.6-src.tar.bz2 b/PDAL-2.5.6-src.tar.bz2 new file mode 100644 index 0000000..71553a1 --- /dev/null +++ b/PDAL-2.5.6-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c7c4570ef518942299479cc4077e0c657ec5b5174daf465415de947a1d3eb99 +size 87001744 diff --git a/PDAL-2.5.6-src.tar.bz2.md5 b/PDAL-2.5.6-src.tar.bz2.md5 new file mode 100644 index 0000000..d33725a --- /dev/null +++ b/PDAL-2.5.6-src.tar.bz2.md5 @@ -0,0 +1 @@ +728a54d18a4a47bf70dd5d45b26e2882 PDAL-2.5.6-src.tar.bz2 diff --git a/PDAL.changes b/PDAL.changes index 617e97f..b020347 100644 --- a/PDAL.changes +++ b/PDAL.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 3 07:29:11 UTC 2023 - Guillaume GARDET + +- Update to 2.5.6 +- Drop upstream patch: + * d11e0e20.patch +- Refresh PDAL_unbundle.patch + ------------------------------------------------------------------- Fri Jan 7 16:29:16 UTC 2022 - Bruno Friedmann diff --git a/PDAL.spec b/PDAL.spec index 6ea82ad..af30769 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -1,7 +1,7 @@ # # spec file for package PDAL # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2021 Friedmann Bruno, Ioda-Net Sàrl, Charmoille, Switzerland. # # All modifications and additions to the file contributed by third parties @@ -17,11 +17,11 @@ # -%define soname 13 -%define sovers 13.0.0 +%define soname 15 +%define sovers 15.6.0 %define lname pdal Name: PDAL -Version: 2.3.0 +Version: 2.5.6 Release: 0 Summary: Point Data Abstraction Library (GDAL for point cloud data) # The code is licensed BSD except for: @@ -37,8 +37,6 @@ Source1: https://github.com/PDAL/PDAL/releases/download/%{version}/%{name # Unbundle some bundled libraries inspired by Fedora work at # https://src.fedoraproject.org/rpms/PDAL/blob/rawhide/f/PDAL_unbundle.patch Patch0: PDAL_unbundle.patch -# Upstream : fix 32bits tests -Patch1: https://github.com/PDAL/PDAL/commit/d11e0e20.patch # Source2: https://www.pdal.io/PDAL.pdf BuildRequires: bash-completion BuildRequires: cairo-devel @@ -168,7 +166,7 @@ PDAL algorithms. %prep %autosetup -p1 -n %{name}-%{version}-src # Remove some bundled libraries to use system -rm -rf vendor/{eigen,gtest,pdalboost} +rm -rf vendor/{eigen,gtest} # Fix all wrong shebang and move to python3 only find . -type f -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} + diff --git a/PDAL_unbundle.patch b/PDAL_unbundle.patch index 011a508..5191256 100644 --- a/PDAL_unbundle.patch +++ b/PDAL_unbundle.patch @@ -1,218 +1,110 @@ -diff -rup a/cmake/gtest.cmake b/cmake/gtest.cmake ---- a/cmake/gtest.cmake 2021-05-28 02:52:49.000000000 +0200 -+++ b/cmake/gtest.cmake 2021-12-28 22:17:41.157270687 +0100 -@@ -5,7 +5,7 @@ if (MSVC) - endif() - - set(GOOGLETEST_VERSION 1.10.0) --add_subdirectory(vendor/gtest) -+# add_subdirectory(vendor/gtest) - - set(FPHSA_NAME_MISMATCHED 1) # Suppress warnings, see https://cmake.org/cmake/help/v3.17/module/FindPackageHandleStandardArgs.html - find_package(absl QUIET) -diff -rup a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-05-28 02:52:50.000000000 +0200 -+++ b/CMakeLists.txt 2021-12-28 22:07:39.474190770 +0100 -@@ -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) - -@@ -140,6 +139,8 @@ include(${PDAL_CMAKE_DIR}/dimension.cmak - include(${PDAL_CMAKE_DIR}/arbiter.cmake) - include(${PDAL_CMAKE_DIR}/nlohmann.cmake) +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 + include(${PDAL_CMAKE_DIR}/utfcpp.cmake) + +find_package(PkgConfig REQUIRED) +PKG_CHECK_MODULES(EIGEN REQUIRED eigen3) - ++ #------------------------------------------------------------------------------ # generate the pdal_features.hpp header -@@ -185,7 +186,6 @@ if (WITH_TESTS) + #------------------------------------------------------------------------------ +@@ -175,7 +178,6 @@ endif() + add_subdirectory(plugins) + + 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 +267,12 @@ 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 -- ${PDAL_VENDOR_DIR}/pdalboost ++ ${EIGEN_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${ZSTD_INCLUDE_DIRS} ${NLOHMANN_INCLUDE_DIR} - ${GDAL_INCLUDE_DIR} - ${LASZIP_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 + 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 +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 + INCLUDES + ${NLOHMANN_INCLUDE_DIR} + ${PDAL_VENDOR_DIR} +- ${PDAL_VENDOR_DIR}/eigen + ${EIGEN_INCLUDE_DIRS} ) - target_link_libraries(${PDAL_BASE_LIB_NAME} + target_compile_definitions(${i3s_reader_libname} PRIVATE -diff -rup a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt ---- a/pdal/util/CMakeLists.txt 2021-05-28 02:52:49.000000000 +0200 -+++ b/pdal/util/CMakeLists.txt 2021-12-28 22:08:12.917894919 +0100 -@@ -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} +@@ -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} ) -diff -rup a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp ---- a/pdal/util/FileUtils.cpp 2021-05-28 02:52:49.000000000 +0200 -+++ b/pdal/util/FileUtils.cpp 2021-12-28 22:09:39.097132189 +0100 -@@ -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)); - } + 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) +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 + ${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/") - bool createDirectory(const std::string& dirname) - { -- return pdalboost::filesystem::create_directory(toNative(dirname)); -+ return boost::filesystem::create_directory(toNative(dirname)); - } +@@ -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} - - 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 -rup a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt ---- a/test/unit/CMakeLists.txt 2021-05-28 02:52:49.000000000 +0200 -+++ b/test/unit/CMakeLists.txt 2021-12-28 21:48:33.736198324 +0100 + ) + 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) + LINK_WITH + ${filter_libname} + INCLUDES +- "${PDAL_VENDOR_DIR}/eigen" ++ "${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 @@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test ${PDAL_SRC_DIR}/private/MathUtils.cpp @@ -231,7 +123,7 @@ diff -rup a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt ) 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 @@ -240,7 +132,7 @@ diff -rup a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt ) PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp) -@@ -189,13 +189,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 @@ -256,7 +148,7 @@ diff -rup a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt ) PDAL_ADD_TEST(pdal_io_ply_reader_test FILES -@@ -231,7 +231,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} @@ -265,7 +157,7 @@ diff -rup a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt ) PDAL_ADD_TEST(pdal_filters_nndistance_test FILES -@@ -282,7 +282,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test +@@ -316,7 +316,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test FILES filters/IcpFilterTest.cpp INCLUDES @@ -274,7 +166,7 @@ diff -rup a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt ) 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 +@@ -337,7 +337,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test FILES filters/PlaneFitFilterTest.cpp INCLUDES @@ -283,7 +175,7 @@ diff -rup a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt 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 +@@ -363,7 +363,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test FILES filters/SplitterTest.cpp INCLUDES diff --git a/d11e0e20.patch b/d11e0e20.patch deleted file mode 100644 index 5a1e6c1..0000000 --- a/d11e0e20.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d11e0e20ba2d67365180cfd79ca8995170817697 Mon Sep 17 00:00:00 2001 -From: Andrew Bell -Date: Thu, 3 Jun 2021 07:50:50 -0400 -Subject: [PATCH] Don't run large file mapping test on WIN32. - ---- - test/unit/UtilsTest.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/test/unit/UtilsTest.cpp b/test/unit/UtilsTest.cpp -index 26a715854d..7ad985cbc9 100644 ---- a/test/unit/UtilsTest.cpp -+++ b/test/unit/UtilsTest.cpp -@@ -477,6 +477,8 @@ TEST(UtilsTest, escapeJSON) - EXPECT_EQ(escaped, "\\u0001\\t\\f\\n\\\\\\\"\\u0016"); - } - -+// Don't run if we are WIN32 -+#if !defined(_WIN32) || defined(_WIN64) - TEST(UtilsTest, map) - { - Support::Tempfile temp; -@@ -536,5 +538,6 @@ TEST(UtilsTest, map) - EXPECT_EQ(std::string(c), "Another."); - FileUtils::unmapFile(ctx); - } -+#endif // guard for 32-bit windows - - }