<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d31645d7f02a7a813d05c6b64ae7ba4919e5c10c">https://github.com/macports/macports-ports/commit/d31645d7f02a7a813d05c6b64ae7ba4919e5c10c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d31645d7f02a7a813d05c6b64ae7ba4919e5c10c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jan 14 10:49:17 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> libmed: update version 4.0.0->4.1.1 & turn off tests
</span>---
science/libmed/Portfile | 12 ++--
science/libmed/files/patch-hdf5-1.12.diff | 110 ++++++++++++++++++------------
2 files changed, 75 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libmed/Portfile b/science/libmed/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e6916a4e09..f0d7d43ed81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libmed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libmed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup mpi 1.0
</span> PortGroup cmake 1.1
name libmed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science devel
platforms darwin
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description MED (Modeling and Exchange of Data) is {*}${description}
</span> master_sites https://files.salome-platform.org/Salome/other/
distname med-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f7f816d81181906a3b8418a2384a882477c4fae3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a474e90b5882ce69c5e9f66f6359c53b8b73eb448c5f631fa96e8cd2c14df004 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 47849098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2e0a189cb4b5d72ae88c8e8fb26a61821e4e60be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dc2b5d54ebf0666e3ff2e974041d2ab0da906061323537023ab165d573389dd0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 50506725
</span>
patchfiles patch-hdf5-1.12.diff \
patch-test10.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,8 @@ if {[mpi_variant_isset]} {
</span> configure.args-append -DMEDFILE_USE_MPI=ON
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DMEDFILE_BUILD_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:hdf5
mpi.enforce_variant hdf5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libmed/files/patch-hdf5-1.12.diff b/science/libmed/files/patch-hdf5-1.12.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dc633520509..ee983376d95 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libmed/files/patch-hdf5-1.12.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libmed/files/patch-hdf5-1.12.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,91 +1,117 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git c/config/cmake_files/medMacros.cmake w/config/cmake_files/medMacros.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b79f387..7c82cec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Bernd Waibel <waebbl-gentoo@posteo.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 24 Aug 2021 08:32:13 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] build against hdf5-1.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config/cmake_files/medMacros.cmake | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/ci/MEDfileCompatibility.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/hdfi/_MEDfileCreate.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/hdfi/_MEDfileOpen.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/hdfi/_MEDmemFileOpen.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/hdfi/_MEDparFileCreate.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/hdfi/_MEDparFileOpen.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7 files changed, 8 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 957c59b..d73c7af 100644
</span> --- config/cmake_files/medMacros.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/cmake_files/medMacros.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -398,7 +398,7 @@ MACRO(MED_FIND_HDF5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config/cmake_files/medMacros.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -447,13 +447,13 @@ MACRO(MED_FIND_HDF5)
</span> ##
## Requires 1.10.x version
##
- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF (HDF5_VERSION VERSION_LESS 1.10.2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(HDF5_VERSION VERSION_LESS 1.10.2)
</span> MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
ENDIF()
##
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git c/src/ci/MEDfileCompatibility.c w/src/ci/MEDfileCompatibility.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b5c42d1..d94e6a8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ci/MEDfileCompatibility.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ci/MEDfileCompatibility.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ISCRUTE(_hversionMMR); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ISCRUTE(HDF_VERSION_NUM_REF); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* TODO : Vérifier si la version mineure HDF du fichier est supérieur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- à la version mineure de la bibliothèque HDF utilisée */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git c/src/hdfi/_MEDfileCreate.c w/src/hdfi/_MEDfileCreate.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34c75cc..66073c1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ADD_DEFINITIONS(-DH5_USE_16_API)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ADD_DEFINITIONS(-DH5_USE_18_API -DH5_USE_16_API)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1d6cabf..43b5b50 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ci/MEDfileCompatibility.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/ci/MEDfileCompatibility.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MED_NUM_MAJEUR != 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "Don't forget to update the test version here when you change the major version of the library !"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if H5_VERS_MINOR > 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if H5_VERS_MINOR > 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "Cf. _MEDfileCreate ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4bc9551..b670c92 100644
</span> --- src/hdfi/_MEDfileCreate.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hdfi/_MEDfileCreate.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,7 +84,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/hdfi/_MEDfileCreate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
</span> * En HDF5-1.10.0p1 cela n'a aucun effet !
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Un test autoconf permet de fixer un intervalle de version HDF à MED.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Un test autoconf permet de fixer un intervalle de version HDF ?? MED.
</span> */
-#if H5_VERS_MINOR > 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if H5_VERS_MINOR > 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if H5_VERS_MINOR > 14
</span> #error "Don't forget to change the compatibility version of the library !"
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git c/src/hdfi/_MEDfileOpen.c w/src/hdfi/_MEDfileOpen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7d0b798..6a7de9a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8ace00e..ebd875b 100644
</span> --- src/hdfi/_MEDfileOpen.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hdfi/_MEDfileOpen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/hdfi/_MEDfileOpen.c
</span> @@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
<span style='display:block; white-space:pre;background:#ffe0e0;'>- • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ??? The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
</span> */
-#if H5_VERS_MINOR > 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if H5_VERS_MINOR > 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if H5_VERS_MINOR > 14
</span> #error "Don't forget to change the compatibility version of the library !"
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* L'avantage de bloquer le modèle interne HDF5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git c/src/hdfi/_MEDmemFileOpen.c w/src/hdfi/_MEDmemFileOpen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9449cda..a3f4adc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* L'avantage de bloquer le mod??le interne HDF5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ae92ba7..4a929ff 100644
</span> --- src/hdfi/_MEDmemFileOpen.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hdfi/_MEDmemFileOpen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/hdfi/_MEDmemFileOpen.c
</span> @@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
goto ERROR;
}
-#if H5_VERS_MINOR > 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if H5_VERS_MINOR > 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if H5_VERS_MINOR > 14
</span> #error "Don't forget to change the compatibility version of the library !"
#endif
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git c/src/hdfi/_MEDparFileCreate.c w/src/hdfi/_MEDparFileCreate.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c6d9f44..b3b2a41 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f0b77be..b7d1b78 100644
</span> --- src/hdfi/_MEDparFileCreate.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hdfi/_MEDparFileCreate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/hdfi/_MEDparFileCreate.c
</span> @@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc
* En HDF5-1.10.0p1 cela n'a aucun effet !
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Un test autoconf permet de fixer un intervalle de version HDF à MED.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Un test autoconf permet de fixer un intervalle de version HDF ?? MED.
</span> */
-#if H5_VERS_MINOR > 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if H5_VERS_MINOR > 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if H5_VERS_MINOR > 14
</span> #error "Don't forget to change the compatibility version of the library !"
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git c/src/hdfi/_MEDparFileOpen.c w/src/hdfi/_MEDparFileOpen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0100729..dfad95c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0a9700d..4933692 100644
</span> --- src/hdfi/_MEDparFileOpen.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hdfi/_MEDparFileOpen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/hdfi/_MEDparFileOpen.c
</span> @@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access
MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
goto ERROR;
}
-#if H5_VERS_MINOR > 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if H5_VERS_MINOR > 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if H5_VERS_MINOR > 14
</span> #error "Don't forget to change the compatibility version of the library !"
#endif
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.32.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>