<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50fde66adc55086ff17756c1e0714bd3675a7c6b">https://github.com/macports/macports-ports/commit/50fde66adc55086ff17756c1e0714bd3675a7c6b</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 50fde66 ecCodes-2.14.1: Update to latest upstream version
</span>50fde66 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 50fde66adc55086ff17756c1e0714bd3675a7c6b
</span>Author: Remko Scharroo <remko@altimetrics.com>
AuthorDate: Mon Nov 4 16:29:44 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> ecCodes-2.14.1: Update to latest upstream version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This also removes the dependency on jasper, as its support is deprecated by the developer. The functionalities are covered by openjpeg.
</span><span style='display:block; white-space:pre;color:#404040;'> Unfortunately an error in the CMake setup makes the configuration look for jasper first, then openjpeg.
</span><span style='display:block; white-space:pre;color:#404040;'> The patchfile avoids this.
</span>---
science/ecCodes/Portfile | 17 ++++++++---------
science/ecCodes/files/patch-no-jasper-deps.diff | 17 +++++++++++++++++
2 files changed, 25 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ecCodes/Portfile b/science/ecCodes/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2da4aa..152cbc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ecCodes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ecCodes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.0
</span> PortGroup compilers 1.0
name ecCodes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.12.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.14.1
</span> platforms darwin
maintainers {takeshi @tenomoto}
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,9 +14,9 @@ description API and tools for decoding and encoding GRIB, BUFR and GTS f
</span> homepage https://confluence.ecmwf.int/display/ECC
master_sites https://confluence.ecmwf.int/download/attachments/45757960
distname eccodes-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f3f6a34fdc521676d6e1069e4741e894d6db174f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c14cb222f18a0357fd996f0802867c54500765836a8fa0aaedb92671973e614 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10968231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f62da706eb064bc22951b040af7d04306a1f8b80 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 16da742691c0ac81ccc378ae3f97311ef0dfdc82505aa4c652eb773e911cc9d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11014537
</span> long_description \
ecCodes is a package developed by ECMWF which provides an application programming interface and \
a set of tools for decoding and encoding messages in the following formats: \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,8 @@ long_description \
</span> \n* WMO FM-94 BUFR edition 3 and edition 4 \
\n* WMO GTS abbreviated header (only decoding).
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-no-jasper-deps.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if [fortran_variant_isset] {
compilers.choose cc fc f77 f90
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +35,8 @@ depends_build-append \
</span> bin:bison:bison \
bin:flex:flex \
port:perl5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:jasper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hdf5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openjpeg15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:openjpeg15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ld64 \
</span> port:libpng \
port:libaec \
port:netcdf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +53,6 @@ configure.args-append \
</span> -DAEC_PATH=${prefix}/lib/libaec \
-DENABLE_PYTHON=OFF \
-DENABLE_TESTS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY_RELEASE=${prefix}/lib/libjasper.dylib \
</span> -DNETCDF_CONFIG_EXECUTABLE=${prefix}/bin/nc-config \
-DOPENJPEG_INCLUDE_DIR=${prefix}/include/openjpeg-1.5 \
-DOPENJPEG_LIBRARY=${prefix}/lib/libopenjpeg.dylib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ecCodes/files/patch-no-jasper-deps.diff b/science/ecCodes/files/patch-no-jasper-deps.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b789fe6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ecCodes/files/patch-no-jasper-deps.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Removed section that finds jasper.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It is not needed since we use openjpeg instead, but the CMakeLists.txt inadvertently forces looking for jasper.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2019-07-08 14:06:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-07-19 13:27:24.158310812 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,11 +196,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which can affect future package discovery if not undone by the caller.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_WARN_DEPRECATED OFF) # Suppress deprecation message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ecbuild_add_extra_search_paths( jasper )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package( Jasper )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH}) # Restore CMAKE_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_WARN_DEPRECATED ON) # Remove suppression
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package( OpenJPEG )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>