From 30737dc88991519b90363c2c7bae8fd049098d13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Oct 2022 01:43:18 +0100 Subject: gentoo auto-resync : 14:10:2022 - 01:43:18 --- sci-libs/pdal/Manifest | 3 ++- sci-libs/pdal/files/pdal-2.4.3-fix-test.patch | 24 ++++++++++++++++++++++++ sci-libs/pdal/pdal-2.4.3.ebuild | 4 ++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 sci-libs/pdal/files/pdal-2.4.3-fix-test.patch (limited to 'sci-libs/pdal') diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest index 35d4e62d733b..ee9784b7955e 100644 --- a/sci-libs/pdal/Manifest +++ b/sci-libs/pdal/Manifest @@ -1,5 +1,6 @@ +AUX pdal-2.4.3-fix-test.patch 1168 BLAKE2B a5b532ac015408c60d7f16d9aa325a36f85cd2aff8e028daf837d99c51cc3b39077a0cca81ce4e6664fe9370835e0410fad46c8ac5b36895b4a62b269a59be01 SHA512 5eea4f07c0368000420f7ee12f1bd63661525547b4169e1f3493df02144e6054074072d1ef589651a840e1a6a9a7c4412d5d46d41cc485a2e7835e5cd163b3b1 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 EBUILD pdal-2.4.0-r1.ebuild 1148 BLAKE2B eb3adb6444f2b20ebdec16fb9557b0eacd1584ee241ec323e35f1bcd2948d9a2feb05a46b3deff0a8f6519df3cbdeb72dc19bfbb3a2d64d3c7bad6b946a6d053 SHA512 d355971c09429fcb34863fe4d367568a26e27d616193530890ae97b9940da4bb302f0d2b50c8c3387d1f1c4870c53dea0000ba4a6f8bda0dc600ad3e8582951c -EBUILD pdal-2.4.3.ebuild 1149 BLAKE2B 963d7f66999dad32d633bc00c161a17c3b4ab609de94e9150e4976891d4f029d815b42c25169bf95789525ac236d6ad360e3b3d129bfded9044b931ea9c200c0 SHA512 05741614f3ac94fed4084798cb52b1784adb882dbfcd23c68e78734e503fd432d63bc071e6cfda4393d89d14d416b3ff73fd27e12d0a8f52810441d61ece15e4 +EBUILD pdal-2.4.3.ebuild 1197 BLAKE2B 6d13db5992dfa5f60b23e65a9a1eb0b58d618c68080cea7ac7c6f19bd8ed04269f042c301394a99f570c711b5845f9fb1a7aabe744053f7a3b7275ffd2214a2e SHA512 393ac33da3787fa024a0a41a8905820feacd158f305473065fb5ea9ce4d79cf84692f9adb56628ed530ec361bb22651693fea47294cb0ebc2583395cb85637b2 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2 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)" -- cgit v1.2.3