<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f841ac7466414ea790d21772f99aa3f633e87bf5">https://github.com/macports/macports-ports/commit/f841ac7466414ea790d21772f99aa3f633e87bf5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f841ac7 gdal: add CharLS, proper Grass 7 and 12-bit JPEG support. Also cleanup.
</span>f841ac7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f841ac7466414ea790d21772f99aa3f633e87bf5
</span>Author: Veence <vince@macports.org>
AuthorDate: Mon May 21 16:36:57 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: add CharLS, proper Grass 7 and 12-bit JPEG support. Also cleanup.
</span>---
gis/gdal/Portfile | 100 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 62 insertions(+), 38 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 d5fb120..a25bc43 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;'>@@ -1,12 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup mpi 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span> PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name gdal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo gdal 4243624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0.20180521
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,19 +24,32 @@ long_description GDAL is a translator library for raster geospatial \
</span> similar capability for simple features vector data.
homepage http://www.gdal.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.osgeo.org/gdal/${version}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 26433559e74b07ff8c7c32cf59042b478e86e336 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2944bbfee009bf1ca092716e4fd547cb4ae2a1e8816186236110c22f11c7e1e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 eb822afdcffce6f0c1f3f059c37f29a95d40d7c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 60325d2cfbcad85a5096172eb2ef45f3ad45b3199de1d48274606619de4f1cc7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21378413
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.choose cc cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${worksrcpath}/gdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gdalwarpkernel_opencl_h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gdalwarpkernel_opencl_cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-apps_GNUmakefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ogr_p_h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ogr_api_cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scripts-GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/55752
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append MacTypes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build-append \
port:bash-completion \
port:pkgconfig
depends_lib-append port:zlib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd \
</span> port:libpng \
port:giflib \
port:proj \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,19 +63,21 @@ set OPENCLBASE "/System/Library/Frameworks/OpenCL.framework/"
</span> configure.universal_args-delete --disable-dependency-tracking
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-local=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libz=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-local=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libz=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zstd=yes \
</span> --without-liblzma \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-png=yes \
</span> --with-libtiff=internal \
--with-geotiff=internal \
--with-jpeg=internal\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gif=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-static-proj4=${prefix}/lib/proj5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-charls=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gif=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj=${prefix}/lib/proj5 \
</span> --with-qhull=yes \
--with-pam \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sqlite3=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-spatialite=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite3=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-spatialite=yes \
</span> --without-pg \
--without-grass \
--without-libgrass \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,26 +116,9 @@ configure.args-append \
</span> # Always choose internal libjson code (#44098)
configure.args-append --with-libjson-c=internal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-gdalwarpkernel_opencl_h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gdalwarpkernel_opencl_cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-apps_GNUmakefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ogr_p_h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ogr_api_cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-scripts-GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/55752
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append MacTypes.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;'>-
</span> # for all platforms without C++11 support
# this is just a suboptimal approximation (doesn't hold for gcc)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.cxx_stdlib} ne "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-cpp11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.cxx_stdlib} eq "libc++"} {
</span> configure.args-append --with-cpp14
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,10 +166,36 @@ variant curl description {Enable curl support} {
</span> configure.args-append --with-curl=${prefix}/bin/curl-config
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant grass description {Enable GRASS 7 GIS I/O} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {lindex [registry_active grass7] 0}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The grass variant requires grass 7 to be installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Since grass7 depends on gdal, please first install gdal WITHOUT the grass variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Then install grass7, then reinstall gdal with the grass variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Missing GRASS 7."
</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;'>+ # Workaround a missing header (trac issue #633)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|(^CPPFLAGS.*)|\\1 \$(PROJ_INCLUDE)|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/frmts/grass/GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|(^CPPFLAGS.*)|\\1 \$(PROJ_INCLUDE)|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ogr/ogrsf_frmts/grass/GNUmakefile
</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-delete --without-grass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-grass=${prefix}/share/grass-7.4.0
</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;'>+variant charls description {Build with CharLS} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:charls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-charls=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-charls=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant mrsid description {Enable MrSID file format} {
depends_lib-append port:geoexpress-sdk
configure.args-delete --without-mrsid
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mrsid=${prefix}/share/Geo_DSDK/Raster_DSDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mrsid=${prefix}/share/Geo_DSDK/Raster_DSDK
</span> }
variant ecw description {Enable ECW file format} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,14 +251,14 @@ variant hdf5 description {Enable HDF5 file format} {
</span> depends_lib-append port:hdf5
configure.args-delete --without-hdf5
configure.args-append --with-hdf5=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.enforce_variant hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# mpi.enforce_variant hdf5
</span> }
variant netcdf description {Enable NetCDF file format} {
depends_lib-append port:netcdf
configure.args-delete --without-netcdf
configure.args-append --with-netcdf=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.enforce_variant netcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# mpi.enforce_variant netcdf
</span> }
variant grib description {Enable GRIB (weather) file format} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,7 +270,7 @@ variant jasper \
</span> description {Enable JasPer JPEG-2000 format support} {
depends_lib-append port:jasper
configure.args-delete --without-jasper
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-jasper=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jasper=${prefix}/include
</span> }
variant openjpeg \
</pre><pre style='margin:0'>
</pre>