gentoo auto-resync : 14:05:2023 - 10:00:59

3 files changed, 66 insertions, 94 deletions

diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch b/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch
new file mode 100644
index 000000000000..0f72473bfe85
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch
@@ -0,0 +1,29 @@
+From https://github.com/hobuinc/laz-perf/commit/a7f0f4f5b2ca851079574d47918f4f7abc6cc785 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 13 Dec 2022 22:06:21 +0000
+Subject: [PATCH] Extractor.hpp: add missing <cstdint> header inclusion (#144)
+
+Without the change build fails on upcomit `gcc-13` as:
+
+    In file included from cpp/lazperf/vlr.cpp:33:
+    cpp/lazperf/Extractor.hpp:185:31: error: 'uint8_t' has not been declared
+      185 |     LeExtractor& operator >> (uint8_t& v)
+          |                               ^~~~~~~
+
+`gcc-13` cleaned header up a bit and `<string>` does not include
+`<cstdint>` implicitly anymore. Let's use it explictly.
+---
+ cpp/lazperf/Extractor.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff -Nru PDAL-2.4.3-src-orig/vendor/lazperf/Extractor.hpp PDAL-2.4.3-src/vendor/lazperf/Extractor.hpp
+--- PDAL-2.4.3-src-orig/vendor/lazperf/Extractor.hpp	2023-05-10 23:13:39.613501276 -0300
++++ PDAL-2.4.3-src/vendor/lazperf/Extractor.hpp	2023-05-10 23:15:41.644241402 -0300
+@@ -34,6 +34,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <vector>
+ 
diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch b/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch
new file mode 100644
index 000000000000..29edb8518b9d
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch
@@ -0,0 +1,37 @@
+From https://github.com/PDAL/PDAL/commit/516e33ad7f40e54affd5754617fbe26d70ef2dd4
+From: Jorge Gustavo Rocha <jgr@geomaster.pt>
+Date: Thu, 20 Apr 2023 13:11:46 +0100
+Subject: [PATCH] prevent invalid conversion from const compile error (#4030)
+squashed with
+From https://github.com/dg0yt/PDAL/commit/49eb31840dc1c07d6ff235ea292c7c0703f8a884
+From: Kai Pastor <dg0yt@darc.de>
+Date: Fri, 12 May 2023 07:44:59 +0200
+Subject: [PATCH] Don't use const_cast
+
+Amends #4030.
+---
+ pdal/Geometry.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pdal/Geometry.cpp b/pdal/Geometry.cpp
+index 10d185dbe4..8b010d3378 100644
+--- a/pdal/Geometry.cpp
++++ b/pdal/Geometry.cpp
+@@ -153,7 +153,7 @@ Geometry& Geometry::operator=(const Geometry& input)
+ 
+ bool Geometry::srsValid() const
+ {
+-    OGRSpatialReference *srs = m_geom->getSpatialReference();
++    const OGRSpatialReference *srs = m_geom->getSpatialReference();
+     return srs && srs->GetRoot();
+ }
+ 
+@@ -172,7 +172,7 @@ Utils::StatusWithReason Geometry::transform(SpatialReference out)
+         return StatusWithReason(-2,
+             "Geometry::transform() failed.  NULL target SRS.");
+ 
+-    OGRSpatialReference *inSrs = m_geom->getSpatialReference();
++    const OGRSpatialReference *inSrs = m_geom->getSpatialReference();
+     SrsTransform transform(*inSrs, OGRSpatialReference(out.getWKT().data()));
+     if (m_geom->transform(transform.get()) != OGRERR_NONE)
+         return StatusWithReason(-1, "Geometry::transform() failed.");
diff --git a/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch b/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch
deleted file mode 100644
index 79a0f0d162b0..000000000000
--- a/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: https://github.com/PDAL/PDAL/commit/a3a8d6f1759f848b1ec6f3a2fcb3e6b40f12d892
-From: Howard Butler <hobu.inc@gmail.com>
-Date: Thu, 19 Jan 2023 09:58:47 -0600
-Subject: [PATCH] Make Abseil/re2 an opt-in, not required when Abseil is lazily
- found (#3948)
-
-* address #3944, Abseil/re2 being required. It is now an opt-in
-
-* missing endif()
-
-* WITH_ABSEIL FALSE
----
- cmake/gtest.cmake   | 48 ++++++++++++++++++++++++---------------------
- cmake/options.cmake |  4 ++++
- 2 files changed, 30 insertions(+), 22 deletions(-)
-
-diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake
-index c0a0d44ba5..df230a10b2 100644
---- a/cmake/gtest.cmake
-+++ b/cmake/gtest.cmake
-@@ -4,32 +4,36 @@ if (MSVC)
-     option(gtest_force_shared_crt "Always use shared Visual C++ run-time DLL" ON)
- endif()
- 
--set(GOOGLETEST_VERSION 1.10.0)
-+set(GOOGLETEST_VERSION 1.12.1)
- add_subdirectory(vendor/gtest)
- 
- set(FPHSA_NAME_MISMATCHED 1) # Suppress warnings, see https://cmake.org/cmake/help/v3.17/module/FindPackageHandleStandardArgs.html
--find_package(absl QUIET)
--set(FPHSA_NAME_MISMATCHED 0)
- 
--if (absl_FOUND)
--    find_package(re2 REQUIRED)
- 
--    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
--        cmake_policy(SET CMP0079 NEW)
-+if (WITH_ABSEIL)
-+    find_package(absl REQUIRED)
-+    set(FPHSA_NAME_MISMATCHED 0)
-+
-+    if (absl_FOUND)
-+        find_package(re2 REQUIRED)
-+
-+        if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
-+            cmake_policy(SET CMP0079 NEW)
-+        endif()
-+        target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
-+        target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
-+        target_link_libraries(gtest PRIVATE absl::algorithm
-+                                            absl::base
-+                                            absl::flags
-+                                            absl::flags_internal
-+                                            absl::flags_usage
-+                                            absl::flags_commandlineflag
-+                                            absl::flags_parse
-+                                            absl::debugging
-+                                            absl::numeric
-+                                            absl::strings
-+                                            absl::utility
-+                                            absl::failure_signal_handler)
-+        target_link_libraries(gtest PUBLIC re2::re2)
-     endif()
--    target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
--    target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
--    target_link_libraries(gtest PRIVATE absl::algorithm
--                                        absl::base
--                                        absl::flags
--                                        absl::flags_internal
--                                        absl::flags_usage
--                                        absl::flags_commandlineflag
--                                        absl::flags_parse
--                                        absl::debugging
--                                        absl::numeric
--                                        absl::strings
--                                        absl::utility
--                                        absl::failure_signal_handler)
--    target_link_libraries(gtest PRIVATE re2::re2)
- endif()
-diff --git a/cmake/options.cmake b/cmake/options.cmake
-index 73be6788b2..ca3460e629 100644
---- a/cmake/options.cmake
-+++ b/cmake/options.cmake
-@@ -105,6 +105,10 @@ add_feature_info("Unit tests" WITH_TESTS "PDAL unit tests")
- option(ENABLE_CTEST
-     "Enable CTest to support submissions of results to CDash at http://cdash.org" FALSE)
- 
-+option(WITH_ABSEIL
-+    "Choose if PDAL should be built with Abseil support for testing" FALSE)
-+add_feature_info("Abseil debugging support " WITH_ABSEIL "unit tests")
-+
- #
- # Choose dependent options
- #