<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8f19ecd410039dd29bfa4dc47bba6862bc0c3ea7">https://github.com/macports/macports-ports/commit/8f19ecd410039dd29bfa4dc47bba6862bc0c3ea7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8f19ecd410039dd29bfa4dc47bba6862bc0c3ea7
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Tue Jun 6 16:01:28 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> pdal: update to version 2.5.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In addition, removes Python related configurations, PDAL Python support
</span><span style='display:block; white-space:pre;color:#404040;'> now resides in a separate repository (https://github.com/PDAL/python).
</span>---
gis/pdal/Portfile | 84 ++++++++++++++++-------------------
gis/pdal/files/pdal_Geometry_cpp.diff | 20 ---------
2 files changed, 38 insertions(+), 66 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/pdal/Portfile b/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d68135c870c..1bf14029935 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup PDAL PDAL 2.5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup PDAL PDAL 2.5.4
</span> revision 0
categories gis
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,57 +32,50 @@ legacysupport.newest_darwin_requires_legacy \
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6cb5187424e44d5a20d9f0af25b7a972ab2425bb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b02623885e66aebbddd9843e807b389a4bd9dd0fcc9a53579f1517d1d86d7780 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 108124300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 887d5772e7601a7a1bf78b29000e15fd82da327f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5b5e4c14e8fb2c4eb647b29e1a7aed2ac8fcbb9963c01e5e5508d447a99f8320 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 108206387
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span>
depends_lib-append port:geos \
port:gdal \
port:libgeotiff \
port:zlib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd \
</span> port:libxml2 \
port:curl \
port:libunwind
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles pdal_Geometry_cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Python stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_suffixes {27 35 36 37 38 39 310}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set def_py_var "if {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach suffix ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend python_variants python${suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set def_py_var "${def_py_var}!\[variant_isset python${suffix}\] && "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Set default variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set def_py_var [string range ${def_py_var} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set def_py_var "${def_py_var}} {default_variants +python310}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval ${def_py_var}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach suffix ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set vrt python${suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pyversion [string index ${suffix} 0].[string range ${suffix} 1 end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set index [lsearch -exact ${python_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set conf [lreplace ${python_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pyfw ${frameworks_dir}/Python.framework/Versions/${pyversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${vrt} description "Use Python ${pyversion}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${vrt} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${suffix}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_PLUGIN_PYTHON=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyversion} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${pyfw}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${pyfw}/lib/libpython${pyversion}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DWITH_ZSTD=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ZLIB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LZMA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TOOLS_NITFWRAP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_COMPLETION=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_CPD=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_DRACO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_I3S=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_ICEBRIDGE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_HDF=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_MATLAB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_NITF=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_OPENSCENEGRAPH=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_RIVLIB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_RDBLIB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_MBIO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_FBX=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_TEASER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_TILEDB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_TRAJECTORY=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_E57=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PostgreSQL variants
</span> set postgresql_suffixes {15 14 13 12 11 10 95 96}
set def_psql_var "if {"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,10 +98,9 @@ foreach suffix ${postgresql_suffixes} {
</span>
variant ${vrt} description "Use PostgreSQL ${pgversion}" conflicts {*}${conf} "
depends_lib-append port:${vrt}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPG_CONFIG=${prefix}/lib/${vrt}/bin/pg_config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPOSTGRESQL_INCLUDE_DIR=${prefix}/include/${vrt} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPOSTGRESQL_LIBRARIES=${prefix}/lib/${vrt}/libpq.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPostgreSQL_ROOT=${prefix}/lib/${vrt} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPostgreSQL_INCLUDE_DIR=${prefix}/include/${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PostgreSQL_ADDITIONAL_VERSIONS=15
</span> "
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/pdal/files/pdal_Geometry_cpp.diff b/gis/pdal/files/pdal_Geometry_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e8779eb27b5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/pdal/files/pdal_Geometry_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pdal/Geometry.cpp.orig 2023-04-13 20:07:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pdal/Geometry.cpp 2023-05-02 20:18:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,7 +153,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool Geometry::srsValid() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OGRSpatialReference *srs = m_geom->getSpatialReference();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OGRSpatialReference *srs = const_cast<OGRSpatialReference *>(m_geom->getSpatialReference());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return srs && srs->GetRoot();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,7 +172,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return StatusWithReason(-2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Geometry::transform() failed. NULL target SRS.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OGRSpatialReference *inSrs = m_geom->getSpatialReference();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OGRSpatialReference *inSrs = const_cast<OGRSpatialReference *>(m_geom->getSpatialReference());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SrsTransform transform(*inSrs, OGRSpatialReference(out.getWKT().data()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_geom->transform(transform.get()) != OGRERR_NONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return StatusWithReason(-1, "Geometry::transform() failed.");
</span></pre><pre style='margin:0'>
</pre>