Attachment 50591 Details for Bug 77038 – diff_vtk

diff_vtk

diff_vtk (text/x-diff; charset="us-ascii"), 4.79 KB, created by Mykola Khotyaintsev on 2005-02-03 11:38:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mykola Khotyaintsev

Created: 2005-02-03 11:38:11 UTC

Size: 4.79 KB

patch

obsolete

>diff -ruN vtk.bak/Makefile vtk/Makefile
>--- vtk.bak/Makefile	Sat Nov  6 17:15:53 2004
>+++ vtk/Makefile	Thu Feb  3 12:20:35 2005
>@@ -14,11 +14,11 @@
> #
> 
> PORTNAME=	vtk
>-PORTVERSION=	4.3.0
>-PORTREVISION=	3
>+PORTVERSION=	4.4
>+PORTREVISION=	0
> CATEGORIES=	math graphics
> MASTER_SITES=	http://ovt.irfu.se/vtk/files/
>-DISTFILES?=	VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz
>+DISTFILES?=	VTK-${PORTVERSION}-LatestRelease.tar.gz
> 
> MAINTAINER=	ko@irfu.se
> COMMENT?=	The Visualization Toolkit shared libs
>@@ -26,14 +26,12 @@
> USE_REINPLACE=	yes
> 
> LIBVER=		1
>-CVSDATE=	20031006
> VTKSRCDIR=	${WRKDIR}/VTK
> TESTINGDIR=	${EXAMPLESDIR}/Testing
> VTKDATAROOT=	${EXAMPLESDIR}/VTKData
>-DOCSDIR=	${PREFIX}/share/doc/${PKGNAME}
>+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
> PLIST=		${.CURDIR}/pkg-plist
> FILESDIR=	${.CURDIR}/files
>-RESTRICTED=	yes
> 
> VTK_KITS=	Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patented
> 
>@@ -58,33 +56,17 @@
> BUILD_DEPENDS+=	${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data
> .endif
> 
>-ONLY_FOR_ARCHS=	i386 # was not tested on other ARCHS
> USE_GMAKE=	yes
> USE_GL=		yes
> INSTALLS_SHLIB=	yes
> 
>-# if optimization flag -O2 or -O3 is present - use g++33
>-# There is a problem compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2
>-# with -02 -march=pentium3
>-.if defined(CXXFLAGS)
>-TTT=	"${CXXFLAGS}"	# this quotes are VERY important!
>-OPTFLAGPRESENT=	${TTT:C/^.*-O[23].*$/yes/}
>-.if ${OPTFLAGPRESENT} == "yes"
>-USE_GCC=	3.3
>-.endif
>-.endif
>-
>-.if ${OSVERSION} < 500016
>-ADDITIONAL_EXE_LINKER_FLAGS=	${PTHREAD_LIBS}
>-.endif
>-
> CMAKE?=		${LOCALBASE}/bin/cmake
> CXXFLAGS+=	-Wno-deprecated
> CMAKE_DEFS+=	-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
> 		-DBUILD_SHARED_LIBS:BOOL=ON \
> 		-DCMAKE_BUILD_TYPE:STRING=Release \
> 		-DCMAKE_SHARED_LINKER_FLAGS:STRING="${LINKERFLAGS}" \
>-		-DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${ADDITIONAL_EXE_LINKER_FLAGS}" \
>+		-DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${PTHREAD_LIBS}" \
> 		-DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\
> 		-DCMAKE_USE_PTHREADS:BOOL=ON \
> 		-DCMAKE_C_COMPILER:STRING='${CC}' \
>diff -ruN vtk.bak/distinfo vtk/distinfo
>--- vtk.bak/distinfo	Wed Mar 31 05:09:35 2004
>+++ vtk/distinfo	Thu Feb  3 12:12:19 2005
>@@ -1,2 +1,2 @@
>-MD5 (VTK-4.3.0-cvs20031006.tar.gz) = 6c574972eb41c9d287fb540811d85e3a
>-SIZE (VTK-4.3.0-cvs20031006.tar.gz) = 6367112
>+MD5 (VTK-4.4-LatestRelease.tar.gz) = 17a5006c4d7acca3e74d32e0e27f4739
>+SIZE (VTK-4.4-LatestRelease.tar.gz) = 6323955
>diff -ruN vtk.bak/files/patch-IO-vtkBMPReader.cxx vtk/files/patch-IO-vtkBMPReader.cxx
>--- vtk.bak/files/patch-IO-vtkBMPReader.cxx	Sat Nov  6 17:15:53 2004
>+++ vtk/files/patch-IO-vtkBMPReader.cxx	Thu Jan  1 01:00:00 1970
>@@ -1,16 +0,0 @@
>-diff -u -r1.44 -r1.45
>---- IO/vtkBMPReader.cxx	2003/09/10 19:41:56	1.44
>-+++ IO/vtkBMPReader.cxx	2003/10/19 14:38:03	1.45
>-@@ -504,11 +504,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];
>-     }
>diff -ruN vtk.bak/files/patch-IO-vtkImageReader.cxx vtk/files/patch-IO-vtkImageReader.cxx
>--- vtk.bak/files/patch-IO-vtkImageReader.cxx	Sat Nov  6 17:15:53 2004
>+++ vtk/files/patch-IO-vtkImageReader.cxx	Thu Jan  1 01:00:00 1970
>@@ -1,30 +0,0 @@
>-diff -u -r1.109 -r1.110
>---- IO/vtkImageReader.cxx	2002/12/26 18:18:50	1.109
>-+++ IO/vtkImageReader.cxx	2003/10/19 14:38:03	1.110
>-@@ -166,7 +166,7 @@
>-   streamStart += this->GetHeaderSize(idx);
>-   
>-   // error checking
>--  this->File->seekg((long)streamStart, ios::beg);
>-+  this->File->seekg(static_cast<long>(streamStart), ios::beg);
>-   if (this->File->fail())
>-     {
>-     vtkErrorMacro(<< "File operation failed: " << streamStart << ", ext: "
>-@@ -366,7 +366,7 @@
>-       // if that happens, store the value in correction and apply later
>-       if (filePos + streamSkip0 >= 0)
>-         {
>--        self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg);
>-+        self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg);
>-         correction = 0;
>-         }
>-       else
>-@@ -376,7 +376,7 @@
>-       outPtr1 += outIncr[1];
>-       }
>-     // move to the next image in the file and data
>--    self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction, 
>-+    self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1 + correction, 
>-                       ios::beg);
>-     outPtr2 += outIncr[2];
>-     }

Actions: View

Attachments on bug 77038: 50590 | 50591 | 50592 | 50593 | 50594 | 50595 | 50596