diff options
| -rw-r--r-- | sci-misc/salome-geom/ChangeLog | 13 | ||||
| -rw-r--r-- | sci-misc/salome-geom/Manifest | 5 | ||||
| -rw-r--r-- | sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch | 78 | ||||
| -rw-r--r-- | sci-misc/salome-geom/salome-geom-3.2.6.ebuild | 22 |
4 files changed, 102 insertions, 16 deletions
diff --git a/sci-misc/salome-geom/ChangeLog b/sci-misc/salome-geom/ChangeLog index eae6c389e..cfceee87c 100644 --- a/sci-misc/salome-geom/ChangeLog +++ b/sci-misc/salome-geom/ChangeLog @@ -1,11 +1,9 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ -21 May 2008; Daniel Tourde <daniel.tourde@caelae.se> - Initial import. - +salome-geom-3.2.6.ebuild, +salome-geom-3.2.6.patch - A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks! - See bug #155974 for more info + 20 Oct May 2008; Daniel Tourde <daniel.tourde@caelae.se> + +salome-geom-3.2.6-vtk-5.2.patch + Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@web.de> 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> salome-geom-3.2.6.ebuild: @@ -15,3 +13,8 @@ salome-geom-3.2.6.ebuild, -Changelog, +metadata.xml: Removed fetch restriction, removed hardcode + 21 May 2008; Daniel Tourde <daniel.tourde@caelae.se> + Initial import. + +salome-geom-3.2.6.ebuild, +salome-geom-3.2.6.patch + A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.$ + See bug #155974 for more info diff --git a/sci-misc/salome-geom/Manifest b/sci-misc/salome-geom/Manifest index abc0b6334..78caef8bf 100644 --- a/sci-misc/salome-geom/Manifest +++ b/sci-misc/salome-geom/Manifest @@ -1,5 +1,6 @@ +AUX salome-geom-3.2.6-vtk-5.2.patch 2251 RMD160 f0d8bbbde9efe9baee35f78999dd434b158970e2 SHA1 6ead93912508c24c5408a7c5e2e89d4dee98dfe5 SHA256 32c7430375f80034d15a4e20e4ea6eefe02f16f7a1c09af940b8687e43626a6d AUX salome-geom-3.2.6.patch 1283 RMD160 04d75a8882a853f38aec7f9b26b0d9f64eb15154 SHA1 8db9ecd670cdf64921574f4b632b43daad5d602a SHA256 5e162b7c1ac10d4510b474beed0b502e700cc99d1ed5d11f107aaaea3b1cbf43 DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-geom-3.2.6.ebuild 3782 RMD160 90ebc39fa2b79e9c228c7319f393f7a6b4337678 SHA1 58cc41955b31dc79c047bb9dfc462d619ffe34ad SHA256 8a5484f7e8959f949bc9624f656e45eb3ac3d45a0ea3986ceab8a5325f16eafd -MISC ChangeLog 876 RMD160 734bd445b5d0a80c46bdf45b6be099a222f6733d SHA1 4fe0cb695b701392c79c87aea181d17ac34bf585 SHA256 bbfa962a51e5df0cf88a9935fb0348719559798e2d330cbe03bc9f9e8e2fa91c +EBUILD salome-geom-3.2.6.ebuild 3945 RMD160 a528faf12c742983a2b4b936de3f5bd1f3345d6b SHA1 0234133b9f500062510b1a75551d8d0a0f1b67b8 SHA256 51a64e320fd757272e68183082284e8c0b372caf89ba08838ed21454c5226deb +MISC ChangeLog 808 RMD160 4ea7e9e8e8d95d41c3a8b289eea99c5c3d81fc72 SHA1 afd84e1f7e831ca03cf8d374393dcff5a61797a8 SHA256 7030b1d17095efaeb8a897f56e31863af06436bcc62569a340174063b8bb3787 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch new file mode 100644 index 000000000..e0b4e8778 --- /dev/null +++ b/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch @@ -0,0 +1,78 @@ +diff -aur src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx +--- src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-07-25 09:16:09.000000000 +0200 ++++ src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-10-16 22:11:49.000000000 +0200 +@@ -88,7 +88,7 @@ + static Standard_Real HatcherConfusion2d = 1.e-8 ; + static Standard_Real HatcherConfusion3d = 1.e-8 ; + +-static Standard_Integer lastVTKpoint = 0; ++static vtkIdType lastVTKpoint = 0; + static Standard_Integer PlotCount = 0; + static Standard_Real IsoRatio = 1.001; + static Standard_Integer MaxPlotCount = 5; +@@ -483,9 +483,9 @@ + { + float coord[3]; + coord[0] = P.X(); coord[1] = P.Y(); coord[2] = P.Z(); +- Standard_Integer NewVTKpoint = Pts->InsertNextPoint(coord); ++ vtkIdType NewVTKpoint = Pts->InsertNextPoint(coord); + +- int pts[2]; ++ vtkIdType pts[2]; + pts[0] = lastVTKpoint; + pts[1] = NewVTKpoint; + +@@ -751,7 +751,7 @@ + aP2 = theNodesP(nbnodes); + + float coord[3]; +- int pts[2]; ++ vtkIdType pts[2]; + + for(int j=1;j<nbnodes;j++) { + gp_Pnt pt1 = theNodesP(j); +@@ -783,7 +783,7 @@ + aP2 = theNodesPoly(nbnodes); + + float coord[3]; +- int pts[2]; ++ vtkIdType pts[2]; + + for(int j=1;j<nbnodes;j++) { + Standard_Integer id1 = Nodesidx(j); +@@ -854,12 +854,12 @@ + float coord[3]; + coord[0] = xo; coord[1] = yo; coord[2] = zo; + +- int ptLoc = Pts->InsertNextPoint(coord); +- int ptFirst = 0; +- int ptPrev = 0; +- int ptCur = 0; ++ vtkIdType ptLoc = Pts->InsertNextPoint(coord); ++ vtkIdType ptFirst = 0; ++ vtkIdType ptPrev = 0; ++ vtkIdType ptCur = 0; + +- int pts[2]; ++ vtkIdType pts[2]; + + int NbPoints = 15; + for (int i = 1; i <= NbPoints; i++, ptPrev = ptCur) +@@ -947,7 +947,7 @@ + + gp_Pnt P = BRep_Tool::Pnt( aVertex ); + float delta = 1, coord[3]; +- int pts[2]; ++ vtkIdType pts[2]; + // insert pt + ZERO_COORD; coord[0] = +delta; + pts[0] = Pts->InsertNextPoint(coord); +@@ -1026,7 +1026,7 @@ + Standard_Integer N1,N2,N3; + Triangles(i).Get(N1,N2,N3); + +- int pts[3]; ++ vtkIdType pts[3]; + pts[0] = N1-1; pts[1] = N2-1; pts[2] = N3-1; + Cells->InsertNextCell(3,pts); + diff --git a/sci-misc/salome-geom/salome-geom-3.2.6.ebuild b/sci-misc/salome-geom/salome-geom-3.2.6.ebuild index 1c78fa6ce..34f9d4745 100644 --- a/sci-misc/salome-geom/salome-geom-3.2.6.ebuild +++ b/sci-misc/salome-geom/salome-geom-3.2.6.ebuild @@ -30,7 +30,6 @@ 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" @@ -39,6 +38,19 @@ src_unpack() { unpack ${A} cd "${MY_S}" epatch "${FILESDIR}"/${P}.patch + + # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk + if has_version ">=sci-libs/vtk-5.0" && has_version "<sci-libs/vtk-5.2" ; then + einfo "vtk version 5 detected" + append-flags -I/usr/include/vtk-5.0 + fi + # If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk + if has_version ">=sci-libs/vtk-5.2" ; then + einfo "vtk version 5 detected" + append-flags -I/usr/include/vtk-5.2 + epatch "${FILESDIR}"/${P}-vtk-5.2.patch + fi + } @@ -48,14 +60,6 @@ src_compile() { rm -r -f autom4te.cache ./build_configure - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.0 - else - einfo "vtk version 4 or prior detected" - fi - # CXXFLAGS are slightly modified to allow the compilation of # salome-geom with OpenCascade and gcc-4.1.x if version_is_at_least "4.1" $(gcc-version) ; then |