[47882] trunk/dports/graphics/vtk
css at macports.org
css at macports.org
Mon Mar 9 05:23:29 PDT 2009
Revision: 47882
http://trac.macports.org/changeset/47882
Author: css at macports.org
Date: 2009-03-09 05:23:26 -0700 (Mon, 09 Mar 2009)
Log Message:
-----------
Update VTK to 4.4.2 with updated gcc4 patches for Tiger and later. Fixed OpenGL dependencies when using the MacPorts X11 libraries in the x11 variant. refs #3688
Modified Paths:
--------------
trunk/dports/graphics/vtk/Portfile
trunk/dports/graphics/vtk/files/patch-vtk3DSImporter.cxx
trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper.cxx
trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper3D.cxx
trunk/dports/graphics/vtk/files/patch-vtkAppendFilter.cxx
trunk/dports/graphics/vtk/files/patch-vtkBMPReader.cxx
trunk/dports/graphics/vtk/files/patch-vtkBooleanTexture.cxx
trunk/dports/graphics/vtk/files/patch-vtkCardinalSpline.cxx
trunk/dports/graphics/vtk/files/patch-vtkOSXRenderingTclInit.c
trunk/dports/graphics/vtk/files/patch-vtkTkWidgetsInit.cxx
Added Paths:
-----------
trunk/dports/graphics/vtk/files/patch-vtkBranchExtentTranslator.cxx
trunk/dports/graphics/vtk/files/patch-vtkDecimate.cxx
Modified: trunk/dports/graphics/vtk/Portfile
===================================================================
--- trunk/dports/graphics/vtk/Portfile 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/Portfile 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,9 +1,9 @@
# $Id$
PortSystem 1.0
+
name VTK
-version 4.2.6
-revision 3
+version 4.4.2
categories graphics
maintainers css
description 3D visualization toolkit
@@ -15,25 +15,13 @@
homepage http://www.vtk.org/
platforms darwin freebsd
-master_sites sourceforge:vtk
-checksums md5 41382fb3f8d15e76d7464c11045ee7a5
+master_sites ${homepage}/files/release/4.4/
+checksums md5 17a5006c4d7acca3e74d32e0e27f4739 \
+ sha1 9a68ecefa35f97a79fedd830c369f5b4225d1f55
depends_build bin:cmake:cmake
-distfiles ${name}-4.2-LatestRelease${extract.suffix}
-distname ${name}
+worksrcdir ${name}
-post-extract {
- set fl [open "| grep VTK_BUILD_VERSION ${worksrcpath}/CMakeLists.txt | grep 6"]
- set data [read $fl]
- close $fl
- if {$data != "SET(VTK_BUILD_VERSION 6)\n"} { ui_msg "$data
-================================================================
-Warning : the Latest VTK version is not the same as the Portfile
-The build may still succeed but this should be reported as a bug
-================================================================"
- }
-}
-
configure { system "cd ${worksrcpath} && cmake ${configure.args} ${worksrcpath}" }
configure.args -D BUILD_SHARED_LIBS:BOOL=ON \
-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
@@ -45,32 +33,37 @@
-D CMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/vtk \
-D CMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-platform darwin 8 {
- patchfiles patch-vtk3DSImporter.cxx \
- patch-vtkAbstractMapper.cxx \
- patch-vtkAbstractMapper3D.cxx \
- patch-vtkAppendFilter.cxx \
- patch-vtkBMPReader.cxx \
- patch-vtkBooleanTexture.cxx \
- patch-vtkCardinalSpline.cxx \
- patch-vtkCocoaGLView.h \
- patch-vtkCocoaGLView.mm \
- patch-vtkImageReader.cxx \
- patch-vtkOSXRenderingTclInit.c \
- patch-vtkTkWidgetsInit.cxx
+platform darwin {
+ if { ${os.major} >= 8 } {
+ # These patches make the code work with gcc4.
+ patchfiles patch-vtk3DSImporter.cxx \
+ patch-vtkAbstractMapper.cxx \
+ patch-vtkAbstractMapper3D.cxx \
+ patch-vtkAppendFilter.cxx \
+ patch-vtkBMPReader.cxx \
+ patch-vtkBooleanTexture.cxx \
+ patch-vtkBranchExtentTranslator.cxx \
+ patch-vtkCardinalSpline.cxx \
+ patch-vtkDecimate.cxx \
+ patch-vtkOSXRenderingTclInit.c \
+ patch-vtkTkWidgetsInit.cxx
- pre-build {
- reinplace "s;VTK_APPLE_SHARED_FLAGS_NEEDED 1;VTK_APPLE_SHARED_FLAGS_NEEDED 0;" ${worksrcpath}/CMakeLists.txt
- }
+ pre-build {
+ reinplace "s;VTK_APPLE_SHARED_FLAGS_NEEDED 1;VTK_APPLE_SHARED_FLAGS_NEEDED 0;" ${worksrcpath}/CMakeLists.txt
+ }
+ }
}
-variant x11 {
- depends_build-append port:xorg-libs
+variant x11 description {Build VTK with the MacPorts X11 libraries} {
+ depends_build-append port:xorg-libs\
+ port:mesa
configure.args-delete "-D VTK_USE_COCOA:BOOL=ON"
configure.args-append -D VTK_USE_COCOA:BOOL=OFF \
-D VTK_USE_X:BOOL=ON \
- -D OPENGL_gl_LIBRARY:FILEPATH=/usr/X11R6/lib/libGL.dylib \
- -D OPENGL_glu_LIBRARY:FILEPATH=/usr/X11R6/lib/libGLU.dylib
+ -D OPENGL_INCLUDE_DIR:PATH=${prefix}/include \
+ -D OPENGL_gl_LIBRARY:FILEPATH=${prefix}/lib/libGL.dylib \
+ -D OPENGL_glu_LIBRARY:FILEPATH=${prefix}/lib/libGLU.dylib
}
-
+#variant system_x11 description {Build VTK with the Apple X11 libraries} {
+#}
Modified: trunk/dports/graphics/vtk/files/patch-vtk3DSImporter.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtk3DSImporter.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtk3DSImporter.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,11 +1,20 @@
---- Hybrid/vtk3DSImporter.cxx.orig 2006-02-12 20:33:47.000000000 -0600
-+++ Hybrid/vtk3DSImporter.cxx 2006-02-12 20:36:02.000000000 -0600
-@@ -34,7 +34,7 @@
+--- ./Hybrid/vtk3DSImporter.cxx.orig 2007-11-11 15:54:01.000000000 -0500
++++ ./Hybrid/vtk3DSImporter.cxx 2007-11-11 15:58:48.000000000 -0500
+@@ -30,17 +30,6 @@
+ vtkCxxRevisionMacro(vtk3DSImporter, "$Revision: 1.36 $");
vtkStandardNewMacro(vtk3DSImporter);
- //----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
+-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-#ifdef __APPLE_CC__
-+#if defined(__APPLE_CC__) && (__GNUC__ == 3)
- extern "C"
- {
- void oft_initHyb()
+-extern "C"
+-{
+- void oft_initHybrid()
+- {
+- extern void _ZNSt8ios_base4InitC4Ev();
+- _ZNSt8ios_base4InitC4Ev();
+- }
+-}
+-#endif
+
+
+ static vtk3DSColour Black = {0.0, 0.0, 0.0};
Modified: trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,19 +1,20 @@
---- Common/vtkAbstractMapper.cxx.orig 2005-06-19 11:09:24.000000000 -0400
-+++ Common/vtkAbstractMapper.cxx 2005-06-19 11:09:40.000000000 -0400
-@@ -29,16 +29,6 @@
+--- ./Common/vtkAbstractMapper.cxx.orig 2007-11-11 15:52:59.000000000 -0500
++++ ./Common/vtkAbstractMapper.cxx 2007-11-11 15:58:29.000000000 -0500
+@@ -26,17 +26,6 @@
vtkCxxSetObjectMacro(vtkAbstractMapper,ClippingPlanes,vtkPlaneCollection);
-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-#ifdef __APPLE_CC__
-extern "C"
--{void oft_initCom()
+-{void oft_initCommon()
- {
- extern void _ZNSt8ios_base4InitC4Ev();
- _ZNSt8ios_base4InitC4Ev();
- }
-}
-#endif
-
+-
// Construct object.
vtkAbstractMapper::vtkAbstractMapper()
+ {
Modified: trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper3D.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper3D.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkAbstractMapper3D.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,21 +1,20 @@
---- Rendering/vtkAbstractMapper3D.cxx.orig 2005-06-19 17:22:26.000000000 -0400
-+++ Rendering/vtkAbstractMapper3D.cxx 2005-06-19 17:25:32.000000000 -0400
-@@ -20,18 +20,6 @@
+--- ./Rendering/vtkAbstractMapper3D.cxx.orig 2007-11-11 15:56:25.000000000 -0500
++++ ./Rendering/vtkAbstractMapper3D.cxx 2007-11-11 15:59:09.000000000 -0500
+@@ -18,17 +18,6 @@
- vtkCxxRevisionMacro(vtkAbstractMapper3D, "$Revision: 1.1 $");
+ vtkCxxRevisionMacro(vtkAbstractMapper3D, "$Revision: 1.17 $");
-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-#ifdef __APPLE_CC__
-extern "C"
-{
-- void oft_initRen()
+- void oft_initRendering()
- {
- extern void _ZNSt8ios_base4InitC4Ev();
- _ZNSt8ios_base4InitC4Ev();
- }
-}
-#endif
--
+
// Construct with initial range (0,1).
vtkAbstractMapper3D::vtkAbstractMapper3D()
- {
Modified: trunk/dports/graphics/vtk/files/patch-vtkAppendFilter.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkAppendFilter.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkAppendFilter.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,21 +1,20 @@
---- Graphics/vtkAppendFilter.cxx.orig 2005-06-19 11:48:14.000000000 -0400
-+++ Graphics/vtkAppendFilter.cxx 2005-06-19 11:48:30.000000000 -0400
-@@ -28,18 +28,6 @@
- vtkCxxRevisionMacro(vtkAppendFilter, "$Revision: 1.1 $");
+--- ./Graphics/vtkAppendFilter.cxx.orig 2007-11-11 15:53:32.000000000 -0500
++++ ./Graphics/vtkAppendFilter.cxx 2007-11-11 15:58:44.000000000 -0500
+@@ -25,17 +25,6 @@
+ vtkCxxRevisionMacro(vtkAppendFilter, "$Revision: 1.64 $");
vtkStandardNewMacro(vtkAppendFilter);
-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-#ifdef __APPLE_CC__
-extern "C"
-{
-- void oft_initGra()
+- void oft_initGraphics()
- {
- extern void _ZNSt8ios_base4InitC4Ev();
- _ZNSt8ios_base4InitC4Ev();
- }
-}
-#endif
--
+
//----------------------------------------------------------------------------
vtkAppendFilter::vtkAppendFilter()
- {
Modified: trunk/dports/graphics/vtk/files/patch-vtkBMPReader.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkBMPReader.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkBMPReader.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,6 +1,6 @@
---- IO/vtkBMPReader.cxx.orig 2005-06-19 16:56:27.000000000 -0400
-+++ IO/vtkBMPReader.cxx 2005-06-19 16:57:40.000000000 -0400
-@@ -30,18 +30,6 @@
+--- ./IO/vtkBMPReader.cxx.orig 2007-11-11 15:54:16.000000000 -0500
++++ ./IO/vtkBMPReader.cxx 2007-11-11 15:58:52.000000000 -0500
+@@ -27,17 +27,6 @@
#undef read
#endif
@@ -15,21 +15,6 @@
- }
-}
-#endif
--
+
vtkBMPReader::vtkBMPReader()
{
- this->Colors = NULL;
-@@ -504,11 +492,11 @@
- outPtr0 += outIncr[0];
- }
- // move to the next row in the file and data
-- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg);
-+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg);
- outPtr1 += outIncr[1];
- }
- // move to the next image in the file and data
-- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg);
-+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1, ios::beg);
- outPtr2 += outIncr[2];
- }
-
Modified: trunk/dports/graphics/vtk/files/patch-vtkBooleanTexture.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkBooleanTexture.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkBooleanTexture.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,21 +1,20 @@
---- Imaging/vtkBooleanTexture.cxx.orig 2005-06-19 11:34:38.000000000 -0400
-+++ Imaging/vtkBooleanTexture.cxx 2005-06-19 11:34:51.000000000 -0400
-@@ -25,18 +25,6 @@
- vtkCxxRevisionMacro(vtkBooleanTexture, "$Revision: 1.1 $");
+--- ./Imaging/vtkBooleanTexture.cxx.orig 2007-11-11 15:54:51.000000000 -0500
++++ ./Imaging/vtkBooleanTexture.cxx 2007-11-11 15:58:56.000000000 -0500
+@@ -22,17 +22,6 @@
+ vtkCxxRevisionMacro(vtkBooleanTexture, "$Revision: 1.37 $");
vtkStandardNewMacro(vtkBooleanTexture);
-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-#ifdef __APPLE_CC__
-extern "C"
-{
-- void oft_initIma()
+- void oft_initImaging()
- {
- extern void _ZNSt8ios_base4InitC4Ev();
- _ZNSt8ios_base4InitC4Ev();
- }
-}
-#endif
--
+
vtkBooleanTexture::vtkBooleanTexture()
{
- this->Thickness = 0;
Added: trunk/dports/graphics/vtk/files/patch-vtkBranchExtentTranslator.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkBranchExtentTranslator.cxx (rev 0)
+++ trunk/dports/graphics/vtk/files/patch-vtkBranchExtentTranslator.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -0,0 +1,20 @@
+--- ./Parallel/vtkBranchExtentTranslator.cxx.orig 2007-11-11 15:55:37.000000000 -0500
++++ ./Parallel/vtkBranchExtentTranslator.cxx 2007-11-11 15:58:59.000000000 -0500
+@@ -23,17 +23,6 @@
+
+ vtkCxxSetObjectMacro(vtkBranchExtentTranslator,OriginalSource,vtkImageData);
+
+-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
+-#ifdef __APPLE_CC__
+-extern "C"
+-{
+- void oft_initParallel()
+- {
+- extern void _ZNSt8ios_base4InitC4Ev();
+- _ZNSt8ios_base4InitC4Ev();
+- }
+-}
+-#endif
+
+
+ //----------------------------------------------------------------------------
Modified: trunk/dports/graphics/vtk/files/patch-vtkCardinalSpline.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkCardinalSpline.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkCardinalSpline.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,21 +1,20 @@
---- Filtering/vtkCardinalSpline.cxx.orig 2005-06-19 11:22:35.000000000 -0400
-+++ Filtering/vtkCardinalSpline.cxx 2005-06-19 11:22:54.000000000 -0400
-@@ -23,18 +23,6 @@
- vtkCxxRevisionMacro(vtkCardinalSpline, "$Revision: 1.1 $");
+--- ./Filtering/vtkCardinalSpline.cxx.orig 2007-11-11 15:53:15.000000000 -0500
++++ ./Filtering/vtkCardinalSpline.cxx 2007-11-11 15:58:40.000000000 -0500
+@@ -20,17 +20,6 @@
+ vtkCxxRevisionMacro(vtkCardinalSpline, "$Revision: 1.23 $");
vtkStandardNewMacro(vtkCardinalSpline);
-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-#ifdef __APPLE_CC__
-extern "C"
-{
-- void oft_initFil()
+- void oft_initFiltering()
- {
- extern void _ZNSt8ios_base4InitC4Ev();
- _ZNSt8ios_base4InitC4Ev();
- }
-}
-#endif
--
+
// Construct a Cardinal Spline.
- vtkCardinalSpline::vtkCardinalSpline ()
Added: trunk/dports/graphics/vtk/files/patch-vtkDecimate.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkDecimate.cxx (rev 0)
+++ trunk/dports/graphics/vtk/files/patch-vtkDecimate.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -0,0 +1,20 @@
+--- ./Patented/vtkDecimate.cxx.orig 2007-11-11 15:56:07.000000000 -0500
++++ ./Patented/vtkDecimate.cxx 2007-11-11 15:59:04.000000000 -0500
+@@ -42,17 +42,6 @@
+ vtkCxxRevisionMacro(vtkDecimate, "$Revision: 1.78 $");
+ vtkStandardNewMacro(vtkDecimate);
+
+-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
+-#ifdef __APPLE_CC__
+-extern "C"
+-{
+- void oft_initPatented()
+- {
+- extern void _ZNSt8ios_base4InitC4Ev();
+- _ZNSt8ios_base4InitC4Ev();
+- }
+-}
+-#endif
+
+
+ #define VTK_TOLERANCE 1.0e-05
Modified: trunk/dports/graphics/vtk/files/patch-vtkOSXRenderingTclInit.c
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkOSXRenderingTclInit.c 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkOSXRenderingTclInit.c 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,13 +1,11 @@
---- Rendering/vtkOSXRenderingTclInit.c.orig 2006-02-12 20:38:43.000000000 -0600
-+++ Rendering/vtkOSXRenderingTclInit.c 2006-02-12 20:40:22.000000000 -0600
-@@ -1,8 +1,10 @@
- //----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-+#if defined(__APPLE_CC__) && (__GNUC__ == 3)
- #include <stdio.h>
- void oft_initRenOSXInit()
- {
- extern void _ZNSt8ios_base4InitC4Ev();
- _ZNSt8ios_base4InitC4Ev();
- }
-+#endif
+--- ./Rendering/vtkOSXRenderingTclInit.c.orig 2007-11-11 15:56:34.000000000 -0500
++++ ./Rendering/vtkOSXRenderingTclInit.c 2007-11-11 15:59:28.000000000 -0500
+@@ -1,8 +1 @@
+-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
+-#include <stdio.h>
+-void oft_initRenOSXInit()
+-{
+- extern void _ZNSt8ios_base4InitC4Ev();
+- _ZNSt8ios_base4InitC4Ev();
+-}
Modified: trunk/dports/graphics/vtk/files/patch-vtkTkWidgetsInit.cxx
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkTkWidgetsInit.cxx 2009-03-09 10:55:20 UTC (rev 47881)
+++ trunk/dports/graphics/vtk/files/patch-vtkTkWidgetsInit.cxx 2009-03-09 12:23:26 UTC (rev 47882)
@@ -1,11 +1,20 @@
---- Rendering/vtkTkWidgetsInit.cxx.orig 2006-02-12 20:38:50.000000000 -0600
-+++ Rendering/vtkTkWidgetsInit.cxx 2006-02-12 20:39:15.000000000 -0600
-@@ -24,7 +24,7 @@
+--- ./Rendering/vtkTkWidgetsInit.cxx.orig 2007-11-11 15:56:48.000000000 -0500
++++ ./Rendering/vtkTkWidgetsInit.cxx 2007-11-11 15:59:34.000000000 -0500
+@@ -20,17 +20,6 @@
+ #include "vtkImageData.h"
- //----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
+-//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
-#ifdef __APPLE_CC__
-+#if defined(__APPLE_CC__) && (__GNUC__ == 3)
- extern "C"
- {
- void oft_initRenWidgets()
+-extern "C"
+-{
+- void oft_initRenderingWidgets()
+- {
+- extern void _ZNSt8ios_base4InitC4Ev();
+- _ZNSt8ios_base4InitC4Ev();
+- }
+-}
+-#endif
+
+
+ //----------------------------------------------------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090309/e67b495e/attachment.html>
More information about the macports-changes
mailing list