kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 5.10.1

Browse source 
Announce:
  http://www.vtk.org/pipermail/vtk-developers/2012-October/012452.html

Feature safe:	yes
This commit is contained in:
Pietro Cerutti 2012-11-07 08:27:56 +00:00
parent f37722a042
commit b7ec593cf0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=307123
6 changed files with 13 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
math/vtk5/Makefile
View file

@ -1,13 +1,11 @@
# New ports collection makefile for: vtk5 # Created by: Mykola Khotyaintsev <ko@irfu.se>,
# Date created: 10 Oct 2003 # Jason W. Bacon <bacon@smithers.neuro.mcw.edu>
# Whom: Mykola Khotyaintsev <ko@irfu.se>
# Repocopied from math/vtk by: Jason W. Bacon <bacon@smithers.neuro.mcw.edu>
# #
# $FreeBSD$ # $FreeBSD$
# #
PORTNAME= vtk PORTNAME= vtk
PORTVERSION= 5.10.0 PORTVERSION= 5.10.1
CATEGORIES= math graphics CATEGORIES= math graphics
MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ \ MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ \
http://www.neuro.mcw.edu/Ports/distfiles/VTK5/ http://www.neuro.mcw.edu/Ports/distfiles/VTK5/
@ -22,7 +20,7 @@ LIB_DEPENDS= expat.[5-6]:${PORTSDIR}/textproc/expat2 \
LATEST_LINK= vtk5 LATEST_LINK= vtk5
WRKSRC= ${WRKDIR}/VTK WRKSRC= ${WRKDIR}/VTK${PORTVERSION}
CONFLICTS= vtk-4* CONFLICTS= vtk-4*
@ -104,12 +102,11 @@ PLIST_SUB+= GL2PS="@comment "
.endif .endif
.if ${PORT_OPTIONS:MOSMESA} .if ${PORT_OPTIONS:MOSMESA}
LIB_DEPENDS+= OSMesa32:${PORTSDIR}/graphics/libosmesa LIB_DEPENDS+= OSMesa:${PORTSDIR}/graphics/libosmesa
CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so \ -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
-DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so \ -DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
-DOPENGL_glu_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSGLU.so \
-DVTK_USE_X:BOOL=OFF -DVTK_USE_X:BOOL=OFF
PLIST_SUB+= X11="@comment " PLIST_SUB+= X11="@comment "
.else .else

4
math/vtk5/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (vtk-5.10.0.tar.gz) = 9dd8c750f5d974ca92734d0168db6b534109b9ec30461eb7082a9f71d4716392 SHA256 (vtk-5.10.1.tar.gz) = f1a240c1f5f0d84e27b57e962f8e4a78b166b25bf4003ae16def9874947ebdbb
SIZE (vtk-5.10.0.tar.gz) = 24803686 SIZE (vtk-5.10.1.tar.gz) = 24804193

17
math/vtk5/files/patch-Common_vtkMath.h
View file

@ -1,17 +0,0 @@
--- Common/vtkMath.h.orig 2012-05-12 13:59:27.000000000 +0200
+++ Common/vtkMath.h 2012-09-13 09:24:53.000000000 +0200
@@ -1336,6 +1336,7 @@
return result;
}
+#ifndef __WRAP__
#if defined(VTK_HAS_ISINF)
//-----------------------------------------------------------------------------
inline int vtkMath::IsInf(double x)
@@ -1351,5 +1352,6 @@
return (isnan(x) ? 1 : 0);
}
#endif
+#endif
#endif

38
math/vtk5/files/patch-Rendering_vtkTkRenderWidget.cxx
View file

