testing/libmedc: upgrade to 4.1.1

testing/libmedc/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
 # Maintainer: Aiden Grossman <agrossman154@yahoo.com>
 pkgname=libmedc
-pkgver=4.1.0
+pkgver=4.1.1
-pkgrel=5
+pkgrel=0
 pkgdesc="Open source library for numerical simulation"
 url="https://www.salome-platform.org/"
 arch="all"
@@ -12,11 +12,10 @@ options="!check" #test suite is nonfunctional with python bindings
 subpackages="$pkgname-dev $pkgname-doc $pkgname-python-pyc $pkgname-python:_py"
 source="
 	https://files.salome-platform.org/Salome/other/med-$pkgver.tar.gz
-	hdf5-1.12.patch
+	hdf5.patch
-	hdf-version.patch
 	cmake-config-dir.patch
 	"
-builddir="$srcdir/med-$pkgver"
+builddir="$srcdir/med-${pkgver}_SRC"
 
 build() {
 	cmake -B build -G Ninja \
@@ -38,8 +37,7 @@ _py() {
 }
 
 sha512sums="
-94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8  med-4.1.0.tar.gz
+8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768  med-4.1.1.tar.gz
-65e68a1ddf077f0406498cf26165d5012039c279d6a5da03e29f67edad3fa4bbf6bb0e767fb4bfe279db0f68d0e6ab67c1e973db4ea967ad014bb40dff51b36d  hdf5-1.12.patch
+68d9291e73a68d674081314028c0fce7bbd4a7b78b93b7e5078117ce62f2d07318bc33ec95091ce677148ec3926c1ce653d0760c34e74b29257a7be59210f040  hdf5.patch
-665f765ed752aaa69b844c1428e551aa93e168f39436877afef0353674a0b8cb61f2774d9ab1de45701d1bb6e99b8654018d895f28ac09ad1d592463fd620133  hdf-version.patch
+8d0f58cd67d205fbacaff0e6da76e2ee5473457b478ede13a551ebe5853c0716c7406b74c3792e1ace33a34d352fccca8dd2940f063a7c060a12529d060a991a  cmake-config-dir.patch
-b794675b97d81a982f06ea3ac07f0a2c6f820cb829055aca9c3259e9157809e674e5de7f7f6502548f3c841f55b27a1521e3734d2aab9291933b131f53b67d59  cmake-config-dir.patch
 "

testing/libmedc/cmake-config-dir.patch

@@ -1,10 +1,11 @@
---- c/CMakeLists.txt
+--- a/CMakeLists.txt
-+++ w/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -101,7 +101,7 @@
  IF(WIN32 AND NOT CYGWIN)
     SET(INSTALL_CMAKE_CONFIG_DIR cmake)
  ELSE()
--   SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
+-   SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION})
-+   SET(INSTALL_CMAKE_CONFIG_DIR lib/cmake/med-fichier-${MED_STR_VERSION})
++   SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/medfile-${MED_STR_VERSION})
  ENDIF()
  SET(INSTALL_INCLUDE_DIR include)
+ 

testing/libmedc/hdf-version.patch

@@ -1,11 +0,0 @@
---- c/src/ci/MEDfileCompatibility.c
-+++ w/src/ci/MEDfileCompatibility.c
-@@ -113,7 +113,7 @@
- #if MED_NUM_MAJEUR != 4
- #error "Don't forget to update the test version here when you change the major version of the library !"
- #endif
--#if H5_VERS_MINOR > 10
-+#if 0
- #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
- #error "Cf. _MEDfileCreate ..."
- #endif

testing/libmedc/hdf5-1.12.patch

