aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-04-05 01:03:18 +0200
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-04-05 01:03:18 +0200
commit4423c859702d6ae0ccb3140e3027979ba0430829 (patch)
treec23d071e80d3f0bf3c59ae217230d7c3b4ccb30e /sci-misc/salome-med
parentChanged DEPEND of media-libs/SoQt from 1.4.2_alpha4181 to 1.4.2_alpha1841 (diff)
downloadsci-4423c859702d6ae0ccb3140e3027979ba0430829.tar.gz
sci-4423c859702d6ae0ccb3140e3027979ba0430829.tar.bz2
sci-4423c859702d6ae0ccb3140e3027979ba0430829.zip
sci-misc/salome-*: changed fetch URL + cleaning (thanks Oliver), new
patch + modifs to (partially) solve med_int issues on amd64
Diffstat (limited to 'sci-misc/salome-med')
-rw-r--r--sci-misc/salome-med/ChangeLog6
-rw-r--r--sci-misc/salome-med/Manifest5
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch297
-rw-r--r--sci-misc/salome-med/salome-med-5.1.3.ebuild30
4 files changed, 315 insertions, 23 deletions
diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog
index 9ecb0e368..71d051ee4 100644
--- a/sci-misc/salome-med/ChangeLog
+++ b/sci-misc/salome-med/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+ salome-med-5.1.3.ebuild, +files/salome-med-5.1.3-med_int.patch:
+ changed fetch URL + cleaning
+ new patch to (partially) solve typedef long med_int issues on amd64:
+ http://bugs.gentoo.org/show_bug.cgi?id=155974#c525
+
*salome-med-5.1.3 (14 Mar 2010)
14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
index 3d813c198..28c08d003 100644
--- a/sci-misc/salome-med/Manifest
+++ b/sci-misc/salome-med/Manifest
@@ -1,10 +1,11 @@
AUX salome-med-5.1.3-check_metis.patch 1573 RMD160 fdcc8a1fcba4d16f4c3a8e8636820c49876476b7 SHA1 28b0021cabc939a7f45df84e36953ea4cf1622f5 SHA256 471f36d3ecb15c5ebf6e4664237958c6f6b01f84d9fb4a184c5d5cf988721aac
AUX salome-med-5.1.3-check_scotch.patch 2538 RMD160 b501d483cdf6accd0f562676179d1be9ecfa038a SHA1 0ad2ef4901f02396c812b26e6e0264c3ae3321d4 SHA256 6802967adc584ba37317c85a8a100cef4734ce12515732b271e9057d788d14ff
AUX salome-med-5.1.3-gcc.patch 1641 RMD160 09962970219edb007984413cd1a010044ec19cef SHA1 233f51828285c4b9fe0dc5a473fa76f7dc8fb2aa SHA256 a6c70ba8dc12f6c2a11565c9551801dc8d3eee63435f2c6977bd2e4d5e545241
+AUX salome-med-5.1.3-med_int.patch 15420 RMD160 46314924e3f8fbf1347f736f47a927272e8030a2 SHA1 efea52020f1dd0aff7a653cca5576098dfbbf6c3 SHA256 b9c0be4f14b2edc9da6eb389133b4059516c18e1292c51cc74f23fdee1ad5ed7
AUX salome-med-5.1.3-mpi.patch 780 RMD160 cc39b630de3f2576fea941b01aa1543b25547dee SHA1 c6afde49f3315e41ad034083290d449a57d3b82b SHA256 8ffd65e56b57ffa3351cc5451562ded665bd3ccba2ccd53865868b763c2bc616
AUX salome-med-5.1.3-qt4-path.patch 466 RMD160 1be9c383e3db380bc1d9a91792d89fa65071685f SHA1 4c4bcde03173ee5f911a925bd7190215761bdab3 SHA256 94b4730b80bfd6abd71d203309467cb4a0fc027d8dbc634633b1f0f4f8e3a08d
AUX salome-med-5.1.3-scotch.patch 411 RMD160 9ecd63a9cd71e6f6a4767c30baa135b6f3e3dadc SHA1 44eb2455570716883643b9c08160924a40c9ef0c SHA256 717c995a718f52ef889c4f204457d22614d85696bb0cca3df96756906791464a
DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
-EBUILD salome-med-5.1.3.ebuild 3815 RMD160 1272bd050ab2932490254da297985d43b3ca4639 SHA1 0e8d2f988c7968433f82d32f283fd964c4d7af78 SHA256 e13283e5bb57b35132dc3a4bfa0777fa399637a8812bb2393a182d5d2b78dedd
-MISC ChangeLog 2269 RMD160 fe98e6f0fdc379ac4af6798c41056bc1d830c7e5 SHA1 7305757b576069db861de45161fa8b80665de527 SHA256 5d6ce488d4ef2c00402baa06e75a735ebdc14ffc105daff85fe046894d29db75
+EBUILD salome-med-5.1.3.ebuild 3795 RMD160 54afae121ae34cf67a4f47b5262b3c027e9c85c9 SHA1 596b6d52c37994c6e5eeb62b2768203fe54dbd86 SHA256 df04ea7eb86b17b1b764831d7296fa2c867528f8291bf06291bdd9998c5e770b
+MISC ChangeLog 2552 RMD160 641f3a605c078cdb7d8fc8e8d8a20eae6da39805 SHA1 32da15ffc46160df7a3af5eb704a895fb3dc3e7f SHA256 135108d579d34928f6f0398750add93a106a3c8046becfaf99b356cd3b385681
MISC metadata.xml 274 RMD160 81f0dbbb32fd2de80832c9872616b0a48b2d4c04 SHA1 72f2c4ce931ef27e7f913218049757f318f0415d SHA256 49d1680ffc0598f56db8198488dc66263eef05571d59bb3875e0a8858f54f5e4
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch b/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch
new file mode 100644
index 000000000..6db1510a4
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch
@@ -0,0 +1,297 @@
+diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx
+--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:07:56.860301255 +0100
++++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:33:59.740251721 +0100
+@@ -189,7 +189,7 @@
+
+ int ncorr = med_2_3::MEDjointInfo(fid,meshname, ijoint+1, name,
+ joint_description,
+- &distant, name_distant);
++ (med_int*)&distant, name_distant);
+
+ for (int ic=0; ic<ncorr; ic++)
+ {
+@@ -209,7 +209,7 @@
+ {
+
+ med_2_3::MEDjointLire(fid, meshname, name,
+- node_corresp,ncouples,
++ (med_int*)node_corresp,ncouples,
+ cor_typent_local, cor_typgeo_local,
+ cor_typent_dist, cor_typgeo_dist
+ );
+@@ -247,7 +247,7 @@
+ if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue;
+ int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type);
+ if (ntype==0) continue;
+- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype,
++ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype,
+ med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
+ offset+=ntype;
+ }
+@@ -259,7 +259,7 @@
+ int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes();
+ {
+ int* array=new int[nnode];
+- med_2_3::MEDglobalNumLire(fid,meshname, array, nnode,
++ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array, nnode,
+ med_2_3::MED_NOEUD, med_2_3::MED_POINT1);
+ nodeglobal[idomain]=array;
+ }
+@@ -280,7 +280,7 @@
+
+ int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,type);
+ if (ntype==0) continue;
+- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype,
++ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype,
+ med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
+ offset+=ntype;
+ }
+@@ -348,7 +348,7 @@
+ jointSort(node_corresp, nbnodes, false);
+
+ error=
+- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes,
++ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)node_corresp, nbnodes,
+ med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1);
+ if (error==-1) cout << "erreur creation de joint "<<endl;
+
+@@ -388,7 +388,7 @@
+ if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue;
+ int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type);
+ if (ntype==0) continue;
+- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype,
++ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype,
+ med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
+ offset+=ntype;
+
+@@ -426,7 +426,7 @@
+
+ int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(constituent_entity,type);
+ if (ntype==0) continue;
+- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype,
++ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype,
+ med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
+
+ offset+=ntype;
+@@ -443,7 +443,7 @@
+
+ m_collection->getTopology()->getNodeList(idomain,array);
+
+- med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode,
++ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array, nnode,
+ med_2_3::MED_NOEUD, med_2_3::MED_POINT1);
+
+ delete[] array;
+@@ -507,7 +507,7 @@
+ corresp.push_back(value[icol]);
+ }
+ int size_joint = corresp.size()/2;
+- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, &corresp[0],
++ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)&corresp[0],
+ size_joint, med_2_3::MED_MAILLE,
+ (med_2_3::med_geometrie_element)local_type ,med_2_3::MED_MAILLE,
+ (med_2_3::med_geometrie_element)distant_type );
+@@ -541,7 +541,7 @@
+ med_2_3::med_geometrie_element distant_geo_elem=(med_2_3::med_geometrie_element)iter->first.second;
+ int size_joint=size/2;
+ //med_2_3::med_err error =
+- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, corresp, size_joint, med_2_3::MED_MAILLE,
++ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)corresp, size_joint, med_2_3::MED_MAILLE,
+ local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem);
+ delete[] corresp;
+ }
+diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx
+--- src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:07:56.624073897 +0100
++++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:42:31.140322486 +0100
+@@ -34,6 +34,7 @@
+
+ #include <vector>
+ #include <set>
++#include <med.h>
+
+ //*****************************************************************************
+ // Some useful macros
+@@ -46,7 +47,7 @@
+ * Pair of index.
+ * See definition of GaussIndexList.
+ */
+-typedef std::pair < std::set<int>*, std::set<int> > IndexPair;
++typedef std::pair < std::set<med_int>*, std::set<med_int> > IndexPair;
+
+ /**
+ * List of gauss index for optimized domain split.
+diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx
+--- src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:07:55.512824126 +0100
++++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:23:57.950316309 +0100
+@@ -169,11 +169,11 @@
+ {
+ int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
+ med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
+- med_int *attide=new int[natt];
+- med_int *attval=new int[natt];
++ med_int *attide=new med_int[natt];
++ med_int *attval=new med_int[natt];
+ char *attdes=new char[MED_TAILLE_DESC*natt+1];
+ char *gro=new char[MED_TAILLE_LNOM*ngro+1];
+- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
+ std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
+ ret[i]=cur;
+ delete [] attdes;
+@@ -196,11 +196,11 @@
+ {
+ int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
+ med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
+- med_int *attide=new int[natt];
+- med_int *attval=new int[natt];
++ med_int *attide=new med_int[natt];
++ med_int *attval=new med_int[natt];
+ char *attdes=new char[MED_TAILLE_DESC*natt+1];
+ char *gro=new char[MED_TAILLE_LNOM*ngro+1];
+- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
+ for(int j=0;j<ngro;j++)
+ {
+ std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
+@@ -446,11 +446,11 @@
+ {
+ int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
+ med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
+- med_int *attide=new int[natt];
+- med_int *attval=new int[natt];
++ med_int *attide=new med_int[natt];
++ med_int *attval=new med_int[natt];
+ char *attdes=new char[MED_TAILLE_DESC*natt+1];
+ char *gro=new char[MED_TAILLE_LNOM*ngro+1];
+- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
+ std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
+ if(std::find(fams.begin(),fams.end(),cur)!=fams.end())
+ ret.push_back(numfam);
+@@ -474,11 +474,11 @@
+ {
+ int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
+ med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
+- med_int *attide=new int[natt];
+- med_int *attval=new int[natt];
++ med_int *attide=new med_int[natt];
++ med_int *attval=new med_int[natt];
+ char *attdes=new char[MED_TAILLE_DESC*natt+1];
+ char *gro=new char[MED_TAILLE_LNOM*ngro+1];
+- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
+ std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
+ for(int j=0;j<ngro;j++)
+ {
+@@ -566,12 +566,12 @@
+ MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1);
+ int *tmp=new int[curNbOfElem];
+ char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1];
+- MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
++ MEDelementsLire(fid,nommaa,Mdim,(med_int*)connTab,MED_FULL_INTERLACE,noms,&inoele,(med_int*)tmp,&inuele,(med_int*)fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
+ delete [] tmp;
+ delete [] noms;
+ //trying to read global numbering
+ int *globArr=new int[curNbOfElem];
+- if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0)
++ if(MEDglobalNumLire(fid,nommaa,(med_int*)globArr,curNbOfElem,whichEntity,curMedType)==0)
+ elem.setGlobal(globArr);
+ else
+ delete [] globArr;
+@@ -590,9 +590,9 @@
+ int *index=new int[curNbOfPolyElem+1];
+ int *locConn=new int[arraySize];
+ int *fam=new int[curNbOfPolyElem];
+- MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize);
+- MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD);
+- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE);
++ MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,(int)arraySize);
++ MEDpolygoneConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)locConn,whichPolyEntity,MED_NOD);
++ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE);
+ conn.push_back(elem);
+ }
+ curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD);
+@@ -604,8 +604,8 @@
+ int *indexFace=new int[indexFaceLgth];
+ int *locConn=new int[connFaceLgth];
+ int *fam=new int[curNbOfPolyElem];
+- MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD);
+- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE);
++ MEDpolyedreConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)indexFace,indexFaceLgth,(med_int*)locConn,MED_NOD);
++ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE);
+ int arraySize=connFaceLgth;
+ for(int i=0;i<curNbOfPolyElem;i++)
+ arraySize+=index[i+1]-index[i]-1;
+@@ -1051,11 +1051,11 @@
+ std::vector<int> medConnIndex2;
+ int nbOfElt=buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn,medConnIndex,medConnIndex2);
+ if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE)
+- MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
++ MEDconnEcr(fid,maa,mesh->getMeshDimension(),(med_int*)&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
+ else
+ {
+ if(curMedType==MED_POLYGONE)
+- MEDpolygoneConnEcr(fid,maa,&medConnIndex[0],medConnIndex.size(),&medConn[0],MED_MAILLE,MED_NOD);
++ MEDpolygoneConnEcr(fid,maa,(med_int*)&medConnIndex[0],medConnIndex.size(),(med_int*)&medConn[0],MED_MAILLE,MED_NOD);
+ }
+ }
+ }
+--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:24:36.370545867 +0100
++++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:30:11.329293723 +0100
+@@ -300,8 +300,8 @@
+ char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
+ char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
+ int dom1, dom2;
+- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
+- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1,(med_int*)&dom1, maa_dist1);
++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2,(med_int*)&dom2, maa_dist2);
+ CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0);
+ CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0);
+ CPPUNIT_ASSERT_EQUAL(dom1,1);
+@@ -467,8 +467,8 @@
+ char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
+ char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
+ int dom1, dom2;
+- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
+- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
+ CPPUNIT_ASSERT_EQUAL(dom1,1);
+ CPPUNIT_ASSERT_EQUAL(dom2,0);
+
+@@ -548,7 +548,7 @@
+ //testing cells global numbering
+ num = new med_2_3::med_int[2];
+ MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc);
+- med_2_3::med_int* globcellref = new int[2];
++ med_2_3::med_int* globcellref = new med_int[2];
+ globcellref[0]=1;
+ globcellref[1]=3;
+
+@@ -773,10 +773,10 @@
+ char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
+ char desc2[MED_TAILLE_DESC];
+ char maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
+- //int dom1, dom2;
+- med_2_3::med_int dom1, dom2;
+- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
+- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
++ int dom1, dom2;
++// med_2_3::med_int dom1, dom2;
++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
+ CPPUNIT_ASSERT_EQUAL(dom1,1);
+ CPPUNIT_ASSERT_EQUAL(dom2,0);
+
+@@ -1143,8 +1143,8 @@
+ char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1];
+ char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1];
+ int dom1, dom2;
+- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
+- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
+ CPPUNIT_ASSERT_EQUAL(dom1,1);
+ CPPUNIT_ASSERT_EQUAL(dom2,0);
+
diff --git a/sci-misc/salome-med/salome-med-5.1.3.ebuild b/sci-misc/salome-med/salome-med-5.1.3.ebuild
index 90adb220d..a09b93238 100644
--- a/sci-misc/salome-med/salome-med-5.1.3.ebuild
+++ b/sci-misc/salome-med/salome-med-5.1.3.ebuild
@@ -5,11 +5,11 @@
EAPI=2
PYTHON_DEPEND="2:2.4"
-inherit distutils eutils flag-o-matic
+inherit eutils flag-o-matic python
DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. MED Component"
HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://www.stasyan.com/devel/distfiles/src${PV}.tar.gz"
+SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
@@ -37,20 +37,16 @@ DEPEND="${RDEPEND}
dev-libs/libxml2"
MODULE_NAME="MED"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-export OPENPBS="/usr"
pkg_setup() {
- PYVER=$(python_get_version)
- [[ ${PYVER} > 2.4 ]] && \
+ [[ $(python_get_version) > 2.4 ]] && \
ewarn "Python 2.4 is highly recommended for Salome..."
}
src_prepare() {
- cd "${MY_S}"
-
epatch "${FILESDIR}"/${P}-qt4-path.patch
epatch "${FILESDIR}"/${P}-gcc.patch
use mpi && epatch "${FILESDIR}"/${P}-mpi.patch
@@ -59,6 +55,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-check_scotch.patch
epatch "${FILESDIR}"/${P}-scotch.patch
fi
+ use amd64 && epatch "${FILESDIR}"/${P}-med_int.patch
rm -r -f autom4te.cache
./clean_configure
@@ -66,7 +63,6 @@ src_prepare() {
}
src_configure() {
- cd "${MY_S}"
local myconf=""
local vtk_suffix=""
@@ -83,15 +79,15 @@ src_configure() {
fi
fi
- cd "${MY_S}"
+ use amd64 && append-flags -DHAVE_F77INT64
econf --prefix=${INSTALL_DIR} \
--datadir=${INSTALL_DIR}/share/salome \
--docdir=${INSTALL_DIR}/doc/salome \
--infodir=${INSTALL_DIR}/share/info \
--libdir=${INSTALL_DIR}/$(get_libdir)/salome \
- --with-python-site=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
- --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
+ --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
+ --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
--with-qt=/usr \
--with-vtk=${VTKHOME} \
--with-vtk-version=${vtk_suffix} \
@@ -105,15 +101,7 @@ src_configure() {
|| die "econf failed"
}
-src_compile() {
- cd "${MY_S}"
-
- emake || die "emake failed"
-}
-
src_install() {
- cd "${MY_S}"
-
emake DESTDIR="${D}" install || die "emake install failed"
use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
@@ -121,7 +109,7 @@ src_install() {
echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
- echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P}
+ echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
doenvd 90${P}
rm adm_local/Makefile
insinto "${INSTALL_DIR}"