From 541213cad68bf4c128da8ae4cb06e46b2b8695ec Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 30 May 2021 19:50:36 +0200 Subject: [PATCH] New upstream version PDAL-2.3.0 --- .gitignore | 1 + PDAL.spec | 21 ++++++------ PDAL_broken-tests.patch | 37 --------------------- PDAL_unbundle.patch | 74 +++++++++++++++++++++-------------------- sources | 2 +- 5 files changed, 50 insertions(+), 85 deletions(-) delete mode 100644 PDAL_broken-tests.patch diff --git a/.gitignore b/.gitignore index 04b0ef6..a70aea5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /PDAL-2.1.0-src.tar.gz /PDAL-2.2.0-src.tar.gz +/PDAL-2.3.0-src.tar.gz diff --git a/PDAL.spec b/PDAL.spec index 7ef92b9..721b9b3 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -1,7 +1,7 @@ Summary: Point Data Abstraction Library Name: PDAL -Version: 2.2.0 -Release: 8%{?dist} +Version: 2.3.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 @@ -32,10 +32,6 @@ Patch0: PDAL_unbundle.patch # Use correct libdir for PDAL_DRIVER_PATH when running tests Patch1: PDAL_tests.patch -# Fix broken tests -# https://github.com/PDAL/PDAL/issues/3280 -Patch2: PDAL_broken-tests.patch - # fix build with sphinxcontrib-bibtex 2.0 (RHBZ #1921498) Patch3: PDAL_sphinxconf.patch @@ -207,11 +203,11 @@ sphinx-build -b html . build/html %license LICENSE.txt %license vendor/arbiter/LICENSE %license plugins/e57/libE57Format/LICENSE.md -%{_libdir}/libpdal_base.so.12* -%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.12* -%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.12* -%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.12* -%{_libdir}/libpdal_util.so.12* +%{_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* %files devel %{_bindir}/pdal-config @@ -237,6 +233,9 @@ sphinx-build -b html . build/html %license LICENSE.txt %changelog +* Sun May 30 2021 Markus Neteler 2.3.0-1 +- new upstream version + * Fri May 07 2021 Sandro Mani - 2.2.0-8 - Rebuild (gdal) diff --git a/PDAL_broken-tests.patch b/PDAL_broken-tests.patch deleted file mode 100644 index c768cb3..0000000 --- a/PDAL_broken-tests.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rupN PDAL-2.2.0-src/test/unit/filters/FerryFilterTest.cpp PDAL-2.2.0-src-new/test/unit/filters/FerryFilterTest.cpp ---- PDAL-2.2.0-src/test/unit/filters/FerryFilterTest.cpp 2020-09-09 17:14:17.000000000 +0200 -+++ PDAL-2.2.0-src-new/test/unit/filters/FerryFilterTest.cpp 2020-11-11 12:44:40.530553155 +0100 -@@ -119,10 +119,10 @@ TEST(FerryFilterTest, test_ferry_copy_js - double x = view->getFieldAs(state_plane_x, 0); - double y = view->getFieldAs(state_plane_y, 0); - -- EXPECT_DOUBLE_EQ(-117.2501328350574, lon); -+ EXPECT_DOUBLE_EQ(-117.25014718503355, lon); - // proj 5 will consider +ellps=GRS80 +towgs84=0,0,0 to be slighly different - // than +datum=WGS84 and return 49.341077823260804. -- EXPECT_NEAR(49.341077824192915, lat, 1e-9); -+ EXPECT_NEAR(49.341084161118197, lat, 1e-9); - EXPECT_DOUBLE_EQ(637012.24, x); - EXPECT_DOUBLE_EQ(849028.31, y); - } -diff -rupN PDAL-2.2.0-src/test/unit/io/FauxReaderTest.cpp PDAL-2.2.0-src-new/test/unit/io/FauxReaderTest.cpp ---- PDAL-2.2.0-src/test/unit/io/FauxReaderTest.cpp 2020-09-09 17:14:17.000000000 +0200 -+++ PDAL-2.2.0-src-new/test/unit/io/FauxReaderTest.cpp 2020-11-11 12:44:01.154607262 +0100 -@@ -241,7 +241,7 @@ TEST(FauxReaderTest, uniform) - { - Options ops; - -- ops.add("bounds", BOX3D(0, 100, 0, 100, 0, 100)); -+ ops.add("bounds", BOX3D(0, 0, 0, 100, 100, 100)); - ops.add("count", 1000); - ops.add("seed", 2121212); - ops.add("mode", "uniform"); -@@ -268,7 +268,7 @@ TEST(FauxReaderTest, uniform) - } - - int xtot[] = { 117, 95, 94, 93, 90, 118, 102, 97, 102, 92 }; -- int ytot[] = { 97, 108, 93, 83, 114, 98, 100, 105, 110, 92 }; -+ int ytot[] = { 92, 110, 105, 100, 98, 114, 83, 93, 108, 97 }; - int ztot[] = { 92, 99, 106, 100, 105, 106, 109, 88, 84, 111 }; - - for (size_t i = 0; i < 10; ++i) diff --git a/PDAL_unbundle.patch b/PDAL_unbundle.patch index 92bdc5b..d63f4c0 100644 --- a/PDAL_unbundle.patch +++ b/PDAL_unbundle.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference PDAL-2.2.0-src/CMakeLists.txt PDAL-2.2.0-src-new/CMakeLists.txt ---- PDAL-2.2.0-src/CMakeLists.txt 2020-09-09 17:14:18.000000000 +0200 -+++ PDAL-2.2.0-src-new/CMakeLists.txt 2020-11-11 12:44:00.407608350 +0100 +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) @@ -48,22 +48,22 @@ diff -rupN --no-dereference PDAL-2.2.0-src/CMakeLists.txt PDAL-2.2.0-src-new/CMa ) target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE -diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/CMakeLists.txt PDAL-2.2.0-src-new/pdal/util/CMakeLists.txt ---- PDAL-2.2.0-src/pdal/util/CMakeLists.txt 2020-09-09 17:14:16.000000000 +0200 -+++ PDAL-2.2.0-src-new/pdal/util/CMakeLists.txt 2020-11-11 12:44:00.408608349 +0100 -@@ -34,7 +34,7 @@ PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NA +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} ) - target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE -diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-src-new/pdal/util/FileUtils.cpp ---- PDAL-2.2.0-src/pdal/util/FileUtils.cpp 2020-09-09 17:14:16.000000000 +0200 -+++ PDAL-2.2.0-src-new/pdal/util/FileUtils.cpp 2020-11-11 12:44:00.408608349 +0100 -@@ -151,25 +151,25 @@ std::ostream *createFile(std::string con +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 @@ -93,7 +93,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr } -@@ -179,15 +179,15 @@ std::vector directoryList(c +@@ -195,15 +195,15 @@ std::vector directoryList(c try { @@ -112,7 +112,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr { files.clear(); } -@@ -227,13 +227,13 @@ void closeFile(std::istream* in) +@@ -243,13 +243,13 @@ void closeFile(std::istream* in) bool deleteFile(const std::string& file) { @@ -128,7 +128,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr } -@@ -244,9 +244,9 @@ bool fileExists(const std::string& name) +@@ -260,9 +260,9 @@ bool fileExists(const std::string& name) try { @@ -140,16 +140,18 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr { } return false; -@@ -255,7 +255,7 @@ bool fileExists(const std::string& name) - +@@ -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) { -- return pdalboost::filesystem::file_size(toNative(file)); -+ return boost::filesystem::file_size(toNative(file)); - } - - -@@ -276,7 +276,7 @@ std::string readFileIntoString(const std +- 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() { @@ -158,7 +160,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr return addTrailingSlash(p.string()); } -@@ -306,7 +306,7 @@ std::string toCanonicalPath(std::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) { @@ -167,7 +169,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr } -@@ -318,7 +318,7 @@ std::string toAbsolutePath(const std::st +@@ -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); @@ -176,7 +178,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr toNative(newbase)).string(); } -@@ -341,8 +341,8 @@ std::string getFilename(const std::strin +@@ -362,8 +362,8 @@ std::string getFilename(const std::strin // Get the directory part of a filename. std::string getDirectory(const std::string& path) { @@ -187,7 +189,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr return addTrailingSlash(dir.string()); } -@@ -363,13 +363,13 @@ std::string stem(const std::string& path +@@ -384,13 +384,13 @@ std::string stem(const std::string& path // Determine if the path represents a directory. bool isDirectory(const std::string& path) { @@ -201,11 +203,11 @@ diff -rupN --no-dereference PDAL-2.2.0-src/pdal/util/FileUtils.cpp PDAL-2.2.0-sr - return pdalboost::filesystem::path(toNative(path)).is_absolute(); + return boost::filesystem::path(toNative(path)).is_absolute(); } - - -diff -rupN --no-dereference PDAL-2.2.0-src/test/unit/CMakeLists.txt PDAL-2.2.0-src-new/test/unit/CMakeLists.txt ---- PDAL-2.2.0-src/test/unit/CMakeLists.txt 2020-09-09 17:14:17.000000000 +0200 -+++ PDAL-2.2.0-src-new/test/unit/CMakeLists.txt 2020-11-11 12:44:00.408608349 +0100 + + +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 @@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test ${PDAL_SRC_DIR}/private/MathUtils.cpp @@ -258,7 +260,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/test/unit/CMakeLists.txt PDAL-2.2.0-s ) PDAL_ADD_TEST(pdal_filters_nndistance_test FILES -@@ -281,7 +281,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test +@@ -282,7 +282,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test FILES filters/IcpFilterTest.cpp INCLUDES @@ -266,8 +268,8 @@ diff -rupN --no-dereference PDAL-2.2.0-src/test/unit/CMakeLists.txt PDAL-2.2.0-s + ${EIGEN_INCLUDE_DIRS} ) PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp) - PDAL_ADD_TEST(pdal_filters_neighborclassifier_test FILES filters/NeighborClassifierFilterTest.cpp) -@@ -301,7 +301,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test + PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp) +@@ -303,7 +303,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test FILES filters/PlaneFitFilterTest.cpp INCLUDES @@ -276,7 +278,7 @@ diff -rupN --no-dereference PDAL-2.2.0-src/test/unit/CMakeLists.txt PDAL-2.2.0-s PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp) PDAL_ADD_TEST(pdal_filters_reprojection_test FILES filters/ReprojectionFilterTest.cpp) -@@ -326,7 +326,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test +@@ -328,7 +328,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test FILES filters/SplitterTest.cpp INCLUDES diff --git a/sources b/sources index 4e4756e..b9d043f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PDAL-2.2.0-src.tar.gz) = c54770973de714473bf6cfe6a69e2c880d516abcf71cce755495304093acb41471b4264cb84f11973a482f3de80a8922d7d8b54994fb91c6b012a6894a8bdac5 +SHA512 (PDAL-2.3.0-src.tar.gz) = 9de87de7370175e76b95d3ec08667eb28b90a63eed8133f144427ff931e575d1f37aa13496f12054577539ee552458475dd054bcbdedfabe52eb0e32c4483d05