Date: Thu, 28 Apr 2016 19:52:31 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414234 - head/french/med/files Message-ID: <201604281952.u3SJqVe7060378@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Thu Apr 28 19:52:30 2016 New Revision: 414234 URL: https://svnweb.freebsd.org/changeset/ports/414234 Log: Chase the latest hdf5 upgrade and unbreak. Added: head/french/med/files/ head/french/med/files/patch-include_2.3.6_med.h.in (contents, props changed) head/french/med/files/patch-include_med.h.in (contents, props changed) head/french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c (contents, props changed) Added: head/french/med/files/patch-include_2.3.6_med.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/french/med/files/patch-include_2.3.6_med.h.in Thu Apr 28 19:52:30 2016 (r414234) @@ -0,0 +1,14 @@ +--- 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 Added: head/french/med/files/patch-include_med.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/french/med/files/patch-include_med.h.in Thu Apr 28 19:52:30 2016 (r414234) @@ -0,0 +1,15 @@ +--- 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 Added: head/french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c Thu Apr 28 19:52:30 2016 (r414234) @@ -0,0 +1,11 @@ +--- 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604281952.u3SJqVe7060378>