From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A052E158020 for ; Thu, 13 Oct 2022 23:01:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8590E08F0; Thu, 13 Oct 2022 23:01:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A1AAE08FB for ; Thu, 13 Oct 2022 23:01:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DECF340FCF for ; Thu, 13 Oct 2022 23:01:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C244602 for ; Thu, 13 Oct 2022 23:01:14 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665701303.4c869d37dccaef9a0454ec688a4d3f48fb60075b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/, sci-libs/pdal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/pdal/files/pdal-2.4.3-fix-test.patch sci-libs/pdal/pdal-2.4.3.ebuild X-VCS-Directories: sci-libs/pdal/ sci-libs/pdal/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4c869d37dccaef9a0454ec688a4d3f48fb60075b X-VCS-Branch: master Date: Thu, 13 Oct 2022 23:01:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c474692-375e-4b8a-9a7f-10d57c556623 X-Archives-Hash: 0e06367d6208bd23977ef0a1728f65c7 commit: 4c869d37dccaef9a0454ec688a4d3f48fb60075b Author: Thomas Bettler gmail com> AuthorDate: Thu Oct 13 14:16:00 2022 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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 +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)"