@@ -1,92 +0,0 @@
-Originally from https://gist.github.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47
-diff --git c/config/cmake_files/medMacros.cmake w/config/cmake_files/medMacros.cmake
-index b79f387..7c82cec 100644
---- c/config/cmake_files/medMacros.cmake
-+++ w/config/cmake_files/medMacros.cmake
-@@ -398,7 +398,7 @@ MACRO(MED_FIND_HDF5)
-     ##
-     ## 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)
-+    IF (HDF5_VERSION VERSION_LESS 1.10.2)
-         MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
-     ENDIF()
-     ##
-diff --git c/src/ci/MEDfileCompatibility.c w/src/ci/MEDfileCompatibility.c
-index b5c42d1..d94e6a8 100644
---- c/src/ci/MEDfileCompatibility.c
-+++ w/src/ci/MEDfileCompatibility.c
-@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename,
-   _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
-   /* ISCRUTE(_hversionMMR); */
-   /* ISCRUTE(HDF_VERSION_NUM_REF); */
--  if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
-+  if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
- 
-   /* TODO : Vérifier si la version mineure HDF du fichier est supérieur 
-      à la version mineure de la bibliothèque HDF utilisée  */
-diff --git c/src/hdfi/_MEDfileCreate.c w/src/hdfi/_MEDfileCreate.c
-index 34c75cc..66073c1 100644
---- c/src/hdfi/_MEDfileCreate.c
-+++ w/src/hdfi/_MEDfileCreate.c
-@@ -84,7 +84,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
-    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
-    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
-    */
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-    
-diff --git c/src/hdfi/_MEDfileOpen.c w/src/hdfi/_MEDfileOpen.c
-index 7d0b798..6a7de9a 100644
---- c/src/hdfi/_MEDfileOpen.c
-+++ w/src/hdfi/_MEDfileOpen.c
-@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
- 
-    •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
-   */
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
- /* L'avantage de bloquer le modèle interne HDF5 
-diff --git c/src/hdfi/_MEDmemFileOpen.c w/src/hdfi/_MEDmemFileOpen.c
-index 9449cda..a3f4adc 100644
---- c/src/hdfi/_MEDmemFileOpen.c
-+++ w/src/hdfi/_MEDmemFileOpen.c
-@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
-     goto ERROR;
-   }
- 
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
-diff --git c/src/hdfi/_MEDparFileCreate.c w/src/hdfi/_MEDparFileCreate.c
-index c6d9f44..b3b2a41 100644
---- c/src/hdfi/_MEDparFileCreate.c
-+++ w/src/hdfi/_MEDparFileCreate.c
-@@ -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 ! 
-    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
-    */
--#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-    
-diff --git c/src/hdfi/_MEDparFileOpen.c w/src/hdfi/_MEDparFileOpen.c
-index 0100729..dfad95c 100644
---- c/src/hdfi/_MEDparFileOpen.c
-+++ w/src/hdfi/_MEDparFileOpen.c
-@@ -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
-+#if H5_VERS_MINOR > 12
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {

testing/libmedc/hdf5.patch

@@ -0,0 +1,94 @@
+Originally from https://gist.github.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47
+diff -rupN med-4.1.0/config/cmake_files/medMacros.cmake med-4.1.0-new/config/cmake_files/medMacros.cmake
+--- med-4.1.0/config/cmake_files/medMacros.cmake	2021-12-03 09:35:30.675827163 +0100
++++ med-4.1.0-new/config/cmake_files/medMacros.cmake	2021-12-03 09:32:31.894994147 +0100
+@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5)
+     ##
+     ## 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)
++    IF (HDF5_VERSION VERSION_LESS 1.10.2)
+         MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
+     ENDIF()
+     ##
+diff -rupN med-4.1.0/src/ci/MEDfileCompatibility.c med-4.1.0-new/src/ci/MEDfileCompatibility.c
+--- med-4.1.0/src/ci/MEDfileCompatibility.c	2021-12-03 09:35:30.676827162 +0100
++++ med-4.1.0-new/src/ci/MEDfileCompatibility.c	2021-12-03 09:33:26.292942149 +0100
+@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const f
+   _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
+   /* ISCRUTE(_hversionMMR); */
+   /* ISCRUTE(HDF_VERSION_NUM_REF); */
+-  if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
++  if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
+ 
+   /* TODO : Vérifier si la version mineure HDF du fichier est supérieure
+      à la version mineure de la bibliothèque HDF utilisée :
+@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const f
+ #if MED_NUM_MAJEUR != 4
+ #error "Don't forget to update the test version here when you change the major version of the library !"
+ #endif
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 14
+ #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
+ #error "Cf. _MEDfileCreate ..."
+ #endif
+diff -rupN med-4.1.0/src/hdfi/_MEDfileCreate.c med-4.1.0-new/src/hdfi/_MEDfileCreate.c
+--- med-4.1.0/src/hdfi/_MEDfileCreate.c	2021-12-03 09:35:30.677827161 +0100
++++ med-4.1.0-new/src/hdfi/_MEDfileCreate.c	2021-12-03 09:32:31.894994147 +0100
+@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * cons
+    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
+    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+    */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 14
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+    
+diff -rupN med-4.1.0/src/hdfi/_MEDfileOpen.c med-4.1.0-new/src/hdfi/_MEDfileOpen.c
+--- med-4.1.0/src/hdfi/_MEDfileOpen.c	2021-12-03 09:35:30.677827161 +0100
++++ med-4.1.0-new/src/hdfi/_MEDfileOpen.c	2021-12-03 09:32:31.894994147 +0100
+@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const
+ 
+    •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
+   */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 14
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+ /* L'avantage de bloquer le modèle interne HDF5 
+diff -rupN med-4.1.0/src/hdfi/_MEDmemFileOpen.c med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c
+--- med-4.1.0/src/hdfi/_MEDmemFileOpen.c	2021-12-03 09:35:30.678827160 +0100
++++ med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c	2021-12-03 09:32:31.894994147 +0100
+@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * con
+     goto ERROR;
+   }
+ 
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 14
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
+diff -rupN med-4.1.0/src/hdfi/_MEDparFileCreate.c med-4.1.0-new/src/hdfi/_MEDparFileCreate.c
+--- med-4.1.0/src/hdfi/_MEDparFileCreate.c	2021-12-03 09:35:30.678827160 +0100
++++ med-4.1.0-new/src/hdfi/_MEDparFileCreate.c	2021-12-03 09:32:31.894994147 +0100
+@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * c
+    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
+    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+    */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 14
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+    
+diff -rupN med-4.1.0/src/hdfi/_MEDparFileOpen.c med-4.1.0-new/src/hdfi/_MEDparFileOpen.c
+--- med-4.1.0/src/hdfi/_MEDparFileOpen.c	2021-12-03 09:35:30.679827159 +0100
++++ med-4.1.0-new/src/hdfi/_MEDparFileOpen.c	2021-12-03 09:32:31.894994147 +0100
+@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * con
+     MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
+     goto ERROR;
+   }
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 14
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {