From 739ac3e5bc22ffad4d2e6dbf989db40f7f69ec65 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 7 Jun 2022 09:24:24 +0200 Subject: [PATCH] Update to 2.4.2 --- .gitignore | 1 + PDAL.spec | 5 ++++- PDAL_sphinxconf.patch | 6 +++--- PDAL_tests.patch | 6 +++--- PDAL_unbundle.patch | 36 ++++++++++++++++++------------------ sources | 2 +- 6 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index e7bbc18..ce06191 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /PDAL-2.3.0-src.tar.gz /PDAL-2.4.0-src.tar.gz /PDAL-2.4.1-src.tar.gz +/PDAL-2.4.2-src.tar.gz diff --git a/PDAL.spec b/PDAL.spec index 494f7ed..54e2c64 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -8,7 +8,7 @@ Summary: Point Data Abstraction Library Name: PDAL # NOTE: Re-verifiy test exclusions in %%check when updating -Version: 2.4.1 +Version: 2.4.2 Release: 1%{?dist} # The code is licensed BSD except for: # - filters/private/csf/* and plugins/i3s/lepcc/* are ASL 2.0 @@ -246,6 +246,9 @@ sphinx-build -b html . build/html %license LICENSE.txt %changelog +* Tue Jun 07 2022 Sandro Mani - 2.4.2-1 +- Update to 2.4.2 + * Sat May 21 2022 Sandro Mani - 2.4.1-1 - Update to 2.4.1 diff --git a/PDAL_sphinxconf.patch b/PDAL_sphinxconf.patch index fbeccb0..4add493 100644 --- a/PDAL_sphinxconf.patch +++ b/PDAL_sphinxconf.patch @@ -1,6 +1,6 @@ -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 +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 @@ -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 3b593ca..821ec43 100644 --- a/PDAL_tests.patch +++ b/PDAL_tests.patch @@ -1,6 +1,6 @@ -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 +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 @@ -228,6 +228,6 @@ macro(PDAL_ADD_TEST _name) "PDAL_DRIVER_PATH=${PROJECT_BINARY_DIR}/bin") else() diff --git a/PDAL_unbundle.patch b/PDAL_unbundle.patch index ab140a3..3074554 100644 --- a/PDAL_unbundle.patch +++ b/PDAL_unbundle.patch @@ -1,6 +1,6 @@ -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 +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) include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional @@ -32,9 +32,9 @@ diff -rupN --no-dereference PDAL-2.4.1-src/CMakeLists.txt PDAL-2.4.1-src-new/CMa ) target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE -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 +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 @@ -4,7 +4,7 @@ find_package(Cpd ${Cpd_VERSION} REQUIRED option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND}) @@ -44,9 +44,9 @@ diff -rupN --no-dereference PDAL-2.4.1-src/plugins/cpd/CMakeLists.txt PDAL-2.4.1 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 +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 @@ -20,7 +20,7 @@ PDAL_ADD_PLUGIN(i3s_reader_libname reade INCLUDES ${NLOHMANN_INCLUDE_DIR} @@ -74,9 +74,9 @@ diff -rupN --no-dereference PDAL-2.4.1-src/plugins/i3s/CMakeLists.txt PDAL-2.4.1 ) 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 +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} ${PDAL_INCLUDE_DIRS} @@ -95,9 +95,9 @@ diff -rupN --no-dereference PDAL-2.4.1-src/plugins/rdb/CMakeLists.txt PDAL-2.4.1 ) 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 +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 @@ -63,6 +63,6 @@ if (WITH_TESTS) LINK_WITH ${filter_libname} @@ -106,9 +106,9 @@ diff -rupN --no-dereference PDAL-2.4.1-src/plugins/teaser/CMakeLists.txt PDAL-2. + "${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 +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 @@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test ${PDAL_SRC_DIR}/private/MathUtils.cpp diff --git a/sources b/sources index 854ee39..887f0dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PDAL-2.4.1-src.tar.gz) = 483d97d627e485d7228b9fdc4ef29ad7757489fdeb02e4e44328e2de5520e52cdb6ff36f57a69bf7ff259fe9c996a8731c51119a65478528ea985e211b314341 +SHA512 (PDAL-2.4.2-src.tar.gz) = 0d74de55c126be0aeb4b5be48a360d4f208b031228cb2cf122bc22ba6bca96ecd97731d6569718fd9be1b03631f3f2aec41f68b725926ed5f6ec306c32b1d20f