[48522] trunk/dports/graphics/vtk

[css at macports.org]

Revision: 48522
          http://trac.macports.org/changeset/48522
Author:   css at macports.org
Date:     2009-03-24 03:41:37 -0700 (Tue, 24 Mar 2009)
Log Message:
-----------
Fix building VTK 4.4 on Leopard by restoring previous Cocoa patches and adding a new one that accounts for better GLint compatibility. refs #18696

Modified Paths:
--------------
    trunk/dports/graphics/vtk/Portfile

Added Paths:
-----------
    trunk/dports/graphics/vtk/files/patch-vtkCocoaRenderWindow.mm

Modified: trunk/dports/graphics/vtk/Portfile
===================================================================
--- trunk/dports/graphics/vtk/Portfile	2009-03-24 05:52:08 UTC (rev 48521)
+++ trunk/dports/graphics/vtk/Portfile	2009-03-24 10:41:37 UTC (rev 48522)
@@ -44,6 +44,9 @@
 			patch-vtkBooleanTexture.cxx \
 			patch-vtkBranchExtentTranslator.cxx \
 			patch-vtkCardinalSpline.cxx \
+			patch-vtkCocoaGLView.h \
+			patch-vtkCocoaGLView.mm \
+			patch-vtkCocoaRenderWindow.mm \
 			patch-vtkDecimate.cxx \
 			patch-vtkOSXRenderingTclInit.c \
 			patch-vtkTkWidgetsInit.cxx

Added: trunk/dports/graphics/vtk/files/patch-vtkCocoaRenderWindow.mm
===================================================================
--- trunk/dports/graphics/vtk/files/patch-vtkCocoaRenderWindow.mm	                        (rev 0)
+++ trunk/dports/graphics/vtk/files/patch-vtkCocoaRenderWindow.mm	2009-03-24 10:41:37 UTC (rev 48522)
@@ -0,0 +1,37 @@
+--- Rendering/vtkCocoaRenderWindow.mm.orig	2009-03-24 06:25:48.000000000 -0400
++++ Rendering/vtkCocoaRenderWindow.mm	2009-03-24 06:26:16.000000000 -0400
+@@ -189,14 +189,14 @@
+ 
+   // Obtain the OpenGL context in order to keep track of the current screen.
+   NSOpenGLContext* context = [[(vtkCocoaWindow*)this->WindowId getvtkCocoaGLView] openGLContext];
+-  int currentScreen = [context currentVirtualScreen];
++  GLint currentScreen = [context currentVirtualScreen];
+ 
+   // The NSOpenGLPixelFormat can only be queried for one particular
+   // attribute at a time. Just make repeated queries to get the
+   // pertinent settings.
+   NSOpenGLPixelFormat* pixelFormat = [[(vtkCocoaWindow*)this->WindowId getvtkCocoaGLView] pixelFormat];
+   strm << "PixelFormat Descriptor:" << endl;
+-  long pfd;
++  GLint pfd;
+   [pixelFormat getValues: &pfd forAttribute: NSOpenGLPFAColorSize forVirtualScreen: currentScreen];
+   strm  << "  colorSize:  " << pfd << endl;
+ 
+@@ -240,7 +240,7 @@
+   int currentScreen = [context currentVirtualScreen];
+ 
+   NSOpenGLPixelFormat* pixelFormat = [[(vtkCocoaWindow*)this->WindowId getvtkCocoaGLView] pixelFormat];
+-  long pfd;
++  GLint pfd;
+   [pixelFormat getValues: &pfd forAttribute: NSOpenGLPFACompliant forVirtualScreen: currentScreen];
+ 
+   return (pfd == YES ? 1 : 0);
+@@ -258,7 +258,7 @@
+   int currentScreen = [context currentVirtualScreen];
+ 
+   NSOpenGLPixelFormat* pixelFormat = [[(vtkCocoaWindow*)this->WindowId getvtkCocoaGLView] pixelFormat];
+-  long pfd;
++  GLint pfd;
+   [pixelFormat getValues: &pfd forAttribute: NSOpenGLPFAFullScreen forVirtualScreen: currentScreen];
+ 
+   return (pfd == YES ? 1 : 0);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090324/c58f9b09/attachment.html>