summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bettler <thomas.bettler@gmail.com>2023-01-19 18:40:42 +0100
committerSam James <sam@gentoo.org>2023-01-20 01:21:12 +0000
commitd97a9547cb7817edc0e2d32e995eefa3ac34cb33 (patch)
tree1e4dd839d0e2d9c56902b077faf74a6f3b7cc87f /sci-libs
parentdev-libs/skalibs: remove doc and ipv6 use flags (diff)
downloadgentoo-d97a9547cb7817edc0e2d32e995eefa3ac34cb33.tar.gz
gentoo-d97a9547cb7817edc0e2d32e995eefa3ac34cb33.tar.bz2
gentoo-d97a9547cb7817edc0e2d32e995eefa3ac34cb33.zip
sci-libs/pdal: bump 2.5.0
Closes: https://github.com/gentoo/gentoo/pull/29173 Signed-off-by: Thomas Bettler <thomas.bettler@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/pdal/Manifest1
-rw-r--r--sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch94
-rw-r--r--sci-libs/pdal/pdal-2.5.0.ebuild61
3 files changed, 156 insertions, 0 deletions
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index 92734a4b47a1..cd137117ac2d 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -1,2 +1,3 @@
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 6dc303abdf98c07a64a1709bf6069d003cddffef976874e635caf950a291aa7dbdffa0c374a83678f7661ccccd5dd7b8d16dacfbe53354954265f688bdce1def SHA512 10545ad44efbb7a654d596d4a861a81177d61a602ff8425965def5dd99e1595a7873c741f99eefcd7ae5dc7f438b321b51399db3b33fb8eddf46bec8394472b4
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
new file mode 100644
index 000000000000..79a0f0d162b0
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch
@@ -0,0 +1,94 @@
+From: https://github.com/PDAL/PDAL/commit/a3a8d6f1759f848b1ec6f3a2fcb3e6b40f12d892
+From: Howard Butler <hobu.inc@gmail.com>
+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()
+- 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 PRIVATE re2::re2)
+ endif()
+diff --git a/cmake/options.cmake b/cmake/options.cmake
+index 73be6788b2..ca3460e629 100644
+--- a/cmake/options.cmake
++++ b/cmake/options.cmake
+@@ -105,6 +105,10 @@ add_feature_info("Unit tests" WITH_TESTS "PDAL unit tests")
+ option(ENABLE_CTEST
+ "Enable CTest to support submissions of results to CDash at http://cdash.org" FALSE)
+
++option(WITH_ABSEIL
++ "Choose if PDAL should be built with Abseil support for testing" FALSE)
++add_feature_info("Abseil debugging support " WITH_ABSEIL "unit tests")
++
+ #
+ # Choose dependent options
+ #
diff --git a/sci-libs/pdal/pdal-2.5.0.ebuild b/sci-libs/pdal/pdal-2.5.0.ebuild
new file mode 100644
index 000000000000..04eb190ce7d6
--- /dev/null
+++ b/sci-libs/pdal/pdal-2.5.0.ebuild
@@ -0,0 +1,61 @@
+# 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/15"
+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] )
+ ${RDEPEND}
+"
+
+S="${WORKDIR}/PDAL-${PV}-src"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-opt-abseil.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)"
+ -DWITH_COMPLETION=ON
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ --exclude-regex '(pgpointcloudtest|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
+}