<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8d3c85a91f9cdb9fef3b63df9d36d7645564355">https://github.com/macports/macports-ports/commit/b8d3c85a91f9cdb9fef3b63df9d36d7645564355</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b8d3c85a91f9cdb9fef3b63df9d36d7645564355
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Mon Oct 16 10:43:52 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> pdal: update to version 2.6.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Related changes:
</span><span style='display:block; white-space:pre;color:#404040;'> - proj is now a required dependency
</span><span style='display:block; white-space:pre;color:#404040;'> - remove unneeded libunwind patch
</span><span style='display:block; white-space:pre;color:#404040;'> - set compiler.thread_local_storage to yes
</span><span style='display:block; white-space:pre;color:#404040;'> - I3S support is now default
</span>---
gis/pdal/Portfile | 42 +++++++++++++++++++++++++++++++-----------
1 file changed, 31 insertions(+), 11 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 8b5afb80de0..975ca47a33a 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,8 +6,8 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup PDAL PDAL 2.5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup PDAL PDAL 2.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
name pdal
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,6 @@ long_description PDAL is a C++ BSD library for translating and\
</span> homepage https://www.pdal.io
distname PDAL-${version}-src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# dist_subdir may be removed with next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir PDAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Enable use of 'macports-libcxx' for macOS 10.14 and earlier, as port uses
# libcxx features normally only available on 10.15 and later.
legacysupport.use_mp_libcxx \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +29,11 @@ legacysupport.newest_darwin_requires_legacy \
</span> 18
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.thread_local_storage yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7173a396becdbd24989ca74d923c003340630f2b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 10cb0c8cad970cb23b774470921562332870c350d999308fb108742c4b4ee287 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 92538105
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a12c956989563187b364f3599f6b59d56b5c8c6b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f5db66a5e56f1d6f25899c2e745282357dd312affd96f527eeb3e3d670fa6724 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 92848670
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,8 +48,7 @@ depends_lib-append port:curl \
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-powerpc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libunwind-cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-powerpc.diff
</span>
# Starting with Xcode 15, the port libunwind is causing crashes,
# see https://trac.macports.org/ticket/68250 and https://trac.macports.org/ticket/66250.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +68,6 @@ configure.args-append \
</span> configure.args-append \
-DBUILD_PLUGIN_CPD=OFF \
-DBUILD_PLUGIN_DRACO=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_PLUGIN_I3S=ON \
</span> -DBUILD_PLUGIN_E57=ON \
-DBUILD_PLUGIN_FBX=OFF \
-DBUILD_PLUGIN_HDF=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +124,30 @@ foreach suffix ${postgresql_suffixes} {
</span> "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set PROJ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_versions {6 7 8 9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend proj_variants proj${pjver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach proj_ver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPROJ_INCLUDE_DIR=${prefix}/lib/proj${proj_ver}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append LIB=${prefix}/lib/proj${proj_ver}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${projdf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Kludge: needs proper fixing
configure.cppflags-append -g
configure.ldflags-append -g
</pre><pre style='margin:0'>
</pre>