public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/, sci-libs/pdal/files/
Date: Thu, 13 Oct 2022 23:01:14 +0000 (UTC)	[thread overview]
Message-ID: <1665701303.4c869d37dccaef9a0454ec688a4d3f48fb60075b.sam@gentoo> (raw)

commit:     4c869d37dccaef9a0454ec688a4d3f48fb60075b
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Thu Oct 13 14:16:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 22:48:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c869d37

sci-libs/pdal: fix test

Closes: https://bugs.gentoo.org/876981
Closes: https://github.com/gentoo/gentoo/pull/27769
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/pdal/files/pdal-2.4.3-fix-test.patch | 24 ++++++++++++++++++++++++
 sci-libs/pdal/pdal-2.4.3.ebuild               |  4 ++++
 2 files changed, 28 insertions(+)

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
new file mode 100644
index 000000000000..e49c2f129f11
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.4.3-fix-test.patch
@@ -0,0 +1,24 @@
+From https://github.com/PDAL/PDAL/commit/88d6825751434a97795d0f65b28d66e3a986f2c4.patch Mon Sep 17 00:00:00 2001
+From: Howard Butler <hobu.inc@gmail.com>
+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)"
++         R"(GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]])"
+     };
+ 
+     EXPECT_TRUE(Utils::startsWith(qi.m_srs.getWKT(), testWkt));
+

diff --git a/sci-libs/pdal/pdal-2.4.3.ebuild b/sci-libs/pdal/pdal-2.4.3.ebuild
index 9bd82c4dc76e..12e0180b0b45 100644
--- a/sci-libs/pdal/pdal-2.4.3.ebuild
+++ b/sci-libs/pdal/pdal-2.4.3.ebuild
@@ -37,6 +37,10 @@ DEPEND="
 
 S="${WORKDIR}/PDAL-${PV}-src"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)"


             reply	other threads:[~2022-10-13 23:01 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-13 23:01 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-14 15:31 [gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/, sci-libs/pdal/files/ Eli Schwartz
2025-07-05  7:16 Sam James
2024-12-01 11:45 Sam James
2023-01-20  1:23 Sam James
2022-10-09 18:29 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1665701303.4c869d37dccaef9a0454ec688a4d3f48fb60075b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox