From d5b81000fbdf6c566016aa1219487f22179c31db Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 22 May 2022 00:03:14 +0200 Subject: [PATCH] Update to 2.4.1 --- .gitignore | 1 + PDAL.spec | 18 ++--- PDAL_240_include_fix.patch | 25 ------ PDAL_sphinxconf.patch | 5 +- PDAL_tests.patch | 8 +- PDAL_unbundle.patch | 154 +++++++++++++++++++------------------ sources | 2 +- 7 files changed, 97 insertions(+), 116 deletions(-) delete mode 100644 PDAL_240_include_fix.patch diff --git a/.gitignore b/.gitignore index c2f1eb0..e7bbc18 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /PDAL-2.2.0-src.tar.gz /PDAL-2.3.0-src.tar.gz /PDAL-2.4.0-src.tar.gz +/PDAL-2.4.1-src.tar.gz diff --git a/PDAL.spec b/PDAL.spec index 09cc518..494f7ed 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -8,8 +8,8 @@ Summary: Point Data Abstraction Library Name: PDAL # NOTE: Re-verifiy test exclusions in %%check when updating -Version: 2.4.0 -Release: 2%{?dist} +Version: 2.4.1 +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 @@ -35,17 +35,13 @@ Source: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name} #Source13: http://download.osgeo.org/proj/vdatum/usa_geoid2012b.zip # Unbundle some bundled libraries -# 03/2022: deactivated, see https://github.com/PDAL/PDAL/issues/3719 -#Patch0: PDAL_unbundle.patch +Patch0: PDAL_unbundle.patch # Use correct libdir for PDAL_DRIVER_PATH when running tests Patch1: PDAL_tests.patch -# Compiler error suppression https://github.com/PDAL/PDAL/pull/3720 -Patch2: PDAL_240_include_fix.patch - # fix build with sphinxcontrib-bibtex 2.0 (RHBZ #1921498) -Patch3: PDAL_sphinxconf.patch +Patch2: PDAL_sphinxconf.patch BuildRequires: boost-devel BuildRequires: cmake @@ -148,8 +144,7 @@ This package contains documentation for PDAL. %autosetup -p1 -n %{name}-%{version}-src # Remove some bundled libraries -# 03/2022: deactivated, see https://github.com/PDAL/PDAL/issues/3719 -# rm -rf vendor/{eigen,gtest,pdalboost} +rm -rf vendor/{eigen,gtest,pdalboost} %build @@ -251,6 +246,9 @@ sphinx-build -b html . build/html %license LICENSE.txt %changelog +* Sat May 21 2022 Sandro Mani - 2.4.1-1 +- Update to 2.4.1 + * Fri May 20 2022 Sandro Mani - 2.4.0-2 - Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 diff --git a/PDAL_240_include_fix.patch b/PDAL_240_include_fix.patch deleted file mode 100644 index ba4f2b4..0000000 --- a/PDAL_240_include_fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/filters/VoxelCentroidNearestNeighborFilter.cpp b/filters/VoxelCentroidNearestNeighborFilter.cpp -index 4be4d5d92e..cdcdf29d14 100644 ---- a/filters/VoxelCentroidNearestNeighborFilter.cpp -+++ b/filters/VoxelCentroidNearestNeighborFilter.cpp -@@ -134,7 +134,7 @@ PointViewSet VoxelCentroidNearestNeighborFilter::run(PointViewPtr view) - - // Compute distance from each point in the voxel to the centroid, - // retaining only the closest. -- PointId pmin; -+ PointId pmin = 0; - double dmin((std::numeric_limits::max)()); - for (auto const& p : t.second) - { -diff --git a/io/LasVLR.hpp b/io/LasVLR.hpp -index 7120511eb4..e90d27ee4e 100644 ---- a/io/LasVLR.hpp -+++ b/io/LasVLR.hpp -@@ -34,6 +34,7 @@ - - #pragma once - -+#include - #include - - #include diff --git a/PDAL_sphinxconf.patch b/PDAL_sphinxconf.patch index 2e2c4b8..fbeccb0 100644 --- a/PDAL_sphinxconf.patch +++ b/PDAL_sphinxconf.patch @@ -1,5 +1,6 @@ ---- 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 +diff -rupN --no-dereference PDAL-2.4.1-src/doc/conf.py PDAL-2.4.1-src-new/doc/conf.py +--- PDAL-2.4.1-src/doc/conf.py 2022-05-19 15:34:53.000000000 +0200 ++++ PDAL-2.4.1-src-new/doc/conf.py 2022-05-21 23:02:01.386244898 +0200 @@ -58,6 +58,7 @@ extensions = ['breathe', 'sphinx.ext.aut 'sphinx.ext.mathjax', 'sphinx.ext.intersphinx', 'sphinxcontrib.bibtex', 'embed'] diff --git a/PDAL_tests.patch b/PDAL_tests.patch index 7a55350..3b593ca 100644 --- a/PDAL_tests.patch +++ b/PDAL_tests.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference PDAL-2.2.0-src/cmake/macros.cmake PDAL-2.2.0-src-new/cmake/macros.cmake ---- PDAL-2.2.0-src/cmake/macros.cmake 2020-09-09 17:14:16.000000000 +0200 -+++ PDAL-2.2.0-src-new/cmake/macros.cmake 2020-11-11 12:44:00.776607812 +0100 -@@ -206,6 +206,6 @@ macro(PDAL_ADD_TEST _name) +diff -rupN --no-dereference PDAL-2.4.1-src/cmake/macros.cmake PDAL-2.4.1-src-new/cmake/macros.cmake +--- PDAL-2.4.1-src/cmake/macros.cmake 2022-05-19 15:34:53.000000000 +0200 ++++ PDAL-2.4.1-src-new/cmake/macros.cmake 2022-05-21 23:02:01.150230421 +0200 +@@ -228,6 +228,6 @@ macro(PDAL_ADD_TEST _name) "PDAL_DRIVER_PATH=${PROJECT_BINARY_DIR}/bin") else() set_property(TEST ${_name} PROPERTY ENVIRONMENT diff --git a/PDAL_unbundle.patch b/PDAL_unbundle.patch index 93f3b7f..ab140a3 100644 --- a/PDAL_unbundle.patch +++ b/PDAL_unbundle.patch @@ -1,5 +1,6 @@ ---- 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 +diff -rupN --no-dereference PDAL-2.4.1-src/CMakeLists.txt PDAL-2.4.1-src-new/CMakeLists.txt +--- PDAL-2.4.1-src/CMakeLists.txt 2022-05-19 15:34:55.000000000 +0200 ++++ PDAL-2.4.1-src-new/CMakeLists.txt 2022-05-21 23:02:00.916216067 +0200 @@ -138,6 +138,9 @@ include(${PDAL_CMAKE_DIR}/nlohmann.cmake include(${PDAL_CMAKE_DIR}/lazperf.cmake) include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional @@ -31,8 +32,83 @@ ) target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE ---- 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 +diff -rupN --no-dereference PDAL-2.4.1-src/plugins/cpd/CMakeLists.txt PDAL-2.4.1-src-new/plugins/cpd/CMakeLists.txt +--- PDAL-2.4.1-src/plugins/cpd/CMakeLists.txt 2022-05-19 15:34:54.000000000 +0200 ++++ PDAL-2.4.1-src-new/plugins/cpd/CMakeLists.txt 2022-05-21 23:02:00.916216067 +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.4.1-src/plugins/i3s/CMakeLists.txt PDAL-2.4.1-src-new/plugins/i3s/CMakeLists.txt +--- PDAL-2.4.1-src/plugins/i3s/CMakeLists.txt 2022-05-19 15:34:54.000000000 +0200 ++++ PDAL-2.4.1-src-new/plugins/i3s/CMakeLists.txt 2022-05-21 23:02:00.916216067 +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) +diff -rupN --no-dereference PDAL-2.4.1-src/plugins/rdb/CMakeLists.txt PDAL-2.4.1-src-new/plugins/rdb/CMakeLists.txt +--- PDAL-2.4.1-src/plugins/rdb/CMakeLists.txt 2022-05-19 15:34:54.000000000 +0200 ++++ PDAL-2.4.1-src-new/plugins/rdb/CMakeLists.txt 2022-05-21 23:02:00.917216128 +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 -rupN --no-dereference PDAL-2.4.1-src/plugins/teaser/CMakeLists.txt PDAL-2.4.1-src-new/plugins/teaser/CMakeLists.txt +--- PDAL-2.4.1-src/plugins/teaser/CMakeLists.txt 2022-05-19 15:34:54.000000000 +0200 ++++ PDAL-2.4.1-src-new/plugins/teaser/CMakeLists.txt 2022-05-21 23:02:00.916216067 +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.4.1-src/test/unit/CMakeLists.txt PDAL-2.4.1-src-new/test/unit/CMakeLists.txt +--- PDAL-2.4.1-src/test/unit/CMakeLists.txt 2022-05-19 15:34:54.000000000 +0200 ++++ PDAL-2.4.1-src-new/test/unit/CMakeLists.txt 2022-05-21 23:02:00.916216067 +0200 @@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test ${PDAL_SRC_DIR}/private/MathUtils.cpp @@ -112,73 +188,3 @@ 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 f69db51..854ee39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PDAL-2.4.0-src.tar.gz) = 655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623 +SHA512 (PDAL-2.4.1-src.tar.gz) = 483d97d627e485d7228b9fdc4ef29ad7757489fdeb02e4e44328e2de5520e52cdb6ff36f57a69bf7ff259fe9c996a8731c51119a65478528ea985e211b314341