Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
Markus Neteler
|
a63ac14dbe |
|
|
@ -5,6 +5,3 @@
|
|||
/PDAL-2.4.1-src.tar.gz
|
||||
/PDAL-2.4.2-src.tar.gz
|
||||
/PDAL-2.4.3-src.tar.gz
|
||||
/PDAL-2.5.0-src.tar.gz
|
||||
/PDAL-2.5.1-src.tar.gz
|
||||
/PDAL-2.5.2-src.tar.gz
|
||||
|
|
|
|||
40
PDAL.spec
40
PDAL.spec
|
|
@ -8,13 +8,13 @@
|
|||
Summary: Point Data Abstraction Library
|
||||
Name: PDAL
|
||||
# NOTE: Re-verifiy test exclusions in %%check when updating
|
||||
Version: 2.5.2
|
||||
Release: 1%{?dist}
|
||||
Version: 2.4.3
|
||||
Release: 2%{?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
|
||||
# - plugins/e57/libE57Format/{src,include}/* is Boost
|
||||
License: BSD-3-Clause AND Apache-2.0 AND MIT AND BSL-1.0
|
||||
License: BSD and ASL 2.0 and MIT and Boost
|
||||
URL: https://www.pdal.io
|
||||
Source: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-src.tar.gz
|
||||
# commented out due to size (320 MB larger)
|
||||
|
|
@ -43,6 +43,10 @@ Patch1: PDAL_tests.patch
|
|||
# fix build with sphinxcontrib-bibtex 2.0 (RHBZ #1921498)
|
||||
Patch2: PDAL_sphinxconf.patch
|
||||
|
||||
# Guard against bad return numbers, https://github.com/PDAL/PDAL/pull/3966
|
||||
# to be removed with PDAL 2.5.1
|
||||
Patch3: PDAL_bad_return_numbers.patch
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: eigen3-devel
|
||||
|
|
@ -216,11 +220,11 @@ sphinx-build -b html . build/html
|
|||
%license LICENSE.txt
|
||||
%license vendor/arbiter/LICENSE
|
||||
%license plugins/e57/libE57Format/LICENSE.md
|
||||
%{_libdir}/libpdal_base.so.15*
|
||||
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.15*
|
||||
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.15*
|
||||
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.15*
|
||||
%{_libdir}/libpdal_util.so.15*
|
||||
%{_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
|
||||
|
|
@ -246,27 +250,9 @@ sphinx-build -b html . build/html
|
|||
%license LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Wed Mar 01 2023 Markus Neteler <neteler@mundialis.de> 2.5.2-1
|
||||
- Update to 2.5.2
|
||||
|
||||
* Sat Feb 11 2023 Markus Neteler <neteler@mundialis.de> 2.5.1-1
|
||||
- Update to 2.5.1
|
||||
|
||||
* Mon Feb 06 2023 Markus Neteler <neteler@mundialis.de> 2.5.0-3
|
||||
* Mon Feb 06 2023 Markus Neteler <neteler@mundialis.de> 2.4.3-2
|
||||
- patch to guard against bad return numbers (from upstream #3966), to be removed with PDAL 2.5.1
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2023 Sandro Mani <manisandro@gmail.com> - 2.5.0-1
|
||||
- Update to 2.5.0
|
||||
|
||||
* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 2.4.3-3
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Wed Nov 09 2022 Markus Neteler <neteler@mundialis.de> 2.4.3-2
|
||||
- SPDX license tag update
|
||||
|
||||
* Sat Aug 06 2022 Sandro Mani <manisandro@gmail.com> - 2.4.3-1
|
||||
- Update to 2.4.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
diff -rupN --no-dereference PDAL-2.5.2-src/doc/conf.py PDAL-2.5.2-src-new/doc/conf.py
|
||||
--- PDAL-2.5.2-src/doc/conf.py 2023-02-28 15:37:57.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/doc/conf.py 2023-03-07 08:22:48.766607840 +0100
|
||||
@@ -56,8 +56,9 @@ sys.path.insert(0, os.path.abspath('.'))
|
||||
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
|
||||
extensions = ['breathe', 'sphinx.ext.autodoc',
|
||||
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','notfound.extension']
|
||||
+ 'sphinxcontrib.bibtex', 'embed']
|
||||
'sphinxcontrib.bibtex', 'embed']
|
||||
|
||||
+bibtex_bibfiles = ['bibliography.bib']
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference PDAL-2.5.2-src/cmake/macros.cmake PDAL-2.5.2-src-new/cmake/macros.cmake
|
||||
--- PDAL-2.5.2-src/cmake/macros.cmake 2023-02-28 15:37:57.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/cmake/macros.cmake 2023-03-07 08:22:48.405612502 +0100
|
||||
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()
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff -rupN --no-dereference PDAL-2.5.2-src/CMakeLists.txt PDAL-2.5.2-src-new/CMakeLists.txt
|
||||
--- PDAL-2.5.2-src/CMakeLists.txt 2023-02-28 15:37:59.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/CMakeLists.txt 2023-03-07 08:22:48.014617551 +0100
|
||||
@@ -140,6 +140,9 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
|
||||
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
|
||||
include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
|
||||
|
||||
+find_package(PkgConfig REQUIRED)
|
||||
+PKG_CHECK_MODULES(EIGEN REQUIRED eigen3)
|
||||
|
|
@ -11,7 +11,7 @@ diff -rupN --no-dereference PDAL-2.5.2-src/CMakeLists.txt PDAL-2.5.2-src-new/CMa
|
|||
#------------------------------------------------------------------------------
|
||||
# generate the pdal_features.hpp header
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -175,7 +178,6 @@ endif()
|
||||
@@ -173,7 +176,6 @@ endif()
|
||||
add_subdirectory(plugins)
|
||||
|
||||
if (WITH_TESTS)
|
||||
|
|
@ -19,18 +19,22 @@ diff -rupN --no-dereference PDAL-2.5.2-src/CMakeLists.txt PDAL-2.5.2-src-new/CMa
|
|||
add_subdirectory(test)
|
||||
endif()
|
||||
add_subdirectory(dimbuilder)
|
||||
@@ -258,7 +260,7 @@ 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
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${ZSTD_INCLUDE_DIRS}
|
||||
${NLOHMANN_INCLUDE_DIR}
|
||||
diff -rupN --no-dereference PDAL-2.5.2-src/plugins/cpd/CMakeLists.txt PDAL-2.5.2-src-new/plugins/cpd/CMakeLists.txt
|
||||
--- PDAL-2.5.2-src/plugins/cpd/CMakeLists.txt 2023-02-28 15:37:58.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/plugins/cpd/CMakeLists.txt 2023-03-07 08:22:48.015617538 +0100
|
||||
${GDAL_INCLUDE_DIR}
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
target_link_libraries(${PDAL_BASE_LIB_NAME}
|
||||
PRIVATE
|
||||
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})
|
||||
|
||||
|
|
@ -40,9 +44,9 @@ diff -rupN --no-dereference PDAL-2.5.2-src/plugins/cpd/CMakeLists.txt PDAL-2.5.2
|
|||
|
||||
PDAL_ADD_PLUGIN(filter_libname filter cpd
|
||||
FILES
|
||||
diff -rupN --no-dereference PDAL-2.5.2-src/plugins/i3s/CMakeLists.txt PDAL-2.5.2-src-new/plugins/i3s/CMakeLists.txt
|
||||
--- PDAL-2.5.2-src/plugins/i3s/CMakeLists.txt 2023-02-28 15:37:58.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/plugins/i3s/CMakeLists.txt 2023-03-07 08:22:48.015617538 +0100
|
||||
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}
|
||||
|
|
@ -70,11 +74,11 @@ diff -rupN --no-dereference PDAL-2.5.2-src/plugins/i3s/CMakeLists.txt PDAL-2.5.2
|
|||
)
|
||||
|
||||
if (BUILD_I3S_TESTS)
|
||||
diff -rupN --no-dereference PDAL-2.5.2-src/plugins/rdb/CMakeLists.txt PDAL-2.5.2-src-new/plugins/rdb/CMakeLists.txt
|
||||
--- PDAL-2.5.2-src/plugins/rdb/CMakeLists.txt 2023-02-28 15:37:58.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/plugins/rdb/CMakeLists.txt 2023-03-07 08:22:48.015617538 +0100
|
||||
@@ -28,7 +28,7 @@ PDAL_ADD_PLUGIN(libname reader rdb
|
||||
${RDB_INCLUDE_C_DIR}
|
||||
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}
|
||||
)
|
||||
-target_include_directories(${libname} PRIVATE "${PDAL_VENDOR_DIR}/eigen")
|
||||
|
|
@ -82,18 +86,18 @@ diff -rupN --no-dereference PDAL-2.5.2-src/plugins/rdb/CMakeLists.txt PDAL-2.5.2
|
|||
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/nlohmann/")
|
||||
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/eigen/")
|
||||
|
||||
@@ -57,7 +57,7 @@ if (BUILD_RDBLIB_TESTS)
|
||||
@@ -55,7 +55,7 @@ if (BUILD_RDBLIB_TESTS)
|
||||
${PROJECT_BINARY_DIR}/plugins/rdb/test
|
||||
${PROJECT_SOURCE_DIR}/plugins/rdb/io
|
||||
${RDB_INCLUDE_CPP_DIR}
|
||||
${RDB_INCLUDE_C_DIR}
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
|
||||
)
|
||||
endif()
|
||||
diff -rupN --no-dereference PDAL-2.5.2-src/plugins/teaser/CMakeLists.txt PDAL-2.5.2-src-new/plugins/teaser/CMakeLists.txt
|
||||
--- PDAL-2.5.2-src/plugins/teaser/CMakeLists.txt 2023-02-28 15:37:58.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/plugins/teaser/CMakeLists.txt 2023-03-07 08:22:48.015617538 +0100
|
||||
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}
|
||||
|
|
@ -102,9 +106,9 @@ diff -rupN --no-dereference PDAL-2.5.2-src/plugins/teaser/CMakeLists.txt PDAL-2.
|
|||
+ "${EIGEN_INCLUDE_DIRS}"
|
||||
)
|
||||
endif()
|
||||
diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-src-new/test/unit/CMakeLists.txt
|
||||
--- PDAL-2.5.2-src/test/unit/CMakeLists.txt 2023-02-28 15:37:59.000000000 +0100
|
||||
+++ PDAL-2.5.2-src-new/test/unit/CMakeLists.txt 2023-03-07 08:22:48.015617538 +0100
|
||||
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
|
||||
|
||||
|
|
@ -123,7 +127,7 @@ diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-s
|
|||
)
|
||||
PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp)
|
||||
@@ -77,7 +77,7 @@ PDAL_ADD_TEST(pdal_point_view_test
|
||||
@@ -70,7 +70,7 @@ PDAL_ADD_TEST(pdal_point_view_test
|
||||
FILES
|
||||
PointViewTest.cpp
|
||||
INCLUDES
|
||||
|
|
@ -132,7 +136,7 @@ diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-s
|
|||
)
|
||||
PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp)
|
||||
|
||||
@@ -212,13 +212,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
|
||||
|
|
@ -148,7 +152,7 @@ diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-s
|
|||
)
|
||||
PDAL_ADD_TEST(pdal_io_ply_reader_test
|
||||
FILES
|
||||
@@ -257,7 +257,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}
|
||||
|
|
@ -157,7 +161,7 @@ diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-s
|
|||
)
|
||||
PDAL_ADD_TEST(pdal_filters_nndistance_test
|
||||
FILES
|
||||
@@ -316,7 +316,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
|
||||
@@ -284,7 +284,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
|
||||
FILES
|
||||
filters/IcpFilterTest.cpp
|
||||
INCLUDES
|
||||
|
|
@ -166,7 +170,7 @@ diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-s
|
|||
)
|
||||
PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp)
|
||||
@@ -337,7 +337,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
|
||||
@@ -305,7 +305,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
|
||||
FILES
|
||||
filters/PlaneFitFilterTest.cpp
|
||||
INCLUDES
|
||||
|
|
@ -175,7 +179,7 @@ diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-s
|
|||
PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_filters_reprojection_test FILES
|
||||
filters/ReprojectionFilterTest.cpp)
|
||||
@@ -363,7 +363,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
|
||||
@@ -330,7 +330,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
|
||||
FILES
|
||||
filters/SplitterTest.cpp
|
||||
INCLUDES
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (PDAL-2.5.2-src.tar.gz) = 64762486ae4b0e1435c9e18846354daeee1de471b3e4754a33c06e5f7b38819a11ccf3ee37155e0af3de501cbb9763cf72f0647a4bf92e93ea2a7f72c01ca4ce
|
||||
SHA512 (PDAL-2.4.3-src.tar.gz) = ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386
|
||||
|
|
|
|||
Loading…
Reference in New Issue