[gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/files/, sci-libs/pdal/
commit: 90ce89f5f1d14890b7e22745dc1114bf7767ea6c
Author: Thomas Bettler gmail com>
AuthorDate: Mon Apr 1 17:58:52 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Apr 24 12:50:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ce89f5
sci-libs/pdal: drop old
Signed-off-by: Thomas Bettler gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36047
Signed-off-by: Conrad Kostecki gentoo.org>
sci-libs/pdal/Manifest | 2 -
sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch | 29
sci-libs/pdal/files/pdal-2.4.3-fix-test.patch | 24 --
sci-libs/pdal/pdal-2.4.3-r1.ebuild | 63 --
sci-libs/pdal/pdal-2.4.3.ebuild| 61 -
sci-libs/pdal/pdal-2.5.3.ebuild| 57 ---
sci-libs/pdal/pdal-2.6.0.ebuild| 60
7 files changed, 296 deletions(-)
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index 210135fb5c78..e54e026b75ea 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -1,4 +1,2 @@
-DIST PDAL-2.4.3-src.tar.gz 100758279 BLAKE2B
7c157bb51416b24bd8896a62e71a186bc9a45b34d5ab58fadbe691cb1abc9595f598fcf92ec528c9103f646c21f940b26fbf199a998e707d17f1527eb2957a85
SHA512
ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386
DIST PDAL-2.5.3-src.tar.bz2 102669314 BLAKE2B
1c6c8406f8de65a04364cc1141be809c00ea716fcfd5578833883357258855b3f7e70ea03c86f487dff0bc98072c29bed45a613c14ace05aef6ae49627b40374
SHA512
f67a303711b7d9e9dc14260afb96d299bcd5327ba0cc947143a583f55bd532a248b131e4602fd37d711ad0084e8601420828dacac40c414b95b8e9f9e8175e1b
-DIST PDAL-2.6.0-src.tar.bz2 87271277 BLAKE2B
56899d1637e79845451132d177eda1b5ae3a7c81d2a61f97b5048eeadc43a2f087a06c52de0a828f8b7bf111467a03e32288b553dadd34f6aab6d51e2b653874
SHA512
61b2575fc5d2751f1e34925e948aca9936b8de72c0b596f9809cdf9156a15e94f670db22bd68c45e484783ba112a6bc43c7309a62e3aa3158567437195901cbd
DIST PDAL-2.6.2-src.tar.bz2 87274819 BLAKE2B
5855a268889064fdc72d15ec1dbe7ab3ed8eb6bee2fa4ec724e9f287f25d6b9f9f9171829a2121e156bec575c96a42f26e223c807c8aa9d3a88f77c245c3d01c
SHA512
4a9c07deaca6fbe994808904a6b90e09beb418155c662369046b6ddea03c8aa57ca2e9b4c2057c8e409bb197b90adb36e334c9c2136034a021be84763fa93551
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
deleted file mode 100644
index 0f72473bfe85..
--- a/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From
https://github.com/hobuinc/laz-perf/commit/a7f0f4f5b2ca851079574d47918f4f7abc6cc785
Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich
-Date: Tue, 13 Dec 2022 22:06:21 +
-Subject: [PATCH] Extractor.hpp: add missing 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 `` does not include
-`` 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.hpp2023-05-10
23:15:41.644241402 -0300
-@@ -34,6 +34,7 @@
-
- #pragma once
-
-+#include
- #include
- #include
-
diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-test.patch
b/sci-libs/pdal/files/pdal-2.4.3-fix-test.patch
deleted file mode 100644
index e49c2f129f11..
--- a/sci-libs/pdal/files/pdal-2.4.3-fix-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From
https://github.com/PDAL/PDAL/commit/88d6825751434a97795d0f65b28d66e3a986f2c4.patch
Mon Sep 17 00:00:00 2001
-From: Howard Butler
-Date: Fri, 16 Sep 2022 08:10:16 -0500
-Subject: [PATCH 01/39] relax WKT checking test now that PROJ 9+ adds AUTHORITY
- bits to more things
-
- test/unit/io/LasReaderTest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/unit/io/LasReaderTest.cpp b/test/unit/io/LasReaderTest.cpp
-index cbc8fab04d..5715039f90 100644
a/test/unit/io/LasReaderTest.cpp
-+++ b/test/unit/io/LasReaderTest.cpp
-@@ -270,7 +270,7 @@ TEST(LasReaderTest, inspect)
- // This string is common for WKT1 and WKT2. When we move to WKT2
- // completely, this can be fixed.
- std::string testWkt {
-- R"(GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS
84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433)"
-+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/files/, sci-libs/pdal/
commit: d64174f63fa545f1c60913c1d244eba99483ec13
Author: Thomas Bettler gmail com>
AuthorDate: Thu May 11 16:33:43 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun May 14 07:26:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d64174f6
sci-libs/pdal: fix gcc-13 build
Closes: https://bugs.gentoo.org/906102
Closes: https://github.com/gentoo/gentoo/pull/30999
Signed-off-by: Thomas Bettler gmail.com>
Signed-off-by: Sam James gentoo.org>
sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch | 29
sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch | 37 +++
sci-libs/pdal/pdal-2.4.3-r1.ebuild | 63 +
sci-libs/pdal/pdal-2.5.3-r1.ebuild | 61
4 files changed, 190 insertions(+)
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 ..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
+Date: Tue, 13 Dec 2022 22:06:21 +
+Subject: [PATCH] Extractor.hpp: add missing 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 `` does not include
+`` 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.hpp2023-05-10
23:15:41.644241402 -0300
+@@ -34,6 +34,7 @@
+
+ #pragma once
+
++#include
+ #include
+ #include
+
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 ..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
+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
+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/pdal-2.4.3-r1.ebuild
b/sci-libs/pdal/pdal-2.4.3-r1.ebuild
new file mode 100644
index ..81dd25d4f4bb
--- /dev/null
+++ b/sci-libs/pdal/pdal-2.4.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A C++ library for translating and manipulating point cloud data"
+HOMEPAGE="https://pdal.io/;
+SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="postgres test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+RDEPEND="
+ net-misc/curl
+ app-arch/zstd:=
+ dev-libs/libxml2
+ dev-libs/openssl:=
+ sci-libs/gdal:=
+ sci-libs/libgeotiff:=
+ sys-libs/libunwind:=
+ sys-libs/zlib
+ postgres? ( dev-db/postgresql:*[xml] )
+"
+DEPEND="
+ test? ( sci-libs/gdal[geos,jpeg,png] )
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/files/, sci-libs/pdal/
commit: 42aec6110ff3c800e3adec984e22062e011eed5d
Author: Thomas Bettler gmail com>
AuthorDate: Fri May 12 12:56:42 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 14 07:03:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42aec611
sci-libs/pdal: drop old versions
Signed-off-by: Thomas Bettler gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31005
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-libs/pdal/Manifest | 2 -
.../pdal/files/pdal-2.5.0-fix-opt-abseil.patch | 94 --
sci-libs/pdal/pdal-2.4.0-r1.ebuild | 56 -
sci-libs/pdal/pdal-2.5.0.ebuild| 61 --
4 files changed, 213 deletions(-)
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index 51dc54d25844..5df6933eface 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -1,4 +1,2 @@
-DIST PDAL-2.4.0-src.tar.gz 113449697 BLAKE2B
8f774555d32ad4f0afe6dd850e6dcaf33b58c02934207ee2224230af762a7d3062a48909e267abf790a97a1d11788bb7543971c99239e5ae742d7945db09bda5
SHA512
655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623
DIST PDAL-2.4.3-src.tar.gz 100758279 BLAKE2B
7c157bb51416b24bd8896a62e71a186bc9a45b34d5ab58fadbe691cb1abc9595f598fcf92ec528c9103f646c21f940b26fbf199a998e707d17f1527eb2957a85
SHA512
ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386
-DIST PDAL-2.5.0-src.tar.gz 105190336 BLAKE2B
6dc303abdf98c07a64a1709bf6069d003cddffef976874e635caf950a291aa7dbdffa0c374a83678f7661d5dd7b8d16dacfbe53354954265f688bdce1def
SHA512
10545ad44efbb7a654d596d4a861a81177d61a602ff8425965def5dd99e1595a7873c741f99eefcd7ae5dc7f438b321b51399db3b33fb8eddf46bec8394472b4
DIST PDAL-2.5.3-src.tar.bz2 102669314 BLAKE2B
1c6c8406f8de65a04364cc1141be809c00ea716fcfd5578833883357258855b3f7e70ea03c86f487dff0bc98072c29bed45a613c14ace05aef6ae49627b40374
SHA512
f67a303711b7d9e9dc14260afb96d299bcd5327ba0cc947143a583f55bd532a248b131e4602fd37d711ad0084e8601420828dacac40c414b95b8e9f9e8175e1b
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..
--- 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
-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()
--
[gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/files/, sci-libs/pdal/
commit: f00caec850988c5051a625c7d1466f259aeee50a
Author: Thomas Bettler gmail com>
AuthorDate: Mon Feb 21 18:18:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 26 02:27:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f00caec8
sci-libs/pdal: fix tests
Closes: https://bugs.gentoo.org/833820
Closes: https://github.com/gentoo/gentoo/pull/24303
Signed-off-by: Thomas Bettler gmail.com>
Signed-off-by: Sam James gentoo.org>
.../files/pdal-2.3.0-fix_tests_for_proj811.patch | 110 +
sci-libs/pdal/pdal-2.3.0.ebuild| 14 ++-
2 files changed, 123 insertions(+), 1 deletion(-)
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 ..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
+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/pdal-2.3.0.ebuild b/sci-libs/pdal/pdal-2.3.0.ebuild
index f85812782818..949b5ab43e8b 100644
--- a/sci-libs/pdal/pdal-2.3.0.ebuild
+++ b/sci-libs/pdal/pdal-2.3.0.ebuild
@@ -12,7 +12,8 @@
SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar
LICENSE="BSD"
SLOT="0/13"
KEYWORDS="~amd64 ~x86"
-IUSE="postgres"
+IUSE="postgres test"
+RESTRICT="!test? ( test )"
BDEPEND="
virtual/pkgconfig
@@ -26,12 +27,14 @@ DEPEND="
sys-libs/libunwind
sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/files/, sci-libs/pdal/
commit: c3ec8e1563acdc7509d0889be2b027d12a7de9fc
Author: Thomas Bettler gmail com>
AuthorDate: Sun Feb 20 09:48:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 20 23:08:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ec8e15
sci-libs/pdal: add pdal library
to work with point clouds (i.e. in qgis)
Bug: https://bugs.gentoo.org/830003
Bug: https://github.com/gentoo/gentoo/pull/23526
Closes: https://bugs.gentoo.org/830002
Closes: https://github.com/gentoo/gentoo/pull/23525
Signed-off-by: Thomas Bettler gmail.com>
Signed-off-by: Sam James gentoo.org>
sci-libs/pdal/Manifest | 1 +
.../pdal-2.3.0-fix_cmake_install_location.patch| 17 +
.../pdal/files/pdal-2.3.0-upgrade_cmake_min.patch | 77 ++
sci-libs/pdal/metadata.xml | 19 ++
sci-libs/pdal/pdal-2.3.0.ebuild| 48 ++
5 files changed, 162 insertions(+)
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
new file mode 100644
index ..87d5e450ed54
--- /dev/null
+++ b/sci-libs/pdal/Manifest
@@ -0,0 +1 @@
+DIST PDAL-2.3.0-src.tar.gz 110530128 BLAKE2B
435997e7ae7fe84ff77d8546e68ce6d32e54a221b5a4bbea45543554355506d7900f65ebb47a4f5333d0f3a44192ffe548178b6b3e8b3b7575d3c104618e288b
SHA512
9de87de7370175e76b95d3ec08667eb28b90a63eed8133f144427ff931e575d1f37aa13496f12054577539ee552458475dd054bcbdedfabe52eb0e32c4483d05
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 ..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-upgrade_cmake_min.patch
b/sci-libs/pdal/files/pdal-2.3.0-upgrade_cmake_min.patch
new file mode 100644
index ..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