@ -1,38 +0,0 @@
--- Rendering/vtkTkRenderWidget.cxx.orig
+++ Rendering/vtkTkRenderWidget.cxx
@@ -941,8 +941,9 @@ static int vtkTkRenderWidget_MakeRenderWindow(struct vtkTkRenderWidget *self)
vtkTclGetObjectFromPointer(self->Interp, self->RenderWindow,
"vtkRenderWindow");
#endif
- self->RW = ckalloc(
- static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1));
+ // in Tcl 8.6.x, ckalloc was changed to return "void *".
+ self->RW = static_cast<char *>(ckalloc(
+ static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1)));
strcpy(self->RW, Tcl_GetStringResult(self->Interp));
Tcl_ResetResult(self->Interp);
}
@@ -1113,8 +1114,9 @@ vtkTkRenderWidget_MakeRenderWindow(struct vtkTkRenderWidget *self)
vtkTclGetObjectFromPointer(self->Interp, self->RenderWindow,
"vtkRenderWindow");
#endif
- self->RW = ckalloc(
- static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1));
+ // in Tcl 8.6.x, ckalloc was changed to return "void *".
+ self->RW = static_cast<char *>(ckalloc(
+ static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1)));
strcpy(self->RW, Tcl_GetStringResult(self->Interp));
Tcl_ResetResult(self->Interp);
}
@@ -1306,8 +1308,9 @@ vtkTkRenderWidget_MakeRenderWindow(struct vtkTkRenderWidget *self)
vtkTclGetObjectFromPointer(self->Interp, self->RenderWindow,
"vtkRenderWindow");
#endif
- self->RW = ckalloc(
- static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1));
+ // in Tcl 8.6.x, ckalloc was changed to return "void *".
+ self->RW = static_cast<char *>(ckalloc(
+ static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1)));
strcpy(self->RW, Tcl_GetStringResult(self->Interp));
Tcl_ResetResult(self->Interp);
}

129
math/vtk5/files/patch-Wrapping_vtkParsePreprocess.c
View file

