diff options
Diffstat (limited to 'sci-libs/pdal/files')
3 files changed, 204 insertions, 0 deletions
diff --git a/sci-libs/pdal/files/pdal-2.3.0-fix_cmake_install_location.patch b/sci-libs/pdal/files/pdal-2.3.0-fix_cmake_install_location.patch new file mode 100644 index 000000000000..65e32100d18d --- /dev/null +++ b/sci-libs/pdal/files/pdal-2.3.0-fix_cmake_install_location.patch @@ -0,0 +1,17 @@ +--- a/cmake/config.cmake.orig 2022-02-19 13:06:41.654048306 +0100 ++++ b/cmake/config.cmake 2022-02-19 13:07:21.007165692 +0100 +@@ -6,7 +6,7 @@ + configure_package_config_file( + PDALConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/PDALConfig.cmake +- INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/PDAL ++ INSTALL_DESTINATION ${PDAL_LIB_INSTALL_DIR}/cmake/PDAL + PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR) + + write_basic_package_version_file( +@@ -17,4 +17,4 @@ + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/PDALConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/PDALConfigVersion.cmake +- DESTINATION ${LIB_INSTALL_DIR}/cmake/PDAL) ++ DESTINATION ${PDAL_LIB_INSTALL_DIR}/cmake/PDAL) diff --git a/sci-libs/pdal/files/pdal-2.3.0-fix_tests_for_proj811.patch b/sci-libs/pdal/files/pdal-2.3.0-fix_tests_for_proj811.patch new file mode 100644 index 000000000000..6a34686330f4 --- /dev/null +++ b/sci-libs/pdal/files/pdal-2.3.0-fix_tests_for_proj811.patch @@ -0,0 +1,110 @@ +From https://github.com/PDAL/PDAL/commit/1a7415f67cfe13f816345ce4b7fc1c68f0a45c83 +Bug https://bugs.gentoo.org/833820 +From: Andrew Bell <andrew.bell.ia@gmail.com> +Date: Thu, 7 Oct 2021 11:15:18 -0400 +Subject: [PATCH] Work around test issues with varying versions of PROJ (#3560) + +* Add range for crop because of varying proj precision. + +* Fix tests for PROJ 8.1.1 + +* More test workaround for proj. +--- + test/unit/filters/CropFilterTest.cpp | 10 +++++++ + test/unit/io/EptReaderTest.cpp | 41 +++++++++++++++++++++++++++- + 2 files changed, 50 insertions(+), 1 deletion(-) + +diff --git a/test/unit/filters/CropFilterTest.cpp b/test/unit/filters/CropFilterTest.cpp +index 23ccb465bc..f4b825c891 100644 +--- a/test/unit/filters/CropFilterTest.cpp ++++ b/test/unit/filters/CropFilterTest.cpp +@@ -250,7 +250,17 @@ TEST(CropFilterTest, test_crop_polygon_reprojection) + PointViewSet viewSet = crop.execute(table); + EXPECT_EQ(viewSet.size(), 1u); + view = *viewSet.begin(); ++//ABELL - I'd like to do the following, but we don't necessarily have proj.h ++/** ++#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101 ++ EXPECT_EQ(view->size(), 45u); ++#else + EXPECT_EQ(view->size(), 47u); ++#endif ++**/ ++// So instead... ++ EXPECT_GE(view->size(), 45u); ++ EXPECT_LE(view->size(), 47u); + + FileUtils::closeFile(wkt_stream); + } +diff --git a/test/unit/io/EptReaderTest.cpp b/test/unit/io/EptReaderTest.cpp +index ab5cfdee4a..0d274d4c08 100644 +--- a/test/unit/io/EptReaderTest.cpp ++++ b/test/unit/io/EptReaderTest.cpp +@@ -625,8 +625,21 @@ TEST(EptReaderTest, boundedCrop) + } + + EXPECT_EQ(eptNp, sourceNp); ++ ++//ABELL - A change in proj changed the numbers, but we don't necessarily have proj.h ++/** ++#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101 ++ EXPECT_EQ(eptNp, 45u); ++ EXPECT_EQ(sourceNp, 45u); ++#else + EXPECT_EQ(eptNp, 47u); + EXPECT_EQ(sourceNp, 47u); ++#endif ++**/ ++ EXPECT_GE(eptNp, 45u); ++ EXPECT_GE(sourceNp, 45u); ++ EXPECT_LE(eptNp, 47u); ++ EXPECT_LE(sourceNp, 47u); + } + + TEST(EptReaderTest, polygonAndBoundsCrop) +@@ -769,8 +782,20 @@ TEST(EptReaderTest, boundedCropReprojection) + sourceNp += view->size(); + + EXPECT_EQ(eptNp, sourceNp); ++//ABELL - We don't necessarily have proj.h, so we can't do this: ++/** ++#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101 ++ EXPECT_EQ(eptNp, 45u); ++ EXPECT_EQ(sourceNp, 45u); ++#else + EXPECT_EQ(eptNp, 47u); + EXPECT_EQ(sourceNp, 47u); ++#endif ++**/ ++ EXPECT_GE(eptNp, 45u); ++ EXPECT_GE(sourceNp, 45u); ++ EXPECT_LE(eptNp, 47u); ++ EXPECT_LE(sourceNp, 47u); + } + + +@@ -811,9 +836,23 @@ TEST(EptReaderTest, ogrCrop) + for (const PointViewPtr& view : source.execute(sourceTable)) + sourceNp += view->size(); + +- EXPECT_EQ(eptNp, sourceNp); ++//ABELL - PROJ changed to make the number of points that pass the filter different from ++// what's in the file we've got stored. ++// EXPECT_EQ(eptNp, sourceNp); ++//ABELL - We don't necessarily have proj.h, so can't do the following: ++/** ++#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101 ++ EXPECT_EQ(eptNp, 89u); ++ EXPECT_EQ(sourceNp, 89u); ++#else + EXPECT_EQ(eptNp, 86u); + EXPECT_EQ(sourceNp, 86u); ++#endif ++**/ ++ EXPECT_LE(eptNp, 89u); ++ EXPECT_LE(sourceNp, 89u); ++ EXPECT_GE(eptNp, 86u); ++ EXPECT_GE(sourceNp, 86u); + } + + } // namespace pdal diff --git a/sci-libs/pdal/files/pdal-2.3.0-upgrade_cmake_min.patch b/sci-libs/pdal/files/pdal-2.3.0-upgrade_cmake_min.patch new file mode 100644 index 000000000000..9b712cb0e789 --- /dev/null +++ b/sci-libs/pdal/files/pdal-2.3.0-upgrade_cmake_min.patch @@ -0,0 +1,77 @@ +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index 8dd8845f35..c4b7e37543 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -3,7 +3,7 @@ + # + # (based originally on the libLAS files copyright Mateusz Loskot) + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + + #------------------------------------------------------------------------------ + # Configure build targets +diff --git a/cmake/ctest.cmake b/cmake/ctest.cmake +index a8382aaef5..98035205d1 100644 +--- a/cmake/ctest.cmake ++++ b/cmake/ctest.cmake +@@ -5,7 +5,7 @@ if(ENABLE_CTEST) + if (WITH_TESTS) + message(STATUS + "Enable CTest to support submissions of results to CDash at http://cdash.org") +- cmake_minimum_required(VERSION 2.8.0) ++ cmake_minimum_required(VERSION 3.5.0) + # + # Dashboard has been prepared for experiments + # http://my.cdash.org/index.php?project=PDAL +diff --git a/dimbuilder/CMakeLists.txt b/dimbuilder/CMakeLists.txt +index 09d334f1f8..9aa9742f63 100644 +--- a/dimbuilder/CMakeLists.txt ++++ b/dimbuilder/CMakeLists.txt +@@ -2,7 +2,7 @@ + # The seemingly strange arrangement of this cmake file allows you to build + # this application as a standalone. + # +-cmake_minimum_required(VERSION 2.8.6) ++cmake_minimum_required(VERSION 3.5) + + set(MAKE_COLOR_MAKEFILE ON) + +diff --git a/plugins/rdb/CMakeLists.txt b/plugins/rdb/CMakeLists.txt +index 2ec0adcf92..2e8ae422de 100644 +--- a/plugins/rdb/CMakeLists.txt ++++ b/plugins/rdb/CMakeLists.txt +@@ -1,6 +1,6 @@ + + if (STANDALONE) +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + set(ROOT_DIR "../../${PROJECT_SOURCE_DIR}") + include(../../cmake/common.cmake NO_POLICY_SCOPE) + include(FeatureSummary) +diff --git a/tools/lasdump/CMakeLists.txt b/tools/lasdump/CMakeLists.txt +index 8083a228d8..767d642e76 100644 +--- a/tools/lasdump/CMakeLists.txt ++++ b/tools/lasdump/CMakeLists.txt +@@ -2,7 +2,7 @@ + # The seemingly strange arrangement of this cmake file allows you to build + # lasdump as a standalone. + # +-cmake_minimum_required(VERSION 2.8.6) ++cmake_minimum_required(VERSION 3.5) + + set(MAKE_COLOR_MAKEFILE ON) + +diff --git a/vendor/gtest/CMakeLists.txt b/vendor/gtest/CMakeLists.txt +index db292946a5..e41e59761e 100644 +--- a/vendor/gtest/CMakeLists.txt ++++ b/vendor/gtest/CMakeLists.txt +@@ -53,7 +53,7 @@ else() + cmake_policy(SET CMP0048 NEW) + project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) + endif() +-cmake_minimum_required(VERSION 2.6.4) ++cmake_minimum_required(VERSION 3.5) + + if (POLICY CMP0063) # Visibility + cmake_policy(SET CMP0063 NEW) |