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/files/, sci-libs/pdal/
Date: Thu, 22 May 2025 19:43:21 +0000 (UTC)	[thread overview]
Message-ID: <1747942947.6fc4c33ae634e95c1ec80f19348d10cc79b43725.sam@gentoo> (raw)

commit:     6fc4c33ae634e95c1ec80f19348d10cc79b43725
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 19:41:24 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 22 19:42:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc4c33a

sci-libs/pdal: backport ODR fix

Bug: https://bugs.gentoo.org/862915
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/pdal/files/pdal-2.8.4-odr.patch | 30 +++++++++++++++
 sci-libs/pdal/pdal-2.8.4-r1.ebuild       | 63 ++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/sci-libs/pdal/files/pdal-2.8.4-odr.patch b/sci-libs/pdal/files/pdal-2.8.4-odr.patch
new file mode 100644
index 000000000000..2fe59ffecd48
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.8.4-odr.patch
@@ -0,0 +1,30 @@
+From 92ac29a2a899c597ae4403c760a2e8991952b448 Mon Sep 17 00:00:00 2001
+From: Andrew Bell <andrew.bell.ia@gmail.com>
+Date: Mon, 19 May 2025 10:35:34 -0400
+Subject: [PATCH] Put arbiter forward declaration in the pdal namespace.
+
+---
+ io/EsriReader.hpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/io/EsriReader.hpp b/io/EsriReader.hpp
+index 7d42f68c49..35a12dce22 100644
+--- a/io/EsriReader.hpp
++++ b/io/EsriReader.hpp
+@@ -50,13 +50,14 @@
+ 
+ #include <nlohmann/json.hpp>
+ 
++namespace pdal
++{
++
+ namespace arbiter
+ {
+     class Arbiter;
+ }
+ 
+-namespace pdal
+-{
+ class SrsTransform;
+ class ThreadPool;
+ 

diff --git a/sci-libs/pdal/pdal-2.8.4-r1.ebuild b/sci-libs/pdal/pdal-2.8.4-r1.ebuild
new file mode 100644
index 000000000000..352d60c1cacd
--- /dev/null
+++ b/sci-libs/pdal/pdal-2.8.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021-2025 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.bz2"
+S="${WORKDIR}/PDAL-${PV}-src"
+
+LICENSE="BSD"
+SLOT="0/18"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug postgres 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/zlib
+	debug? ( sys-libs/libunwind:= )
+	postgres? ( dev-db/postgresql:*[xml] )
+"
+
+DEPEND="
+	test? ( sci-libs/gdal[geos,jpeg,png,sqlite] )
+	${RDEPEND}
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.4-odr.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)"
+		-DWITH_COMPLETION=ON
+		-DWITH_BACKTRACE="$(usex debug)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		--exclude-regex '(pgpointcloudtest|pdal_info_test|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test|pdal_io_stac_reader_test)'
+		--output-on-failure
+		-j1
+	)
+
+	cmake_src_test
+}


             reply	other threads:[~2025-05-22 19:43 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-22 19:43 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-11  8:13 [gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/files/, sci-libs/pdal/ Sam James
2024-04-24 12:51 Conrad Kostecki
2023-05-14  7:26 Sam James
2023-05-14  7:03 Andreas Sturmlechner
2022-02-26  2:30 Sam James
2022-02-20 23:11 Sam James

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=1747942947.6fc4c33ae634e95c1ec80f19348d10cc79b43725.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