Commit d7e34e08 authored by Francesco Marinucci's avatar Francesco Marinucci

[skip-ci] med: update to 3.3.1

parent 0319400a
Pipeline #1544 skipped
# Contributor: Oliver Goethel <deezy>
pkgname=med
pkgver=3.2.1
pkgver=3.3.1
pkgrel=1
pkgdesc="MED stands for Modelisation et Echanges de Donnees, i.e. Data Modelization and Exchanges - MED is code-aster exchange module linked to hdf5"
url="http://www.code-aster.org/outils/med/"
url="https://www.salome-platform.org/downloads"
license=('LGPL')
depends=('hdf5' 'openmpi' 'swig')
makedepends=('gcc-fortran' 'coreutils' 'python2')
......@@ -15,16 +15,16 @@ replaces=('med_fichier')
backup=()
arch=('x86_64')
source=("http://files.salome-platform.org/Salome/other/${pkgname}-${pkgver}.tar.gz"
"patch-include_2.3.6_med.h.in"
"patch-include_med.h.in"
"patch-src_2.3.6_ci_MEDequivInfo.c"
"patch-int2long")
md5sums=('4965899bb578229ba27c9bc5293c651e'
'b83949326d7ae0ca77a06822b754a329'
'14a151cea108388d7a3b4c62887169f6'
'8f0cbf6f08783a6ba68ff5ab240dd62e'
'be65d145b85ed5b19a709d9dee84b6d2')
"hdf5-1.10-support.patch")
md5sums=('4981a02fa50b1a487a022804512631ff'
'8fe2bc9bc5e6756351e1ff80e613dba3')
prepare() {
cd "$pkgname-$pkgver"_SRC
patch -p1 -i ../hdf5-1.10-support.patch
autoreconf -i
}
build() {
export FFLAGS="-fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -ffixed-line-length-0 ${CFLAGS}"
export FCFLAGS="-fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -ffixed-line-length-0 ${CFLAGS}"
......@@ -34,30 +34,16 @@ build() {
export PYTHON="$(which python2)"
cd ${srcdir}/${pkgname}-${pkgver} || return 1
# patch H5public_extract.h.in
sed -i -e '/^#typedef/ s/#/\/\//' ./include/H5public_extract.h.in
#patch for hdf5-1.10
patch -p0 < ${srcdir}/patch-include_2.3.6_med.h.in
patch -p0 < ${srcdir}/patch-include_med.h.in
patch -p0 < ${srcdir}/patch-src_2.3.6_ci_MEDequivInfo.c
patch -p0 < ${srcdir}/patch-int2long
./configure --with-f90=mpif90 --prefix=/usr --datadir=/usr/share/med --with-swig=yes || return 1
make || return 1
cd "${pkgname}-${pkgver}"_SRC
./configure --with-f90=mpif90 --prefix=/usr --datadir=/usr/share/med --with-swig=yes
make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver} || return 1
cd "${pkgname}-${pkgver}"_SRC
make DESTDIR=${pkgdir} install || return 1
# now move the testprograms to share, we don't want all the stuff in the bindir
cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/testc ${pkgdir}/usr/share/med/testc
cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/testf ${pkgdir}/usr/share/med/
cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/unittests ${pkgdir}/usr/share/med/
cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/usescases ${pkgdir}/usr/share/med/
rm -r ${pkgdir}/usr/bin/{usescases,unittests,testf,testc}
make DESTDIR=${pkgdir} install
}
This diff is collapsed.
--- include/2.3.6/med.h.in.orig 2014-10-09 08:12:57 UTC
+++ include/2.3.6/med.h.in
@@ -25,11 +25,7 @@ extern "C" {
#endif
#define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100 + H5_VERS_RELEASE )
-#if HDF5_VERSION < 10607
-#define HDF5_SELECT_BUG (const hsize_t **)
-#else
#define HDF5_SELECT_BUG
-#endif
#define MED_NUM_MAJEUR 2
--- include/med.h.in.orig 2014-10-09 08:12:57 UTC
+++ include/med.h.in
@@ -27,12 +27,7 @@ extern "C" {
#define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100 + H5_VERS_RELEASE )
-#if HDF5_VERSION < 10607
-/*TODO : A enlever après MAJ complète api hdf5-1.8 */
-#define HDF5_SELECT_BUG (const hsize_t **)
-#else
#define HDF5_SELECT_BUG
-#endif
/*Le symbole H5F_LIBVER_18 n'existe pas dans hdf5-1.8.4 (uniquement à partir de la version 1.8.6)
Pour rester dans le modèle interne hdf introduit en 1.8 quelque soit les futurs modèles internes hdf
diff -Nur src.orig/2.3.6/hdfi/MEDattrNumEcrire.c src/2.3.6/hdfi/MEDattrNumEcrire.c
--- src.orig/2.3.6/hdfi/MEDattrNumEcrire.c 2015-09-07 18:55:34.000000000 +0200
+++ src/2.3.6/hdfi/MEDattrNumEcrire.c 2016-05-24 02:15:27.450098778 +0200
@@ -36,7 +36,7 @@
{
med_idt aid,attr;
med_err ret;
- int type_hdf;
+ long type_hdf;
med_mode_acces MED_MODE_ACCES;
if ( (MED_MODE_ACCES = _MEDmodeAcces(pere) ) == MED_UNDEF_MODE_ACCES ) {
diff -Nur src.orig/hdfi/_MEDattributeNumRdByName.c src/hdfi/_MEDattributeNumRdByName.c
--- src.orig/hdfi/_MEDattributeNumRdByName.c 2015-09-07 18:55:16.000000000 +0200
+++ src/hdfi/_MEDattributeNumRdByName.c 2016-05-24 02:15:27.443432111 +0200
@@ -27,7 +27,7 @@
{
med_idt _attid=0;
med_err _ret=-1;
- int type_hdf;
+ long type_hdf;
switch(type)
{
diff -Nur src.orig/hdfi/_MEDattributeNumWrByName.c src/hdfi/_MEDattributeNumWrByName.c
--- src.orig/hdfi/_MEDattributeNumWrByName.c 2015-09-07 18:55:17.000000000 +0200
+++ src/hdfi/_MEDattributeNumWrByName.c 2016-05-24 02:15:27.443432111 +0200
@@ -32,7 +32,7 @@
{
med_idt _attid=0,aid=0;
med_err _ret=-1;
- int type_hdf;
+ long type_hdf;
med_access_mode MED_ACCESS_MODE;
H5O_info_t _oinfo;
diff -Nur src.orig/hdfi/_MEDattributeNumWr.c src/hdfi/_MEDattributeNumWr.c
--- src.orig/hdfi/_MEDattributeNumWr.c 2015-09-07 18:55:16.000000000 +0200
+++ src/hdfi/_MEDattributeNumWr.c 2016-05-24 02:15:27.443432111 +0200
@@ -32,7 +32,7 @@
{
med_idt _attid=0,aid=0;
med_err _ret=-1;
- int type_hdf;
+ long type_hdf;
med_access_mode MED_ACCESS_MODE;
H5O_info_t _oinfo;
diff -Nur src.orig/hdfi/_MEDattributeStringRdByName.c src/hdfi/_MEDattributeStringRdByName.c
--- src.orig/hdfi/_MEDattributeStringRdByName.c 2015-09-07 18:55:15.000000000 +0200
+++ src/hdfi/_MEDattributeStringRdByName.c 2016-05-24 02:15:27.443432111 +0200
@@ -29,7 +29,7 @@
{
med_err _ret=-1;
med_idt _attid=0;
- int type_hdf=0;
+ long type_hdf=0;
if ( (type_hdf = H5Tcopy(H5T_C_S1)) < 0) {
MED_ERR_(_ret,MED_ERR_CREATE,MED_ERR_HDFTYPE, MED_ERR_NAME_MSG );
diff -Nur src.orig/hdfi/_MEDattributeStringWrByName.c src/hdfi/_MEDattributeStringWrByName.c
--- src.orig/hdfi/_MEDattributeStringWrByName.c 2015-09-07 18:55:16.000000000 +0200
+++ src/hdfi/_MEDattributeStringWrByName.c 2016-05-24 02:15:27.443432111 +0200
@@ -31,7 +31,7 @@
med_access_mode MED_ACCESS_MODE;
med_idt _attid=0,aid=0;
med_err _ret=-1;
- int type_hdf=0;
+ long type_hdf=0;
med_bool _attmustbecreated= MED_FALSE;
hsize_t _attsize=0;
med_size _valsize=0;
diff -Nur src.orig/hdfi/_MEDattributeStringWr.c src/hdfi/_MEDattributeStringWr.c
--- src.orig/hdfi/_MEDattributeStringWr.c 2015-09-07 18:55:17.000000000 +0200
+++ src/hdfi/_MEDattributeStringWr.c 2016-05-24 02:15:27.443432111 +0200
@@ -30,7 +30,7 @@
med_access_mode MED_ACCESS_MODE;
med_idt _attid=0,aid=0;
med_err _ret=-1;
- int type_hdf=0;
+ long type_hdf=0;
med_bool _attmustbecreated= MED_FALSE;
hsize_t _attsize=0;
med_size _valsize=0;
diff -Nur src.orig/hdfi/_MEDdatasetRd.c src/hdfi/_MEDdatasetRd.c
--- src.orig/hdfi/_MEDdatasetRd.c 2015-09-07 18:55:15.000000000 +0200
+++ src/hdfi/_MEDdatasetRd.c 2016-05-24 02:15:27.443432111 +0200
@@ -32,7 +32,7 @@
med_idt _dataset=0, _dataspace=0;
med_size _datasetsize[1]={0};
med_err _ret=-1;
- int _hdftype=0;
+ long _hdftype=0;
int _datasetsizeEqualTosizespace = 0;
med_access_mode _MED_ACCESS_MODE;
med_int _nvaluesperentity=0,_nconstituentpervalue=0;
diff -Nur src.orig/hdfi/_MEDdatasetWr.c src/hdfi/_MEDdatasetWr.c
--- src.orig/hdfi/_MEDdatasetWr.c 2015-09-07 18:55:15.000000000 +0200
+++ src/hdfi/_MEDdatasetWr.c 2016-05-24 02:15:27.443432111 +0200
@@ -30,7 +30,7 @@
med_idt _dataset=0, _dataspace=0,_datadiskspace=0;
med_size _datasetsize[1]={0};
med_err _ret=-1;
- int _hdftype=0;
+ long _hdftype=0;
int _datasetsizeEqualTosizespace = 0;
med_access_mode _MED_ACCESS_MODE;
med_int _nvaluesperentity=0,_nconstituentpervalue=0;
\ No newline at end of file
--- src/2.3.6/ci/MEDequivInfo.c.orig 2014-10-09 08:12:59 UTC
+++ src/2.3.6/ci/MEDequivInfo.c
@@ -24,7 +24,7 @@
#include <stdlib.h>
int
-MEDequivInfo(int fid, char *maa, int ind, char *eq, char *des)
+MEDequivInfo(med_idt fid, char *maa, int ind, char *eq, char *des)
{
med_idt eqid;
med_err ret;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment