<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/60783d4c427c854ae4b7613ede990497c488baa9">https://github.com/macports/macports-ports/commit/60783d4c427c854ae4b7613ede990497c488baa9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 60783d4c427c854ae4b7613ede990497c488baa9
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Fri Jan 24 08:57:10 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> gdal: add subport 'gdal-hdf5', replacing the 'hdf5' variant
</span>---
gis/gdal/Portfile | 68 ++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 47 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33784eb9390..3589ebd141d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,6 +250,7 @@ configure.args-append \
</span> -DBUILD_CSHARP_BINDINGS=OFF \
-DBUILD_JAVA_BINDINGS=OFF \
-DBUILD_PYTHON_BINDINGS=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_ENABLE_DRIVER_HDF5=OFF \
</span> -DGDAL_USE_ARCHIVE=OFF \
-DGDAL_USE_ARMADILLO=OFF \
-DGDAL_USE_CFITSIO=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,6 +262,7 @@ configure.args-append \
</span> -DGDAL_USE_GEOS=ON \
-DGDAL_USE_GEOTIFF_INTERNAL=ON \
-DGDAL_USE_GIF=ON \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_USE_HDF4=OFF \
</span> -DGDAL_USE_HDF5=OFF \
-DGDAL_USE_HEIF=OFF \
-DGDAL_USE_ICONV=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,7 +330,8 @@ if {$subport eq $name} {
</span> configure.args-append \
-DGDAL_REGISTER_DRIVER_HDF4_FOR_LATER_PLUGIN=ON \
-DGDAL_DRIVER_HDF4_PLUGIN_INSTALLATION_MESSAGE="Install the HDF4 driver with 'sudo port install gdal-hdf4'." \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGDAL_USE_HDF4=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_REGISTER_DRIVER_HDF5_FOR_LATER_PLUGIN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_DRIVER_HDF5_PLUGIN_INSTALLATION_MESSAGE="Install the HDF5 driver with 'sudo port install gdal-hdf4'." \
</span> -DGDAL_REGISTER_DRIVER_PDF_FOR_LATER_PLUGIN=ON \
-DGDAL_DRIVER_PDF_PLUGIN_INSTALLATION_MESSAGE="Install the PDF driver with 'sudo port install gdal-pdf'." \
-DGDAL_USE_POPPLER=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -338,6 +341,7 @@ if {$subport eq $name} {
</span>
depends_build-append \
path:lib/pkgconfig/poppler.pc:poppler \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5 \
</span> port:libkml
if {[variant_isset kea] && ![variant_isset hdf5]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,27 +422,10 @@ if {$subport eq $name} {
</span> }
variant hdf5 description {Enable HDF5 file format} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If HDF5 is built with a mpi variant, we need to know the path to "mpi.h".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Figure out HDF5's mpi include directory:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpl_include_dir ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants hdf5 openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpl_include_dir "-I${prefix}/include/openmpi-mp"
</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;'>- if {![catch {set result [active_variants hdf5 mpich]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpl_include_dir "-I${prefix}/include/mpich-mp"
</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;'>- if {$mpl_include_dir ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append ${mpl_include_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The '+hdf5' variant has been removed and replaced by the 'gdal-hdf5' subport."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "unsupported variant"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:hdf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DGDAL_USE_HDF5=OFF -DGDAL_USE_HDF5=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DGDAL_ENABLE_DRIVER_HDF5=ON
</span> }
variant heif description {Enable HEIF support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -736,6 +723,45 @@ subport gdal-hdf4 {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gdal-hdf5 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description GDAL - HDF5 driver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_gdal_variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If HDF5 is built with a mpi variant, we need to know the path to "mpi.h".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Figure out HDF5's mpi include directory:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpl_include_dir ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants hdf5 openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpl_include_dir "-I${prefix}/include/openmpi-mp"
</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;'>+ if {![catch {set result [active_variants hdf5 mpich]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpl_include_dir "-I${prefix}/include/mpich-mp"
</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;'>+ if {$mpl_include_dir ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append ${mpl_include_dir}
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DGDAL_USE_HDF5=OFF -DGDAL_USE_HDF5=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_ENABLE_DRIVER_HDF5=OFF -DGDAL_ENABLE_DRIVER_HDF5=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DGDAL_ENABLE_DRIVER_HDF5_PLUGIN=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot} "find . ! -name 'gdal_HDF5.dylib' \\( -type f -or -type l \\) -exec rm -f {} +"
</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;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport gdal-libkml {
description GDAL - LIBKML driver
long_description {*}${description}.
</pre><pre style='margin:0'>
</pre>