@ -1,129 +0,0 @@
--- Wrapping/vtkParsePreprocess.c.orig 2012-09-10 16:13:54.000000000 +0200
+++ Wrapping/vtkParsePreprocess.c 2012-09-10 16:14:03.000000000 +0200
@@ -33,6 +33,9 @@
#define PREPROC_DEBUG 0
+/** Block size for reading files */
+#define FILE_BUFFER_SIZE 8192
+
/** Preprocessor tokens. */
enum _preproc_token_t
{
@@ -1787,10 +1790,10 @@
PreprocessInfo *info, const char *filename, int system_first)
{
char *tbuf;
- size_t tbuflen = 8192;
+ size_t tbuflen = FILE_BUFFER_SIZE;
char *line;
size_t linelen = 80;
- size_t i, j, n;
+ size_t i, j, n, r;
int in_comment = 0;
int in_quote = 0;
int result = VTK_PARSE_OK;
@@ -1849,29 +1852,48 @@
info->IsExternal = 1;
info->FileName = path;
- tbuf = (char *)malloc(tbuflen);
+ tbuf = (char *)malloc(tbuflen+4);
line = (char *)malloc(linelen);
/* the buffer must hold a whole line for it to be processed */
j = 0;
i = 0;
n = 0;
+ r = 0;
do
{
- if (i == n)
+ if (i >= n)
{
+ /* recycle unused lookahead chars */
+ if (r)
+ {
+ r = n + 2 - i;
+ if (r == 2)
+ {
+ tbuf[0] = tbuf[tbuflen-2];
+ tbuf[1] = tbuf[tbuflen-1];
+ }
+ else if (r == 1)
+ {
+ tbuf[0] = tbuf[tbuflen-1];
+ }
+ }
+
/* read the next chunk of the file */
i = 0;
if (feof(fp))
{
- n = 0;
+ /* still have the lookahead chars left */
+ n = r;
+ r = 0;
}
else
{
+ /* fill the remainder of the buffer */
errno = 0;
- i = 0;
- while ((n = fread(tbuf, 1, tbuflen, fp)) == 0 && ferror(fp))
+ tbuflen = r + FILE_BUFFER_SIZE;
+ while ((n = fread(&tbuf[r], 1, tbuflen-r, fp)) == 0 && ferror(fp))
{
if (errno != EINTR)
{
@@ -1884,6 +1906,22 @@
errno = 0;
clearerr(fp);
}
+
+ if (n + r < tbuflen)
+ {
+ /* this only occurs if the final fread does not fill the buffer */
+ n += r;
+ r = 0;
+ }
+ else
+ {
+ /* set a lookahead reserve of two chars */
+ n -= (2 - r);
+ r = 2;
+ }
+
+ /* guard against lookahead past last char in file */
+ tbuf[n + r] = '\0';
}
}
@@ -1891,7 +1929,7 @@
while (i < n)
{
/* expand line buffer as necessary */
- if (j+4 > linelen)
+ while (j+4 > linelen)
{
linelen *= 2;
line = (char *)realloc(line, linelen);
@@ -1917,7 +1955,7 @@
line[j++] = tbuf[i++];
in_quote = 0;
}
- else if (tbuf[i] == '\\' && tbuf[i] == '\"')
+ else if (tbuf[i] == '\\' && tbuf[i+1] == '\"')
{
line[j++] = tbuf[i++];
line[j++] = tbuf[i++];
@@ -1927,7 +1965,7 @@
line[j++] = tbuf[i++];
}
}
- else if (tbuf[i] == '/' && tbuf[i] == '*')
+ else if (tbuf[i] == '/' && tbuf[i+1] == '*')
{
line[j++] = tbuf[i++];
line[j++] = tbuf[i++];

20
math/vtk5/pkg-plist
View file

@ -2838,24 +2838,12 @@ include/vtk-%%VER2%%/vtkmetaio/metaTubeGraph.h
include/vtk-%%VER2%%/vtkmetaio/metaTypes.h include/vtk-%%VER2%%/vtkmetaio/metaTypes.h
include/vtk-%%VER2%%/vtkmetaio/metaUtils.h include/vtk-%%VER2%%/vtkmetaio/metaUtils.h
include/vtk-%%VER2%%/vtkmetaio/metaVesselTube.h include/vtk-%%VER2%%/vtkmetaio/metaVesselTube.h
include/vtk-%%VER2%%/vtknetcdf/include/fbits.h include/vtk-%%VER2%%/vtknetcdf/include/ncvalues.h
include/vtk-%%VER2%%/vtknetcdf/include/nc.h
include/vtk-%%VER2%%/vtknetcdf/include/nc3dispatch.h
include/vtk-%%VER2%%/vtknetcdf/include/nc_logging.h
include/vtk-%%VER2%%/vtknetcdf/include/nc_tests.h
include/vtk-%%VER2%%/vtknetcdf/include/nc_url.h
include/vtk-%%VER2%%/vtknetcdf/include/ncdimscale.h
include/vtk-%%VER2%%/vtknetcdf/include/ncdispatch.h
include/vtk-%%VER2%%/vtknetcdf/include/ncio.h
include/vtk-%%VER2%%/vtknetcdf/include/nclist.h
include/vtk-%%VER2%%/vtknetcdf/include/netcdf.h include/vtk-%%VER2%%/vtknetcdf/include/netcdf.h
include/vtk-%%VER2%%/vtknetcdf/include/netcdf_f.h include/vtk-%%VER2%%/vtknetcdf/include/netcdf.hh
include/vtk-%%VER2%%/vtknetcdf/include/netcdf_par.h include/vtk-%%VER2%%/vtknetcdf/include/netcdfcpp.h
include/vtk-%%VER2%%/vtknetcdf/include/utf8proc.h include/vtk-%%VER2%%/vtknetcdf/include/vtk_netcdf_config.h
include/vtk-%%VER2%%/vtknetcdf/include/vtk_netcdf_mangle.h include/vtk-%%VER2%%/vtknetcdf/include/vtk_netcdf_mangle.h
include/vtk-%%VER2%%/vtknetcdf/ncconfig.h
include/vtk-%%VER2%%/vtknetcdf/ncvalues.h
include/vtk-%%VER2%%/vtknetcdf/netcdfcpp.h
include/vtk-%%VER2%%/vtksqlite/vtk_sqlite3.h include/vtk-%%VER2%%/vtksqlite/vtk_sqlite3.h
include/vtk-%%VER2%%/vtkstd/algorithm include/vtk-%%VER2%%/vtkstd/algorithm
include/vtk-%%VER2%%/vtkstd/deque include/vtk-%%VER2%%/vtkstd/deque