From 4739304a245c6b4c738574c840cdb12d30af8a5a Mon Sep 17 00:00:00 2001 From: danieltourde Date: Sat, 25 Oct 2008 10:47:13 +0000 Subject: Added patch to support hdf5-1.6.7 git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1323 32389bae-6d03-0410-99cf-db05cde120eb --- sci-misc/salome-med/ChangeLog | 3 + sci-misc/salome-med/Manifest | 5 +- .../files/salome-med-3.2.6-hdf5-1.6.7.patch | 367 +++++++++++++++++++++ sci-misc/salome-med/salome-med-3.2.6.ebuild | 4 +- 4 files changed, 375 insertions(+), 4 deletions(-) create mode 100644 sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch (limited to 'sci-misc/salome-med') diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog index f7d5a89d3..bf52e71ae 100644 --- a/sci-misc/salome-med/ChangeLog +++ b/sci-misc/salome-med/ChangeLog @@ -1,5 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 October 2008; Daniel Tourde + +salome-med-3.2.6-hdf5-1.6.7.patch + Patch provided by Bert Karwatzki 05 Sep 2008; Oliver Borm (boroli) salome-med-3.2.6.ebuild, +files/salome-med-3.2.6_boost-1.35.patch: diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest index 4186c1ed6..37d4bd2db 100644 --- a/sci-misc/salome-med/Manifest +++ b/sci-misc/salome-med/Manifest @@ -1,9 +1,10 @@ AUX salome-med-3.2.6-gcc-4.3.patch 2565 RMD160 62ad0205e90c291eade1dd20706489d7e8147b7b SHA1 3cac370c4f6fed86ec70587b3abe72149c6c07c3 SHA256 1a3ace4ce4b6423d34c934dd2768d8169ac8f3895f95b01b488f0da26ca811cf +AUX salome-med-3.2.6-hdf5-1.6.7.patch 13390 RMD160 5e7b4f18bc5d4aba21a37dbe56aa165f4d48a70b SHA1 67c9203deaf9709eee70bbc38db1bf775bfa4500 SHA256 24ef7737f766135812584e94c0fe13a3b375d7f14dd2582866935cbbc8072bf8 AUX salome-med-3.2.6.patch 1295 RMD160 0c9363c57a7ade8e631f42ba41ab9335bd37feae SHA1 b6938d6bf1990ab2325cba90f0eabaf6b9742d81 SHA256 af6defd83e9196bcf5df66e5dda0a64e1fd5cecf07259bd410ef0f91bb057b2b AUX salome-med-3.2.6_boost-1.35.patch 774 RMD160 db99f619e4cd989e3de772863f14bb2185e8bce3 SHA1 1fd5d3b49c8d804eefdc7fb7f2cd64c0b0ea74a6 SHA256 a896371677425ddcb6bd5902d83f1a65cceddd7a77e1f5f40b1d9fd0c9267cd2 AUX salome-med-3.2.6_environ.patch 829 RMD160 b2d457296e389d0f26344d1667cbd39f95bced69 SHA1 e3b584cef8a149c2bc92e98892714617383b8271 SHA256 718ce88901ec43210dcf67e7b36cae6cd1bde6f7e334f316da73bf8368304556 AUX salome-med-3.2.6_gcc4.patch 947 RMD160 c2af9d3fa5b8dd87baae7dab13798f71d61dd4f9 SHA1 16b58dbc90eb61835547f7c4987426fb295f242b SHA256 02f59ca69ee92a0a7378f0fa9662f00078fbcd8c4fa24f8c097ef5046787ed07 DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-med-3.2.6.ebuild 4012 RMD160 bc5c0d17a4af885043f4516eecd51f971d727b8e SHA1 33d82cade26af98571d91439dc2e54f7e1598f7e SHA256 66cb41e2d9ec740163efd6c0368fb8c3f4ee12c2fb915f2497941232ef41dd81 -MISC ChangeLog 1272 RMD160 1a912c446e85b8377ab6582d28d2822fa255423e SHA1 5dff29c248e73dfc6525a4cb09db81316e700181 SHA256 75d4c17d2f9e088de4b5f932520e03334e7eac1718d6c67bd456b6183c949247 +EBUILD salome-med-3.2.6.ebuild 4001 RMD160 ce14750998c8bec078744056a7aada368822e0a4 SHA1 17c57039844995d1310690a91cf15a292af2e634 SHA256 48af426aa92c06ae5d212e309628e0ed0e362b48fa6301a058ff15be611437a7 +MISC ChangeLog 1422 RMD160 77dbb824b1523c2283a232098aa9f69d0027be84 SHA1 24e38871bc87cf4f7b988e0223b068b581071d5f SHA256 894a28efe5781f73c394aa6c46713c44b767aaff96b49872722c6a05c1c077de MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch b/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch new file mode 100644 index 000000000..7342af130 --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch @@ -0,0 +1,367 @@ +diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx +--- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-07-25 09:16:10.000000000 +0200 ++++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-10-15 12:03:32.000000000 +0200 +@@ -258,12 +258,22 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; + +@@ -291,13 +301,23 @@ + } + } + +-#ifdef HDF_NEW_API ++#ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; + +@@ -378,9 +398,16 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) + return -1; + #endif +@@ -418,11 +445,21 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) +- return -1; ++ return -1; ++#else ++ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ + #else + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; +diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx +--- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-07-25 09:16:10.000000000 +0200 ++++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-10-15 12:03:08.000000000 +0200 +@@ -205,27 +205,37 @@ + { /* switch pflmod pout FULL_INTERLACE*/ + case MED_GLOBALE : + +- /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */ +- if ( (memspace = H5Screate_simple (1, size, NULL)) <0) +- return -1; ++ /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */ ++ if ( (memspace = H5Screate_simple (1, size, NULL)) <0) ++ return -1; ++ ++ for (dim=firstdim; dim < lastdim; dim++) { ++ ++ for (i=0; i < psize; i++) /* i balaye les élements du profil */ ++ for (j=0; j < ngauss; j++) { ++ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); ++ pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim; ++ pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; ++ } ++ } ++ ++ #ifdef HDF_NEW_API + +- for (dim=firstdim; dim < lastdim; dim++) { +- +- for (i=0; i < psize; i++) /* i balaye les élements du profil */ +- for (j=0; j < ngauss; j++) { +- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); +- pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim; +- pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; +- } +- } +- +-#ifdef HDF_NEW_API ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; + +@@ -255,12 +265,22 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; + +@@ -326,39 +346,46 @@ + pfldsk = (med_size *) malloc(sizeof(med_size)*pcount[0]); + #else + pfldsk = (med_ssize *) malloc(sizeof(med_ssize)*pcount[0]); +-#endif ++ #endif + +- switch(pflmod) +- { /*switch plfmod pour NO_INTERLACE */ +- case MED_GLOBALE : +- +- for (dim=firstdim; dim < lastdim; dim++) { +- +- for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ +- for (j=0; j < ngauss; j++) { +- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); +- pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j; +- } +- } +- ++ switch(pflmod) ++ { /*switch plfmod pour NO_INTERLACE */ ++ case MED_GLOBALE : ++ ++ for (dim=firstdim; dim < lastdim; dim++) { ++ ++ for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ ++ for (j=0; j < ngauss; j++) { ++ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); ++ pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j; ++ } ++ } ++ + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) + return -1; + #endif +- ++ + if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0) + return -1; +- ++ + break; +- ++ + case MED_COMPACT : +- +- /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */ +- /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */ +- /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */ ++ ++ /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */ ++ /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */ ++ /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */ + + if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0) + return -1; +@@ -368,26 +395,36 @@ + #else + pflmem = (med_ssize *) malloc (sizeof(med_ssize)*pcount[0]); + #endif +- ++ + /* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/ +- ++ + for (dim=firstdim; dim < lastdim; dim++) { +- ++ + for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ + for (j=0; j < ngauss; j++) { + index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); +- pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j; ++ pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j; + pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; + } + } +- ++ + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; + +diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx +--- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-07-25 09:16:10.000000000 +0200 ++++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-10-15 12:01:30.000000000 +0200 +@@ -204,12 +204,22 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; + +@@ -239,11 +249,21 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) ++ return -1; ++#else ++ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) + return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ + #else + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; +@@ -325,9 +345,16 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) + return -1; + #else ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ ++#else + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) + return -1; + #endif +@@ -369,11 +396,21 @@ + } + + #ifdef HDF_NEW_API ++ ++#if H5_VERS_RELEASE < 7 + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) + return -1; + + if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) +- return -1; ++ return -1; ++#else ++ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) ++ return -1; ++ ++ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) ++ return -1; ++#endif ++ + #else + if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) + return -1; diff --git a/sci-misc/salome-med/salome-med-3.2.6.ebuild b/sci-misc/salome-med/salome-med-3.2.6.ebuild index 40f6e77e0..8a5940617 100644 --- a/sci-misc/salome-med/salome-med-3.2.6.ebuild +++ b/sci-misc/salome-med/salome-med-3.2.6.ebuild @@ -32,8 +32,7 @@ export OPENPBS="/usr" src_unpack() { python_version distutils_python_version - ewarn "Python 2.4 is highly recommended for Salome..." - + if ! built_with_use sci-libs/vtk python ; then die "You must rebuild sci-libs/vtk with python USE flag" fi @@ -43,6 +42,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}_gcc4.patch epatch "${FILESDIR}"/${P}.patch epatch "${FILESDIR}"/${P}_environ.patch + epatch "${FILESDIR}"/${P}-hdf5-1.6.7.patch # boost 1.35.0 support if has_version ">=dev-libs/boost-1.35.0" ; then -- cgit v1.2.3-18-g5258