debian/0000775000000000000000000000000012313324052007163 5ustar debian/vtk-examples.compress0000664000000000000000000000006312250600354013361 0ustar find usr/share/doc/vtk-examples -name "changelog*" debian/pvtk.10000664000000000000000000000050212250600354010230 0ustar .TH PVTK 1 .SH NAME pvtk \- Visualization Tool Kit .SH SYNOPSIS .B mpirun -np 4 -machinefile ~/machines pvtk .I [script] -MPDENV- DISPLAY=:0 .SH "DESCRIPTION" This manual page documents briefly the .B pvtk command. Better info can be found at http://www.vtk.org .SH AUTHORS Ken Martin, Will Schroeder, and Bill Lorensen debian/vtkWrapHierarchy.10000664000000000000000000000106312250600354012544 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKWRAPHIERARCHY "1" "December 2011" "vtkWrapHierarchy 5.8.0" "User Commands" .SH NAME vtkWrapHierarchy \- Command line tool for vtkWrapHierarchy .SH SYNOPSIS .B vtkWrapHierarchy \fI-o output_file data_file \fR[\fIfiles_to_merge\fR] .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .PP .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/vtkParseJava.10000664000000000000000000000160112250600354011646 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKPARSEJAVA "1" "December 2011" "vtkParseJava 5.8.0" "User Commands" .SH NAME vtkParseJava \- Command line tool for vtkParseJava .SH SYNOPSIS .B vtkParseJava [\fIoptions\fR] \fIinput_file output_file\fR .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .TP \fB\-\-concrete\fR force concrete class .TP \fB\-\-abstract\fR force abstract class .TP \fB\-\-vtkobject\fR vtkObjectBase\-derived class .TP \fB\-\-special\fR non\-vtkObjectBase class .TP \fB\-\-hints\fR hints file .TP \fB\-\-types\fR type hierarchy file .TP \fB\-I\fR add an include directory .TP \fB\-D\fR define a preprocessor macro .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/control0000664000000000000000000001701012313324024010564 0ustar Source: vtk Section: graphics Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Science Team Build-Depends: debhelper (>= 9), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libosmesa6-dev, libx11-dev, libxt-dev, xvfb, x11proto-core-dev, tcl8.6-dev, tk8.6-dev, python-dev (>= 2.5.3), cmake (>= 2.6.3), libexpat-dev, libjpeg-dev, libpng-dev, libtiff-dev, zlib1g-dev, default-jdk, libboost-all-dev, mpi-default-dev, libnetcdf-dev, libmysqlclient-dev, libpq-dev, libxpm-dev, libavformat-dev, libavutil-dev, libavcodec-dev, libswscale-dev, libgl2ps-dev, libsqlite3-dev, libfreetype6-dev, ftgl-dev, libqt4-dev, python-support (>= 0.5.3), libxml2-dev, pkg-config, libhdf5-dev, dpkg-dev (>= 1.16.1~) Build-Depends-Indep: libdigest-md5-perl, doxygen-latex, graphviz, gnuplot-nox, ghostscript XS-Python-Version: current Uploaders: A. Maitland Bottoms , Dominique Belhachemi , Mathieu Malaterre Standards-Version: 3.9.3 Homepage: http://www.vtk.org/ Vcs-Git: git://git.debian.org/git/collab-maint/vtk.git Vcs-Browser: http://git.debian.org/?p=collab-maint/vtk.git;a=summary Package: vtk-doc Architecture: all Depends: ${misc:Depends}, doc-base Suggests: libvtk5-dev, vtk-examples, vtkdata Section: doc Description: VTK class reference documentation The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This package contains exhaustive HTML documentation for the all the documented VTK C++ classes. The documentation was generated using doxygen and some excellent perl scripts from Sebastien Barre et. al. Please read the README.docs in /usr/share/doc/vtk-doc/ for details. The documentation is available under /usr/share/doc/vtk/html. Package: vtk-examples Architecture: all Suggests: libvtk5-dev, tcl-vtk, python-vtk, vtk-doc, python, tclsh, libqt4-dev Section: graphics Depends: ${misc:Depends} Description: C++, Tcl and Python example programs/scripts for VTK The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This package contains examples from the VTK source. To compile the C++ examples you will need to install the vtk-dev package as well. Some of them require the libqt4-dev package. . The Python and Tcl examples can be run with the corresponding packages (python-vtk, tcl-vtk). Package: libvtk5.8 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libvtk, libvtk32, libvtk4, libvtk4c2, libvtk4c2a, python-vtk (<< 4.4), libvtk5 Replaces: libvtk, libvtk32, libvtk4, libvtk4c2, libvtk4c2a, libvtk5 Suggests: openmpi-bin | lam-runtime, libvtk5-dev, vtk-examples, vtk-doc Section: libs Description: Visualization Toolkit - A high level 3D visualization library - runtime The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . VTK enables users to concentrate on their work by providing a large number of excellent and feature packed high level functions that do visualization. The library needs OpenGL to render the graphics and for Linux machines Mesa is necessary. The terms/copyright can be read in /usr/share/doc/vtk/README and README.html. VTK-Linux-HOWTO has information about using vtk, getting documentataion or help and instructions on building VTK. . This package provides the shared libraries needed to run C++ programs that use VTK. . To compile C++ code that uses VTK you have to install libvtk5-dev. Package: libvtk-java Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends} Suggests: libvtk5-dev (= ${binary:Version}), vtk-examples, vtk-doc, java-virtual-machine Section: java Description: Visualization Toolkit - A high level 3D visualization library - java The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This package provides the VTK Java language support. Package: libvtk5-dev Architecture: any Conflicts: libvtk4-dev, libvtk-dev, libvtk32-dev Replaces: libvtk4-dev, libvtk-dev, libvtk32-dev Depends: ${misc:Depends}, libvtk5.8 (= ${binary:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libx11-dev, libxt-dev, x11proto-core-dev, libc6-dev, libxss-dev, libxft-dev, libexpat-dev, libjpeg-dev, libpng-dev, libtiff-dev, zlib1g-dev, tcl8.6-dev, tk8.6-dev, libavformat-dev, libavutil-dev, libavcodec-dev, libswscale-dev, libgl2ps-dev, libfreetype6-dev, libxml2-dev, libpq-dev, libnetcdf-dev, libmysqlclient-dev, mpi-default-dev, libqt4-dev Suggests: vtk-examples, vtk-doc Section: libdevel Description: VTK header files for building C++ code The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This package provides the VTK header files required to compile C++ programs that use VTK to do 3D visualisation. Package: libvtk5.8-qt4 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Section: libs Description: Visualization Toolkit - A high level 3D visualization library - Qt runtime The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This package provides the VTK GUI support for Qt4. Package: libvtk5-qt4-dev Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libvtk5.8-qt4 (= ${binary:Version}), libvtk5-dev (= ${binary:Version}) Conflicts: libvtk5-qt3-dev Breaks: libvtk5-qt4 (<< 5.4.2-8), libvtk5-dev (<< 5.8.0-11) Replaces: libvtk5-qt4 (<< 5.4.2-8), libvtk5-dev (<< 5.8.0-11) Section: libdevel Description: Visualization Toolkit - A high level 3D visualization library - Qt devel The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This package provides the VTK header files required to compile C++ programs that use VTK GUI support for Qt4. Package: tcl-vtk Architecture: any Depends: libvtk5.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: vtk-examples, vtk-doc Replaces: vtk, vtk-tcl Section: interpreters Description: Tcl bindings for VTK The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This provides the shared libraries and executable that enable one to use VTK from Tcl/Tk scripts. You will need Tcl/Tk and vtk installed to use this. Package: python-vtk Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Suggests: vtk-examples, vtk-doc, mayavi2 XB-Python-Version: ${python:Versions} Section: python Description: Python bindings for VTK The Visualization Toolkit (VTK) is an object oriented, high level library that allows one to easily write C++ programs, Tcl, Python and Java scripts that do 3D visualization. . This provides the shared libraries that enable one to use VTK from Python scripts. You will need Python and vtk installed to use this. Some useful information may be available in /usr/share/doc/python-vtk/. debian/tcl-vtk.readme.debian0000664000000000000000000000011312313327253013150 0ustar The Debian tcl-vtk package installs under the default tcl8.6 library path. debian/vtkWrapTclInit.10000664000000000000000000000102012250600354012165 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKWRAPTCLINIT "1" "December 2011" "vtkWrapTclInit 5.8.0" "User Commands" .SH NAME vtkWrapTclInit \- Command line tool for vtkWrapTclInit .SH SYNOPSIS .B vtkWrapTclInit \fIinput_file output_file\fR .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .PP .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/libvtk5.8.file0000664000000000000000000000025512250600354011556 0ustar usr/lib/vtk/libvtkCommon.so usr/lib/vtk/libvtkFiltering.so usr/lib/vtk/libvtkImaging.so usr/lib/vtk/libvtkGraphics.so usr/lib/vtk/libvtkIO.so usr/lib/vtk/libvtkRendering.so debian/vtkWrapJava.10000664000000000000000000000157412250600354011516 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKWRAPJAVA "1" "December 2011" "vtkWrapJava 5.8.0" "User Commands" .SH NAME vtkWrapJava \- Command line tool for vtkWrapJava .SH SYNOPSIS .B vtkWrapJava [\fIoptions\fR] \fIinput_file output_file\fR .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .TP \fB\-\-concrete\fR force concrete class .TP \fB\-\-abstract\fR force abstract class .TP \fB\-\-vtkobject\fR vtkObjectBase\-derived class .TP \fB\-\-special\fR non\-vtkObjectBase class .TP \fB\-\-hints\fR hints file .TP \fB\-\-types\fR type hierarchy file .TP \fB\-I\fR add an include directory .TP \fB\-D\fR define a preprocessor macro .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/python-vtk.dirs0000664000000000000000000000007112250600354012171 0ustar usr/bin usr/share/doc/python-vtk usr/lib/vtk-5.8/testing debian/pycompat0000664000000000000000000000000212250600354010734 0ustar 2 debian/python-vtk.shlibs0000664000000000000000000000173212250600354012521 0ustar libvtkChartsPythonD 5.8 python-vtk libvtkCommonPythonD 5.8 python-vtk libvtkFilteringPythonD 5.8 python-vtk libvtkGenericFilteringPythonD 5.8 python-vtk libvtkGeovisPythonD 5.8 python-vtk libvtkGraphicsPythonD 5.8 python-vtk libvtkHybridPythonD 5.8 python-vtk libvtkImagingPythonD 5.8 python-vtk libvtkInfovisPythonD 5.8 python-vtk libvtkIOPythonD 5.8 python-vtk libvtkParallelPythonD 5.8 python-vtk libvtkPythonCore 5.8 python-vtk libvtkRenderingPythonD 5.8 python-vtk libvtkRenderingPythonTkWidgets 5.8 python-vtk libvtkViewsPythonD 5.8 python-vtk libvtkVolumeRenderingPythonD 5.8 python-vtk libvtkWidgetsPythonD 5.8 python-vtk debian/vtk_common.1.in0000664000000000000000000000037312250600354012033 0ustar [DESCRIPTION] This manual page documents briefly the command. More information can be found at http://vtk.org [AUTHOR] This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/python-vtk.install0000664000000000000000000000046212250600354012702 0ustar usr/bin/vtkWrapPython usr/bin/vtkWrapPythonInit usr/bin/vtkpython usr/lib/*Python*.so* usr/lib usr/lib/vtk-5.8/testing/*py usr/lib/vtk-5.8/testing/ usr/lib/vtk-5.8/VTKConfig-Python.cmake usr/lib/python2.*/*-packages/* usr/bin/pvtkpython usr/bin/pvtk debian/python-vtk.lintian-overrides0000664000000000000000000000442412250600354014674 0ustar python-vtk: package-name-doesnt-match-sonames libvtkChartsPythonD5.8 libvtkCommonPythonD5.8 libvtkFilteringPythonD5.8 libvtkGenericFilteringPythonD5.8 libvtkGeovisPythonD5.8 libvtkGraphicsPythonD5.8 libvtkHybridPythonD5.8 libvtkIOPythonD5.8 libvtkImagingPythonD5.8 libvtkInfovisPythonD5.8 libvtkParallelPythonD5.8 libvtkPythonCore5.8 libvtkRenderingPythonD5.8 libvtkRenderingPythonTkWidgets5.8 libvtkViewsPythonD5.8 libvtkVolumeRenderingPythonD5.8 libvtkWidgetsPythonD5.8 python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkImagingPythonD.so.5.8.0 usr/lib/libvtkImagingPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkParallelPythonD.so.5.8.0 usr/lib/libvtkParallelPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkHybridPythonD.so.5.8.0 usr/lib/libvtkHybridPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkIOPythonD.so.5.8.0 usr/lib/libvtkIOPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkRenderingPythonTkWidgets.so.5.8.0 usr/lib/libvtkRenderingPythonTkWidgets.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkVolumeRenderingPythonD.so.5.8.0 usr/lib/libvtkVolumeRenderingPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkWidgetsPythonD.so.5.8.0 usr/lib/libvtkWidgetsPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkCommonPythonD.so.5.8.0 usr/lib/libvtkCommonPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkRenderingPythonD.so.5.8.0 usr/lib/libvtkRenderingPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkViewsPythonD.so.5.8.0 usr/lib/libvtkViewsPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkGraphicsPythonD.so.5.8.0 usr/lib/libvtkGraphicsPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkInfovisPythonD.so.5.8.0 usr/lib/libvtkInfovisPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkGenericFilteringPythonD.so.5.8.0 usr/lib/libvtkGenericFilteringPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkFilteringPythonD.so.5.8.0 usr/lib/libvtkFilteringPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkChartsPythonD.so.5.8.0 usr/lib/libvtkChartsPythonD.so python-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkGeovisPythonD.so.5.8.0 usr/lib/libvtkGeovisPythonD.so debian/python.vtk.patch0000664000000000000000000000050712250600354012334 0ustar --- misc.py.orig 2004-08-23 13:19:49.000000000 +0300 +++ misc.py 2004-08-23 13:20:23.000000000 +0300 @@ -20,7 +20,7 @@ try: dataRoot = os.environ['VTK_DATA_ROOT'] except KeyError: - dataRoot = '../../../../VTKData' + dataRoot = '/usr/share/VTKData' return dataRoot debian/vtk-examples.docs0000664000000000000000000000002712250600354012456 0ustar debian/README.examples debian/tcl-vtk.install0000664000000000000000000000061212313327266012150 0ustar usr/lib/*TCL.so* usr/lib usr/bin/vtk usr/bin/vtkWrapTcl usr/bin/vtkWrapTclInit ../../Wrapping/Tcl/vtkinteraction usr/share/tcltk/tcl8.6/vtk usr/lib/vtk-5.8/testing/*tcl usr/share/tcltk/tcl8.6/vtk usr/lib/vtk-5.8/VTKConfig-Tcl.cmake usr/lib/tcl usr/lib/vtk-5.8 usr/lib/pkgIndex.tcl usr/lib/vtk-5.8 debian/vtkEncodeString.10000664000000000000000000000143012250600354012356 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKENCODESTRING "1" "December 2011" "vtkEncodeString 5.8.0" "User Commands" .SH NAME vtkEncodeString \- Command line tool for vtkEncodeString .SH SYNOPSIS .B vtkEncodeString \fI \fR[\fI--build-header \fR] .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .PP Encode a string in a C or C++ file from a text file. .PP Example: vtkEncodeString MyString.cxx MyString.txt MyGeneratedString \fB\-\-build\-header\fR MYSTRING_EXPORT MyHeaderDefiningExport.h .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/libvtk5.8-qt4.shlibs0000664000000000000000000000007212250600354012626 0ustar libvtkQtChart 5.8 libvtk5.8-qt4 libQVTK 5.8 libvtk5.8-qt4 debian/libvtk5.8-qt4.lintian-overrides0000664000000000000000000000011512250600354014776 0ustar libvtk5.8-qt4: package-name-doesnt-match-sonames libQVTK5.8 libvtkQtChart5.8 debian/vtkpython.10000664000000000000000000000140512250600354011315 0ustar .TH VTK 1 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other parms are allowed: see man(7), man(1) .SH NAME vtkpython \- Visualization Tool Kit .SH SYNOPSIS .B vtkpython .I vtk_script.py .SH "DESCRIPTION" This manual page documents briefly the .B vtkpython command. Better info can be found at http://public.kitware.com/VTK .PP .B vtkpython This program is like the python interpreter .I python but is linked with The Visualization Toolkit libraries. .SH OPTIONS Hopefully, it accepts the same arguments as .I python .SH "SEE ALSO" python(1) .SH AUTHORS Ken Martin, Will Schroeder, and Bill Lorensen This manual page was written by A. Maitland Bottoms for the Debian GNU/Linux system (but may be used by others). debian/vtkWrapTcl.10000664000000000000000000000156712250600354011361 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKWRAPTCL "1" "December 2011" "vtkWrapTcl 5.8.0" "User Commands" .SH NAME vtkWrapTcl \- Command line tool for vtkWrapTcl .SH SYNOPSIS .B vtkWrapTcl [\fIoptions\fR] \fIinput_file output_file\fR .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .TP \fB\-\-concrete\fR force concrete class .TP \fB\-\-abstract\fR force abstract class .TP \fB\-\-vtkobject\fR vtkObjectBase\-derived class .TP \fB\-\-special\fR non\-vtkObjectBase class .TP \fB\-\-hints\fR hints file .TP \fB\-\-types\fR type hierarchy file .TP \fB\-I\fR add an include directory .TP \fB\-D\fR define a preprocessor macro .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/libvtk5.8.lintian-overrides0000664000000000000000000000101612250600354014271 0ustar libvtk5.8: package-name-doesnt-match-sonames libCosmo5.8 libVPIC5.8 libvtkCharts5.8 libvtkCommon5.8 libvtkDICOMParser5.8 libvtkFiltering5.8 libvtkGenericFiltering5.8 libvtkGeovis5.8 libvtkGraphics5.8 libvtkHybrid5.8 libvtkIO5.8 libvtkImaging5.8 libvtkInfovis5.8 libvtkParallel5.8 libvtkRendering5.8 libvtkViews5.8 libvtkVolumeRendering5.8 libvtkWidgets5.8 libvtkalglib5.8 libvtkexoIIc5.8 libvtkftgl5.8 libvtkmetaio5.8 libvtkproj4-5.8 libvtksys5.8 libvtkverdict5.8 libvtk5.8: embedded-library usr/lib/libvtkftgl.so.5.8.0: ftgl debian/tcl-vtk.dirs0000664000000000000000000000005612250600354011435 0ustar usr/bin usr/share/doc/tcl-vtk usr/lib/vtk-5.8 debian/tcl-vtk.manpages0000664000000000000000000000007112250600354012264 0ustar debian/vtk.1 debian/vtkWrapTcl.1 debian/vtkWrapTclInit.1 debian/vtkWrapPythonInit.10000664000000000000000000000103712250600354012734 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKWRAPPYTHONINIT "1" "December 2011" "vtkWrapPythonInit 5.8.0" "User Commands" .SH NAME vtkWrapPythonInit \- Command line tool for vtkWrapPythonInit .SH SYNOPSIS .B vtkWrapPythonInit \fIinput_file output_file\fR .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .PP .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/vtk-examples.install0000664000000000000000000000004012250600354013167 0ustar ../../Examples/* usr/share/vtk debian/libvtk5-dev.dirs0000664000000000000000000000003412250600354012201 0ustar usr/include usr/lib/vtk-5.8 debian/vtk-doc.prerm0000664000000000000000000000161312250600354011604 0ustar #!/bin/sh -e PACKAGE=vtk-doc # vtk-doc 5.0.2-4 (from etch) asked user if doxytag # should be called in order to generate a searchable # index. This has been disabled afterwards because # docs are huge. Keep this maintainer script until # after squeeze. case "$1" in remove|purge|upgrade) if [ -f /usr/lib/cgi-bin/search-vtk.cgi ] ; then rm -f /usr/lib/cgi-bin/search-vtk.cgi fi if [ -f /usr/share/doc/vtk-doc/html/search.idx ] ; then rm -f /usr/share/doc/vtk-doc/html/search.idx rm -f /usr/share/doc/vtk-doc/html/search.cgi fi exit 0 ;; failed-upgrade|abort-install|abort-upgrade|disappear) exit 0 ;; *) echo "prerm called with unknown argument \$1'" >&2 exit 0 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/libvtk5-qt4-dev.install0000664000000000000000000000052212250600354013416 0ustar usr/include/vtk-5.8/QVTK* usr/include usr/include/vtk-5.8/vtkQt* usr/include usr/lib/libQVTK.so usr/lib usr/lib/libvtkQtChart.so usr/lib usr/plugins/designer/* usr/lib/qt4/plugins/designer usr/lib/vtk-5.8/VTKConfigQt.cmake debian/libvtk-java.manpages0000664000000000000000000000005312250600354013112 0ustar debian/vtkParseJava.1 debian/vtkWrapJava.1 debian/python-vtk.manpages0000664000000000000000000000014712250600354013027 0ustar debian/vtkpython.1 debian/pvtk.1 debian/pvtkpython.1 debian/vtkWrapPython.1 debian/vtkWrapPythonInit.1 debian/vtk-doc.install0000664000000000000000000000053112250600354012123 0ustar ../../Build/Utilities/Doxygen/doc/html/* usr/share/doc/vtk-doc/html ../../Utilities/Upgrading usr/share/doc/vtk-doc ../../Utilities/Doxygen/*.pl usr/share/doc/vtk-doc/html ../../Utilities/Doxygen/doc_index.stop usr/share/doc/vtk-doc/html ../../Build/Utilities/Doxygen/vtk5.8.tag usr/share/doc/vtk-doc/html debian/4041-plot3d_2.patch0000664000000000000000000000374512250600354012233 0ustar *** vtkPLOT3DReader.cxx.old Fri Nov 10 10:11:24 2006 --- vtkPLOT3DReader.cxx Tue Nov 14 14:52:34 2006 *************** *** 570,576 **** int ni, nj, nk; this->ReadIntBlock(fp, 1, &ni); this->ReadIntBlock(fp, 1, &nj); ! this->ReadIntBlock(fp, 1, &nk); vtkDebugMacro("Q, block " << i << " dimensions: " << ni << " " << nj << " " << nk); --- 570,583 ---- int ni, nj, nk; this->ReadIntBlock(fp, 1, &ni); this->ReadIntBlock(fp, 1, &nj); ! if (!this->TwoDimensionalGeometry) ! { ! this->ReadIntBlock(fp, 1, &nk); ! } ! else ! { ! nk = 1; ! } vtkDebugMacro("Q, block " << i << " dimensions: " << ni << " " << nj << " " << nk); *************** *** 958,963 **** --- 965,971 ---- nthOutput->GetPointData()->AddArray(se); se->Delete(); + this->SkipByteCount(qFp); if ( this->FunctionList->GetNumberOfTuples() > 0 ) { *** vtkMultiBlockPLOT3DReader.cxx.old Fri Nov 10 10:11:32 2006 --- vtkMultiBlockPLOT3DReader.cxx Tue Nov 14 14:51:31 2006 *************** *** 589,595 **** int ni, nj, nk; this->ReadIntBlock(fp, 1, &ni); this->ReadIntBlock(fp, 1, &nj); ! this->ReadIntBlock(fp, 1, &nk); vtkDebugMacro("Q, block " << i << " dimensions: " << ni << " " << nj << " " << nk); --- 589,602 ---- int ni, nj, nk; this->ReadIntBlock(fp, 1, &ni); this->ReadIntBlock(fp, 1, &nj); ! if (!this->TwoDimensionalGeometry) ! { ! this->ReadIntBlock(fp, 1, &nk); ! } ! else ! { ! nk = 1; ! } vtkDebugMacro("Q, block " << i << " dimensions: " << ni << " " << nj << " " << nk); *************** *** 1012,1017 **** --- 1019,1025 ---- nthOutput->GetPointData()->AddArray(se); se->Delete(); + this->SkipByteCount(qFp); if ( this->FunctionList->GetNumberOfTuples() > 0 ) { debian/libvtk5-qt4-dev.dirs0000664000000000000000000000002412250600354012706 0ustar usr/lib usr/include debian/pvtkpython.10000664000000000000000000000052412250600354011476 0ustar .TH PVTKPYTHON 1 .SH NAME pvtkpython \- Visualization Tool Kit .SH SYNOPSIS .B mpirun -np 4 -machinefile ~/machines pvtkpython .I [script] -MPDENV- DISPLAY=:0 .SH "DESCRIPTION" This manual page documents briefly the .B pvtk command. Better info can be found at http://www.vtk.org .SH AUTHORS Ken Martin, Will Schroeder, and Bill Lorensen debian/libvtk5.8-qt4.install0000664000000000000000000000027512250600354013015 0ustar #qt4-support/usr/lib/vtk-5.8/lib*.so.* usr/lib usr/lib/libQVTK.so.* usr/lib usr/lib/libvtkQtChart.so.* usr/lib debian/libvtk5.8.postinst0000664000000000000000000000011312250600354012513 0ustar #!/bin/sh -e if [ "$1" = "configure" ]; then ldconfig fi #DEBHELPER# debian/python-vtk.docs0000664000000000000000000000004012250600354012154 0ustar Wrapping/Python/README_WRAP.txt debian/vtk-doc.docs0000664000000000000000000000001412250600354011401 0ustar README.html debian/vtk-examples.dirs0000664000000000000000000000005412250600354012467 0ustar /usr/share/doc/vtk-examples/ /usr/share/vtk debian/vtk-doc.doc-base0000664000000000000000000000071712250600354012140 0ustar Document: vtk-doc Title: VTK class documentation Author: Various Abstract: VTK is a high level, object oriented visualization library. VTK allows one to easily write C++ programs, Tcl, Python and Java scripts that do 2D and 3D visualization. This provides exhaustive HTML documentation for all the documented VTK classes. Section: Science/Data Analysis Format: HTML Index: /usr/share/doc/vtk-doc/html/index.html Files: /usr/share/doc/vtk-doc/html/*.html debian/tcl-vtk.lintian-overrides0000664000000000000000000000373112250600354014135 0ustar tcl-vtk: package-name-doesnt-match-sonames libvtkChartsTCL5.8 libvtkCommonTCL5.8 libvtkFilteringTCL5.8 libvtkGenericFilteringTCL5.8 libvtkGeovisTCL5.8 libvtkGraphicsTCL5.8 libvtkHybridTCL5.8 libvtkIOTCL5.8 libvtkImagingTCL5.8 libvtkInfovisTCL5.8 libvtkParallelTCL5.8 libvtkRenderingTCL5.8 libvtkViewsTCL5.8 libvtkVolumeRenderingTCL5.8 libvtkWidgetsTCL5.8 tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkChartsTCL.so.5.8.0 usr/lib/libvtkChartsTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkCommonTCL.so.5.8.0 usr/lib/libvtkCommonTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkFilteringTCL.so.5.8.0 usr/lib/libvtkFilteringTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkGenericFilteringTCL.so.5.8.0 usr/lib/libvtkGenericFilteringTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkGeovisTCL.so.5.8.0 usr/lib/libvtkGeovisTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkGraphicsTCL.so.5.8.0 usr/lib/libvtkGraphicsTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkHybridTCL.so.5.8.0 usr/lib/libvtkHybridTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkImagingTCL.so.5.8.0 usr/lib/libvtkImagingTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkInfovisTCL.so.5.8.0 usr/lib/libvtkInfovisTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkIOTCL.so.5.8.0 usr/lib/libvtkIOTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkParallelTCL.so.5.8.0 usr/lib/libvtkParallelTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkRenderingTCL.so.5.8.0 usr/lib/libvtkRenderingTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkViewsTCL.so.5.8.0 usr/lib/libvtkViewsTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkVolumeRenderingTCL.so.5.8.0 usr/lib/libvtkVolumeRenderingTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkWidgetsTCL.so.5.8.0 usr/lib/libvtkWidgetsTCL.so tcl-vtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkChartsTCL.so.5.8.0 usr/lib/libvtkChartsTCL.so debian/watch0000664000000000000000000000042212250600354010214 0ustar version=3 opts=uversionmangle=s/(\d)[\.\-]?((?:rc|RC|pre)(?:\.|-)?\d+(?:-\d+)?)$/$1~$2/ \ http://www.vtk.org/files/release/(\d+(?:\.\d+)*)/vtk(?:-|\.|_|_v|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) # Bart Martens Sat, 18 May 2013 17:27:53 +0000 debian/libvtk-java.dirs0000664000000000000000000000006712250600354012265 0ustar usr/bin usr/include/vtk-5.8 usr/share/java usr/lib/jni debian/changelog0000664000000000000000000012061712313366070011052 0ustar vtk (5.8.0-14.1ubuntu3) trusty; urgency=medium * rebuild against tk/tcl 8.6 (Closes: #1294927) - tcl8.6.patch: fix build failure * tcl-links.patch: fix underlinking of tcl libraries (Closes: #904469, #978152) -- Julian Taylor Sat, 22 Mar 2014 16:11:20 +0100 vtk (5.8.0-14.1ubuntu2) trusty; urgency=low * {d/rules,allpatches.patch}: Fix FreeType paths, resolving FTBFS. -- Daniel T Chen Sat, 21 Dec 2013 13:33:55 -0500 vtk (5.8.0-14.1ubuntu1) trusty; urgency=medium * Merge with Debian unstable, remaining change: - Tell the buildsystem that tcl/tk are in multiarch directories. * Revert the libtiff5 change, libtiff should work fine now. -- Dmitry Shachnev Sat, 07 Dec 2013 14:58:54 +0400 vtk (5.8.0-14.1) unstable; urgency=low * Non-maintainer upload. * debian/patches/libav9.patch: Backport patches from upstream to fix compilation with libav 9. (Closes: #693639) -- Sebastian Ramacher Fri, 23 Aug 2013 15:28:14 +0200 vtk (5.8.0-14ubuntu3) trusty; urgency=low * debian/control: change libtiff-dev to libtiff5-dev, stops other packages from ftbfs -- Jackson Doak Sat, 16 Nov 2013 09:48:41 +1100 vtk (5.8.0-14ubuntu2) trusty; urgency=low * No change rebuild against libav 9. -- Dmitrijs Ledkovs Sun, 10 Nov 2013 01:17:03 +0000 vtk (5.8.0-14ubuntu1) saucy; urgency=low * Merge from Debian, remaining changes are: + Tell the buildsystem that tcl/tk are in multiarch directories. + libav-0.9.patch: fix FTBFS with libav 0.9 by replacing deprecated functions with new ones -- Dmitrijs Ledkovs Fri, 02 Aug 2013 11:58:14 +0100 vtk (5.8.0-14) unstable; urgency=low [ Mathieu Malaterre ] * [eb7e4ed] Fix VTKTargets.cmake. (Closes: #714935) [ Bart Martens ] * [ee7ff23] Update debian/watch [ Anton Gladky ] * Team upload. -- Anton Gladky Mon, 08 Jul 2013 21:40:56 +0200 vtk (5.8.0-13.1) unstable; urgency=low * Non-maintainer upload. * Use multiarched libpython2.7.so location. Closes: #713794 * Add build-dep on dpkg-dev >= 1.16.1~. -- Dmitrijs Ledkovs Tue, 25 Jun 2013 20:50:11 +0100 vtk (5.8.0-13ubuntu2) saucy; urgency=low [ Iain Lane ] * Tell the buildsystem that python2.7 and tcl/tk are in multiarch directories. -- Dmitrijs Ledkovs Wed, 05 Jun 2013 14:58:29 +0100 vtk (5.8.0-13ubuntu1) raring; urgency=low * libav-0.9.patch: fix FTBFS with libav 0.9 by replacing deprecated functions with new ones -- Fabrice Coutadeur Mon, 19 Nov 2012 21:51:42 +0100 vtk (5.8.0-13build1) quantal; urgency=low * Rebuild for libtiff5. -- Colin Watson Sun, 09 Sep 2012 13:18:40 +0100 vtk (5.8.0-13) unstable; urgency=low * Make sure to include VTK/QT cmake file. Closes: #656115 * Revert back to libtiff4-dev and use libtiff-dev in d/control. Closes: #674998 * Fix tkInt.h installation, using proper cmake magic. Closes: #674169 * Make sure to discover init.tcl properly. Closes: #673245 -- Mathieu Malaterre Wed, 30 May 2012 13:48:14 +0200 vtk (5.8.0-12) unstable; urgency=low * Install QT cmake export file with qt package. Closes: #656115 * Re-activate old patch from bug #506992. Closes: #672729 -- Mathieu Malaterre Wed, 16 May 2012 11:10:32 +0200 vtk (5.8.0-11) unstable; urgency=low * fix FTBFS with gcc 4.7 -- Mathieu Malaterre Tue, 08 May 2012 13:54:51 +0200 vtk (5.8.0-10) unstable; urgency=low * Use my @d.o alias, remove DMUA flag * Move to Debian Science Team umbrella organisation * Fix issue with libtiff5-dev transition * Remove old dot hack, and generate svg output * Fix vtk-doc package. Closes: #610964 * Move QT option within qt cmake file. Closes: #656115 -- Mathieu Malaterre Mon, 07 May 2012 19:21:25 +0200 vtk (5.8.0-9) unstable; urgency=low * fix FTBFS with boost 1.49 (Closes: #667878) -- Dominique Belhachemi Sun, 08 Apr 2012 21:28:50 -0400 vtk (5.8.0-8) unstable; urgency=low * split VTKConfig.cmake into multiple parts (Closes: #584300) -- Dominique Belhachemi Tue, 13 Mar 2012 10:50:30 -0400 vtk (5.8.0-7) unstable; urgency=low * Prepare vtk for move to multi-arch (png,tiff,z,jpeg). Closes: #661676 * Bump to Std-Vers: 3.9.3, no changes needed. -- Mathieu Malaterre Sun, 04 Mar 2012 21:54:19 +0100 vtk (5.8.0-6) unstable; urgency=low [Dominique Belhachemi] * merged with upstream's release branch (Closes: #653805) * set debian/compat=9 to receive CFLAGS * cleanup debian/rules * set build dependency from libhdf5-serial-dev to libhdf5-dev [Mathieu Malaterre] * Add missing man pages (remove lintian warnings) * Fix needless-dependency-on-jre -- Dominique Belhachemi Sun, 22 Jan 2012 18:42:09 -0500 vtk (5.8.0-5) unstable; urgency=low * install vtkWrapHierarchy and vtkEncodeString into /usr/bin * install *Java.so* into /usr/lib/jni -- Dominique Belhachemi Tue, 06 Dec 2011 18:59:02 -0500 vtk (5.8.0-4) unstable; urgency=low * upload to unstable * removed some java annotations and generics to fix FTBFS on kfreebsd * fixed tcl path -- Dominique Belhachemi Mon, 21 Nov 2011 20:16:02 -0500 vtk (5.8.0-3) experimental; urgency=low * adjust installation path for VTKTargets.cmake * removed unused debian/tcl-vtk.postinst * compiled java classes with -source 1.6 * keep VTKConfigQt.cmake only in libvtk5-dev * removed usr/lib/libMapReduceMPI.so* -- Dominique Belhachemi Tue, 08 Nov 2011 20:12:47 -0500 vtk (5.8.0-2) experimental; urgency=low * build with system hdf5 * set VTK_INSTALL_LIB_DIR:PATH=/lib/ -- Dominique Belhachemi Sat, 15 Oct 2011 11:00:53 -0400 vtk (5.8.0-1) experimental; urgency=low [Mathieu Malaterre] * Non-maintainer upload. * New upstream: 5.8.0 * Adapt to new libav. Closes: #638559 * Remove convenient sqlite copy. Closes: #638883 - Use lintian to hide ftgl copy [Alastair McKinstry] * Ensure python-vtk pyc files are deleted * shlibs for pythonCore needed -- Alastair McKinstry Tue, 13 Sep 2011 21:31:17 +0100 vtk (5.6.1-7) unstable; urgency=low * Drop obsolete paths from CMakeCache.txt.debian. Thanks to Julien Cristau (Closes: #643814) -- Dominique Belhachemi Fri, 30 Sep 2011 20:48:45 -0400 vtk (5.6.1-6.1) unstable; urgency=low [ Michael Schutte ] * Non-maintainer upload. * Remove absolute paths to required libraries from /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: #506992. Due to the multiarch transition, the original behavior frequently causes reverse build-deps to FTBFS. This change should probably be reverted once all required libraries are multiarched. [ Steve M. Robbins ] * Override lintian diagnostic about embedded libraries ftgl and sqlite. * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav 0.7. -- Steve M. Robbins Thu, 01 Sep 2011 23:35:32 -0500 vtk (5.6.1-6) unstable; urgency=low * VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx: * - Make mapper more verbose if GPU is not supported. * - Don't deactivate the mapper if the 'OpenGL renderer string' * contains 'Mesa' (e.g. Intel GPU's) (Closes: #600424) -- Dominique Belhachemi Thu, 02 Jun 2011 23:21:18 -0400 vtk (5.6.1-5) unstable; urgency=low * Include to ensure ptrdiff_t is defined. (Closes: #624878) -- Dominique Belhachemi Sat, 07 May 2011 12:01:54 -0400 vtk (5.6.1-4) unstable; urgency=low * vtkEncodeString is in /usr/lib/vtk-5.6 (Closes: #618519) * replace doxygen and texlive build dependencies with doxygen-latex (Closes: #616284) * Re-apply commit 4e1dd55 which had not been merged into 5.6.0. Added Break and Replace control fields (Closes: #601992, #601994) -- Dominique Belhachemi Tue, 15 Mar 2011 20:44:14 -0400 vtk (5.6.1-3) unstable; urgency=low [ Dominique Belhachemi ] * debian/control: Added versioned dependency for python-dev (Closes: #604467) * debian/control: vtk-examples suggests libqt4-dev (Closes: #612952) * debian/rules: use find/xargs combination to delete *.md5 files, avoids that rm is failing because of a long argument list * debian/rules: Make cmake output verbose if DH_VERBOSE is set [ Denis Barbier ] * Fix FTBFS on kfreebsd. (Closes: #614134) -- Dominique Belhachemi Mon, 21 Feb 2011 17:17:49 -0500 vtk (5.6.1-2) unstable; urgency=low * Upload to unstable (Closes: #604388, #613907, #613908, #6139011) * Link against Debian's system netcdf instead of vtknetcdf * removed libvtkNetCDF_cxx.so* (Closes: #602065) * Added workaround for FFMPEG build error -- Dominique Belhachemi Thu, 17 Feb 2011 18:26:48 -0500 vtk (5.6.1-1) experimental; urgency=low * new upstream patch release * Bump Standards-Version to 3.9.1(no changes needed) * added libvtkNetCDF_cxx.so.* -- Dominique Belhachemi Sun, 24 Oct 2010 13:23:50 -0400 vtk (5.6.0-2) experimental; urgency=low * Package tcl-vtk depends now on libvtk5.6 instead of libvtk5-dev * some link target changed to reduce unnecessary dependencies * Package is compliant to Debian policy version 3.9.0(no changes needed) -- Dominique Belhachemi Thu, 15 Jul 2010 15:53:18 -0400 vtk (5.6.0-1) experimental; urgency=low * Switch to dpkg-source 3.0 (quilt) format * renamed package according to the Debian Tcl/Tk policy vtk-tcl -> tcl-vtk * bump library version number in runtime packages: libvtk5.4-qt4 -> libvtk5.6-qt4 libvtk5.4 -> libvtk5.6 * removed packages: libvtk5.4-qt3 and libvtk5-qt3-dev * Try not to link against unnecessary libraries -- Dominique Belhachemi Wed, 16 Jun 2010 00:09:11 -0400 vtk (5.4.2-8) unstable; urgency=low * debian/control: Added Break and Replace control fields (Closes: #601992, #601994) -- Dominique Belhachemi Sat, 06 Nov 2010 11:33:04 -0400 vtk (5.4.2-7) unstable; urgency=low [ Denis Barbier ] * copy Wrapping/Python/vtk/gtk/GtkGLExtVTKRenderWindow{,Interactor}.py files * allow building against boost 1.42 and up (Closes: #582455) * drop CMake/FindJNI.cmake and build-depends cmake >= 2.8.1-3 instead * let python-vtk build with python 2.5 or 2.6. Report and patch by Fabrice Coutadeur (Closes: #582565) -- A. Maitland Bottoms Tue, 25 May 2010 06:54:16 -0400 vtk (5.4.2-6) unstable; urgency=low * remove explicit references to python2.5 (Closes: #571519, #571491) * make libvtk5-dev explicitly depend upon tcl8.5-dev and tk8.5-dev (Closes: #572189) -- A. Maitland Bottoms Wed, 14 Apr 2010 14:40:49 -0400 vtk (5.4.2-5) unstable; urgency=low [ Dominique Belhachemi ] * Move library file libQVTKWidgetPlugin.so from libvtk5.4-{qt3,qt4} to libvtk5-{qt3,qt4}-dev . (Closes: #567379, #567380) [ Denis Barbier ] * CMake/FindJNI.cmake: add support for SH. Report and patch by Nobuhiro Iwamatsu. Closes: #568964 -- Dominique Belhachemi Mon, 15 Feb 2010 18:27:01 -0500 vtk (5.4.2-4) unstable; urgency=low * Upload to unstable -- A. Maitland Bottoms Tue, 26 Jan 2010 11:39:45 -0500 vtk (5.4.2-3) experimental; urgency=low [ Denis Barbier ] * Several VTK_USE_* features have lately been enabled. Add development packages to Depends field of libvtk5-dev, those libraries are now listed in VTKLibraryDepends.cmake [ Dominique Belhachemi ] * Use virtual packages (libexpat-dev, libjpeg-dev, libpng-dev) * doxyfile.in updated (doxygen 1.6.2 supports SVG) * debian/rules: removed build-stamp target from docs-stamp target * debian/rules: removed install-stamp target from binary-indep target -- Dominique Belhachemi Tue, 05 Jan 2010 18:44:38 -0500 vtk (5.4.2-2) experimental; urgency=low * fix java path: /usr/share/java/vtk.jar -- Dominique Belhachemi Fri, 01 Jan 2010 19:39:39 -0500 vtk (5.4.2-1) experimental; urgency=low [ A. Maitland Bottoms ] * New Upstream Version (Closes: #531989, #396283) * Drop VTK_X3D_USE_JAVA option, it has been removed from VTK 5.4. As a consequence, vtkHybrid does no more depend on Java libraries. Closes: #558714, #559629 * Turn VTK_USE_POSTGRES ON. [ Denis Barbier ] * Fix FTBFS with gcj (Closes: #558716) * Drop all prerm scripts except vtk-doc.prerm * Copy CMake/FindJNI.cmake from 5.2.1-11, it had accidentally been removed. * Set JAVA_HOME in debian/rules to help FindJNI.cmake and FindJava.cmake * Remove debian/doxydot.sh, this script does nothing * Use a dot wrapper, taken from gdcmtk, to generate graphs without antialiasing, generated png files are much smaller and do not need to be compressed. (Closes: #560661) -- A. Maitland Bottoms Wed, 16 Dec 2009 12:05:30 -0500 vtk (5.2.1-15) unstable; urgency=low [ Dominique Belhachemi ] * reduce size of vtk-doc by using the svg format * removed temporary debian/dot wrapper [ Denis Barbier ] * Fix vtk.jar installation path. Closes: bug#562387 -- Dominique Belhachemi Mon, 11 Jan 2010 11:55:14 -0500 vtk (5.2.1-14) unstable; urgency=low * Turn VTK_X3D_USE_JAVA back OFF. Closes: bug#558675. * Suggest openmpi-bin Closes: bug#559452. * vtkEncodeString is in /usr/lib/vtk-5.2 Closes: bug#560817, bug#557545. -- A. Maitland Bottoms Sun, 03 Dec 2009 20:51:57 -0500 vtk (5.2.1-13) unstable; urgency=low * Build-Dep on mpi-default-dev for VTK_USE_MPI. Closes: bug#552357. -- A. Maitland Bottoms Tue, 24 Nov 2009 21:06:58 -0500 vtk (5.2.1-12) unstable; urgency=low [ A. Maitland Bottoms ] * Update IO/vtkFFMPEGWriter.cxx to use swscale API. * Turn VTK_USE_FFMPEG_ENCODER ON. Closes: bug#552356. * Don't override values found by local FindJNI.cmake. Closes: bug#533193. [ Gerfried Fuchs ] * Adopt package description suggestion. Closes: bug#550104. [ Mathieu Malaterre ] * Suggest mayavi2 instead of removed mayavi. Closes: bug#552341. * Remove md5 doxygen generated files Closes: bug#552343. * VTK_X3D_USE_JAVA is ON. Closes: bug#552352. * vtkEncodeString is now packaged. Closes: bug#552353. * Turn VTK_USE_BOOST ON. Closes: bug#552354. * Turn VTK_USE_MPI ON. Closes: bug#552357. * Turn VTK_USE_MYSQL ON. Closes: bug#552359. * Use system gl2ps library instead of convenient copy. Closes: bug#552363. * Fix path to libQVTKWidgetPlugin.so. Closes: bug#555122. * Turn SEARCHENGINE=NO in doxygen configuration. Closes: bug#557237. * Compress the png files. Closes: bug#557238. -- A. Maitland Bottoms Sat, 21 Nov 2009 17:40:47 -0500 vtk (5.2.1-11) unstable; urgency=low * Using a local FindJNI.cmake to set JAVA_AWT_LIBRARY -- Dominique Belhachemi Thu, 17 Sep 2009 13:53:21 -0400 vtk (5.2.1-10) unstable; urgency=low [ Dominique Belhachemi ] * Switched to Tcl/Tk 8.5 * Removed transitional package gcj from Build-Depends * Bump Standards-Version to 3.8.3 * Added debian/python-vtk.lintian-overrides * Added debian/vtk-tcl.lintian-overrides * Added debian/libvtk5.2-qt4.lintian-overrides * Added debian/libvtk5.2-qt3.lintian-overrides * Removed debian/libvtk-java.lintian-overrides * Compat level set to 7 * Removed some unused shlib entries [ Denis Barbier ] * Remove bashisms from debian/rules * Remove calls to install-docs from libvtk-java.{postinst,prerm}. * Add ${misc:Depends} to Depends field in debian/control * Move libvtk-java section from 'interpreters' into 'java' * Drop vtk-doc.postinst -- Dominique Belhachemi Sun, 06 Sep 2009 15:26:38 -0400 vtk (5.2.1-9) unstable; urgency=low [ A. Maitland Bottoms ] * compile with support for osmesa * Be more flexible about egg-info naming. (Thanks Cyril Brulebois) Closes: bug#540520 * Fix FTBFS on armel/kfreebsd-amd64/kfreebsd-i386 (when debian arch != debian cpu). Report and patch by Aurélien Jarno. Closes: bug#541891. [ Denis Barbier ] * Fix FTBFS with parallel builds. Closes: bug#543114. There seems to be a race when compiling Java bindings with parallel builds, modify CMake/vtkWrapJava.cmake to call javac only once for each kit. -- Dominique Belhachemi Sun, 30 Aug 2009 22:51:02 -0400 vtk (5.2.1-8) unstable; urgency=low * dak upload failed -- A. Maitland Bottoms Thu, 20 Aug 2009 09:54:34 -0400 vtk (5.2.1-7) unstable; urgency=low [ A. Maitland Bottoms ] * Do not confuse Linux on sparc with SUN * java-policy is to use /usr/lib/jni. Closes: bug#533198. [ malaterre ] * BUG: Fix debian bug #532009. TBFS: error: AxesActor cannot be resolved to a type. Using the latest gcj 4.4 compiler for providing javac compiler there is an issue where -d path (destination dir) is not *always* added to the user class path. Furthermore by the time we compiler TestVTKCanvas, AxesActor should already have been compiled. Thus reorder foreach loop. Closes: bug#532009 -- A. Maitland Bottoms Fri, 10 Jul 2009 13:58:07 -0400 vtk (5.2.1-6) unstable; urgency=low * correct python-support usage (Closes: #529961) -- A. Maitland Bottoms Wed, 24 Jun 2009 21:52:32 -0400 vtk (5.2.1-5) unstable; urgency=low * correct python-support shared library path (Closes: #529961) -- A. Maitland Bottoms Sat, 23 May 2009 09:47:08 -0400 vtk (5.2.1-4) unstable; urgency=low * new libvtk5.2 packages (Closes: #520906, #523118) * dev packages now built for each architecture (Closes: #521451, #529292) * consistent use of dh-install and .dirs files (Closes: #519058) * install all qt support libraries (Closes: #520003) * install vtkWrapPythonInit (Closes: #486794) * libvtk5-dev depends upon libfreetype6-dev libxss-dev libxft-dev libpng12-dev (Closes: #527119) -- A. Maitland Bottoms Tue, 19 May 2009 21:35:17 -0400 vtk (5.2.1-3) unstable; urgency=low * Build without ccache (Closes: #522641) * versioned dependency on libvtk5 (Closes: #520328) * install all qt support libraries (Closes: #520003) -- A. Maitland Bottoms Mon, 06 Apr 2009 09:42:16 -0400 vtk (5.2.1-2) unstable; urgency=low * use a sensible default VTK_DATA_ROOT for Debian (Closes: #513822) * python-vtk.manpages * update copyright file * build-depend upon gnuplot-nox rather than gnuplot * Unset QT_QT_LIBRARY for Qt4 build (Closes: #516756) -- A. Maitland Bottoms Tue, 10 Mar 2009 10:32:59 -0400 vtk (5.2.1-1) unstable; urgency=low * New upstream release (Closes: #500232) -- A. Maitland Bottoms Wed, 11 Feb 2009 02:59:36 -0500 vtk (5.2.0.99-1) unstable; urgency=low * bump up * add quilt -- Mathieu Malaterre Sun, 28 Dec 2008 01:18:04 +0100 vtk (5.2.0) unstable; urgency=low * Bump up -- Mathieu Malaterre Wed, 24 Dec 2008 14:55:29 +0100 vtk (5.0.4-1.1) unstable; urgency=low * Non-maintainer upload. * Compile with -O0 on arm to workaround fslview FTBFS. Closes: 498053, 492538 . Thanks Peter Green. -- Riku Voipio Fri, 10 Oct 2008 11:28:25 +0300 vtk (5.0.4-1) unstable; urgency=low * New upstream release (Closes: #472512) * install cstddef and vtkTemplateAliasMacro.h in libvtk5-dev (Closes: #472520) * added cstring includes in Utilities/DICOMParser, GCC 4.3 compilation works (Closes: #455442) * Update wxPython support from upstream CVS, use the wx namespace rather than the deprecated API (Closes: #448895) -- A. Maitland Bottoms Mon, 24 Mar 2008 15:13:54 -0400 vtk (5.0.3-1.1) unstable; urgency=medium * Non-maintainer upload. * Fix FTBFS with gcc-4.3. Thanks to Cyril Brulebois. Closes: #455442 -- Andreas Barth Sun, 16 Mar 2008 23:07:05 +0000 vtk (5.0.3-1) unstable; urgency=low * New upstream release * keep multiblock (Fortran unformatted) PLOT3D solution file patch * Build using newer cmake, avoid /usr/lib64 path (Closes: #418201) * Correctly close bug for vtkWrap* executables (Closes: #401746) -- A. Maitland Bottoms Tue, 26 Jun 2007 16:37:05 -0400 vtk (5.0.2.dfsg-1) unstable; urgency=high * Remove patent encumbered MPEG2 library from source (Closes: #408552) * Recommend python-vtk (Closes: #405119) * Correctly install VTKConfig.cmake (Closes: #407687) * multiblock (Fortran unformatted) PLOT3D solution file patch (Closes: #400406) * include vtkWrap* executables are needed to build libraries bindings for tcl and python that extend vtk. (Closes: ##401746) -- A. Maitland Bottoms Tue, 20 Feb 2007 21:55:26 -0500 vtk (5.0.2-4) unstable; urgency=low * Add description of fix for two-dimensional PLOT3D to README.debian -- A. Maitland Bottoms Mon, 13 Nov 2006 20:55:44 -0500 vtk (5.0.2-3) unstable; urgency=low * Fixup VTKData pathname (Closes: #389549) -- A. Maitland Bottoms Mon, 13 Nov 2006 11:00:05 -0500 vtk (5.0.2-2) unstable; urgency=low * depend on x11proto-core-dev rather than x-dev (Closes: #389001) -- A. Maitland Bottoms Fri, 10 Nov 2006 23:17:11 -0500 vtk (5.0.2-1) unstable; urgency=low * New upstream release (Closes: #395566) * Build with Qt support thanks to Michael Hanke. (Closes: #384908) * Correct VTK_DATA_ROOT path (Closes: #389549) * libvtk5-qt4-dev depends on libvtk5-qt4, libvtk5-qt3-dev depends on libvtk5-qt3 (Closes: #389521) * Apply fix for two-dimensional PLOT3D by Francesco Poli (Closes: #397186) -- A. Maitland Bottoms Fri, 10 Nov 2006 14:17:57 -0500 vtk (5.0.1-4) unstable; urgency=low * Remove build system paths from vtkCommonKit.cmake and vtkRenderingKit.cmake in the libvtk5-dev package (Closes: #388736) Thanks to Thomas Weber -- A. Maitland Bottoms Fri, 22 Sep 2006 09:54:24 -0400 vtk (5.0.1-3) experimental; urgency=low * Add libraries to libvtk5-qt3 and libvtk5-qt3 * Add conflicts to libvtk5-qt3 and libvtk5-qt3 since both have libQVTK.so.5.0.1 * Add back graphviz in Build-Depends-Indep since it is in main now. -- A. Maitland Bottoms Thu, 14 Sep 2006 11:58:06 -0400 vtk (5.0.1-2) experimental; urgency=low * Build with Qt support thanks to Michael Hanke. (Closes: #384908) * Use python-support -- A. Maitland Bottoms Thu, 7 Sep 2006 18:38:30 -0400 vtk (5.0.1-1) unstable; urgency=low * New upstream branch * New soversion, new library package name (Closes: #351476) * Automatic build-time python version setting, for new Python policy, (Closes: #373406) -- A. Maitland Bottoms Sun, 6 Aug 2006 14:59:14 -0400 vtk (4.4.2-9) unstable; urgency=low * renamed libvtk4c2 to libvtk4c2a(libstdc++ allocator change) (Closes: #339276) * New X dependencies - (Closes #346505) * patch QVTKRenderWindowInteractor.py invocation of the QWidget constructor (Closes: #333812) -- A. Maitland Bottoms Tue, 10 Jan 2006 12:41:41 -0500 vtk (4.4.2-8) unstable; urgency=low * Fix build-depends to prefer libgl1-mesa-dev (Closes: #328971) -- A. Maitland Bottoms Sun, 18 Sep 2005 10:15:01 -0400 vtk (4.4.2-7) unstable; urgency=low * g++ 4.0 Transition * Pick up some of the ubuntu patches: Update {build-,}depends for xorg -> mesa GL/GLU transition. Change (build-)dependencies xlibmesa-glu* to libglu*-xorg. Fix libvtk-dev dependencies. CXX transition: Rename libvtk4 to libvtk4c2. debian/python-vtk.{postinst,prerm}: Remove, use dh_python. Work around xorg reorganization, add -I/usr/X11R6/include to the path. * Debian still has Python 2.3 as the default -- A. Maitland Bottoms Sun, 11 Sep 2005 21:20:03 -0400 vtk (4.4.2-6ubuntu2) breezy; urgency=low * Update {build-,}depends for xorg -> mesa GL/GLU transition. -- Adam Conrad Thu, 25 Aug 2005 00:35:49 +1000 vtk (4.4.2-6ubuntu1) breezy; urgency=low * Synchronise with Debian. * Change (build-)dependencies xlibmesa-glu* to libglu*-xorg. * Fix libvtk-dev dependencies. * CXX transition: Rename libvtk4 to libvtk4c2. * Tighten build dependency on ftgl-dev (>= 2.1.2-1ubuntu1). * debian/python-vtk.{postinst,prerm}: Remove, use dh_python. * Work around xorg reorganization, add -I/usr/X11R6/include to the path. -- Matthias Klose Mon, 30 May 2005 14:57:29 +0200 vtk (4.4.2-6) unstable; urgency=low * provide /usr/include/vtk/vtkAMRBox.h in libvtk4-dev (Closes: #258090) -- A. Maitland Bottoms Sun, 20 Mar 2005 11:48:50 -0500 vtk (4.4.2-5) unstable; urgency=low * fix dependency for GLU development package libglu-dev (Closes: #299523) * also fix libgl-dev dependency, use XFree86 OpenGL by default * correct version in shlibs file with dh_makeshlibs -V (Closes: #299479) * support system lib freetype 6 (Closes: #277602) -- A. Maitland Bottoms Mon, 14 Mar 2005 19:13:10 -0500 vtk (4.4.2-4) unstable; urgency=low * works with mayavi and gl2ps (Closes: #237051, #232019) * vtk-tcl depends on -dev (Closes: #231138) * help octaviz transition out of experimental * Build-depends upon cmake version 2.0.5 -- A. Maitland Bottoms Tue, 8 Mar 2005 09:56:07 -0500 vtk (4.4.2-3) experimental; urgency=low * ship Common/vtkAMRBox.h in libvtk4-dev (Closes: #258090) * python-vtk: vtkGetDataRoot returns correct directory -- A. Maitland Bottoms Thu, 19 Aug 2004 09:27:41 -0400 vtk (4.4.2-2) experimental; urgency=low * Give experimental version a build with new libtiff, cmake 2.0.3 -- A. Maitland Bottoms Thu, 12 Aug 2004 13:40:42 -0400 vtk (4.4.2-1) experimental; urgency=low * New upstream release, use vtkIdTypeArray instead of vtkIntArray -- A. Maitland Bottoms Mon, 29 Mar 2004 22:34:09 -0500 vtk (4.4.1-2) experimental; urgency=low * fix some .so links (Closes: #237051) -- A. Maitland Bottoms Tue, 9 Mar 2004 09:16:47 -0500 vtk (4.4.1-1) experimental; urgency=low * New upstream release -- A. Maitland Bottoms Sun, 7 Mar 2004 23:04:50 -0500 vtk (4.4-2) experimental; urgency=low * Enable gl2ps support -- A. Maitland Bottoms Tue, 17 Feb 2004 21:15:18 -0500 vtk (4.4-1) experimental; urgency=low * New upstream "interim" release -- A. Maitland Bottoms Sun, 15 Feb 2004 08:45:07 -0500 vtk (4.2.6-5ubuntu1) hoary; urgency=low * Rebuilt for Python 2.4. -- Herve Cauwelier Thu, 17 Mar 2005 10:18:35 +0100 vtk (4.2.5-1) unstable; urgency=low * New upstream release * Added conflicts line because I moved files between libvtk4 and python-vtk (Closes: #227006) -- A. Maitland Bottoms Tue, 20 Jan 2004 21:19:29 -0500 vtk (4.2.4-4) unstable; urgency=low * Fix .so file handling in binary-arch only builds. (Closes: #225659) -- A. Maitland Bottoms Wed, 31 Dec 2003 11:22:54 -0500 vtk (4.2.4-3) unstable; urgency=low * apply patch Wrapping/Python/vtk/tk/vtkLoadPythonTkWidgets.py (again) -- A. Maitland Bottoms Tue, 16 Dec 2003 19:33:40 -0500 vtk (4.2.4-2) unstable; urgency=low * Fix FTBFS package bug * Lose some cruft, adjust some rules to make backporting easier. -- A. Maitland Bottoms Mon, 15 Dec 2003 22:58:23 -0500 vtk (4.2.4-1) unstable; urgency=low * New upstream release * With cmake 1.8.2+ fix_linkage is no longer needed * update depends for python-vtk and vtk-tcl (Closes: #222927) -- A. Maitland Bottoms Thu, 4 Nov 2003 19:38:35 -0500 vtk (4.2.2-6) unstable; urgency=low * Fix doc-base entry for vtk-doc (Closes: #212917) * More robust tmpfile for debian/fix_linkage (Closes: #219440) * Fix vtk-tcl (Closes: #219722) -- A. Maitland Bottoms Sat, 8 Nov 2003 20:26:31 -0500 vtk (4.2.2-5) unstable; urgency=low * Enable VTK_USE_PARALLEL - with threads rather than MPI -- A. Maitland Bottoms Thu, 21 Aug 2003 11:08:11 -0400 vtk (4.2.2-4) unstable; urgency=low * /usr/lib/vtk/CMake/ is needed, too. (Closes: #199907) -- A. Maitland Bottoms Thu, 21 Aug 2003 20:42:26 -0400 vtk (4.2.2-3) unstable; urgency=low * Craft /usr/lib/vtk/VTKConfig.cmake paths by hand to reflect the install platform rather than the build platform (Closes: #199907) * Don't ship any .pyc, the postinst handles it. (Closes: #206454) * interface with tcl in Tkinter changed slightly in python 2.3, patch Wrapping/Python/vtk/tk/vtkLoadPythonTkWidgets.py (Closes #206455) -- A. Maitland Bottoms Wed, 20 Aug 2003 17:16:54 -0400 vtk (4.2.2-2) unstable; urgency=low * more python2.3 migration (Closes: #205641) * change sections, libvtk4-dev in libdevel, python-vtk in python * install /usr/lib/vtk/UseVTK.cmake and friends (Closes: #199907) -- A. Maitland Bottoms Wed, 20 Aug 2003 08:47:54 -0400 vtk (4.2.2-1) unstable; urgency=low * New upstream release * use soname fix_linkage from Gavin Baker * build wiith python2.3 -- A. Maitland Bottoms Wed, 20 Aug 2003 04:48:06 +0000 vtk (4.2.1-1) unstable; urgency=low * New upstream release -- A. Maitland Bottoms Fri, 7 Mar 2003 22:23:22 -0500 vtk (4.1.20030227-1) unstable; urgency=low * Upstream expat changes, try Debian's expat libary again -- A. Maitland Bottoms Fri, 28 Feb 2003 03:01:59 +0000 vtk (4.1.20030224-2) unstable; urgency=low * don't use Debian expat library * more work on Tcl packaging -- A. Maitland Bottoms Tue, 25 Feb 2003 08:14:36 -0500 vtk (4.1.20030224-1) unstable; urgency=low * downloaded from http://www.vtk.org/files/release/4.2/ * include Upgrading notes in vtk-doc * install pkgIndex.tcl rather than pkgIndex.tcl.in * use Debian expat library -- A. Maitland Bottoms Mon, 24 Feb 2003 18:04:37 -0500 vtk (4.1.20030216-2) unstable; urgency=low * Adjust build depends (xlibmesa-gl-dev xlibmesa-glu-dev) use cmake 1.6.4 instead of 1.4.7 -- A. Maitland Bottoms Sun, 16 Feb 2003 06:01:17 -0500 vtk (4.1.20030216-1) unstable; urgency=low * New upstream release 4.2 coming soon, getting this through the Debian autobuilders before official release might be a good thing * source from today's nightly snapshot * Will build with GCC 3.2 (Closes: #180767) * Only use Dart if it is already installed, but no Build-depends on dart-client (Closes: #175576) -- A. Maitland Bottoms Sat, 15 Feb 2003 23:41:34 -0500 vtk (4.0.dfsg-2) unstable; urgency=low * Plain gcc, Python cleanups, use tcl8.4 and link with tk8.4 * Builds OK in my pbuilder environment (Closes: #164983) -- A. Maitland Bottoms Thu, 24 Oct 2002 21:36:48 -0400 vtk (4.0.dfsg-1) unstable; urgency=low * Now with DFSG source. (rm -rf Patented) ...more details in README.debian * Don't Build-Depends-Indep on graphviz. (Closes: #162460) * Avoid g++-3.2 on sparc. " mait: don't expect gcc-3.2 to work too well on sparc right now" * The new "package of d00m" release. -- A. Maitland Bottoms Fri, 27 Sep 2002 19:13:13 -0400 vtk (4.0-2) unstable; urgency=low * Conflict/replaces older libvtk*-dev (Closes: #161429) * Update to policy 3.5.7, use Build-Depends-Indep (Closes: #161906, #161910) * Place supporting tcl files in /usr/lib/vtk/tcl for vtk-tcl (Closes: #162271) * Use -ffunction-sections flag for hppa build, via CMake this time. * Avoid time-outs on slow architectures by not running tests on arm, m68k, mipsel. -- A. Maitland Bottoms Wed, 25 Sep 2002 19:19:40 -0400 vtk (4.0-1) unstable; urgency=low * New upstream - major changes (Closes: #140160) -- A. Maitland Bottoms Mon, 26 Aug 2002 20:17:59 -0400 vtk (3.2-11) woody-proposed-updates; urgency=low * Release Team: Please consider this upload for inclusion in woody. The following bugfixes only update packaging. * Removed useless links (Closes: #145868) * Now fakeroot debian/rules binary-patented works (Closes: #140632) -- A. Maitland Bottoms Fri, 5 Jul 2002 15:28:24 -0400 vtk (3.2-10) unstable; urgency=low * Fix libvtk32-dev dependencies - correctly this time :-) (Closes: #137329) -- A. Maitland Bottoms Tue, 19 Mar 2002 10:34:38 -0500 vtk (3.2-9) unstable; urgency=low * Fix libvtk32-dev dependencies (Closes: #137329) -- A. Maitland Bottoms Fri, 8 Mar 2002 08:32:21 -0500 vtk (3.2-8) unstable; urgency=low * Use -l flag of dh_shlibdeps after using dh_makeshlibs to ensure the proper Depends line. (Closes: #134824) -- A. Maitland Bottoms Sat, 23 Feb 2002 17:50:06 -0500 vtk (3.2-7) unstable; urgency=low * libvtk32-dev depends upon libvtk32 rather than suggests (Closes: #133457) -- A. Maitland Bottoms Fri, 4 Jan 2002 10:00:01 -0500 vtk (3.2-6) unstable; urgency=low * Build binary-indep correctly * don't hardcode dependency (Closes: #127603) -- A. Maitland Bottoms Fri, 4 Jan 2002 15:01:58 -0500 vtk (3.2-5) unstable; urgency=low * Link from html documentation into example programs * Oops, I had missed a change LaMont made (Closes: #127175) * Kudos to Ryan Murray for the clue I really needed (Closes: #127178) * ... those two were the same bug. -- A. Maitland Bottoms Mon, 31 Dec 2001 10:02:07 -0500 vtk (3.2-4) unstable; urgency=low * Avoid building docs in binary-arch target * Cleaner clean rules (Closes: #126691) * Get Mac OS stuff out of powerpc build (common/vtkDynamicLoader.h line 61) (Closes: #126694) * python-vtk provides its own widgets. (Closes: #126323) -- A. Maitland Bottoms Fri, 28 Dec 2001 07:51:11 -0500 vtk (3.2-3.7) unstable; urgency=low * NMU * Make debian/cleanjava executable. -- LaMont Jones Tue, 25 Dec 2001 16:36:38 -0700 vtk (3.2-3.6) unstable; urgency=low * move vtkTkImageViewerWidget vtkTkImageWindowWidget vtkTkRenderWidget into /usr/lib so that applications (such as mayavi) find them. * Acknowledge bug fixes from previous versions: (Closes #119233, #98011, #91238, #104718, #106242, #124370, #105761) -- A. Maitland Bottoms Fri, 21 Dec 2001 14:10:14 -0500 vtk (3.2-3.5) unstable; urgency=low * Clean up better to make a smaller .diff * Add conflicts/replaces to smooth upgrade transition -- A. Maitland Bottoms Fri, 21 Dec 2001 09:14:54 -0500 vtk (3.2-3) unstable; urgency=low * changelog entry started Sat, 15 Dec 2001 17:54:57 -0500 * Incorporate NMU changes from Matthias Klose 3.2-0.1, which collided in incoming with my upload of my 3.2-2 package. * First of these, make python-vtk installation the way a Debian Python guru did. Acknowledge bugs closed this way... (Closes: #119233, #98011) * NMU is building...good. (Closes: #91238, #104718, #106242) * Has full set of header files. (Closes: #124370, #105761) * Build DFSG free, without patented functions, no graphvis dependency. -- A. Maitland Bottoms Tue, 18 Dec 2001 15:03:30 -0500 vtk (3.2-0.1) unstable; urgency=low * NMU. New upstream version (closes: #122863). * Remove the task-vtk package. * Use python v2.1 (closes: #119233). * Adjust build dependencies. * Apply patch to build on powerpc (closes: #106242). * /usr/include/vtk/vtk.h: Other headers are included from current directory. Closes: #105761. * Build without patented modules (closes: #111405, #115375, #122795). * Build in a subdirectory (closes: #104718). * Remove debian/*{dirs,docs} files and integrate into rules file. * Install all example files in vtk-examples package (closes: #122862). * Do not compress example files (closes: #104568). * Fixed loading of python module (closes: #98011). * Build error on sparc. Retry with the upstream version (closes: #91238). -- Matthias Klose Fri, 14 Dec 2001 20:59:47 +0100 vtk (3.2-2) unstable; urgency=low * examples cooperate with new vtkdata package closes: #104568, #122862 * new upstream since vtk-3.1 bugs filed... closes: #105761, #106242, #104718, #91238, #122863 * updated for python2.1, check python library locations closes: #98011, #111405, #119233 * handle patented build, describe in more detail closes: #115375, #107654 * Punting patented build and java build for now in order to get bugfixes in. -- A. Maitland Bottoms Tue, 15 May 2001 18:20:09 -0400 vtk (3.2-1) unstable; urgency=low * Official 3.2 release of VTK from Kitware. * Assign sonames, since there are none upstream. * Merge Prabhu's patches and 3.2beta debianization efforts. -- A. Maitland Bottoms Tue, 15 May 2001 18:20:09 -0400 vtk (3.1.2-1) unstable; urgency=low * New Upstream, work on sonames -- A. Maitland Bottoms Tue, 27 Feb 2001 18:58:48 -0500 vtk (3.2beta-1) unstable; urgency=low * Updated the sources to 3.2beta from CVS. * Minor improvements in the packaging. -- Prabhu Ramachandran Sun, 25 Feb 2001 13:16:21 +0530 vtk (3.1.2-20001204-1) unstable; urgency=medium * Updated source. * Added makefile rules for installation of examples, headers and docs. * Fixed makefiles to reduce bloat in the python bindings. * Python libs can also be built statically. * Added variables to specify installation directories in user.make. * Miscellaneous fixes/improvements to the java and python makefiles. * Added a small hack to enable py_cpp vtk bindings - the hack will not affect usual vtk users, it justs adds a little functionality I may need. * Removed doxytag serach index generation from vtk-doc.postinst because doxytag chokes. -- Prabhu Ramachandran Mon, 4 Dec 2000 18:29:56 +0530 vtk (3.1.2-20001120-1) unstable; urgency=medium * Updated source to the current VTK CVS tree. * Fixed some minor packaging bugs. * Added Sebastien Barre et. al.'s perl scripts to enable proper doxygen documentation. Many thanks to them. -- Prabhu Ramachandran Tue, 21 Nov 2000 17:23:16 +0530 vtk (3.1-2) unstable; urgency=medium * Fixed some bad packaging errors in previous debs. Modified for potato. * Added documentation based on vtkHTML and doxygen. Searcheable docs are now part of vtk-docs and are generated at build time. Requires doxygen to be installed, not necessarily as a deb. * vtk-doc also adds itself to the doc-base tree. * The newer version of Mesa labels libraries as libGL so I no longer need to use the --mesagl option. * vtk-python uses the site-packages/vtk directory now. * Using the jdk1.1-dev deb instead of the jdk117 I was using. * Many thanks to Sudhakar Chandrasekharan for help with the packaging. -- Prabhu Ramachandran Thu, 18 May 2000 12:19:02 +0530 vtk (3.1-1) unstable; urgency=low * First debian package for vtk. This debianisation is based mostly on the vtk-2.4 RPM which was built based on my original vtk-2.2 RPM. * Made the packages according to the debian policy v2.5 - for slink. Will have to modify some of the dirs for potato. * Added new configure option --with-mesagl so that vtk will work with standard Mesa as well as accelerated GL libs provided by card vendors like nVidia. This is done by making sure that vtk does not use any Mesa specific extensions. -- Prabhu Ramachandran Wed, 3 May 2000 21:32:37 +0530 vtk (3.1-0.1) unstable; urgency=low * Initial Release. -- A. Maitland Bottoms Wed, 15 Mar 2000 10:52:54 -0500 debian/tcl-vtk.shlibs20000664000000000000000000000143312250600354012042 0ustar libvtkCommonTCL 5.8 tcl-vtk libvtkFilteringTCL 5.8 tcl-vtk libvtkGenericFilteringTCL 5.8 tcl-vtk libvtkGeovisTCL 5.8 tcl-vtk libvtkGraphicsTCL 5.8 tcl-vtk libvtkHybridTCL 5.8 tcl-vtk libvtkIOTCL 5.8 tcl-vtk libvtkImagingTCL 5.8 tcl-vtk libvtkInfovisTCL 5.8 tcl-vtk libvtkParallelTCL 5.8 tcl-vtk libvtkRenderingTCL 5.8 tcl-vtk libvtkViewsTCL 5.8 tcl-vtk libvtkVolumeRenderingTCL 5.8 tcl-vtk libvtkWidgetsTCL 5.8 tcl-vtk libvtkChartsTCL 5.8 tcl-vtk debian/vtk-doc.dirs0000664000000000000000000000003312250600354011413 0ustar usr/share/doc/vtk-doc/html debian/libvtk5.8.docs0000664000000000000000000000003012250600354011556 0ustar README.html vtkLogo.jpg debian/source/0000775000000000000000000000000012250600354010465 5ustar debian/source/format0000664000000000000000000000001412250600354011673 0ustar 3.0 (quilt) debian/libvtk5.8.shlibs0000664000000000000000000000231112250600354012116 0ustar libCosmo 5.8 libvtk5.8 libVPIC 5.8 libvtk5.8 libvtkalglib 5.8 libvtk5.8 libvtkCharts 5.8 libvtk5.8 libvtkCommon 5.8 libvtk5.8 libvtkDICOMParser 5.8 libvtk5.8 libvtkexoIIc 5.8 libvtk5.8 libvtkFiltering 5.8 libvtk5.8 libvtkftgl 5.8 libvtk5.8 libvtkGenericFiltering 5.8 libvtk5.8 libvtkGeovis 5.8 libvtk5.8 libvtkGraphics 5.8 libvtk5.8 libvtkHybrid 5.8 libvtk5.8 libvtkImaging 5.8 libvtk5.8 libvtkInfovis 5.8 libvtk5.8 libvtkIO 5.8 libvtk5.8 libvtkmetaio 5.8 libvtk5.8 libvtkParallel 5.8 libvtk5.8 libvtkproj4 5.8 libvtk5.8 libvtkRendering 5.8 libvtk5.8 libvtksys 5.8 libvtk5.8 libvtkverdict 5.8 libvtk5.8 libvtkViews 5.8 libvtk5.8 libvtkVolumeRendering 5.8 libvtk5.8 libvtkWidgets 5.8 libvtk5.8 debian/vtkWrapPython.10000664000000000000000000000160612250600354012112 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH VTKWRAPPYTHON "1" "December 2011" "vtkWrapPython 5.8.0" "User Commands" .SH NAME vtkWrapPython \- Command line tool for vtkWrapPython .SH SYNOPSIS .B vtkWrapPython [\fIoptions\fR] \fIinput_file output_file\fR .SH DESCRIPTION This manual page documents briefly the command. More information can be found at http://vtk.org .TP \fB\-\-concrete\fR force concrete class .TP \fB\-\-abstract\fR force abstract class .TP \fB\-\-vtkobject\fR vtkObjectBase\-derived class .TP \fB\-\-special\fR non\-vtkObjectBase class .TP \fB\-\-hints\fR hints file .TP \fB\-\-types\fR type hierarchy file .TP \fB\-I\fR add an include directory .TP \fB\-D\fR define a preprocessor macro .SH AUTHOR This manual page was written by Mathieu Malaterre for the Debian GNU/Linux system, but may be used by others. debian/compat0000664000000000000000000000000212250600354010363 0ustar 9 debian/xvfb-run0000775000000000000000000000666712250600354010701 0ustar #!/bin/sh # xvfb-run - run the specified command in a virtual X server # This script starts an instance of Xvfb, the "fake" X server, runs a # command with that server available, and kills the X server when # done. The return value of the command becomes the return value of # this script. # # If anyone is using this to build a Debian package, make sure the # package Build-Depends on xvfb, xbase-clients, and xfonts-base. set -e PROGNAME=xvfb-run SERVERNUM=99 AUTHFILE=$(pwd)/.Xauthority ERRORFILE=/dev/null STARTWAIT=3 LISTENTCP="-nolisten tcp" XAUTHPROTO=. # display a usage message usage () { cat << EOF Usage: $PROGNAME [OPTION ...] command run specified X client or command in a virtual X server environment -a --auto-servernum try to get a free server number, starting at --server-num -e FILE --error-file=FILE file used to store xauth errors and Xvfb output (defualt: $ERRORFILE) -f FILE --auth-file=FILE file used to store auth cookie (default: ./.Xauthority) -h --help display this usage message and exit -n NUM --server-num=NUM server number to use (default: $SERVERNUM) -l --listen-tcp enable TCP port listening in the X server -p PROTO --xauth-protocol=PROTO X authority protocol name to use (defaults to xauth's default) -w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start (default: $STARTWAIT) EOF :; } # find free server number by looking at .X*-lock files in /tmp find_free_servernum() { i=$SERVERNUM while [ -f /tmp/.X$i-lock ]; do i=$(($i + 1)) done echo $i; } # parse command line ARGS=$(getopt --options +ae:f:hn:lp:w: \ --long auto-servernum,authority-file:,server-num:error-file:,help,listen-tcp,wait:,xauth-protocol: \ --name "$PROGNAME" -- "$@") if [ $? -ne 0 ]; then echo "$PROGNAME: error while getting options" >&2 exit 1 fi eval set -- "$ARGS" while :; do case "$1" in -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; -e|--error-file) ERRORFILE="$1"; shift ;; -f|--auth-file) AUTHFILE="$1"; shift ;; -h|--help) SHOWHELP=1 ;; -n|--server-num) SERVERNUM="$1"; shift ;; -l|--listen-tcp) LISTENTCP="" ;; -p|--xauth-protocol) XAUTHPROTO="$1"; shift ;; -w|--wait) STARTWAIT="$1"; shift ;; --) shift; break ;; *) echo "$PROGNAME: error while parsing option \"$1\"" >&2; USAGE=$(usage); echo "$USAGE" >&2; exit 1 ;; esac shift done if [ "$SHOWHELP" ]; then usage exit 0 fi if [ -z "$*" ]; then echo "$PROGNAME: need a command to run" >&2 exit 2 fi if ! which xauth > /dev/null; then echo "$PROGNAME: xauth command not found; exiting." >&2 exit 3 fi # start Xvfb rm -f $AUTHFILE MCOOKIE=$(mcookie) XAUTHORITY=$AUTHFILE xauth add :$SERVERNUM $XAUTHPROTO $MCOOKIE > $ERRORFILE 2>&1 XAUTHORITY=$AUTHFILE Xvfb :$SERVERNUM -screen 0 1024x768x24 $LISTENTCP > $ERRORFILE 2>&1 & XVFBPID=$! sleep $STARTWAIT # start the command and save its exit status set +e DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE $@ 2>&1 RETVAL=$? set -e # kill Xvfb now that the command has exited kill $XVFBPID # clean up XAUTHORITY=$AUTHFILE xauth remove :$SERVERNUM > $ERRORFILE 2>&1 rm $AUTHFILE # return the executed command's exit status exit $RETVAL # vim:set ai et sts=4 sw=4 tw=0: debian/tcl-vtk.docs0000664000000000000000000000006112250600354011420 0ustar Wrapping/Tcl/README debian/tcl-vtk.readme.debian debian/README.examples0000664000000000000000000000432512313327311011665 0ustar There are examples written in C++, Java, Python and Tcl. The Java ones won't be of much use to Debian users until the Debian vtk maintainer understands how to make Java packages. They live under /usr/share/vtk The example data is under /usr/share/VTKData when the vtkdata package is installed. The Python and Tcl examples have relative paths to the data. You can either cd to the directory with the example to run it, or most (all?) examples will use the VTK_DATA_ROOT environment variable. export VTK_DATA_ROOT=/usr/share/VTKData *** *** *** For example, to compile the Cone4 Cxx example program yourself, try: g++ -I/usr/include/vtk-5.8 -o Cone /usr/share/vtk/Tutorial/Step4/Cxx/Cone4.cxx /usr/lib/libvtkGraphics.so /usr/lib/libvtkCommon.so -L /usr/X11R6/lib -lGL -lXt -lX11 /usr/lib/libvtkImaging.so /usr/lib/libvtkRendering.so /usr/lib/libvtkFiltering.so And then run it: ./Cone *** *** *** CMake: VTK applications often use cmake. For an example try: $ mkdir ~/tmp $ cd ~/tmp $ cmake /usr/share/vtk/Tutorial/Step1/Cxx/ $ make $ ./Cone *** *** *** The Java examples: $ mkdir ~/tmp $ cp /usr/share/vtk/Tutorial/Step1/Java/Cone.java ~/tmp/ $ cd ~/tmp $ javac -classpath /usr/share/java/vtk.jar Cone.java $ export CLASSPATH=/usr/share/java/vtk.jar:. ### replace i386 in the following line if necessary $ export LD_LIBRARY_PATH=/usr/lib/jvm/default-java/jre/lib/i386/xawt/:$LD_LIBRARY_PATH $ java Cone *** *** *** The Python ones are easy, just run (to pick one): /usr/share/vtk/Tutorial/Step1/Python/Cone.py VTK is built against the default Debian python version. Try: $ python Python 2.6.5+ (release26-maint, Jul 1 2010, 00:47:18) [GCC 4.4.4] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import vtk >>> *** *** *** The Tcl examples: vtk /usr/share/vtk/Tutorial/Step1/Tcl/Cone.tcl VTK_DATA_ROOT=/usr/share/VTKData vtk /usr/share/vtk/IO/Tcl/flamingo.tcl Some Tcl examples have relative paths built into the scripts, to run them cd to the example directory first. cd /usr/share/vtk/Rendering/Tcl vtk keyBottle.tcl VTK is built against tcl8.6, and extends it. Try: $ tclsh % package require vtk 5.8 % debian/vtk.10000664000000000000000000000135012250600354010052 0ustar .TH VTK 1 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other parms are allowed: see man(7), man(1) .SH NAME vtk \- Visualization Tool Kit .SH SYNOPSIS .B vtk .I vtk_script.tcl .SH "DESCRIPTION" This manual page documents briefly the .B vtk command. Better info can be found at http://public.kitware.com/VTK .PP .B vtk This program is like the Tcl/Tk interpreter .I wish but is linked with The Visualization Toolkit libraries. .SH OPTIONS Hopefully, it accepts the same arguments as .I wish .SH "SEE ALSO" wish(1) .SH AUTHORS Ken Martin, Will Schroeder, and Bill Lorensen This manual page was written by A. Maitland Bottoms for the Debian GNU/Linux system (but may be used by others). debian/libvtk5-dev.docs0000664000000000000000000000002512250600354012170 0ustar debian/README.debian debian/libvtk5.8.dirs0000664000000000000000000000004012250600354011570 0ustar usr/lib usr/share/doc/libvtk5.8 debian/README.debian0000664000000000000000000000421612250600354011271 0ustar vtk for Debian -------------- The VTK home page is at: http://vtk.org/ Documentation for this package is available in the vtk-doc package. First Debian packaging done by: -- A. Maitland Bottoms , Wed, 15 Mar 2000 10:52:54 -0500 -- Prabhu Ramachandran , Thu, 18 May 2000 12:19:02 +0530 Debian packaging for VTK is managed at: http://git.debian.org/?p=collab-maint/vtk.git;a=summary git://git.debian.org/collab-maint/vtk.git | The Debian packaging .diff file integrates a patch contributed by | Francesco Poli, which modifies VTK source as follows: | | * IO/vtkPLOT3DReader.cxx | -> fixed a bug in ReadQHeader() that prevented 2D files to be read | -> discarded useless StagnationEnergy loading in some PLOT3D | function computation methods | -> fixed a debug message | -> fixed VTK_PINF macro definition (irrelevant as long as | VTK_RHOINF is 1.0, but anyway...) | -> fixed some wrong comments | | * IO/vtkMultiBlockPLOT3DReader.cxx | -> fixed a bug in ReadQHeader() that prevented 2D files to be read | -> discarded useless StagnationEnergy loading in some PLOT3D | function computation methods | -> fixed a debug message | -> fixed VTK_PINF macro definition (irrelevant as long as | VTK_RHOINF is 1.0, but anyway...) | -> fixed some wrong comments The Debian .diff also adds a '#include ' to Utilities/DICOMParser/DICOMParser.cxx Utilities/DICOMParser/DICOMFile.cxx Utilities/DICOMParser/DICOMAppHelper.cxx allowing compilation with GCC 4.3. The Debian .diff also updates Wrapping/Python/vtk/wx/ from upstream CVS to work with current wxPython versions. The default value for VTK_DATA_ROOT is /usr/share/VTKData which is provided by the Debian vtkdata package. The Debian .diff has an upstream enhancement: ENH: Add new option: VTK_USE_SYSTEM_GL2PS, to be able to use a system installed gl2ps library, by Mathieu Malaterre The Debian .diff has an enhancement to update IO/vtkFFMPEGWriter.cxx to use swscale API of ffmpeg by A. Maitland Bottoms. The Debian source, vtk_5.6.1.orig.tar.gz is identical to the upstream distributed vtk-5.6.1.tar.gz file. debian/patches/0000775000000000000000000000000012313362701010615 5ustar debian/patches/tcl8.6.patch0000664000000000000000000000120112313333464012652 0ustar Description: fix ftbfs with tcl 8.6 Applied-Upstream: 5.10.1 --- a/Rendering/vtkTkRenderWidget.cxx +++ b/Rendering/vtkTkRenderWidget.cxx @@ -1306,8 +1306,8 @@ vtkTkRenderWidget_MakeRenderWindow(struc vtkTclGetObjectFromPointer(self->Interp, self->RenderWindow, "vtkRenderWindow"); #endif - self->RW = ckalloc( - static_cast(strlen(Tcl_GetStringResult(self->Interp)) + 1)); + self->RW = static_cast(ckalloc( + static_cast(strlen(Tcl_GetStringResult(self->Interp)) + 1))); strcpy(self->RW, Tcl_GetStringResult(self->Interp)); Tcl_ResetResult(self->Interp); } debian/patches/series0000664000000000000000000000007312313356261012036 0ustar allpatches.patch libav9.patch tcl8.6.patch tcl-links.patch debian/patches/tcl-links.patch0000664000000000000000000000330212313365562013544 0ustar Description: add missing tcl library links hackishly fix underlinking of tcl libraries $ tcsh package require vtk Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/vtk/+bug/904469 --- a/CMake/KitCommonTclWrapBlock.cmake +++ b/CMake/KitCommonTclWrapBlock.cmake @@ -3,7 +3,26 @@ VTK_WRAP_TCL3(vtk${KIT}TCL KitTCL_SRCS "${Kit_TCL_EXTRA_CMDS}") VTK_ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS}) SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}TCL) -TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS}) + +IF("vtk${KIT}TCL" STREQUAL "vtkCommonTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS}) +ELSEIF("vtk${KIT}TCL" STREQUAL "vtkHybridTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkImagingTCL) +ELSEIF("vtk${KIT}TCL" STREQUAL "vtkParallelTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkGraphicsTCL vtkImagingTCL) +ELSEIF("vtk${KIT}TCL" STREQUAL "vtkGeovisTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkInfovisTCL) +ELSEIF("vtk${KIT}TCL" STREQUAL "vtkViewsTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkRenderingTCL) +ELSEIF("vtk${KIT}TCL" STREQUAL "vtkChartsTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkRenderingTCL) +ELSEIF("vtk${KIT}TCL" STREQUAL "vtkViewsTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkRenderingTCL) +ELSEIF("vtk${KIT}TCL" STREQUAL "vtkInfovisTCL") + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkIOTCL) +ELSE() + TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS} vtkFilteringTCL) +ENDIF() set_target_properties(vtk${KIT}TCL debian/patches/allpatches.patch0000664000000000000000000037743512255426234014010 0ustar Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . vtk (5.8.0-13) unstable; urgency=low . * Make sure to include VTK/QT cmake file. Closes: #656115 * Revert back to libtiff4-dev and use libtiff-dev in d/control. Closes: #674998 * Fix tkInt.h installation, using proper cmake magic. Closes: #674169 * Make sure to discover init.tcl properly. Closes: #673245 Author: Mathieu Malaterre Bug-Debian: http://bugs.debian.org/656115 Bug-Debian: http://bugs.debian.org/673245 Bug-Debian: http://bugs.debian.org/674169 Bug-Debian: http://bugs.debian.org/674998 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: Index: vtk-5.8.0/VTKConfig-Java.cmake.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ vtk-5.8.0/VTKConfig-Java.cmake.in 2013-12-21 18:58:11.025934826 -0500 @@ -0,0 +1,14 @@ +# The list of available languages. +SET(VTK_LANGUAGES ${VTK_LANGUAGES} JAVA) + +SET(VTK_WRAP_JAVA 1) + +# The Java configuration. +SET(VTK_JAVA_JAR "@VTK_JAVA_JAR_CONFIG@") +SET(VTK_PARSE_JAVA_EXE "@VTK_PARSE_JAVA_EXE_CONFIG@") +SET(VTK_WRAP_JAVA_EXE "@VTK_WRAP_JAVA_EXE_CONFIG@") +SET(VTK_JAVA_INCLUDE_DIR "@JAVA_INCLUDE_PATH@;@JAVA_INCLUDE_PATH2@") +SET(VTK_JAVA_AWT_LIBRARY "@JAVA_AWT_LIBRARY@") +SET(VTK_JVM_LIBRARY "@JAVA_JVM_LIBRARY@") + + Index: vtk-5.8.0/VTKConfig-Python.cmake.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ vtk-5.8.0/VTKConfig-Python.cmake.in 2013-12-21 18:58:11.025934826 -0500 @@ -0,0 +1,14 @@ +# The list of available languages. +SET(VTK_LANGUAGES ${VTK_LANGUAGES} PYTHON) + +SET(VTK_WRAP_PYTHON 1) + +# The Python configuration. +# If VTK_CONFIGURATION_TYPES is set (see below) then the VTK_PYTHONPATH_DIRS +# will have subdirectories for each configuration type. +SET(VTK_PYTHONPATH_DIRS "@VTK_PYTHONPATH_DIRS_CONFIG@") +SET(VTK_WRAP_PYTHON_EXE "@VTK_WRAP_PYTHON_EXE_CONFIG@") +SET(VTK_WRAP_PYTHON_INIT_EXE "@VTK_WRAP_PYTHON_INIT_EXE_CONFIG@") +SET(VTK_PYTHON_INCLUDE_DIR "@PYTHON_INCLUDE_DIR@") +SET(VTK_PYTHON_LIBRARY "@PYTHON_LIBRARY@") + Index: vtk-5.8.0/VTKConfig-Tcl.cmake.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ vtk-5.8.0/VTKConfig-Tcl.cmake.in 2013-12-21 18:58:11.025934826 -0500 @@ -0,0 +1,21 @@ +# The list of available languages. +SET(VTK_LANGUAGES ${VTK_LANGUAGES} TCL) + +SET(VTK_WRAP_TCL 1) + +# The Tcl/Tk configuration. +SET(VTK_TCL_TK_STATIC "@VTK_TCL_TK_STATIC@") +SET(VTK_TCL_TK_COPY_SUPPORT_LIBRARY "@VTK_TCL_TK_COPY_SUPPORT_LIBRARY@") +SET(VTK_TCL_SUPPORT_LIBRARY_PATH "@VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG@") +SET(VTK_TK_SUPPORT_LIBRARY_PATH "@VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG@") +SET(VTK_TCL_TK_MACROS_MODULE "@VTK_TCL_TK_MACROS_MODULE_CONFIG@") +SET(VTK_TCL_HOME "@VTK_TCL_HOME_CONFIG@") +SET(VTK_WRAP_TCL_EXE "@VTK_WRAP_TCL_EXE_CONFIG@") +SET(VTK_WRAP_TCL_INIT_EXE "@VTK_WRAP_TCL_INIT_EXE_CONFIG@") +SET(VTK_TK_INTERNAL_DIR "@VTK_TK_INTERNAL_DIR_CONFIG@") +SET(VTK_TK_RESOURCES_DIR "@VTK_TK_RESOURCES_DIR_CONFIG@") +SET(VTK_TCL_INCLUDE_DIR "@TCL_INCLUDE_PATH@") +SET(VTK_TCL_LIBRARY "@TCL_LIBRARY@") +SET(VTK_TK_INCLUDE_DIR "@TK_INCLUDE_PATH@") +SET(VTK_TK_LIBRARY "@TK_LIBRARY@") + Index: vtk-5.8.0/vtkGenerateVTKConfig.cmake =================================================================== --- vtk-5.8.0.orig/vtkGenerateVTKConfig.cmake 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/vtkGenerateVTKConfig.cmake 2013-12-21 18:58:11.025934826 -0500 @@ -147,9 +147,6 @@ "${VTK_CMAKE_DIR}/vtkTclTkMacros.cmake") SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${VTK_BINARY_DIR}/CMake) -# Export Targets file. -SET(VTK_TARGETS_FILE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake") - # Build configuration information. SET(VTK_CONFIGURATION_TYPES_CONFIG ${CMAKE_CONFIGURATION_TYPES}) SET(VTK_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE}) @@ -166,6 +163,12 @@ ${VTK_BINARY_DIR}/VTKConfig.cmake @ONLY IMMEDIATE) CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfigVersion.cmake.in ${VTK_BINARY_DIR}/VTKConfigVersion.cmake @ONLY IMMEDIATE) +CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Java.cmake.in + ${VTK_BINARY_DIR}/VTKConfig-Java.cmake @ONLY IMMEDIATE) +CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Python.cmake.in + ${VTK_BINARY_DIR}/VTKConfig-Python.cmake @ONLY IMMEDIATE) +CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Tcl.cmake.in + ${VTK_BINARY_DIR}/VTKConfig-Tcl.cmake @ONLY IMMEDIATE) #----------------------------------------------------------------------------- # Settings specific to the install tree. @@ -339,6 +342,15 @@ CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Java.cmake.in + ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig-Java.cmake + @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Python.cmake.in + ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig-Python.cmake + @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Tcl.cmake.in + ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig-Tcl.cmake + @ONLY IMMEDIATE) ENDFOREACH(config) # Install the config file corresponding to the build configuration @@ -350,12 +362,39 @@ DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} COMPONENT Development ) + IF(VTK_WRAP_JAVA) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/${DOLLAR}{BUILD_TYPE}/VTKConfig-Java.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_JAVA) + IF(VTK_WRAP_PYTHON) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/${DOLLAR}{BUILD_TYPE}/VTKConfig-Python.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_PYTHON) + IF(VTK_WRAP_TCL) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/${DOLLAR}{BUILD_TYPE}/VTKConfig-Tcl.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_TCL) ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) ELSE(CMAKE_CONFIGURATION_TYPES) # There is only one build configuration. Configure one VTKConfig.cmake. SET(VTK_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE}) CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in ${VTK_BINARY_DIR}/Utilities/VTKConfig.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Java.cmake.in + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Java.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Python.cmake.in + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Python.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Tcl.cmake.in + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Tcl.cmake @ONLY IMMEDIATE) # Setup an install rule for the config file. IF(NOT VTK_INSTALL_NO_DEVELOPMENT) @@ -364,6 +403,27 @@ DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} COMPONENT Development ) + IF(VTK_WRAP_JAVA) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Java.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_JAVA) + IF(VTK_WRAP_PYTHON) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Python.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_PYTHON) + IF(VTK_WRAP_TCL) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Tcl.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_TCL) ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) ENDIF(CMAKE_CONFIGURATION_TYPES) Index: vtk-5.8.0/VTKConfig.cmake.in =================================================================== --- vtk-5.8.0.orig/VTKConfig.cmake.in 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/VTKConfig.cmake.in 2013-12-21 18:58:11.025934826 -0500 @@ -99,8 +99,6 @@ SET(VTK_USE_PARALLEL "@VTK_USE_PARALLEL@") SET(VTK_USE_PARALLEL_BGL "@VTK_USE_PARALLEL_BGL@") SET(VTK_USE_POSTGRES "@VTK_USE_POSTGRES@") -SET(VTK_USE_QVTK "@VTK_USE_QVTK@") -SET(VTK_USE_QVTK_OPENGL "@VTK_USE_QVTK_OPENGL@") SET(VTK_USE_RENDERING "@VTK_USE_RENDERING@") SET(VTK_USE_TDX "@VTK_USE_TDX@") SET(VTK_USE_TEXT_ANALYSIS "@VTK_USE_TEXT_ANALYSIS@") @@ -110,10 +108,16 @@ SET(VTK_USE_VIEWS "@VTK_USE_VIEWS@") SET(VTK_USE_VOLUMEPRO_1000 "@VTK_USE_VOLUMEPRO_1000@") SET(VTK_USE_X "@VTK_USE_X@") -SET(VTK_WRAP_JAVA "@VTK_WRAP_JAVA@") -SET(VTK_WRAP_PYTHON "@VTK_WRAP_PYTHON@") -SET(VTK_WRAP_TCL "@VTK_WRAP_TCL@") -SET(VTK_WRAP_PYTHON_SIP "@VTK_WRAP_PYTHON_SIP@") + +SET(VTK_WRAP_JAVA 0) +SET(VTK_WRAP_PYTHON 0) +SET(VTK_WRAP_TCL 0) +SET(VTK_WRAP_PYTHON_SIP 0) + +INCLUDE("${VTK_DIR}/VTKConfig-Java.cmake" OPTIONAL) +INCLUDE("${VTK_DIR}/VTKConfig-Python.cmake" OPTIONAL) +INCLUDE("${VTK_DIR}/VTKConfig-Tcl.cmake" OPTIONAL) +# Python_sip is not provided by Debian packages # The Hybrid and VolumeRendering kits are now switched with Rendering. SET(VTK_USE_HYBRID "@VTK_USE_RENDERING@") @@ -133,44 +137,11 @@ SET(VTK_MPI_INCLUDE_DIR "@MPI_INCLUDE_PATH@") SET(VTK_MPI_LIBRARIES "@MPI_LIBRARY@;@MPI_EXTRA_LIBRARY@") -# The Tcl/Tk configuration. -SET(VTK_TCL_TK_STATIC "@VTK_TCL_TK_STATIC@") -SET(VTK_TCL_TK_COPY_SUPPORT_LIBRARY "@VTK_TCL_TK_COPY_SUPPORT_LIBRARY@") -SET(VTK_TCL_SUPPORT_LIBRARY_PATH "@VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG@") -SET(VTK_TK_SUPPORT_LIBRARY_PATH "@VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG@") -SET(VTK_TCL_TK_MACROS_MODULE "@VTK_TCL_TK_MACROS_MODULE_CONFIG@") -SET(VTK_TCL_HOME "@VTK_TCL_HOME_CONFIG@") -SET(VTK_WRAP_TCL_EXE "@VTK_WRAP_TCL_EXE_CONFIG@") -SET(VTK_WRAP_TCL_INIT_EXE "@VTK_WRAP_TCL_INIT_EXE_CONFIG@") -SET(VTK_TK_INTERNAL_DIR "@VTK_TK_INTERNAL_DIR_CONFIG@") -SET(VTK_TK_RESOURCES_DIR "@VTK_TK_RESOURCES_DIR_CONFIG@") -SET(VTK_TCL_INCLUDE_DIR "@TCL_INCLUDE_PATH@") -SET(VTK_TCL_LIBRARY "@TCL_LIBRARY@") -SET(VTK_TK_INCLUDE_DIR "@TK_INCLUDE_PATH@") -SET(VTK_TK_LIBRARY "@TK_LIBRARY@") - -# The Java configuration. -SET(VTK_JAVA_JAR "@VTK_JAVA_JAR_CONFIG@") -SET(VTK_PARSE_JAVA_EXE "@VTK_PARSE_JAVA_EXE_CONFIG@") -SET(VTK_WRAP_JAVA_EXE "@VTK_WRAP_JAVA_EXE_CONFIG@") -SET(VTK_JAVA_INCLUDE_DIR "@JAVA_INCLUDE_PATH@;@JAVA_INCLUDE_PATH2@") -SET(VTK_JAVA_AWT_LIBRARY "@JAVA_AWT_LIBRARY@") -SET(VTK_JVM_LIBRARY "@JAVA_JVM_LIBRARY@") - # The Matlab configuration. SET(VTK_MATLAB_ROOT_DIR "@MATLAB_ROOT_DIR@") SET(VTK_MATLAB_INCLUDE_DIR "@MATLAB_INCLUDE_DIR@") SET(VTK_MATLAB_LIB_DIR "@MATLAB_LIB_DIR@") -# The Python configuration. -# If VTK_CONFIGURATION_TYPES is set (see below) then the VTK_PYTHONPATH_DIRS -# will have subdirectories for each configuration type. -SET(VTK_PYTHONPATH_DIRS "@VTK_PYTHONPATH_DIRS_CONFIG@") -SET(VTK_WRAP_PYTHON_EXE "@VTK_WRAP_PYTHON_EXE_CONFIG@") -SET(VTK_WRAP_PYTHON_INIT_EXE "@VTK_WRAP_PYTHON_INIT_EXE_CONFIG@") -SET(VTK_PYTHON_INCLUDE_DIR "@PYTHON_INCLUDE_DIR@") -SET(VTK_PYTHON_LIBRARY "@PYTHON_LIBRARY@") - # Other executables SET(VTK_ENCODESTRING_EXE "@VTK_ENCODESTRING_EXE_CONFIG@") @@ -196,9 +167,7 @@ SET(VTK_HDF5_LIBRARIES "@VTK_HDF5_LIBRARIES@") # The VTK Qt configuration. -IF(VTK_USE_QVTK) - INCLUDE(${VTK_DIR}/VTKConfigQt.cmake) -ENDIF(VTK_USE_QVTK) +INCLUDE("${VTK_DIR}/VTKConfigQt.cmake" OPTIONAL) # Relative install paths in the VTK install tree SET(VTK_INSTALL_BIN_DIR "@VTK_INSTALL_BIN_DIR@") Index: vtk-5.8.0/CMake/KitCommonJavaWrapBlock.cmake =================================================================== --- vtk-5.8.0.orig/CMake/KitCommonJavaWrapBlock.cmake 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/CMake/KitCommonJavaWrapBlock.cmake 2013-12-21 18:58:11.025934826 -0500 @@ -8,7 +8,7 @@ INSTALL(TARGETS vtk${KIT}Java EXPORT ${VTK_INSTALL_EXPORT_NAME} RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries - LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries + LIBRARY DESTINATION "${VTK_INSTALL_LIB_DIR_CM24}/jni" COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development) ENDIF(NOT VTK_INSTALL_NO_LIBRARIES) ADD_DEPENDENCIES(vtk${KIT}Java vtk${KIT}) Index: vtk-5.8.0/CMake/KitCommonPythonWrapBlock.cmake =================================================================== --- vtk-5.8.0.orig/CMake/KitCommonPythonWrapBlock.cmake 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/CMake/KitCommonPythonWrapBlock.cmake 2013-12-21 18:58:11.025934826 -0500 @@ -80,6 +80,16 @@ # vtkpython executable in the build tree should have the needed # RPATH anyway. SET_TARGET_PROPERTIES(vtk${KIT}Python PROPERTIES SKIP_BUILD_RPATH 1) + + set_target_properties(vtk${KIT}PythonD + PROPERTIES + LINK_INTERFACE_LIBRARIES "${KIT_INTERFACE_LIBRARIES}" + ) + + set_target_properties(vtk${KIT}Python + PROPERTIES + LINK_INTERFACE_LIBRARIES "" + ) IF(WIN32 OR APPLE) TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES}) Index: vtk-5.8.0/CMake/KitCommonTclWrapBlock.cmake =================================================================== --- vtk-5.8.0.orig/CMake/KitCommonTclWrapBlock.cmake 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/CMake/KitCommonTclWrapBlock.cmake 2013-12-21 18:58:11.025934826 -0500 @@ -4,6 +4,14 @@ VTK_ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS}) SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}TCL) TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS}) + + + set_target_properties(vtk${KIT}TCL + PROPERTIES + LINK_INTERFACE_LIBRARIES "${KIT_INTERFACE_LIBRARIES}" + ) + + IF(NOT VTK_INSTALL_NO_LIBRARIES) INSTALL(TARGETS vtk${KIT}TCL EXPORT ${VTK_INSTALL_EXPORT_NAME} Index: vtk-5.8.0/Charts/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Charts/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Charts/CMakeLists.txt 2013-12-21 18:58:11.025934826 -0500 @@ -98,9 +98,9 @@ SET(QT_DONT_USE_QTGUI) INCLUDE(${QT_USE_FILE}) IF (APPLE) - LIST (APPEND KIT_INTERFACE_LIBRARIES ${QT_LIBRARIES}) + LIST (APPEND KIT_INTERFACE_LIBRARIES QtGui QtCore ) ELSE (APPLE) - LIST (APPEND KIT_LIBS ${QT_LIBRARIES}) + LIST (APPEND KIT_LIBS QtGui QtCore ) ENDIF (APPLE) ENDIF(VTK_USE_QT) Index: vtk-5.8.0/Common/vtkWin32Header.h =================================================================== --- vtk-5.8.0.orig/Common/vtkWin32Header.h 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Common/vtkWin32Header.h 2013-12-21 18:58:11.025934826 -0500 @@ -102,9 +102,15 @@ # define vtkGetWindowLong GetWindowLong # define vtkSetWindowLong SetWindowLong # define vtkLONG LONG +# ifdef _WIN64 +# define vtkGWL_WNDPROC GWLP_WNDPROC +# define vtkGWL_HINSTANCE GWLP_HINSTANCE +# define vtkGWL_USERDATA GWLP_USERDATA +# else # define vtkGWL_WNDPROC GWL_WNDPROC # define vtkGWL_HINSTANCE GWL_HINSTANCE # define vtkGWL_USERDATA GWL_USERDATA +# endif #endif // #endif Index: vtk-5.8.0/Examples/ParallelProcessing/Generic/Cxx/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Examples/ParallelProcessing/Generic/Cxx/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Examples/ParallelProcessing/Generic/Cxx/CMakeLists.txt 2013-12-21 18:58:11.025934826 -0500 @@ -1,7 +1,7 @@ INCLUDE_REGULAR_EXPRESSION("^(lex|vtk|png|j|Task|Pipe).*$") IF (VTK_USE_MPI) - INCLUDE_DIRECTORIES("${MPI_INCLUDE_PATH}") + INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) IF (MPI_LIBRARY) SET(MPI_LIBRARIES ${MPI_LIBRARY}) ENDIF (MPI_LIBRARY) Index: vtk-5.8.0/GUISupport/Qt/QVTKPaintEngine.cxx =================================================================== --- vtk-5.8.0.orig/GUISupport/Qt/QVTKPaintEngine.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/GUISupport/Qt/QVTKPaintEngine.cxx 2013-12-21 18:58:11.025934826 -0500 @@ -46,7 +46,7 @@ QPaintEngine::Type QVTKPaintEngine::type() const { - return QPaintEngine::User; + return QPaintEngine::OpenGL; } void QVTKPaintEngine::updateState(const QPaintEngineState&) Index: vtk-5.8.0/GUISupport/Qt/VTKConfigQt.cmake.in =================================================================== --- vtk-5.8.0.orig/GUISupport/Qt/VTKConfigQt.cmake.in 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/GUISupport/Qt/VTKConfigQt.cmake.in 2013-12-21 18:58:11.025934826 -0500 @@ -5,6 +5,9 @@ # This file is configured by VTK and used by the VTKConfig.cmake module # to load VTK's Qt settings for an external project. +SET(VTK_USE_QVTK "@VTK_USE_QVTK@") +SET(VTK_USE_QVTK_OPENGL "@VTK_USE_QVTK_OPENGL@") + # exports for Qt4 SET(VTK_QT_RCC_EXECUTABLE "@QT_RCC_EXECUTABLE@") Index: vtk-5.8.0/Hybrid/vtkPolyDataSilhouette.cxx =================================================================== --- vtk-5.8.0.orig/Hybrid/vtkPolyDataSilhouette.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Hybrid/vtkPolyDataSilhouette.cxx 2013-12-21 18:58:11.025934826 -0500 @@ -255,9 +255,9 @@ } if( ( this->PreComp->mtime.GetMTime() > output->GetMTime() ) || - ( this->Camera->GetMTime() > output->GetMTime() ) || - ( this->Prop3D!=0 && this->Prop3D->GetMTime() > output->GetMTime() ) || - vecChanged ) + ( this->Camera && this->Camera->GetMTime() > output->GetMTime() ) || + ( this->Prop3D && this->Prop3D->GetMTime() > output->GetMTime() ) || + vecChanged ) { vtkDebugMacro(<<"Extract edges\n"); Index: vtk-5.8.0/Hybrid/vtkVideoSource.cxx =================================================================== --- vtk-5.8.0.orig/Hybrid/vtkVideoSource.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Hybrid/vtkVideoSource.cxx 2013-12-21 18:58:11.025934826 -0500 @@ -32,9 +32,9 @@ //--------------------------------------------------------------- // Important FrameBufferMutex rules: -// +// // The frame grabs are generally done asynchronously, and it is necessary -// to ensure that when the frame buffer is valid when it is being written +// to ensure that when the frame buffer is valid when it is being written // to or read from // // The following information can only be changed within a mutex lock, @@ -59,8 +59,8 @@ // // AdvanceFrameBuffer() // -// Any methods which might be called asynchronously must lock the -// mutex before reading the above information, and you must be very +// Any methods which might be called asynchronously must lock the +// mutex before reading the above information, and you must be very // careful when accessing any information except for the above. // These methods include the following: // @@ -74,13 +74,13 @@ #if ( _MSC_VER >= 1300 ) // Visual studio .NET #pragma warning ( disable : 4311 ) #pragma warning ( disable : 4312 ) -#endif +#endif //---------------------------------------------------------------------------- vtkVideoSource::vtkVideoSource() { int i; - + this->Initialized = 0; this->AutoAdvance = 1; @@ -93,7 +93,7 @@ { this->FrameBufferExtent[i] = 0; } - + this->Playing = 0; this->Recording = 0; @@ -151,8 +151,8 @@ //---------------------------------------------------------------------------- vtkVideoSource::~vtkVideoSource() -{ - // we certainly don't want to access a virtual +{ + // we certainly don't want to access a virtual // function after the subclass has destructed!! this->vtkVideoSource::ReleaseSystemResources(); @@ -165,10 +165,10 @@ void vtkVideoSource::PrintSelf(ostream& os, vtkIndent indent) { int idx; - + this->Superclass::PrintSelf(os,indent); - - os << indent << "FrameSize: (" << this->FrameSize[0] << ", " + + os << indent << "FrameSize: (" << this->FrameSize[0] << ", " << this->FrameSize[1] << ", " << this->FrameSize[2] << ")\n"; os << indent << "ClipRegion: (" << this->ClipRegion[0]; @@ -177,14 +177,14 @@ os << ", " << this->ClipRegion[idx]; } os << ")\n"; - + os << indent << "DataSpacing: (" << this->DataSpacing[0]; for (idx = 1; idx < 3; ++idx) { os << ", " << this->DataSpacing[idx]; } os << ")\n"; - + os << indent << "DataOrigin: (" << this->DataOrigin[0]; for (idx = 1; idx < 3; ++idx) { @@ -205,7 +205,7 @@ os << ", " << this->OutputWholeExtent[idx]; } os << ")\n"; - + os << indent << "FrameRate: " << this->FrameRate << "\n"; os << indent << "FrameCount: " << this->FrameCount << "\n"; @@ -232,7 +232,7 @@ //---------------------------------------------------------------------------- // Update the FrameBuffers according to any changes in the FrameBuffer* -// information. +// information. // This function should always be called from within a FrameBufferMutex lock // and should never be called asynchronously. // It sets up the FrameBufferExtent @@ -246,10 +246,10 @@ for (i = 0; i < 3; i++) { oldExt = this->FrameBufferExtent[2*i+1] - this->FrameBufferExtent[2*i] + 1; - this->FrameBufferExtent[2*i] = ((this->ClipRegion[2*i] > 0) - ? this->ClipRegion[2*i] : 0); - this->FrameBufferExtent[2*i+1] = ((this->ClipRegion[2*i+1] < - this->FrameSize[i]-1) + this->FrameBufferExtent[2*i] = ((this->ClipRegion[2*i] > 0) + ? this->ClipRegion[2*i] : 0); + this->FrameBufferExtent[2*i+1] = ((this->ClipRegion[2*i+1] < + this->FrameSize[i]-1) ? this->ClipRegion[2*i+1] : this->FrameSize[i]-1); ext[i] = this->FrameBufferExtent[2*i+1] - this->FrameBufferExtent[2*i] + 1; @@ -318,20 +318,20 @@ //---------------------------------------------------------------------------- void vtkVideoSource::SetFrameSize(int x, int y, int z) { - if (x == this->FrameSize[0] && - y == this->FrameSize[1] && + if (x == this->FrameSize[0] && + y == this->FrameSize[1] && z == this->FrameSize[2]) { return; } - if (x < 1 || y < 1 || z < 1) + if (x < 1 || y < 1 || z < 1) { vtkErrorMacro(<< "SetFrameSize: Illegal frame size"); return; } - if (this->Initialized) + if (this->Initialized) { this->FrameBufferMutex->Lock(); this->FrameSize[0] = x; @@ -349,7 +349,7 @@ this->Modified(); } - + //---------------------------------------------------------------------------- void vtkVideoSource::SetFrameRate(float rate) { @@ -363,7 +363,7 @@ } //---------------------------------------------------------------------------- -void vtkVideoSource::SetClipRegion(int x0, int x1, int y0, int y1, +void vtkVideoSource::SetClipRegion(int x0, int x1, int y0, int y1, int z0, int z1) { if (this->ClipRegion[0] != x0 || this->ClipRegion[1] != x1 || @@ -371,7 +371,7 @@ this->ClipRegion[4] != z0 || this->ClipRegion[5] != z1) { this->Modified(); - if (this->Initialized) + if (this->Initialized) { // modify the FrameBufferExtent this->FrameBufferMutex->Lock(); this->ClipRegion[0] = x0; this->ClipRegion[1] = x1; @@ -422,7 +422,7 @@ this->FrameBufferBitsPerPixel + 7)/8; bytesPerRow = ((bytesPerRow + this->FrameBufferRowAlignment - 1) / this->FrameBufferRowAlignment)*this->FrameBufferRowAlignment; - int totalSize = bytesPerRow * + int totalSize = bytesPerRow * (this->FrameBufferExtent[3]-this->FrameBufferExtent[2]+1) * (this->FrameBufferExtent[5]-this->FrameBufferExtent[4]+1); @@ -432,7 +432,7 @@ ptr = reinterpret_cast(this->FrameBuffer[index])->GetPointer(0); // Somebody should check this: - lptr = (int *)(((((long)ptr) + 3)/4)*4); + lptr = (int *)(((((intptr_t)ptr) + 3)/4)*4); i = totalSize/4; while (--i >= 0) @@ -482,7 +482,7 @@ //---------------------------------------------------------------------------- // Sleep until the specified absolute time has arrived. -// You must pass a handle to the current thread. +// You must pass a handle to the current thread. // If '0' is returned, then the thread was aborted before or during the wait. static int vtkThreadSleep(vtkMultiThreader::ThreadInfo *data, double time) { @@ -506,7 +506,7 @@ remaining = 0.1; } - // check to see if we are being told to quit + // check to see if we are being told to quit data->ActiveFlagLock->Lock(); int activeFlag = *(data->ActiveFlag); data->ActiveFlagLock->Unlock(); @@ -527,7 +527,7 @@ static void *vtkVideoSourceRecordThread(vtkMultiThreader::ThreadInfo *data) { vtkVideoSource *self = (vtkVideoSource *)(data->UserData); - + double startTime = vtkTimerLog::GetUniversalTime(); double rate = self->GetFrameRate(); int frame = 0; @@ -544,7 +544,7 @@ //---------------------------------------------------------------------------- // Set the source to grab frames continuously. -// You should override this as appropriate for your device. +// You should override this as appropriate for your device. void vtkVideoSource::Record() { if (this->Playing) @@ -559,19 +559,19 @@ this->Recording = 1; this->FrameCount = 0; this->Modified(); - this->PlayerThreadId = + this->PlayerThreadId = this->PlayerThreader->SpawnThread((vtkThreadFunctionType)\ &vtkVideoSourceRecordThread,this); } } - + //---------------------------------------------------------------------------- // this function runs in an alternate thread to 'play the tape' at the // specified frame rate. static void *vtkVideoSourcePlayThread(vtkMultiThreader::ThreadInfo *data) { vtkVideoSource *self = (vtkVideoSource *)(data->UserData); - + double startTime = vtkTimerLog::GetUniversalTime(); double rate = self->GetFrameRate(); int frame = 0; @@ -588,7 +588,7 @@ //---------------------------------------------------------------------------- // Set the source to play back recorded frames. -// You should override this as appropriate for your device. +// You should override this as appropriate for your device. void vtkVideoSource::Play() { if (this->Recording) @@ -602,12 +602,12 @@ this->Playing = 1; this->Modified(); - this->PlayerThreadId = + this->PlayerThreadId = this->PlayerThreader->SpawnThread((vtkThreadFunctionType)\ &vtkVideoSourcePlayThread,this); } } - + //---------------------------------------------------------------------------- // Stop continuous grabbing or playback. You will have to override this // if your class overrides Play() and Record() @@ -621,7 +621,7 @@ this->Recording = 0; this->Modified(); } -} +} //---------------------------------------------------------------------------- // Rewind back to the frame with the earliest timestamp. @@ -665,7 +665,7 @@ } this->FrameBufferMutex->Unlock(); -} +} //---------------------------------------------------------------------------- // Fast-forward to the frame with the latest timestamp. @@ -717,12 +717,12 @@ } this->FrameBufferMutex->Unlock(); -} +} //---------------------------------------------------------------------------- // Rotate the buffers void vtkVideoSource::Seek(int n) -{ +{ this->FrameBufferMutex->Lock(); this->AdvanceFrameBuffer(n); this->FrameIndex = (this->FrameIndex + n) % this->FrameBufferSize; @@ -731,7 +731,7 @@ this->FrameIndex += this->FrameBufferSize; } this->FrameBufferMutex->Unlock(); - this->Modified(); + this->Modified(); } //---------------------------------------------------------------------------- @@ -798,7 +798,7 @@ //---------------------------------------------------------------------------- // set or change the circular buffer size -// you will have to override this if you want the buffers +// you will have to override this if you want the buffers // to be device-specific (i.e. something other than vtkDataArray) void vtkVideoSource::SetFrameBufferSize(int bufsize) { @@ -830,12 +830,12 @@ { this->FrameBuffer[i] = vtkUnsignedCharArray::New(); this->FrameBufferTimeStamps[i] = 0.0; - } + } this->FrameBufferSize = bufsize; this->Modified(); } } - else + else { if (bufsize > 0) { @@ -909,7 +909,7 @@ void vtkVideoSource::AdvanceFrameBuffer(int n) { int i = (this->FrameBufferIndex - n) % this->FrameBufferSize; - while (i < 0) + while (i < 0) { i += this->FrameBufferSize; } @@ -918,7 +918,7 @@ //---------------------------------------------------------------------------- double vtkVideoSource::GetFrameTimeStamp(int frame) -{ +{ double timeStamp; this->FrameBufferMutex->Lock(); @@ -959,7 +959,7 @@ // if 'flag' is set in output extent, use the FrameBufferExtent instead if (extent[2*i+1] < extent[2*i]) { - extent[2*i] = 0; + extent[2*i] = 0; extent[2*i+1] = \ this->FrameBufferExtent[2*i+1] - this->FrameBufferExtent[2*i]; } @@ -981,7 +981,7 @@ extent[5] = extent[4] + (extent[5]-extent[4]+1) * numFrames - 1; outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),extent,6); - + // set the spacing outInfo->Set(vtkDataObject::SPACING(),this->DataSpacing,3); @@ -989,7 +989,7 @@ outInfo->Set(vtkDataObject::ORIGIN(),this->DataOrigin,3); // set default data type (8 bit greyscale) - vtkDataObject::SetPointDataActiveScalarInfo(outInfo, VTK_UNSIGNED_CHAR, + vtkDataObject::SetPointDataActiveScalarInfo(outInfo, VTK_UNSIGNED_CHAR, this->NumberOfScalarComponents); return 1; @@ -1000,7 +1000,7 @@ // unusual pixel packing formats, such as XRGB XBRG BGRX BGR etc. // The version below assumes that the packing of the framebuffer is // identical to that of the output. -void vtkVideoSource::UnpackRasterLine(char *outPtr, char *rowPtr, +void vtkVideoSource::UnpackRasterLine(char *outPtr, char *rowPtr, int start, int count) { char *inPtr = rowPtr + start*this->NumberOfScalarComponents; @@ -1020,7 +1020,7 @@ //---------------------------------------------------------------------------- // The Execute method is fairly complex, so I would not recommend overriding // it unless you have to. Override the UnpackRasterLine() method instead. -// You should only have to override it if you are using something other +// You should only have to override it if you are using something other // than 8-bit vtkUnsignedCharArray for the frame buffer. int vtkVideoSource::RequestData( vtkInformation *vtkNotUsed(request), @@ -1037,9 +1037,9 @@ { saveOutputExtent[i] = outputExtent[i]; } - // clip to extent to the Z size of one frame - outputExtent[4] = this->FrameOutputExtent[4]; - outputExtent[5] = this->FrameOutputExtent[5]; + // clip to extent to the Z size of one frame + outputExtent[4] = this->FrameOutputExtent[4]; + outputExtent[5] = this->FrameOutputExtent[5]; int frameExtentX = this->FrameBufferExtent[1]-this->FrameBufferExtent[0]+1; int frameExtentY = this->FrameBufferExtent[3]-this->FrameBufferExtent[2]+1; @@ -1093,8 +1093,8 @@ outPadY = 0; } - int outX = frameExtentX - inPadX; - int outY = frameExtentY - inPadY; + int outX = frameExtentX - inPadX; + int outY = frameExtentY - inPadY; int outZ; // do outZ later if (outX > extentX - outPadX) @@ -1117,7 +1117,7 @@ } // ditto for number of scalar components - if (data->GetNumberOfScalarComponents() != + if (data->GetNumberOfScalarComponents() != this->LastNumberOfScalarComponents) { this->LastNumberOfScalarComponents = data->GetNumberOfScalarComponents(); @@ -1132,7 +1132,7 @@ (saveOutputExtent[3]-saveOutputExtent[2]+1)* (saveOutputExtent[5]-saveOutputExtent[4]+1)*outIncX); this->OutputNeedsInitialization = 0; - } + } // we have to modify the outputExtent of the first frame, // because it might be complete (it will be restored after @@ -1143,7 +1143,7 @@ this->FrameBufferMutex->Lock(); int index = this->FrameBufferIndex; - this->FrameTimeStamp = + this->FrameTimeStamp = this->FrameBufferTimeStamps[index % this->FrameBufferSize]; int frame; @@ -1152,8 +1152,8 @@ if (frame == finalFrame) { outputExtent[5] = finalOutputExtent5; - } - + } + vtkDataArray *frameBuffer = reinterpret_cast(this->FrameBuffer[(index + frame) % this->FrameBufferSize]); char *inPtr = reinterpret_cast(frameBuffer->GetVoidPointer(0)); @@ -1162,7 +1162,7 @@ extentZ = outputExtent[5]-outputExtent[4]+1; inPadZ = 0; outPadZ = -outputExtent[4]; - + if (outPadZ < 0) { inPadZ -= outPadZ; @@ -1209,7 +1209,7 @@ outPtrTmp = outPtr; for (j = 0; j < outY; j++) { - if (outX > 0) + if (outX > 0) { this->UnpackRasterLine(outPtrTmp,inPtrTmp,inPadX,outX); } Index: vtk-5.8.0/IO/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/IO/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/IO/CMakeLists.txt 2013-12-21 18:58:11.025934826 -0500 @@ -18,9 +18,9 @@ SET(KIT_PYTHON_LIBS vtkFilteringPythonD) SET(KIT_JAVA_LIBS vtkFilteringJava) SET(KIT_INTERFACE_LIBRARIES vtkFiltering) -SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx - ${_VTK_METAIO_LIB} vtksqlite - ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES} +SET(KIT_LIBS vtkDICOMParser netcdf netcdf_c++ + ${_VTK_METAIO_LIB} sqlite3 + ${VTK_PNG_LIBRARIES} ${VTK_JPEG_LIBRARIES} ${VTK_TIFF_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_OGGTHEORA_LIBRARIES} ${KWSYS_NAMESPACE}) Index: vtk-5.8.0/IO/vtkFFMPEGWriter.cxx =================================================================== --- vtk-5.8.0.orig/IO/vtkFFMPEGWriter.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/IO/vtkFFMPEGWriter.cxx 2013-12-21 18:58:13.274594864 -0500 @@ -123,7 +123,7 @@ } //choose avi media file format - this->avOutputFormat = guess_format("avi", NULL, NULL); + this->avOutputFormat = av_guess_format("avi", NULL, NULL); if (!this->avOutputFormat) { vtkGenericWarningMacro (<< "Could not open the avi media file format."); @@ -150,7 +150,7 @@ //Set up the codec. AVCodecContext *c = this->avStream->codec; c->codec_id = (CodecID)this->avOutputFormat->video_codec; - c->codec_type = CODEC_TYPE_VIDEO; + c->codec_type = AVMEDIA_TYPE_VIDEO; c->width = this->Dim[0]; c->height = this->Dim[1]; c->pix_fmt = PIX_FMT_YUVJ420P; @@ -343,7 +343,7 @@ pkt.stream_index = this->avStream->index; if (cc->coded_frame->key_frame) //treat keyframes well { - pkt.flags |= PKT_FLAG_KEY; + pkt.flags |= AV_PKT_FLAG_KEY; } pkt.duration = 0; //presentation duration in time_base units or 0 if NA pkt.pos = -1; //byte position in stream or -1 if NA Index: vtk-5.8.0/IO/vtkSQLiteDatabase.cxx =================================================================== --- vtk-5.8.0.orig/IO/vtkSQLiteDatabase.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/IO/vtkSQLiteDatabase.cxx 2013-12-21 18:58:11.025934826 -0500 @@ -29,7 +29,7 @@ #include #include -#include +#include vtkStandardNewMacro(vtkSQLiteDatabase); @@ -307,15 +307,15 @@ } } - int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); + int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); - if (result != VTK_SQLITE_OK) + if (result != SQLITE_OK) { vtkDebugMacro(<<"SQLite open() failed. Error code is " << result << " and message is " - << vtk_sqlite3_errmsg(this->SQLiteInstance) ); + << sqlite3_errmsg(this->SQLiteInstance) ); - vtk_sqlite3_close(this->SQLiteInstance); + sqlite3_close(this->SQLiteInstance); return false; } else @@ -334,8 +334,8 @@ } else { - int result = vtk_sqlite3_close(this->SQLiteInstance); - if (result != VTK_SQLITE_OK) + int result = sqlite3_close(this->SQLiteInstance); + if (result != SQLITE_OK) { vtkWarningMacro(<< "Close(): SQLite returned result code " << result); } @@ -374,7 +374,7 @@ if (!status) { vtkErrorMacro(<< "GetTables(): Database returned error: " - << vtk_sqlite3_errmsg(this->SQLiteInstance) ); + << sqlite3_errmsg(this->SQLiteInstance) ); query->Delete(); return this->Tables; } @@ -403,7 +403,7 @@ if (!status) { vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " - << vtk_sqlite3_errmsg(this->SQLiteInstance) ); + << sqlite3_errmsg(this->SQLiteInstance) ); query->Delete(); return NULL; } @@ -467,10 +467,10 @@ // ---------------------------------------------------------------------- bool vtkSQLiteDatabase::HasError() { - return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); + return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); } const char* vtkSQLiteDatabase::GetLastErrorText() { - return vtk_sqlite3_errmsg(this->SQLiteInstance); + return sqlite3_errmsg(this->SQLiteInstance); } Index: vtk-5.8.0/IO/vtkSQLiteDatabase.h =================================================================== --- vtk-5.8.0.orig/IO/vtkSQLiteDatabase.h 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/IO/vtkSQLiteDatabase.h 2013-12-21 18:58:11.025934826 -0500 @@ -48,7 +48,7 @@ class vtkSQLQuery; class vtkSQLiteQuery; class vtkStringArray; -struct vtk_sqlite3; +struct sqlite3; class VTK_IO_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase { @@ -146,7 +146,7 @@ virtual bool ParseURL(const char* url); private: - vtk_sqlite3 *SQLiteInstance; + sqlite3 *SQLiteInstance; // We want this to be private, a user of this class // should not be setting this for any reason Index: vtk-5.8.0/IO/vtkSQLiteQuery.cxx =================================================================== --- vtk-5.8.0.orig/IO/vtkSQLiteQuery.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/IO/vtkSQLiteQuery.cxx 2013-12-21 18:58:11.025934826 -0500 @@ -25,7 +25,7 @@ #include "vtkVariant.h" #include "vtkVariantArray.h" -#include +#include #include @@ -43,7 +43,7 @@ { this->Statement = NULL; this->InitialFetch = true; - this->InitialFetchResult=VTK_SQLITE_DONE; + this->InitialFetchResult=SQLITE_DONE; this->LastErrorText = NULL; this->TransactionInProgress = false; } @@ -61,7 +61,7 @@ { if (this->Database != NULL) { - vtk_sqlite3_finalize(this->Statement); + sqlite3_finalize(this->Statement); this->Statement = NULL; } } @@ -131,8 +131,8 @@ if (this->Statement) { vtkDebugMacro(<<"Finalizing old statement"); - int finalizeStatus = vtk_sqlite3_finalize(this->Statement); - if (finalizeStatus != VTK_SQLITE_OK) + int finalizeStatus = sqlite3_finalize(this->Statement); + if (finalizeStatus != SQLITE_OK) { vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " << finalizeStatus); @@ -151,19 +151,19 @@ return false; } - vtk_sqlite3 *db = dbContainer->SQLiteInstance; + sqlite3 *db = dbContainer->SQLiteInstance; const char *unused_statement; - int prepareStatus = vtk_sqlite3_prepare_v2(db, + int prepareStatus = sqlite3_prepare_v2(db, this->Query, static_cast(strlen(this->Query)), &this->Statement, &unused_statement); - if (prepareStatus != VTK_SQLITE_OK) + if (prepareStatus != SQLITE_OK) { - this->SetLastErrorText(vtk_sqlite3_errmsg(db)); - vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " + this->SetLastErrorText(sqlite3_errmsg(db)); + vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " << this->GetLastErrorText() << " on statement: '" << this->Query << "'"); @@ -194,31 +194,31 @@ } else { - vtk_sqlite3_reset(this->Statement); + sqlite3_reset(this->Statement); } vtkDebugMacro(<<"Execute(): Query ready to execute."); this->InitialFetch = true; - int result = vtk_sqlite3_step(this->Statement); + int result = sqlite3_step(this->Statement); this->InitialFetchResult = result; - if (result == VTK_SQLITE_DONE) + if (result == SQLITE_DONE) { this->SetLastErrorText(NULL); this->Active = true; return true; } - else if (result != VTK_SQLITE_ROW) + else if (result != SQLITE_ROW) { vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast(this->Database); assert(dbContainer != NULL); - vtk_sqlite3 *db = dbContainer->SQLiteInstance; + sqlite3 *db = dbContainer->SQLiteInstance; - this->SetLastErrorText(vtk_sqlite3_errmsg(db)); - vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " + this->SetLastErrorText(sqlite3_errmsg(db)); + vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " << this->GetLastErrorText()); this->Active = false; return false; @@ -239,7 +239,7 @@ } else { - return vtk_sqlite3_column_count(this->Statement); + return sqlite3_column_count(this->Statement); } } @@ -259,7 +259,7 @@ } else { - return vtk_sqlite3_column_name(this->Statement, column); + return sqlite3_column_name(this->Statement, column); } } @@ -279,22 +279,22 @@ } else { - switch (vtk_sqlite3_column_type(this->Statement, column)) + switch (sqlite3_column_type(this->Statement, column)) { - case VTK_SQLITE_INTEGER: + case SQLITE_INTEGER: return VTK_INT; - case VTK_SQLITE_FLOAT: + case SQLITE_FLOAT: return VTK_FLOAT; - case VTK_SQLITE_TEXT: + case SQLITE_TEXT: return VTK_STRING; - case VTK_SQLITE_BLOB: + case SQLITE_BLOB: return VTK_STRING; // until we have a BLOB type of our own - case VTK_SQLITE_NULL: + case SQLITE_NULL: return VTK_VOID; // ??? what makes sense here? default: { vtkErrorMacro(<<"GetFieldType(): Unknown data type " - << vtk_sqlite3_column_type(this->Statement, column) + << sqlite3_column_type(this->Statement, column) <<" from SQLite."); return VTK_VOID; } @@ -315,7 +315,7 @@ { vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); this->InitialFetch = false; - if (this->InitialFetchResult == VTK_SQLITE_DONE) + if (this->InitialFetchResult == SQLITE_DONE) { return false; } @@ -326,12 +326,12 @@ } else { - int result = vtk_sqlite3_step(this->Statement); - if (result == VTK_SQLITE_DONE) + int result = sqlite3_step(this->Statement); + if (result == SQLITE_DONE) { return false; } - else if (result == VTK_SQLITE_ROW) + else if (result == SQLITE_ROW) { return true; } @@ -339,8 +339,8 @@ { vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); assert(dbContainer != NULL); - vtk_sqlite3 *db = dbContainer->SQLiteInstance; - this->SetLastErrorText(vtk_sqlite3_errmsg(db)); + sqlite3 *db = dbContainer->SQLiteInstance; + this->SetLastErrorText(sqlite3_errmsg(db)); vtkErrorMacro(<<"NextRow(): Database returned error code " << result << " with the following message: " << this->GetLastErrorText()); @@ -366,33 +366,33 @@ } else { - switch (vtk_sqlite3_column_type(this->Statement, column)) + switch (sqlite3_column_type(this->Statement, column)) { - case VTK_SQLITE_INTEGER: - return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); + case SQLITE_INTEGER: + return vtkVariant(sqlite3_column_int(this->Statement, column)); - case VTK_SQLITE_FLOAT: - return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); + case SQLITE_FLOAT: + return vtkVariant(sqlite3_column_double(this->Statement, column)); - case VTK_SQLITE_TEXT: + case SQLITE_TEXT: { vtksys_ios::ostringstream str; - str << vtk_sqlite3_column_text(this->Statement, column); + str << sqlite3_column_text(this->Statement, column); return vtkVariant(vtkStdString(str.str())); } - case VTK_SQLITE_BLOB: + case SQLITE_BLOB: { // This is a hack ... by passing the BLOB to vtkStdString with an explicit // byte count, we ensure that the string will store all of the BLOB's bytes, // even if there are NULL values. return vtkVariant(vtkStdString( - static_cast(vtk_sqlite3_column_blob(this->Statement, column)), - vtk_sqlite3_column_bytes(this->Statement, column))); + static_cast(sqlite3_column_blob(this->Statement, column)), + sqlite3_column_bytes(this->Statement, column))); } - case VTK_SQLITE_NULL: + case SQLITE_NULL: default: return vtkVariant(); } @@ -423,11 +423,11 @@ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); assert(dbContainer != NULL); - vtk_sqlite3 *db = dbContainer->SQLiteInstance; + sqlite3 *db = dbContainer->SQLiteInstance; char *errorMessage = NULL; - int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); + int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); - if (result == VTK_SQLITE_OK) + if (result == SQLITE_OK) { this->TransactionInProgress = true; this->SetLastErrorText(NULL); @@ -451,7 +451,7 @@ { if (this->Statement) { - vtk_sqlite3_finalize(this->Statement); + sqlite3_finalize(this->Statement); this->Statement = NULL; } @@ -463,11 +463,11 @@ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); assert(dbContainer != NULL); - vtk_sqlite3 *db = dbContainer->SQLiteInstance; + sqlite3 *db = dbContainer->SQLiteInstance; char *errorMessage = NULL; - int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); + int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); - if (result == VTK_SQLITE_OK) + if (result == SQLITE_OK) { this->TransactionInProgress = false; this->SetLastErrorText(NULL); @@ -499,11 +499,11 @@ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); assert(dbContainer != NULL); - vtk_sqlite3 *db = dbContainer->SQLiteInstance; + sqlite3 *db = dbContainer->SQLiteInstance; char *errorMessage = NULL; - int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); + int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); - if (result == VTK_SQLITE_OK) + if (result == SQLITE_OK) { this->TransactionInProgress = false; this->SetLastErrorText(NULL); @@ -647,11 +647,11 @@ if (this->Active) { this->Active = false; - vtk_sqlite3_reset(this->Statement); + sqlite3_reset(this->Statement); } - int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); + int status = sqlite3_bind_int(this->Statement, index+1, value); - if (status != VTK_SQLITE_OK) + if (status != SQLITE_OK) { vtksys_ios::ostringstream errormessage; errormessage << "sqlite_bind_int returned error: " << status; @@ -676,11 +676,11 @@ if (this->Active) { this->Active = false; - vtk_sqlite3_reset(this->Statement); + sqlite3_reset(this->Statement); } - int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast(value)); + int status = sqlite3_bind_int(this->Statement, index+1, static_cast(value)); - if (status != VTK_SQLITE_OK) + if (status != SQLITE_OK) { vtksys_ios::ostringstream errormessage; errormessage << "sqlite_bind_int64 returned error: " << status; @@ -705,12 +705,12 @@ if (this->Active) { this->Active = false; - vtk_sqlite3_reset(this->Statement); + sqlite3_reset(this->Statement); } - int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); + int status = sqlite3_bind_double(this->Statement, index+1, value); - if (status != VTK_SQLITE_OK) + if (status != SQLITE_OK) { vtksys_ios::ostringstream errormessage; errormessage << "sqlite_bind_double returned error: " << status; @@ -734,12 +734,12 @@ if (this->Active) { this->Active = false; - vtk_sqlite3_reset(this->Statement); + sqlite3_reset(this->Statement); } - int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); + int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); - if (status != VTK_SQLITE_OK) + if (status != SQLITE_OK) { vtksys_ios::ostringstream errormessage; errormessage << "sqlite_bind_text returned error: " << status; @@ -763,17 +763,17 @@ if (this->Active) { this->Active = false; - vtk_sqlite3_reset(this->Statement); + sqlite3_reset(this->Statement); } int status = - vtk_sqlite3_bind_blob(this->Statement, + sqlite3_bind_blob(this->Statement, index+1, data, length, - VTK_SQLITE_TRANSIENT); + SQLITE_TRANSIENT); - if (status != VTK_SQLITE_OK) + if (status != SQLITE_OK) { vtksys_ios::ostringstream errormessage; errormessage << "sqlite_bind_blob returned error: " << status; @@ -797,12 +797,12 @@ if (this->Active) { this->Active = false; - vtk_sqlite3_reset(this->Statement); + sqlite3_reset(this->Statement); } - int status = vtk_sqlite3_clear_bindings(this->Statement); + int status = sqlite3_clear_bindings(this->Statement); - if (status != VTK_SQLITE_OK) + if (status != SQLITE_OK) { vtksys_ios::ostringstream errormessage; errormessage << "sqlite_clear_bindings returned error: " << status; Index: vtk-5.8.0/IO/vtkSQLiteQuery.h =================================================================== --- vtk-5.8.0.orig/IO/vtkSQLiteQuery.h 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/IO/vtkSQLiteQuery.h 2013-12-21 18:58:11.025934826 -0500 @@ -46,7 +46,7 @@ class vtkSQLiteDatabase; class vtkVariant; class vtkVariantArray; -struct vtk_sqlite3_stmt; +struct sqlite3_stmt; class VTK_IO_EXPORT vtkSQLiteQuery : public vtkSQLQuery { @@ -154,7 +154,7 @@ vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. void operator=(const vtkSQLiteQuery &); // Not implemented. - vtk_sqlite3_stmt *Statement; + sqlite3_stmt *Statement; bool InitialFetch; int InitialFetchResult; char *LastErrorText; Index: vtk-5.8.0/Infovis/vtkBoostBreadthFirstSearchTree.cxx =================================================================== --- vtk-5.8.0.orig/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2013-12-21 18:58:11.025934826 -0500 @@ -47,6 +47,23 @@ vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); +#if BOOST_VERSION >= 104800 // Boost 1.48.x +namespace { + vtkIdType unwrap_edge_id(vtkEdgeType const &e) + { + return e.Id; + } + vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor const &e) + { +# if BOOST_VERSION == 104800 + return e.underlying_desc.Id; +# else + return e.underlying_descx.Id; +# endif + } +} +#endif + // Redefine the bfs visitor, the only visitor we // are using is the tree_edge visitor. template @@ -95,7 +112,12 @@ // Copy the vertex and edge data from the graph to the tree. tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); +#if BOOST_VERSION < 104800 // Boost 1.48.x tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); +#else + tree->GetEdgeData()->CopyData(graph->GetEdgeData(), + unwrap_edge_id(e), tree_e.Id); +#endif } private: Index: vtk-5.8.0/Parallel/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Parallel/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Parallel/CMakeLists.txt 2013-12-21 18:58:11.025934826 -0500 @@ -151,7 +151,7 @@ IF (VTK_USE_MPI) INCLUDE (FindMPI) - INCLUDE_DIRECTORIES("${MPI_INCLUDE_PATH}") + INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) SET ( Kit_SRCS ${Kit_SRCS} @@ -205,7 +205,7 @@ MESSAGE("Could not find the required MPI libraries") ENDIF (MPI_LIBRARY) IF (MPI_EXTRA_LIBRARY) - SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}") + SET(KIT_LIBS ${KIT_LIBS} "${MPI_LIBRARY}") ENDIF (MPI_EXTRA_LIBRARY) ENDIF (VTK_USE_MPI) @@ -240,6 +240,8 @@ ENDFOREACH(file) ENDIF(VTK_USE_RENDERING) + + #----------------------------------------------------------------------------- # Include CMake code common to all kits. INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake) Index: vtk-5.8.0/Rendering/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Rendering/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Rendering/CMakeLists.txt 2013-12-21 18:58:11.025934826 -0500 @@ -9,9 +9,7 @@ ENDIF (JAVA_AWT_LIBRARY) SET(KIT_INTERFACE_LIBRARIES vtkGraphics vtkImaging) -SET(KIT_LIBS vtkIO vtkftgl - ${VTK_FREETYPE_LIBRARIES} -) +SET(KIT_LIBS vtkIO vtkftgl) #INCLUDE(${VTK_CMAKE_DIR}/vtkTestGL.cmake) #INCLUDE(${VTK_CMAKE_DIR}/vtkTestGLX.cmake) @@ -440,9 +438,9 @@ # path in install names. This workaround fixes the problem by forcing all libraries # and executables that depend on vtkRendering to also directly link to Qt libraries. IF (APPLE) - LIST (APPEND KIT_INTERFACE_LIBRARIES ${QT_LIBRARIES}) + LIST (APPEND KIT_INTERFACE_LIBRARIES QtGui QtCore) ELSE (APPLE) - LIST (APPEND KIT_LIBS ${QT_LIBRARIES}) + LIST (APPEND KIT_LIBS QtGui QtCore) ENDIF (APPLE) ENDIF(VTK_USE_QT) @@ -538,7 +536,6 @@ INCLUDE(CheckFunctionExists) SET(VTK_SAVE_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") SET(CMAKE_REQUIRED_LIBRARIES - ${OPENGL_LIBRARIES} ${CMAKE_THREAD_LIBS} ${CMAKE_REQUIRED_LIBRARIES} -lm @@ -784,7 +781,7 @@ # Use special interactor for X and Tk. IF(VTK_USE_X) SET(KitTCL_SRCS ${KitTCL_SRCS} vtkXRenderWindowTclInteractor.cxx) - SET(KIT_TCL_LIBS ${KIT_TCL_LIBS} ${X11_LIBRARIES}) + SET(KIT_TCL_LIBS ${KIT_TCL_LIBS} X11) ENDIF(VTK_USE_X) IF(VTK_USE_CARBON) SET(KIT_TCL_LIBS ${KIT_TCL_LIBS} "-framework Carbon") @@ -837,7 +834,7 @@ ${RenderingPythonTkWidgets_SRCS}) SET(VTK_PYTHONTK_LIBRARIES ${VTK_TK_LIBRARIES}) IF(VTK_USE_X) - SET(VTK_PYTHONTK_LIBRARIES ${VTK_PYTHONTK_LIBRARIES} ${X11_LIBRARIES}) + SET(VTK_PYTHONTK_LIBRARIES ${VTK_PYTHONTK_LIBRARIES} X11) ENDIF(VTK_USE_X) IF(VTK_USE_CARBON) SET(VTK_PYTHONTK_LIBRARIES ${VTK_PYTHONTK_LIBRARIES} "-framework Carbon") @@ -874,7 +871,7 @@ IF (X11_Xt_LIB) TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xt_LIB}) ENDIF (X11_Xt_LIB) - TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_LIBRARIES}) + TARGET_LINK_LIBRARIES(vtk${KIT} X11) IF (VTK_USE_TK) # Definitely needed in case we are linking against a Tcl/Tk 8.5 static, # which by default seems to be missing Xss and Xft. It can not just be @@ -883,12 +880,12 @@ FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH}) MARK_AS_ADVANCED(X11_Xscreensaver_LIB) IF(X11_Xscreensaver_LIB) - TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xscreensaver_LIB}) +# TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xscreensaver_LIB}) ENDIF(X11_Xscreensaver_LIB) FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH}) MARK_AS_ADVANCED(X11_Xft_LIB) IF(X11_Xft_LIB) - TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xft_LIB}) +# TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xft_LIB}) ENDIF(X11_Xft_LIB) IF(APPLE) FIND_LIBRARY(X11_fontconfig_LIB fontconfig ${X11_LIB_SEARCH_PATH}) Index: vtk-5.8.0/Rendering/vtkWin32OpenGLRenderWindow.cxx =================================================================== --- vtk-5.8.0.orig/Rendering/vtkWin32OpenGLRenderWindow.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Rendering/vtkWin32OpenGLRenderWindow.cxx 2013-12-21 18:58:11.025934826 -0500 @@ -75,9 +75,9 @@ void vtkWin32OpenGLRenderWindow::Clean() { GLuint id; - + /* finish OpenGL rendering */ - if (this->ContextId) + if (this->ContextId) { this->MakeCurrent(); @@ -86,7 +86,7 @@ { glDisable((GLenum)cur_light); } - + /* now delete all textures */ glDisable(GL_TEXTURE_2D); for (int i = 1; i < this->TextureResourceIds->GetNumberOfIds(); i++) @@ -106,16 +106,16 @@ } this->CleanUpRenderers(); - + // Note: wglMakeCurrent(NULL,NULL) is valid according to the documentation // and works with nVidia and ATI but not with Intel. Passing an existing // device context works in any case. // see VTK Bug 7119. - if(wglMakeCurrent(this->DeviceContext,NULL)!=TRUE) + if(wglMakeCurrent(this->DeviceContext,NULL)!=TRUE) { vtkErrorMacro("wglMakeCurrent failed in Clean(), error: " << GetLastError()); } - if (wglDeleteContext(this->ContextId) != TRUE) + if (wglDeleteContext(this->ContextId) != TRUE) { vtkErrorMacro("wglDeleteContext failed in Clean(), error: " << GetLastError()); } @@ -136,7 +136,7 @@ // destructor) vtkRenderer *ren; vtkCollectionSimpleIterator rsit; - for (this->Renderers->InitTraversal(rsit); + for (this->Renderers->InitTraversal(rsit); (ren = this->Renderers->GetNextRenderer(rsit));) { ren->SetRenderWindow(NULL); @@ -144,13 +144,13 @@ } } -LRESULT APIENTRY vtkWin32OpenGLRenderWindow::WndProc(HWND hWnd, UINT message, - WPARAM wParam, +LRESULT APIENTRY vtkWin32OpenGLRenderWindow::WndProc(HWND hWnd, UINT message, + WPARAM wParam, LPARAM lParam) { LRESULT res; - vtkWin32OpenGLRenderWindow *me = + vtkWin32OpenGLRenderWindow *me = (vtkWin32OpenGLRenderWindow *)vtkGetWindowLong(hWnd,sizeof(vtkLONG)); if (me && me->GetReferenceCount()>0) @@ -199,7 +199,7 @@ return 1; } } - + return 0; } @@ -216,21 +216,21 @@ " than the one doing the picking, this can causes crashes" " and/or bad pick results"); } - else + else { - if (wglMakeCurrent(this->DeviceContext, this->ContextId) != TRUE) + if (wglMakeCurrent(this->DeviceContext, this->ContextId) != TRUE) { LPVOID lpMsgBuf; - ::FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | + ::FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language (LPTSTR) &lpMsgBuf, 0, - NULL + NULL ); if(lpMsgBuf) { @@ -243,7 +243,7 @@ delete [] wmsg; delete [] wtemp; #else - vtkErrorMacro("wglMakeCurrent failed in MakeCurrent(), error: " + vtkErrorMacro("wglMakeCurrent failed in MakeCurrent(), error: " << (LPCTSTR)lpMsgBuf); #endif ::LocalFree( lpMsgBuf ); @@ -289,13 +289,13 @@ } } } - + else if (this->Mapped) { if (!resizing) { resizing = 1; - + if (this->ParentId) { SetWindowExtEx(this->DeviceContext,x,y,NULL); @@ -330,7 +330,7 @@ if (!resizing) { resizing = 1; - + SetWindowPos(this->WindowId,HWND_TOP,x,y, 0, 0, SWP_NOSIZE | SWP_NOZORDER); resizing = 0; @@ -426,7 +426,7 @@ if (pfd.cColorBits <= 8) { strm << "class: PseudoColor" << endl; - } + } else { strm << "class: TrueColor" << endl; @@ -447,14 +447,14 @@ strm << "double buffer: False" << endl; } if (pfd.dwFlags & PFD_STEREO) { - strm << "stereo: True" << endl; + strm << "stereo: True" << endl; } else { strm << "stereo: False" << endl; } if (pfd.dwFlags & PFD_GENERIC_FORMAT) { - strm << "hardware acceleration: False" << endl; + strm << "hardware acceleration: False" << endl; } else { - strm << "hardware acceleration: True" << endl; + strm << "hardware acceleration: True" << endl; } strm << "rgba: redSize=" << static_cast(pfd.cRedBits) << " greenSize=" << static_cast(pfd.cGreenBits) << "blueSize=" << static_cast(pfd.cBlueBits) << "alphaSize=" << static_cast(pfd.cAlphaBits) << endl; strm << "aux buffers: " << static_cast(pfd.cAuxBuffers)<< endl; @@ -463,17 +463,17 @@ strm << "accum: redSize=" << static_cast(pfd.cAccumRedBits) << " greenSize=" << static_cast(pfd.cAccumGreenBits) << "blueSize=" << static_cast(pfd.cAccumBlueBits) << "alphaSize=" << static_cast(pfd.cAccumAlphaBits) << endl; delete[] this->Capabilities; - + size_t len = strm.str().length() + 1; this->Capabilities = new char[len]; strncpy(this->Capabilities, strm.str().c_str(), len); - + return this->Capabilities; } - -void vtkWin32OpenGLRenderWindow::SetupPixelFormat(HDC hDC, DWORD dwFlags, - int debug, int bpp, + +void vtkWin32OpenGLRenderWindow::SetupPixelFormat(HDC hDC, DWORD dwFlags, + int debug, int bpp, int zbpp) { PIXELFORMATDESCRIPTOR pfd = { @@ -505,12 +505,12 @@ if (!(pfd.dwFlags & PFD_SUPPORT_OPENGL)) { #ifdef UNICODE - MessageBox(WindowFromDC(hDC), + MessageBox(WindowFromDC(hDC), L"Invalid pixel format, no OpenGL support", L"Error", MB_ICONERROR | MB_OK); #else - MessageBox(WindowFromDC(hDC), + MessageBox(WindowFromDC(hDC), "Invalid pixel format, no OpenGL support", "Error", MB_ICONERROR | MB_OK); @@ -524,11 +524,11 @@ { exit(1); } - } + } } else { - // hDC has no current PixelFormat, so + // hDC has no current PixelFormat, so pixelFormat = ChoosePixelFormat(hDC, &pfd); if (pixelFormat == 0) { @@ -549,8 +549,8 @@ exit(1); } } - DescribePixelFormat(hDC, pixelFormat,sizeof(pfd), &pfd); - if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) + DescribePixelFormat(hDC, pixelFormat,sizeof(pfd), &pfd); + if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) { // int err = GetLastError(); #ifdef UNICODE @@ -626,10 +626,10 @@ } -LRESULT vtkWin32OpenGLRenderWindow::MessageProc(HWND hWnd, UINT message, +LRESULT vtkWin32OpenGLRenderWindow::MessageProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) + switch (message) { case WM_CREATE: { @@ -648,18 +648,18 @@ return 0; case WM_SIZE: /* track window size changes */ - if (this->ContextId) + if (this->ContextId) { this->SetSize((int) LOWORD(lParam),(int) HIWORD(lParam)); return 0; } case WM_PALETTECHANGED: /* realize palette if this is *not* the current window */ - if (this->ContextId && this->Palette && (HWND) wParam != hWnd) + if (this->ContextId && this->Palette && (HWND) wParam != hWnd) { SelectPalette(this->DeviceContext, this->OldPalette, FALSE); UnrealizeObject(this->Palette); - this->OldPalette = SelectPalette(this->DeviceContext, + this->OldPalette = SelectPalette(this->DeviceContext, this->Palette, FALSE); RealizePalette(this->DeviceContext); this->Render(); @@ -667,11 +667,11 @@ break; case WM_QUERYNEWPALETTE: /* realize palette if this is the current window */ - if (this->ContextId && this->Palette) + if (this->ContextId && this->Palette) { SelectPalette(this->DeviceContext, this->OldPalette, FALSE); UnrealizeObject(this->Palette); - this->OldPalette = SelectPalette(this->DeviceContext, + this->OldPalette = SelectPalette(this->DeviceContext, this->Palette, FALSE); RealizePalette(this->DeviceContext); this->Render(); @@ -682,7 +682,7 @@ { PAINTSTRUCT ps; BeginPaint(hWnd, &ps); - if (this->ContextId) + if (this->ContextId) { this->Render(); } @@ -730,20 +730,20 @@ { static int count = 1; char *windowName; - + if (!this->WindowId) { WNDCLASS wndClass; this->DeviceContext = 0; - - int len = static_cast(strlen("Visualization Toolkit - Win32OpenGL #")) + + int len = static_cast(strlen("Visualization Toolkit - Win32OpenGL #")) + (int)ceil( (double) log10( (double)(count+1) ) ) - + 1; + + 1; windowName = new char [ len ]; sprintf(windowName,"Visualization Toolkit - Win32OpenGL #%i",count++); this->SetWindowName(windowName); delete [] windowName; - + // has the class been registered ? #ifdef UNICODE if (!GetClassInfo(this->ApplicationInstance,L"vtkOpenGL",&wndClass)) @@ -770,7 +770,7 @@ wndClass.cbWndExtra = 2 * sizeof(vtkLONG); RegisterClass(&wndClass); } - + #ifdef UNICODE wchar_t *wname = new wchar_t [mbstowcs(NULL, this->WindowName, 32000)+1]; mbstowcs(wname, this->WindowName, 32000); @@ -779,7 +779,7 @@ int y = ((this->Position[1] >= 0) ? this->Position[1] : 5); int height = ((this->Size[1] > 0) ? this->Size[1] : 300); int width = ((this->Size[0] > 0) ? this->Size[0] : 300); - + /* create window */ if (this->ParentId) { @@ -812,7 +812,7 @@ this->WindowId = CreateWindow( L"vtkOpenGL", wname, style, x,y, width+2*GetSystemMetrics(SM_CXFRAME), - height+2*GetSystemMetrics(SM_CYFRAME) + height+2*GetSystemMetrics(SM_CYFRAME) +GetSystemMetrics(SM_CYCAPTION), NULL, NULL, this->ApplicationInstance, NULL); #else @@ -827,14 +827,14 @@ #ifdef UNICODE delete [] wname; #endif - + if (!this->WindowId) { vtkErrorMacro("Could not create window, error: " << GetLastError()); return; } // extract the create info - + /* display window */ if(!this->OffScreenRendering) { @@ -842,7 +842,7 @@ } //UpdateWindow(this->WindowId); this->OwnWindow = 1; - vtkSetWindowLong(this->WindowId,sizeof(vtkLONG),(vtkLONG)this); + vtkSetWindowLong(this->WindowId,sizeof(vtkLONG),(intptr_t)this); } if (!this->DeviceContext) { @@ -862,16 +862,16 @@ } this->SetupPalette(this->DeviceContext); this->ContextId = wglCreateContext(this->DeviceContext); - if (this->ContextId == NULL) + if (this->ContextId == NULL) { vtkErrorMacro("wglCreateContext failed in CreateAWindow(), error: " << GetLastError()); } this->MakeCurrent(); - + // wipe out any existing display lists vtkRenderer* ren; vtkCollectionSimpleIterator rsit; - for (this->Renderers->InitTraversal(rsit); + for (this->Renderers->InitTraversal(rsit); (ren = this->Renderers->GetNextRenderer(rsit));) { ren->SetRenderWindow(0); @@ -889,20 +889,20 @@ // Initialize the window for rendering. void vtkWin32OpenGLRenderWindow::WindowInitialize() -{ +{ // create our own window if not already set this->OwnWindow = 0; if (!this->MFChandledWindow) { this->InitializeApplication(); this->CreateAWindow(); - } - else + } + else { this->MakeCurrent(); // hsr this->OpenGLInit(); } - + // set the DPI this->SetDPI(GetDeviceCaps(this->DeviceContext, LOGPIXELSY)); } @@ -910,7 +910,7 @@ // Initialize the rendering window. void vtkWin32OpenGLRenderWindow::Initialize (void) { - // make sure we havent already been initialized + // make sure we havent already been initialized if (!this->OffScreenRendering && !this->ContextId) { this->WindowInitialize(); @@ -955,7 +955,7 @@ ReleaseDC(this->WindowId, this->DeviceContext); // can't set WindowId=NULL, needed for DestroyWindow this->DeviceContext = NULL; - + // clear the extra data before calling destroy vtkSetWindowLong(this->WindowId,sizeof(vtkLONG),(vtkLONG)0); if(this->OwnWindow) @@ -971,18 +971,18 @@ // Get the current size of the window. int *vtkWin32OpenGLRenderWindow::GetSize(void) { - // if we aren't mapped then just return the ivar + // if we aren't mapped then just return the ivar if (this->Mapped) { RECT rect; - // Find the current window size + // Find the current window size if (GetClientRect(this->WindowId, &rect)) - { + { this->Size[0] = rect.right; this->Size[1] = rect.bottom; } - else + else { this->Size[0] = 0; this->Size[1] = 0; @@ -999,23 +999,23 @@ RECT rect; SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0); - + this->Size[0] = rect.right - rect.left; this->Size[1] = rect.bottom - rect.top; - + return this->Size; } // Get the position in screen coordinates of the window. int *vtkWin32OpenGLRenderWindow::GetPosition(void) { - // if we aren't mapped then just return the ivar + // if we aren't mapped then just return the ivar if (!this->Mapped) { return this->Position; } - // Find the current window position + // Find the current window position // x,y,&this->Position[0],&this->Position[1],&child); return this->Position; @@ -1025,34 +1025,34 @@ void vtkWin32OpenGLRenderWindow::SetFullScreen(int arg) { int *temp; - + if (this->FullScreen == arg) { return; } - + if (!this->Mapped) { this->PrefFullScreen(); return; } - // set the mode + // set the mode this->FullScreen = arg; if (this->FullScreen <= 0) { this->Position[0] = this->OldScreen[0]; this->Position[1] = this->OldScreen[1]; - this->Size[0] = this->OldScreen[2]; + this->Size[0] = this->OldScreen[2]; this->Size[1] = this->OldScreen[3]; this->Borders = this->OldScreen[4]; } else { - // if window already up get its values + // if window already up get its values if (this->WindowId) { - temp = this->GetPosition(); + temp = this->GetPosition(); this->OldScreen[0] = temp[0]; this->OldScreen[1] = temp[1]; @@ -1060,8 +1060,8 @@ this->PrefFullScreen(); } } - - // remap the window + + // remap the window this->WindowRemap(); this->Modified(); @@ -1092,14 +1092,14 @@ size = this->GetScreenSize(); - // use full screen + // use full screen this->Position[0] = 0; this->Position[1] = 0; this->Size[0] = size[0] - 2*GetSystemMetrics(SM_CXFRAME); - this->Size[1] = size[1] - + this->Size[1] = size[1] - 2*GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYCAPTION); - // don't show borders + // don't show borders this->Borders = 0; } @@ -1108,8 +1108,8 @@ { // close everything down this->Finalize(); - - // set the default windowid + + // set the default windowid this->WindowId = this->NextWindowId; this->NextWindowId = 0; @@ -1129,7 +1129,7 @@ // Get the window id. HWND vtkWin32OpenGLRenderWindow::GetWindowId() { - vtkDebugMacro(<< "Returning WindowId of " << this->WindowId << "\n"); + vtkDebugMacro(<< "Returning WindowId of " << this->WindowId << "\n"); return this->WindowId; } @@ -1138,11 +1138,11 @@ void vtkWin32OpenGLRenderWindow::SetWindowId(HWND arg) { vtkDebugMacro(<< "Setting WindowId to " << arg << "\n"); - + if (arg != this->WindowId) { this->WindowId = arg; - if (this->ContextId) + if (this->ContextId) { wglDeleteContext(this->ContextId); } @@ -1155,24 +1155,24 @@ void vtkWin32OpenGLRenderWindow::SetWindowInfo(char *info) { int tmp; - + sscanf(info,"%i",&tmp); this->WindowId = (HWND)tmp; - vtkDebugMacro(<< "Setting WindowId to " << this->WindowId << "\n"); + vtkDebugMacro(<< "Setting WindowId to " << this->WindowId << "\n"); } void vtkWin32OpenGLRenderWindow::SetNextWindowInfo(char *info) { int tmp; - + sscanf(info,"%i",&tmp); this->SetNextWindowId((HWND)tmp); } void vtkWin32OpenGLRenderWindow::SetDisplayId(void * arg) -{ +{ this->DeviceContext = (HDC) arg; } @@ -1181,7 +1181,7 @@ this->ContextId = arg; } -void vtkWin32OpenGLRenderWindow::SetDeviceContext(HDC arg) +void vtkWin32OpenGLRenderWindow::SetDeviceContext(HDC arg) { this->DeviceContext = arg; this->MFChandledWindow = TRUE; @@ -1191,17 +1191,17 @@ void vtkWin32OpenGLRenderWindow::SetParentInfo(char *info) { int tmp; - + sscanf(info,"%i",&tmp); this->ParentId = (HWND)tmp; - vtkDebugMacro(<< "Setting ParentId to " << this->ParentId << "\n"); + vtkDebugMacro(<< "Setting ParentId to " << this->ParentId << "\n"); } // Set the window id to a pre-existing window. void vtkWin32OpenGLRenderWindow::SetParentId(HWND arg) { - vtkDebugMacro(<< "Setting ParentId to " << arg << "\n"); + vtkDebugMacro(<< "Setting ParentId to " << arg << "\n"); this->ParentId = arg; } @@ -1209,7 +1209,7 @@ // Set the window id of the new window once a WindowRemap is done. void vtkWin32OpenGLRenderWindow::SetNextWindowId(HWND arg) { - vtkDebugMacro(<< "Setting NextWindowId to " << arg << "\n"); + vtkDebugMacro(<< "Setting NextWindowId to " << arg << "\n"); this->NextWindowId = arg; } @@ -1228,7 +1228,7 @@ this->Initialize(); } - // set the current window + // set the current window this->MakeCurrent(); } @@ -1296,13 +1296,13 @@ DeleteDC(dc); } this->CreatingOffScreenWindow = status; -} +} void vtkWin32OpenGLRenderWindow::CreateOffScreenDC(int xsize, int ysize, HDC aHdc) { int dataWidth = ((xsize*3+3)/4)*4; - + this->MemoryDataHeader.bmiHeader.biSize = 40; this->MemoryDataHeader.bmiHeader.biWidth = xsize; this->MemoryDataHeader.bmiHeader.biHeight = ysize; @@ -1314,7 +1314,7 @@ this->MemoryDataHeader.bmiHeader.biSizeImage = dataWidth*ysize; this->MemoryDataHeader.bmiHeader.biXPelsPerMeter = 10000; this->MemoryDataHeader.bmiHeader.biYPelsPerMeter = 10000; - + HBITMAP dib = CreateDIBSection(aHdc, &this->MemoryDataHeader, DIB_RGB_COLORS, (void **)(&(this->MemoryData)), NULL, 0); @@ -1330,13 +1330,13 @@ GetObject(hbmp, sizeof(BITMAP), &bm); this->MemoryBuffer = hbmp; - + // Create a compatible device context this->MemoryHdc = (HDC)CreateCompatibleDC(aHdc); - + // Put the bitmap into the device context SelectObject(this->MemoryHdc, this->MemoryBuffer); - + // Renderers will need to redraw anything cached in display lists this->CleanUpRenderers(); @@ -1344,15 +1344,15 @@ this->Mapped =0; this->Size[0] = bm.bmWidth; this->Size[1] = bm.bmHeight; - + this->DeviceContext = this->MemoryHdc; this->DoubleBuffer = 0; - this->SetupPixelFormat(this->DeviceContext, - PFD_SUPPORT_OPENGL | PFD_SUPPORT_GDI | + this->SetupPixelFormat(this->DeviceContext, + PFD_SUPPORT_OPENGL | PFD_SUPPORT_GDI | PFD_DRAW_TO_BITMAP, this->GetDebug(), 24, 32); this->SetupPalette(this->DeviceContext); this->ContextId = wglCreateContext(this->DeviceContext); - if (this->ContextId == NULL) + if (this->ContextId == NULL) { vtkErrorMacro("wglCreateContext failed in CreateOffScreenDC(), error: " << GetLastError()); } @@ -1391,7 +1391,7 @@ this->ScreenContextId = this->ContextId; this->CreateOffScreenDC(hbmp, dc); - DeleteDC(dc); + DeleteDC(dc); } HDC vtkWin32OpenGLRenderWindow::GetMemoryDC() @@ -1411,15 +1411,15 @@ { return; } - + GdiFlush(); - + // we need to release resources this->CleanUpRenderers(); DeleteDC(this->MemoryHdc); this->MemoryHdc = (HDC)0; DeleteObject(this->MemoryBuffer); - if (wglDeleteContext(this->ContextId) != TRUE) + if (wglDeleteContext(this->ContextId) != TRUE) { vtkErrorMacro("wglDeleteContext failed in CleanUpOffScreenRendering(), error: " << GetLastError()); } @@ -1429,7 +1429,7 @@ void vtkWin32OpenGLRenderWindow::ResumeScreenRendering(void) { - // release OpenGL graphics resources before switch back to on-screen. + // release OpenGL graphics resources before switch back to on-screen. if(this->ContextId!=0) { this->MakeCurrent(); @@ -1467,10 +1467,10 @@ this->CursorHidden = 0; ::ShowCursor(!this->CursorHidden); -} +} //---------------------------------------------------------------------------- -void vtkWin32OpenGLRenderWindow::SetCursorPosition(int x, int y) +void vtkWin32OpenGLRenderWindow::SetCursorPosition(int x, int y) { int *size = this->GetSize(); @@ -1517,7 +1517,7 @@ cursorName = IDC_SIZEALL; break; case VTK_CURSOR_HAND: -#if(WINVER >= 0x0500) +#if(WINVER >= 0x0500) cursorName = IDC_HAND; #else cursorName = IDC_ARROW; @@ -1527,10 +1527,10 @@ cursorName = IDC_CROSS; break; } - + if (cursorName) { - HANDLE cursor = + HANDLE cursor = LoadImage(0,cursorName,IMAGE_CURSOR,0,0,LR_SHARED | LR_DEFAULTSIZE); SetCursor((HCURSOR)cursor); } Index: vtk-5.8.0/Rendering/vtkWin32RenderWindowInteractor.cxx =================================================================== --- vtk-5.8.0.orig/Rendering/vtkWin32RenderWindowInteractor.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Rendering/vtkWin32RenderWindowInteractor.cxx 2013-12-21 18:58:11.029936005 -0500 @@ -17,7 +17,10 @@ #include #include + +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0400 // for trackmouseevent support requires Win95 with IE 3.0 or greater. +#endif #include "vtkWin32OpenGLRenderWindow.h" @@ -31,7 +34,7 @@ # define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam)) #endif //GET_WHEEL_DELTA_WPARAM -// MSVC does the right thing without the forward declaration when it +// MSVC does the right thing without the forward declaration when it // sees it in the friend decl in vtkWin32RenderWindowInteractor, but // GCC needs to see the declaration beforehand. It has to do with the // CALLBACK attribute. @@ -60,42 +63,42 @@ //---------------------------------------------------------------------------- // Construct object so that light follows camera motion. -vtkWin32RenderWindowInteractor::vtkWin32RenderWindowInteractor() +vtkWin32RenderWindowInteractor::vtkWin32RenderWindowInteractor() { this->WindowId = 0; this->InstallMessageProc = 1; this->MouseInWindow = 0; this->StartedMessageLoop = 0; - + #ifdef VTK_USE_TDX this->Device=vtkTDxWinDevice::New(); #endif } //---------------------------------------------------------------------------- -vtkWin32RenderWindowInteractor::~vtkWin32RenderWindowInteractor() +vtkWin32RenderWindowInteractor::~vtkWin32RenderWindowInteractor() { vtkWin32OpenGLRenderWindow *tmp; // we need to release any hold we have on a windows event loop - if (this->WindowId && this->Enabled && this->InstallMessageProc) + if (this->WindowId && this->Enabled && this->InstallMessageProc) { vtkWin32OpenGLRenderWindow *ren; ren = static_cast(this->RenderWindow); tmp = (vtkWin32OpenGLRenderWindow *)(vtkGetWindowLong(this->WindowId,sizeof(vtkLONG))); // watch for odd conditions - if ((tmp != ren) && (ren != NULL)) + if ((tmp != ren) && (ren != NULL)) { // OK someone else has a hold on our event handler // so lets have them handle this stuff // well send a USER message to the other // event handler so that it can properly // call this event handler if required - CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(LONG)this->OldProc); + CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(intptr_t)this->OldProc); } - else + else { - vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)this->OldProc); + vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)this->OldProc); } this->Enabled = 0; } @@ -105,7 +108,7 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::Start() +void vtkWin32RenderWindowInteractor::Start() { // Let the compositing handle the event loop if it wants to. if (this->HasObserver(vtkCommand::StartEvent) && !this->HandleEventLoop) @@ -132,18 +135,18 @@ //---------------------------------------------------------------------------- // Begin processing keyboard strokes. -void vtkWin32RenderWindowInteractor::Initialize() +void vtkWin32RenderWindowInteractor::Initialize() { vtkWin32OpenGLRenderWindow *ren; int *size; // make sure we have a RenderWindow and camera - if ( ! this->RenderWindow) + if ( ! this->RenderWindow) { vtkErrorMacro(<<"No renderer defined!"); return; } - if (this->Initialized) + if (this->Initialized) { return; } @@ -160,35 +163,35 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::Enable() +void vtkWin32RenderWindowInteractor::Enable() { vtkWin32OpenGLRenderWindow *ren; vtkWin32OpenGLRenderWindow *tmp; - if (this->Enabled) + if (this->Enabled) { return; } - if (this->InstallMessageProc) + if (this->InstallMessageProc) { // add our callback ren = (vtkWin32OpenGLRenderWindow *)(this->RenderWindow); this->OldProc = (WNDPROC)vtkGetWindowLong(this->WindowId,vtkGWL_WNDPROC); tmp=(vtkWin32OpenGLRenderWindow *)vtkGetWindowLong(this->WindowId,sizeof(vtkLONG)); // watch for odd conditions - if (tmp != ren) + if (tmp != ren) { // OK someone else has a hold on our event handler // so lets have them handle this stuff // well send a USER message to the other // event handler so that it can properly // call this event handler if required - CallWindowProc(this->OldProc,this->WindowId,WM_USER+12,24,(LONG)vtkHandleMessage); + CallWindowProc(this->OldProc,this->WindowId,WM_USER+12,24,(intptr_t)vtkHandleMessage); } - else + else { - vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)vtkHandleMessage); + vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)vtkHandleMessage); } - + #ifdef VTK_USE_TDX if(this->UseTDx) { @@ -197,7 +200,7 @@ this->Device->StartListening(); } #endif - + // in case the size of the window has changed while we were away int *size; size = ren->GetSize(); @@ -210,33 +213,33 @@ //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::Disable() +void vtkWin32RenderWindowInteractor::Disable() { vtkWin32OpenGLRenderWindow *tmp; - if (!this->Enabled) + if (!this->Enabled) { return; } - - if (this->InstallMessageProc && this->Enabled && this->WindowId) + + if (this->InstallMessageProc && this->Enabled && this->WindowId) { // we need to release any hold we have on a windows event loop vtkWin32OpenGLRenderWindow *ren; ren = (vtkWin32OpenGLRenderWindow *)(this->RenderWindow); tmp = (vtkWin32OpenGLRenderWindow *)vtkGetWindowLong(this->WindowId,sizeof(vtkLONG)); // watch for odd conditions - if ((tmp != ren) && (ren != NULL)) + if ((tmp != ren) && (ren != NULL)) { // OK someone else has a hold on our event handler // so lets have them handle this stuff // well send a USER message to the other // event handler so that it can properly // call this event handler if required - CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(LONG)this->OldProc); + CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(intptr_t)this->OldProc); } - else + else { - vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)this->OldProc); + vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)this->OldProc); } #ifdef VTK_USE_TDX if(this->Device->GetInitialized()) @@ -270,7 +273,7 @@ } //---------------------------------------------------------------------------- -int vtkWin32RenderWindowInteractor::InternalDestroyTimer(int platformTimerId) +int vtkWin32RenderWindowInteractor::InternalDestroyTimer(int platformTimerId) { return KillTimer(this->WindowId,platformTimerId); } @@ -282,42 +285,42 @@ // this ascii code to keysym table is meant to mimic Tk static const char *AsciiToKeySymTable[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - "space", "exclam", "quotedbl", "numbersign", - "dollar", "percent", "ampersand", "quoteright", - "parenleft", "parenright", "asterisk", "plus", + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + "space", "exclam", "quotedbl", "numbersign", + "dollar", "percent", "ampersand", "quoteright", + "parenleft", "parenright", "asterisk", "plus", "comma", "minus", "period", "slash", - "0", "1", "2", "3", "4", "5", "6", "7", + "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "colon", "semicolon", "less", "equal", "greater", "question", - "at", "A", "B", "C", "D", "E", "F", "G", + "at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", - "X", "Y", "Z", "bracketleft", + "X", "Y", "Z", "bracketleft", "backslash", "bracketright", "asciicircum", "underscore", "quoteleft", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "braceleft", "bar", "braceright", "asciitilde", "Delete", - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - + // this virtual key code to keysym table is meant to mimic Tk static const char *VKeyCodeToKeySymTable[] = { 0, 0, 0, "Cancel", 0, 0, 0, 0, "BackSpace", "Tab", 0, 0, "Clear", "Return", 0, 0, - "Shift_L", "Control_L", "Alt_L", "Pause", "Caps_Lock", 0,0,0, + "Shift_L", "Control_L", "Alt_L", "Pause", "Caps_Lock", 0,0,0, 0, 0, 0, "Escape", 0, 0, 0, 0, "space", "Prior", "Next", "End", "Home", "Left", "Up", "Right", "Down", "Select", 0, "Execute", "Snapshot", "Insert", "Delete", "Help", - "0", "1", "2", "3", "4", "5", "6", "7", + "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", 0, 0, 0, 0, 0, 0, 0, "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", @@ -326,7 +329,7 @@ "KP_0", "KP_1", "KP_2", "KP_3", "KP_4", "KP_5", "KP_6", "KP_7", "KP_8", "KP_9", "asterisk", "plus", "bar", "minus", "period", "slash", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", - "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", + "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24", 0, 0, 0, 0, 0, 0, 0, 0, "Num_Lock", "Scroll_Lock", 0, 0, 0, 0, 0, 0, @@ -341,20 +344,20 @@ //------------------------------------------------------------- // Event loop handlers //------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnMouseMove(HWND hWnd, UINT nFlags, - int X, int Y) +void vtkWin32RenderWindowInteractor::OnMouseMove(HWND hWnd, UINT nFlags, + int X, int Y) { - if (!this->Enabled) + if (!this->Enabled) { return; } - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); - if (!this->MouseInWindow && + if (!this->MouseInWindow && (X >= 0 && X < this->Size[0] && Y >= 0 && Y < this->Size[1])) { this->InvokeEvent(vtkCommand::EnterEvent, NULL); @@ -366,15 +369,15 @@ tme.hwndTrack = hWnd; TrackMouseEvent(&tme); } - + this->InvokeEvent(vtkCommand::MouseMoveEvent, NULL); } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnNCMouseMove(HWND, UINT nFlags, - int X, int Y) +void vtkWin32RenderWindowInteractor::OnNCMouseMove(HWND, UINT nFlags, + int X, int Y) { - if (!this->Enabled) + if (!this->Enabled) { return; } @@ -382,9 +385,9 @@ int *pos = this->RenderWindow->GetPosition(); if (this->MouseInWindow) { - this->SetEventInformationFlipY(X - pos[0], + this->SetEventInformationFlipY(X - pos[0], Y - pos[1], - nFlags & MK_CONTROL, + nFlags & MK_CONTROL, nFlags & MK_SHIFT); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); this->InvokeEvent(vtkCommand::LeaveEvent, NULL); @@ -393,50 +396,50 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnMouseWheelForward(HWND,UINT nFlags, - int X, int Y) +void vtkWin32RenderWindowInteractor::OnMouseWheelForward(HWND,UINT nFlags, + int X, int Y) { - if (!this->Enabled) + if (!this->Enabled) { return; } - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); this->InvokeEvent(vtkCommand::MouseWheelForwardEvent,NULL); } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnMouseWheelBackward(HWND,UINT nFlags, - int X, int Y) +void vtkWin32RenderWindowInteractor::OnMouseWheelBackward(HWND,UINT nFlags, + int X, int Y) { - if (!this->Enabled) + if (!this->Enabled) { return; } - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); this->InvokeEvent(vtkCommand::MouseWheelBackwardEvent,NULL); } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnLButtonDown(HWND wnd,UINT nFlags, - int X, int Y, int repeat) +void vtkWin32RenderWindowInteractor::OnLButtonDown(HWND wnd,UINT nFlags, + int X, int Y, int repeat) { - if (!this->Enabled) + if (!this->Enabled) { return; } SetFocus(wnd); SetCapture(wnd); - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT, 0, repeat); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); @@ -444,16 +447,16 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnLButtonUp(HWND,UINT nFlags, - int X, int Y) +void vtkWin32RenderWindowInteractor::OnLButtonUp(HWND,UINT nFlags, + int X, int Y) { - if (!this->Enabled) + if (!this->Enabled) { return; } - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); this->InvokeEvent(vtkCommand::LeftButtonReleaseEvent,NULL); @@ -461,18 +464,18 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnMButtonDown(HWND wnd,UINT nFlags, - int X, int Y, int repeat) +void vtkWin32RenderWindowInteractor::OnMButtonDown(HWND wnd,UINT nFlags, + int X, int Y, int repeat) { - if (!this->Enabled) + if (!this->Enabled) { return; } SetFocus(wnd); SetCapture(wnd); - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT, 0, repeat); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); @@ -480,16 +483,16 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnMButtonUp(HWND,UINT nFlags, - int X, int Y) +void vtkWin32RenderWindowInteractor::OnMButtonUp(HWND,UINT nFlags, + int X, int Y) { - if (!this->Enabled) + if (!this->Enabled) { return; } - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); this->InvokeEvent(vtkCommand::MiddleButtonReleaseEvent,NULL); @@ -497,18 +500,18 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnRButtonDown(HWND wnd,UINT nFlags, - int X, int Y, int repeat) +void vtkWin32RenderWindowInteractor::OnRButtonDown(HWND wnd,UINT nFlags, + int X, int Y, int repeat) { - if (!this->Enabled) + if (!this->Enabled) { return; } SetFocus(wnd); SetCapture(wnd); - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT, 0, repeat); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); @@ -516,16 +519,16 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnRButtonUp(HWND,UINT nFlags, - int X, int Y) +void vtkWin32RenderWindowInteractor::OnRButtonUp(HWND,UINT nFlags, + int X, int Y) { - if (!this->Enabled) + if (!this->Enabled) { return; } - this->SetEventInformationFlipY(X, - Y, - nFlags & MK_CONTROL, + this->SetEventInformationFlipY(X, + Y, + nFlags & MK_CONTROL, nFlags & MK_SHIFT); this->SetAltKey(GetKeyState(VK_MENU) & (~1)); this->InvokeEvent(vtkCommand::RightButtonReleaseEvent,NULL); @@ -542,15 +545,15 @@ } //---------------------------------------------------------------------------- -void vtkWin32RenderWindowInteractor::OnTimer(HWND,UINT timerId) +void vtkWin32RenderWindowInteractor::OnTimer(HWND,UINT timerId) { - if (!this->Enabled) + if (!this->Enabled) { return; } int tid = static_cast(timerId); this->InvokeEvent(vtkCommand::TimerEvent,(void*)&tid); - + // Here we deal with one-shot versus repeating timers if ( this->IsOneShotTimer(tid) ) { @@ -578,7 +581,7 @@ nChar = 0; } #endif - } + } const char *keysym = AsciiToKeySymTable[(unsigned char)nChar]; if (keysym == 0) { @@ -588,10 +591,10 @@ { keysym = "None"; } - this->SetKeyEventInformation(ctrl, - shift, - nChar, - nRepCnt, + this->SetKeyEventInformation(ctrl, + shift, + nChar, + nRepCnt, keysym); this->SetAltKey(alt); this->InvokeEvent(vtkCommand::KeyPressEvent, NULL); @@ -627,10 +630,10 @@ { keysym = "None"; } - this->SetKeyEventInformation(ctrl, - shift, - nChar, - nRepCnt, + this->SetKeyEventInformation(ctrl, + shift, + nChar, + nRepCnt, keysym); this->SetAltKey(alt); this->InvokeEvent(vtkCommand::KeyReleaseEvent, NULL); @@ -645,11 +648,11 @@ return; } int ctrl = GetKeyState(VK_CONTROL) & (~1); - int shift = GetKeyState(VK_SHIFT) & (~1); + int shift = GetKeyState(VK_SHIFT) & (~1); int alt = GetKeyState(VK_MENU) & (~1); - this->SetKeyEventInformation(ctrl, - shift, - nChar, + this->SetKeyEventInformation(ctrl, + shift, + nChar, nRepCnt); this->SetAltKey(alt); this->InvokeEvent(vtkCommand::CharEvent, NULL); @@ -658,11 +661,11 @@ //---------------------------------------------------------------------------- void vtkWin32RenderWindowInteractor::OnFocus(HWND,UINT) { - if (!this->Enabled) + if (!this->Enabled) { return; } - + #ifdef VTK_USE_TDX if(this->Device->GetInitialized() && !this->Device->GetIsListening()) { @@ -674,7 +677,7 @@ //---------------------------------------------------------------------------- void vtkWin32RenderWindowInteractor::OnKillFocus(HWND,UINT) { - if (!this->Enabled) + if (!this->Enabled) { return; } @@ -688,8 +691,8 @@ //---------------------------------------------------------------------------- // This is only called when InstallMessageProc is true -LRESULT CALLBACK vtkHandleMessage(HWND hWnd,UINT uMsg, WPARAM wParam, - LPARAM lParam) +LRESULT CALLBACK vtkHandleMessage(HWND hWnd,UINT uMsg, WPARAM wParam, + LPARAM lParam) { LRESULT res = 0; vtkWin32OpenGLRenderWindow *ren; @@ -713,33 +716,33 @@ } #ifndef MAKEPOINTS -#define MAKEPOINTS(l) (*((POINTS FAR *) & (l))) +#define MAKEPOINTS(l) (*((POINTS FAR *) & (l))) #endif //---------------------------------------------------------------------------- -LRESULT CALLBACK vtkHandleMessage2(HWND hWnd,UINT uMsg, WPARAM wParam, - LPARAM lParam, - vtkWin32RenderWindowInteractor *me) +LRESULT CALLBACK vtkHandleMessage2(HWND hWnd,UINT uMsg, WPARAM wParam, + LPARAM lParam, + vtkWin32RenderWindowInteractor *me) { - if ((uMsg == WM_USER+13)&&(wParam == 26)) + if ((uMsg == WM_USER+13)&&(wParam == 26)) { // someone is telling us to set our OldProc me->OldProc = (WNDPROC)lParam; return 1; } - - switch (uMsg) + + switch (uMsg) { case WM_PAINT: me->Render(); return CallWindowProc(me->OldProc,hWnd,uMsg,wParam,lParam); break; - + case WM_SIZE: me->OnSize(hWnd,wParam,LOWORD(lParam),HIWORD(lParam)); return CallWindowProc(me->OldProc,hWnd,uMsg,wParam,lParam); break; - + case WM_LBUTTONDBLCLK: me->OnLButtonDown(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y, 1); break; @@ -747,7 +750,7 @@ case WM_LBUTTONDOWN: me->OnLButtonDown(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y, 0); break; - + case WM_LBUTTONUP: me->OnLButtonUp(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y); break; @@ -759,11 +762,11 @@ case WM_MBUTTONDOWN: me->OnMButtonDown(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y, 0); break; - + case WM_MBUTTONUP: me->OnMButtonUp(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y); break; - + case WM_RBUTTONDBLCLK: me->OnRButtonDown(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y, 1); break; @@ -771,7 +774,7 @@ case WM_RBUTTONDOWN: me->OnRButtonDown(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y, 0); break; - + case WM_RBUTTONUP: me->OnRButtonUp(hWnd,wParam,MAKEPOINTS(lParam).x,MAKEPOINTS(lParam).y); break; @@ -811,7 +814,7 @@ case WM_CHAR: me->OnChar(hWnd,wParam,LOWORD(lParam),HIWORD(lParam)); break; - + case WM_KEYDOWN: case WM_SYSKEYDOWN: me->OnKeyDown(hWnd,wParam,LOWORD(lParam),HIWORD(lParam)); @@ -823,7 +826,7 @@ break; case WM_TIMER: - me->OnTimer(hWnd,wParam); + me->OnTimer(hWnd,wParam); break; case WM_ACTIVATE: @@ -836,25 +839,25 @@ me->OnFocus(hWnd,wParam); } break; - + case WM_SETFOCUS: // occurs when SetFocus() is called on the current window me->OnFocus(hWnd,wParam); break; - + case WM_KILLFOCUS: // occurs when the focus was on the current window and SetFocus() is - // called on another window. + // called on another window. me->OnKillFocus(hWnd,wParam); break; - + default: - if (me) + if (me) { return CallWindowProc(me->OldProc,hWnd,uMsg,wParam,lParam); } }; - + return 0; } Index: vtk-5.8.0/Rendering/vtkFreeTypeUtilities.cxx =================================================================== --- vtk-5.8.0.orig/Rendering/vtkFreeTypeUtilities.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Rendering/vtkFreeTypeUtilities.cxx 2013-12-21 18:58:11.029936005 -0500 @@ -32,6 +32,7 @@ #include "fonts/vtkEmbeddedFonts.h" #include +#include // Print debug info @@ -337,7 +338,7 @@ // Map the ID to a text property vtkTextProperty *tprop = vtkTextProperty::New(); - self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); + self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); // Fonts, organized by [Family][Bold][Italic] Index: vtk-5.8.0/Rendering/vtkFreeTypeTools.cxx =================================================================== --- vtk-5.8.0.orig/Rendering/vtkFreeTypeTools.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Rendering/vtkFreeTypeTools.cxx 2013-12-21 18:58:11.029936005 -0500 @@ -31,6 +31,8 @@ // The embedded fonts #include "fonts/vtkEmbeddedFonts.h" +#include + // Print debug info #define VTK_FTFC_DEBUG 0 #define VTK_FTFC_DEBUG_CD 0 @@ -222,7 +224,7 @@ // Map the ID to a text property vtkSmartPointer tprop = vtkSmartPointer::New(); - self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); + self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); // Fonts, organized by [Family][Bold][Italic] static EmbeddedFontStruct EmbeddedFonts[3][2][2] = Index: vtk-5.8.0/Utilities/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -18,7 +18,7 @@ VTK_THIRD_PARTY_SUBDIR(DICOMParser DICOMParser) VTK_THIRD_PARTY_SUBDIR(MATERIALLIBRARY MaterialLibrary) VTK_THIRD_PARTY_SUBDIR(LIBPROJ4 vtklibproj4) -VTK_THIRD_PARTY_SUBDIR(MRMPI mrmpi) +#VTK_THIRD_PARTY_SUBDIR(MRMPI mrmpi) IF(VTK_USE_OGGTHEORA_ENCODER) VTK_THIRD_PARTY_SUBDIR(OGGTHEORA vtkoggtheora) ENDIF(VTK_USE_OGGTHEORA_ENCODER) @@ -37,12 +37,12 @@ SET( verdict_INSTALL_LIB_DIR ${VTK_INSTALL_LIB_DIR_CM24}) ADD_SUBDIRECTORY(verdict) -ADD_SUBDIRECTORY(vtknetcdf) +#ADD_SUBDIRECTORY(vtknetcdf) IF(VTK_USE_METAIO) ADD_SUBDIRECTORY(vtkmetaio) SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio) ENDIF(VTK_USE_METAIO) -ADD_SUBDIRECTORY(vtksqlite) +#ADD_SUBDIRECTORY(vtksqlite) IF(VTK_HAS_EXODUS) ADD_SUBDIRECTORY(vtkexodus2) Index: vtk-5.8.0/Utilities/vtk_netcdf.h =================================================================== --- vtk-5.8.0.orig/Utilities/vtk_netcdf.h 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/vtk_netcdf.h 2013-12-21 18:58:11.029936005 -0500 @@ -16,6 +16,9 @@ #define __vtk_netcdf_h /* Use the netcdf library configured for VTK. */ -#include +//#include + +/* Use Debian's netcdf */ +#include #endif Index: vtk-5.8.0/Utilities/vtk_netcdfcpp.h =================================================================== --- vtk-5.8.0.orig/Utilities/vtk_netcdfcpp.h 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/vtk_netcdfcpp.h 2013-12-21 18:58:11.029936005 -0500 @@ -16,6 +16,9 @@ #define __vtk_netcdfcpp_h /* Use the netcdf library configured for VTK. */ -#include +//#include + +#include + #endif Index: vtk-5.8.0/Utilities/Cosmo/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/Cosmo/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/Cosmo/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -5,7 +5,7 @@ SET(Cosmo_LIBS) IF(VTK_USE_MPI) - INCLUDE_DIRECTORIES("${MPI_INCLUDE_PATH}") + INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) IF(MPI_EXTRA_LIBRARY) SET(Cosmo_LIBS ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY}) ELSE(MPI_EXTRA_LIBRARY) @@ -43,6 +43,13 @@ SET_TARGET_PROPERTIES(Cosmo PROPERTIES ${VTK_LIBRARY_PROPERTIES}) ENDIF(VTK_LIBRARY_PROPERTIES) +# Apply user-defined properties to the library targets. +IF(VTK_LIBRARY_PROPERTIES) + SET_TARGET_PROPERTIES(Cosmo PROPERTIES + ${VTK_LIBRARY_PROPERTIES} + ) +ENDIF(VTK_LIBRARY_PROPERTIES) + IF(NOT VTK_INSTALL_NO_LIBRARIES) INSTALL(TARGETS Cosmo EXPORT ${VTK_INSTALL_EXPORT_NAME} Index: vtk-5.8.0/Utilities/DICOMParser/DICOMParser.cxx =================================================================== --- vtk-5.8.0.orig/Utilities/DICOMParser/DICOMParser.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/DICOMParser/DICOMParser.cxx 2013-12-21 18:58:11.029936005 -0500 @@ -41,6 +41,7 @@ #include #include +#include // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr // #define DEBUG_DICOM Index: vtk-5.8.0/Utilities/Doxygen/doxyfile.in =================================================================== --- vtk-5.8.0.orig/Utilities/Doxygen/doxyfile.in 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/Doxygen/doxyfile.in 2013-12-21 18:58:11.029936005 -0500 @@ -22,6 +22,7 @@ HAVE_DOT = @HAVE_DOT_YESNO@ DOT_PATH = "@DOT_PATH@" +DOT_IMAGE_FORMAT = svg CLASS_GRAPH = YES COLLABORATION_GRAPH = YES TEMPLATE_RELATIONS = YES Index: vtk-5.8.0/Utilities/LastConfigureStep/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/LastConfigureStep/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/LastConfigureStep/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -11,7 +11,7 @@ #----------------------------------------------------------------------------- GET_PROPERTY(VTK_TARGETS GLOBAL PROPERTY VTK_TARGETS) EXPORT(TARGETS ${VTK_TARGETS} FILE ${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake) -INSTALL(EXPORT ${VTK_INSTALL_EXPORT_NAME} DESTINATION ${VTK_INSTALL_LIB_DIR_CM24}) +INSTALL(EXPORT ${VTK_INSTALL_EXPORT_NAME} DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24}) GET_PROPERTY(VTK_LIBRARIES GLOBAL PROPERTY VTK_LIBRARIES) #----------------------------------------------------------------------------- # Create the VTKConfig.cmake file containing the VTK configuration. Index: vtk-5.8.0/Utilities/VPIC/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/VPIC/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/VPIC/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -17,7 +17,7 @@ ) IF(VTK_USE_MPI) - INCLUDE_DIRECTORIES("${MPI_INCLUDE_PATH}") + INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) ADD_DEFINITIONS("-DUSE_PARALLEL_VPIC -DMPICH_IGNORE_CXX_SEEK") ENDIF(VTK_USE_MPI) @@ -25,6 +25,14 @@ VTK_ADD_LIBRARY(VPIC ${VPIC_SOURCES}) TARGET_LINK_LIBRARIES(VPIC vtksys ) + +# Apply user-defined properties to the library targets. +IF(VTK_LIBRARY_PROPERTIES) + SET_TARGET_PROPERTIES(VPIC PROPERTIES + ${VTK_LIBRARY_PROPERTIES} + ) +ENDIF(VTK_LIBRARY_PROPERTIES) + IF(VTK_USE_MPI) TARGET_LINK_LIBRARIES(VPIC ${MPI_LIBRARY}) IF(MPI_EXTRA_LIBRARY) Index: vtk-5.8.0/Utilities/ftgl/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/ftgl/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/ftgl/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -1,5 +1,7 @@ PROJECT (VTKFTGL) +INCLUDE(TestCXXAcceptsFlag) + # # Dependency mask # @@ -165,6 +167,39 @@ ENDIF(NOT VTK_INSTALL_NO_LIBRARIES) # +# To avoid name clashes (and the resulting crashes) between our FTGL and the +# system FTGL, we configure the linker to add a prefix to all symbols. +# + +if (CMAKE_COMPILER_IS_GNUCXX) + + GET_TARGET_PROPERTY(VTKFTGL_LINK_FLAGS vtkftgl LINK_FLAGS) + IF(VTKFTGL_LINK_FLAGS) + SET(VTKFTGL_LINK_FLAGS "${VTKFTGL_LINK_FLAGS} ") + ELSE(VTKFTGL_LINK_FLAGS) + SET(VTKFTGL_LINK_FLAGS) + ENDIF(VTKFTGL_LINK_FLAGS) + + + set(_version_script_content "libvtkftgl { *; };") + set(_version_script "${CMAKE_CURRENT_BINARY_DIR}/version.script") + file(WRITE ${_version_script} "${_version_script_content}\n") + + # Check if the linker supports version script (i.e. is GNU ld) + check_cxx_accepts_flag("-Wl,--version-script,${_version_script}" + LD_ACCEPTS_VERSION_SCRIPT) + if (LD_ACCEPTS_VERSION_SCRIPT) + set(_link_flags "-Wl,--version-script,'${_version_script}'") + endif (LD_ACCEPTS_VERSION_SCRIPT) + + if (_link_flags) + SET_TARGET_PROPERTIES(vtkftgl PROPERTIES + LINK_FLAGS "${VTKFTGL_LINK_FLAGS}${_link_flags}") + endif (_link_flags) +endif (CMAKE_COMPILER_IS_GNUCXX) + + +# # Do not cover this lib # CONFIGURE_FILE (${VTKFTGL_SOURCE_DIR}/.NoDartCoverage Index: vtk-5.8.0/Utilities/mrmpi/src/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/mrmpi/src/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/mrmpi/src/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -7,6 +7,9 @@ memory.cpp error.cpp) + INCLUDE_DIRECTORIES( + ${MPI_INCLUDE_PATH} + ) VTK_ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES}) TARGET_LINK_LIBRARIES (MapReduceMPI ${mrmpi_LIBS}) IF(VTK_LIBRARY_PROPERTIES) Index: vtk-5.8.0/Utilities/vtkexodus2/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/vtkexodus2/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/vtkexodus2/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -213,7 +213,7 @@ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) -TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) +TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) # Apply user-defined properties to the library target. IF(VTK_LIBRARY_PROPERTIES) Index: vtk-5.8.0/Utilities/vtkexodus2/test/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Utilities/vtkexodus2/test/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/vtkexodus2/test/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -21,7 +21,7 @@ ) ADD_EXECUTABLE( ExoIICTests ${ExoIICTests} ) -TARGET_LINK_LIBRARIES( ExoIICTests vtkCommon vtkexoIIc vtkNetCDF ) +TARGET_LINK_LIBRARIES( ExoIICTests vtkCommon vtkexoIIc netcdf ) SET( TestsToRun ${ExoIICTests} ) REMOVE( TestsToRun ExoIICTests.cxx ) Index: vtk-5.8.0/Utilities/vtkhdf5/ConfigureChecks.cmake =================================================================== --- vtk-5.8.0.orig/Utilities/vtkhdf5/ConfigureChecks.cmake 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Utilities/vtkhdf5/ConfigureChecks.cmake 2013-12-21 18:58:11.029936005 -0500 @@ -75,14 +75,14 @@ ENDIF (HDF5_WANT_DCONV_EXCEPTION) SET (LINUX_LFS 0) -IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") +IF (CMAKE_SYSTEM MATCHES "Linux") # Linux Specific flags ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) IF (HDF5_ENABLE_LARGE_FILE) SET (LARGEFILE 1) ENDIF (HDF5_ENABLE_LARGE_FILE) -ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") +ENDIF (CMAKE_SYSTEM MATCHES "Linux") SET (HDF5_EXTRA_FLAGS) IF (LINUX_LFS) SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) Index: vtk-5.8.0/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx =================================================================== --- vtk-5.8.0.orig/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx 2013-12-21 18:58:11.029936005 -0500 @@ -2076,7 +2076,7 @@ } if(!this->LoadExtensionsSucceeded) { - vtkDebugMacro( + vtkErrorMacro( "The following OpenGL extensions are required but not supported: " << (this->UnsupportedRequiredExtensions->Stream.str()).c_str()); return 0; @@ -2169,6 +2169,8 @@ // "framebuffer has bad draw buffer" // "render clipped 1 ERROR (x506) invalid framebuffer operation ext" this->LoadExtensionsSucceeded=0; + this->UnsupportedRequiredExtensions->Stream<< + " Intel cards and Mesa implementations are not supported"; return; } Index: vtk-5.8.0/Wrapping/Java/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Wrapping/Java/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Wrapping/Java/CMakeLists.txt 2013-12-21 18:58:11.029936005 -0500 @@ -130,7 +130,7 @@ DEPENDS ${VTK_BUILD_ALL_DEPENDS} SOURCE ${VTK_BINARY_DIR}/java/vtk/vtkBuildAllDriver.java COMMAND ${JAVA_COMPILE} - ARGS -classpath ${VTK_JAVA_HOME}/.. -d ${VTK_JAVA_HOME}/.. + ARGS -source 1.6 -classpath ${VTK_JAVA_HOME}/.. -d ${VTK_JAVA_HOME}/.. ${VTK_BINARY_DIR}/java/vtk/vtkBuildAllDriver.java ) @@ -216,7 +216,7 @@ OUTPUTS ${class} DEPENDS ${VTK_JAVA_HOME}/vtkPanel.java COMMAND ${JAVA_COMPILE} - ARGS -classpath ${VTK_JAVA_HOME}/.. -d ${VTK_JAVA_HOME}/.. ${dst} + ARGS -source 1.6 -classpath ${VTK_JAVA_HOME}/.. -d ${VTK_JAVA_HOME}/.. ${dst} ) SET(CLASS_FILES ${CLASS_FILES} ${class}) @@ -235,7 +235,7 @@ OUTPUTS ${class} DEPENDS ${VTK_JAVA_HOME}/vtkPanel.class COMMAND ${JAVA_COMPILE} - ARGS -classpath ${VTK_JAVA_HOME}/.. -d ${VTK_JAVA_HOME}/.. ${dst} + ARGS -source 1.6 -classpath ${VTK_JAVA_HOME}/.. -d ${VTK_JAVA_HOME}/.. ${dst} ) SET(CLASS_FILES ${CLASS_FILES} ${class}) @@ -272,7 +272,7 @@ ADD_CUSTOM_COMMAND( SOURCE ${VTK_SOURCE_DIR}/Wrapping/Java/vtk/test/${jfile}.java COMMAND ${JAVA_COMPILE} - ARGS -classpath ${VTK_JAR_PATH}/vtk.jar${SEPARATOR}${VTK_BINARY_DIR}/Wrapping/Java + ARGS -source 1.6 -classpath ${VTK_JAR_PATH}/vtk.jar${SEPARATOR}${VTK_BINARY_DIR}/Wrapping/Java -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java -d ${VTK_BINARY_DIR}/Wrapping/Java ${VTK_SOURCE_DIR}/Wrapping/Java/vtk/test/${jfile}.java @@ -362,7 +362,7 @@ ADD_CUSTOM_COMMAND( SOURCE ${VTK_SOURCE_DIR}/Wrapping/Java/vtk/test/${jfile}.java COMMAND ${JAVA_COMPILE} - ARGS -classpath ${VTK_JAR_PATH}/vtk.jar${SEPARATOR}${VTK_BINARY_DIR}/Wrapping/Java + ARGS -source 1.6 -classpath ${VTK_JAR_PATH}/vtk.jar${SEPARATOR}${VTK_BINARY_DIR}/Wrapping/Java -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java -d ${VTK_BINARY_DIR}/Wrapping/Java ${VTK_SOURCE_DIR}/Wrapping/Java/vtk/test/${jfile}.java Index: vtk-5.8.0/Wrapping/Java/vtk/vtkJavaMemoryManager.java =================================================================== --- vtk-5.8.0.orig/Wrapping/Java/vtk/vtkJavaMemoryManager.java 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Wrapping/Java/vtk/vtkJavaMemoryManager.java 2013-12-21 18:58:11.029936005 -0500 @@ -18,14 +18,12 @@ * Create or return an existing instance of the vtkObject that corresponds * to the pointer id vtkId. * - * @param - * Type of the object that we want to return. * @param vtkId * is used to uniquely identify a vtkObject inside the C++ layer. * * @return a java object that map its underlying C++ instance. */ - T getJavaObject(Long vtkId); + vtkObjectBase getJavaObject(Long vtkId); /** * Store the Java instance of a vtkObject inside a weak pointer map. Index: vtk-5.8.0/Wrapping/Java/vtk/vtkJavaMemoryManagerImpl.java =================================================================== --- vtk-5.8.0.orig/Wrapping/Java/vtk/vtkJavaMemoryManagerImpl.java 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Wrapping/Java/vtk/vtkJavaMemoryManagerImpl.java 2013-12-21 18:58:11.033937183 -0500 @@ -29,9 +29,8 @@ } @SuppressWarnings("unchecked") - @Override // Thread safe - public T getJavaObject(Long vtkId) { + public vtkObjectBase getJavaObject(Long vtkId) { // Check pre-condition if (vtkId == null || vtkId.longValue() == 0) { throw new RuntimeException("Invalid ID, can not be null or equal to 0."); @@ -53,7 +52,7 @@ value = objectMap.get(vtkId); resultObject = (value == null) ? null : value.get(); if (resultObject != null) { - return (T) resultObject; + return resultObject; } // We need to do the work of the gc @@ -65,9 +64,9 @@ if (resultObject == null) { try { String className = vtkObjectBase.VTKGetClassNameFromReference(vtkId.longValue()); - Class c = (Class) Class.forName("vtk." + className); - Constructor cons = c.getConstructor(new Class[] { long.class }); - resultObject = cons.newInstance(new Object[] { vtkId }); + Class c = Class.forName("vtk." + className); + Constructor cons = c.getConstructor(new Class[] { long.class }); + resultObject = (vtkObjectBase) cons.newInstance(new Object[] { vtkId }); } catch (Exception e) { e.printStackTrace(); } @@ -76,10 +75,9 @@ this.lock.unlock(); } } - return (T) resultObject; + return resultObject; } - @Override // Thread safe public void registerJavaObject(Long id, vtkObjectBase obj) { try { @@ -91,7 +89,6 @@ } } - @Override // Thread safe public void unRegisterJavaObject(Long id) { try { @@ -110,7 +107,6 @@ } } - @Override // Thread safe public vtkReferenceInformation gc(boolean debug) { System.gc(); @@ -134,12 +130,10 @@ } } - @Override public vtkJavaGarbageCollector getAutoGarbageCollector() { return this.garbageCollector; } - @Override // Thread safe public int deleteAll() { int size = this.objectMap.size(); @@ -154,12 +148,10 @@ return size; } - @Override public int getSize() { return objectMap.size(); } - @Override public vtkReferenceInformation getLastReferenceInformation() { return this.lastGcResult; } Index: vtk-5.8.0/Wrapping/Python/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Wrapping/Python/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Wrapping/Python/CMakeLists.txt 2013-12-21 18:58:11.033937183 -0500 @@ -295,7 +295,7 @@ SET(PVTKPYTHON_EXECUTABLE) # Create the pvtkpython Python wrapper executable with MPI support. IF (VTK_USE_PARALLEL AND VTK_USE_MPI) - INCLUDE_DIRECTORIES("${MPI_INCLUDE_PATH}") + INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) IF (MPI_LIBRARY) SET(MPI_LIBRARIES ${MPI_LIBRARY}) ENDIF (MPI_LIBRARY) Index: vtk-5.8.0/Wrapping/Tcl/CMakeLists.txt =================================================================== --- vtk-5.8.0.orig/Wrapping/Tcl/CMakeLists.txt 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Wrapping/Tcl/CMakeLists.txt 2013-12-21 18:58:11.033937183 -0500 @@ -74,7 +74,7 @@ IF (VTK_USE_RENDERING) TARGET_LINK_LIBRARIES(vtk vtkRenderingTCL) - TARGET_LINK_LIBRARIES(vtk vtkVolumeRenderingTCL) + TARGET_LINK_LIBRARIES(vtk vtkVolumeRenderingTCL vtkVolumeRendering) TARGET_LINK_LIBRARIES(vtk vtkHybridTCL) TARGET_LINK_LIBRARIES(vtk vtkWidgetsTCL) ENDIF (VTK_USE_RENDERING) @@ -84,7 +84,7 @@ ENDIF (VTK_USE_PARALLEL) IF (VTK_USE_GEOVIS) - TARGET_LINK_LIBRARIES(vtk vtkGeovisTCL) + TARGET_LINK_LIBRARIES(vtk vtkGeovisTCL vtkGeovis) ENDIF (VTK_USE_GEOVIS) IF (VTK_USE_INFOVIS) @@ -135,7 +135,7 @@ # Create the pvtk Tcl wrapper executable with MPI support. IF (VTK_USE_PARALLEL) IF (VTK_USE_MPI) - INCLUDE_DIRECTORIES("${MPI_INCLUDE_PATH}") + INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) IF (MPI_LIBRARY) SET(MPI_LIBRARIES ${MPI_LIBRARY}) ENDIF (MPI_LIBRARY) @@ -164,16 +164,22 @@ vtkIOTCL vtkParallelTCL ${MPI_LIBRARIES} + ${VTK_TCL_LIBRARIES} ) + IF (VTK_USE_TK) + TARGET_LINK_LIBRARIES(pvtk ${VTK_TK_LIBRARIES}) + ENDIF (VTK_USE_TK) + IF (VTK_USE_RENDERING) TARGET_LINK_LIBRARIES(pvtk vtkHybridTCL) TARGET_LINK_LIBRARIES(pvtk vtkWidgetsTCL) - TARGET_LINK_LIBRARIES(pvtk vtkVolumeRenderingTCL) + TARGET_LINK_LIBRARIES(pvtk vtkRenderingTCL) + TARGET_LINK_LIBRARIES(pvtk vtkVolumeRenderingTCL vtkVolumeRendering) ENDIF (VTK_USE_RENDERING) IF (VTK_USE_GEOVIS) - TARGET_LINK_LIBRARIES(pvtk vtkGeovisTCL) + TARGET_LINK_LIBRARIES(pvtk vtkGeovisTCL vtkGeovis) ENDIF (VTK_USE_GEOVIS) IF (VTK_USE_INFOVIS) Index: vtk-5.8.0/Wrapping/Tcl/pkgIndex.tcl.in =================================================================== --- vtk-5.8.0.orig/Wrapping/Tcl/pkgIndex.tcl.in 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Wrapping/Tcl/pkgIndex.tcl.in 2013-12-21 18:58:11.033937183 -0500 @@ -5,6 +5,7 @@ proc load_library_package {libName libPath {libPrefix {@VTK_TCL_LIBNAME_PREFIX@}}} { set libExt [info sharedlibextension] set currentDirectory [pwd] + set libPath /usr/@VTK_INSTALL_LIB_DIR@/ set libFile [file join $libPath "$libPrefix$libName$libExt"] if {[catch "cd {$libPath}; load {$libFile}" errorMessage]} { puts $errorMessage Index: vtk-5.8.0/Wrapping/Tcl/vtkTkAppInit.cxx =================================================================== --- vtk-5.8.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/Wrapping/Tcl/vtkTkAppInit.cxx 2013-12-21 18:58:11.033937183 -0500 @@ -228,6 +228,8 @@ // Help Tcl find the Tcl/Tk helper files. const char* relative_dirs[] = { + "../share/tcltk", + "../../share/tcltk", "TclTk/lib", ".." VTK_INSTALL_TCL_DIR, 0 Index: vtk-5.8.0/CMake/FindFREETYPE.cmake =================================================================== --- vtk-5.8.0.orig/CMake/FindFREETYPE.cmake 2013-12-21 18:47:07.000000000 -0500 +++ vtk-5.8.0/CMake/FindFREETYPE.cmake 2013-12-21 19:04:39.335764295 -0500 @@ -10,9 +10,11 @@ # also defined, but not for general use are # FREETYPE_LIBRARY, where to find the FREETYPE library. -FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h) +FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h + /usr/include/freetype2 +) -FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h +FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h /usr/include/freetype2 /usr/local/include/freetype2 ) debian/patches/libav9.patch0000664000000000000000000001175112250600354013030 0ustar Description: Fix compilation with libav 9 Origin: upstream, http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=bc976d74591a6f2c8a1e62f1c54691c281d21e00, http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=52a07b454b93c14b7b0f51e9e71ae7b2b2d525fe, http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=1967fef7709dccb5adaa6ac7f780a2e95f327c78, http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=d48033e127b208228b46f820d454c5eca1c719e1 Bug-Debian: http://bugs.debian.org/693639 Last-Update: 2013-08-23 --- a/IO/vtkFFMPEGWriter.cxx +++ b/IO/vtkFFMPEGWriter.cxx @@ -60,8 +60,10 @@ AVStream *avStream; +#if LIBAVFORMAT_VERSION_MAJOR < 54 unsigned char *codecBuf; int codecBufSize; +#endif AVFrame *rgbInput; AVFrame *yuvOutput; @@ -83,7 +85,9 @@ this->avStream = NULL; +#if LIBAVFORMAT_VERSION_MAJOR < 54 this->codecBuf = NULL; +#endif this->rgbInput = NULL; this->yuvOutput = NULL; @@ -111,7 +115,7 @@ av_register_all(); //create the format context that wraps all of the media output structures -#ifdef VTK_FFMPEG_NEW_ALLOC +#if LIBAVFORMAT_VERSION_MAJOR >= 52 this->avFormatContext = avformat_alloc_context(); #else this->avFormatContext = av_alloc_format_context(); @@ -140,7 +144,11 @@ strcpy(this->avFormatContext->filename, this->Writer->GetFileName()); //create a stream for that file +#if LIBAVFORMAT_VERSION_MAJOR < 54 this->avStream = av_new_stream(this->avFormatContext, 0); +#else + this->avStream = avformat_new_stream(this->avFormatContext, 0); +#endif if (!this->avStream) { vtkGenericWarningMacro (<< "Could not create video stream."); @@ -191,13 +199,14 @@ { c->bit_rate_tolerance = this->Writer->GetBitRateTolerance(); } - +#if LIBAVFORMAT_VERSION_MAJOR < 54 //apply the chosen parameters if (av_set_parameters(this->avFormatContext, NULL) < 0) { vtkGenericWarningMacro (<< "Invalid output format parameters." ); return 0; } +#endif //manufacture a codec with the chosen parameters AVCodec *codec = avcodec_find_encoder(c->codec_id); @@ -206,7 +215,11 @@ vtkGenericWarningMacro (<< "Codec not found." ); return 0; } +#if LIBAVFORMAT_VERSION_MAJOR < 54 if (avcodec_open(c, codec) < 0) +#else + if (avcodec_open2(c, codec, NULL) < 0) +#endif { vtkGenericWarningMacro (<< "Could not open codec."); return 0; @@ -214,6 +227,7 @@ //create buffers for the codec to work with. +#if LIBAVFORMAT_VERSION_MAJOR < 54 //working compression space this->codecBufSize = 2*c->width*c->height*4; //hopefully this is enough this->codecBuf = new unsigned char[this->codecBufSize]; @@ -222,6 +236,7 @@ vtkGenericWarningMacro (<< "Could not make codec working space." ); return 0; } +#endif //for the output of the writer's input... this->rgbInput = avcodec_alloc_frame(); @@ -259,14 +274,22 @@ //Finally, open the file and start it off. - if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0) +#if LIBAVFORMAT_VERSION_MAJOR < 54 + if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0) +#else + if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0) +#endif { vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." ); return 0; } this->openedFile = 1; +#if LIBAVFORMAT_VERSION_MAJOR < 54 av_write_header(this->avFormatContext); +#else + avformat_write_header(this->avFormatContext, NULL); +#endif return 1; } @@ -321,8 +344,13 @@ } #endif +#if LIBAVFORMAT_VERSION_MAJOR >= 54 + AVPacket pkt = { 0 }; + int got_frame; +#endif //run the encoder +#if LIBAVFORMAT_VERSION_MAJOR < 54 int toAdd = avcodec_encode_video(cc, this->codecBuf, this->codecBufSize, @@ -357,6 +385,26 @@ return 0; } +#else + int ret = avcodec_encode_video2(cc, + &pkt, + this->yuvOutput, + &got_frame); + + //dump the compressed result to file + if (got_frame) + { + pkt.stream_index = this->avStream->index; + ret = av_write_frame(this->avFormatContext, &pkt); + } + + if (ret<0) + { + vtkGenericWarningMacro (<< "Problem encoding frame." ); + return 0; + } +#endif + return 1; } @@ -377,21 +425,25 @@ this->rgbInput = NULL; } +#if LIBAVFORMAT_VERSION_MAJOR < 54 if (this->codecBuf) { av_free(this->codecBuf); this->codecBuf = NULL; } +#endif if (this->avFormatContext) { if (this->openedFile) { av_write_trailer(this->avFormatContext); -#ifdef VTK_FFMPEG_OLD_URL_FCLOSE +#if VTK_FFMPEG_OLD_URL_FCLOSE url_fclose(&this->avFormatContext->pb); -#else +#elif LIBAVFORMAT_VERSION_MAJOR < 54 url_fclose(this->avFormatContext->pb); +#else + avio_close(this->avFormatContext->pb); #endif this->openedFile = 0; } debian/libvtk5.8-qt4.dirs0000664000000000000000000000001012250600354012273 0ustar usr/lib debian/libvtk5-dev.manpages0000664000000000000000000000006312250600354013035 0ustar debian/vtkEncodeString.1 debian/vtkWrapHierarchy.1 debian/copyright0000664000000000000000000000464012250600354011124 0ustar This package was debianized by A. Maitland Bottoms on Wed, 15 Mar 2000 10:52:54 -0500. This package was also debianized by Prabhu Ramachandran on Mon, 24 Apr 2000 02:16:12 +0530. The Debian packaging is distributed under the same conditions as the upstream. See the README.debian file for details on the modification of source done for the Debian distribution of VTK. Home page is at: http://www.vtk.org/ It was downloaded from http://www.vtk.org/files/release/5.6/vtk-5.6.0.tar.gz (See also http://vtk.org/VTK/resources/software.html) Upstream Authors: Ken Martin, Will Schroeder, and Bill Lorensen. kitware@kitware.com Copyright: /*========================================================================= Program: Visualization Toolkit Module: $RCSfile: Copyright.txt,v $ Copyright (c) 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither name of Ken Martin, Will Schroeder, or Bill Lorensen nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =========================================================================*/ debian/tcl-vtk.shlibs0000664000000000000000000000143312250600354011760 0ustar libvtkChartsTCL 5.8 tcl-vtk libvtkCommonTCL 5.8 tcl-vtk libvtkFilteringTCL 5.8 tcl-vtk libvtkGenericFilteringTCL 5.8 tcl-vtk libvtkGeovisTCL 5.8 tcl-vtk libvtkGraphicsTCL 5.8 tcl-vtk libvtkHybridTCL 5.8 tcl-vtk libvtkImagingTCL 5.8 tcl-vtk libvtkInfovisTCL 5.8 tcl-vtk libvtkIOTCL 5.8 tcl-vtk libvtkParallelTCL 5.8 tcl-vtk libvtkRenderingTCL 5.8 tcl-vtk libvtkViewsTCL 5.8 tcl-vtk libvtkVolumeRenderingTCL 5.8 tcl-vtk libvtkWidgetsTCL 5.8 tcl-vtk debian/libvtk-java.shlibs0000664000000000000000000000134512250600354012610 0ustar libvtkCommonJava 5.8 libvtk-java libvtkFilteringJava 5.8 libvtk-java libvtkGenericFilteringJava 5.8 libvtk-java libvtkGraphicsJava 5.8 libvtk-java libvtkHybridJava 5.8 libvtk-java libvtkImagingJava 5.8 libvtk-java libvtkInfovisJava 5.8 libvtk-java libvtkIOJava 5.8 libvtk-java libvtkParallelJava 5.8 libvtk-java libvtkRenderingJava 5.8 libvtk-java libvtkViewsJava 5.8 libvtk-java libvtkVolumeRenderingJava 5.8 libvtk-java libvtkWidgetsJava 5.8 libvtk-java debian/CMakeCache.txt.debian0000664000000000000000000000333312313327354013063 0ustar BUILD_DOCUMENTATION:BOOL=ON BUILD_EXAMPLES:BOOL=ON BUILD_SHARED_LIBS:BOOL=ON BUILD_TESTING:BOOL=OFF CMAKE_ROOT:FILEPATH=/usr/share/CMake CMAKE_CXX_SHLIB_RUNTIME_FLAG:STRING=-Wl CMAKE_INSTALL_PREFIX:PATH=/usr VTK_INSTALL_PREFIX:PATH=/usr CMAKE_SKIP_RPATH:BOOL=ON VTK_NO_LIBRARY_VERSION:BOOL=OFF VTK_INSTALL_NO_DOCUMENTATION:BOOL=OFF VTK_DATA_ROOT:PATH=/usr/share/VTKData VTK_USE_ANSI_STDLIB:BOOL=ON VTK_USE_BOOST:BOOL=ON VTK_USE_HYBRID:BOOL=ON VTK_USE_QTCHARTS:BOOL=ON VTK_USE_MPI:BOOL=ON VTK_USE_RENDERING:BOOL=ON VTK_USE_VOLUMEPRO:BOOL=OFF VTK_USE_PARALLEL:BOOL=ON VTK_USE_INFOVIS:BOOL=ON VTK_USE_VIEWS:BOOL=ON VTK_USE_CG_SHADERS:BOOL=OFF VTK_WRAP_JAVA:BOOL=ON VTK_WRAP_PYTHON:BOOL=ON VTK_WRAP_TCL:BOOL=ON MPI_INCLUDE_PATH:PATH=/usr/include/mpi VTK_INSTALL_JAVA_DIR:PATH=/share/java TCL_INCLUDE_PATH:PATH=/usr/include/tcl8.6 TCL_LIBRARY:FILEPATH=/usr/lib/libtcl8.6.so TK_INCLUDE_PATH:PATH=/usr/include/tcl8.6 TK_LIBRARY:FILEPATH=/usr/lib/libtk8.6.so TK_INTERNAL_PATH:PATH=/usr/include/tcl8.6/tk-private/generic VTK_TCL_LIBRARY_DIR:FILEPATH=/usr/lib/tcl8.6 PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python TCL_TCLSH:FILEPATH=/usr/bin/tclsh TK_WISH:FILEPATH=/usr/bin/wish VTK_USE_SYSTEM_EXPAT:BOOL=ON EXPAT_LIBRARY:FILEPATH=expat VTK_USE_SYSTEM_JPEG:BOOL=ON JPEG_LIBRARY:FILEPATH=jpeg VTK_USE_SYSTEM_PNG:BOOL=ON PNG_LIBRARY:FILEPATH=png VTK_USE_SYSTEM_TIFF:BOOL=ON TIFF_LIBRARY:FILEPATH=tiff VTK_USE_SYSTEM_ZLIB:BOOL=ON ZLIB_LIBRARY:FILEPATH=z VTK_USE_SYSTEM_FREETYPE:BOOL=ON VTK_USE_SYSTEM_LIBXML2:BOOL=ON VTK_USE_SYSTEM_HDF5:BOOL=ON VTK_USE_GL2PS:BOOL=ON VTK_USE_SYSTEM_GL2PS:BOOL=ON VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T:BOOL=ON VTK_USE_FFMPEG_ENCODER:BOOL=ON VTK_USE_MPEG2_ENCODER:BOOL=OFF VTK_USE_METAIO:BOOL=ON VTK_USE_MYSQL:BOOL=ON VTK_USE_POSTGRES:BOOL=ON debian/libvtk-java.install0000664000000000000000000000045412250600354012772 0ustar usr/bin/vtkWrapJava usr/bin usr/bin/vtkParseJava usr/bin usr/include/vtk-5.8/vtkJavaUtil.h usr/include/vtk-5.8 usr/lib/vtk-5.8/VTKConfig-Java.cmake usr/lib/jni/*Java.so* usr/lib/jni usr/share/java/vtk.jar usr/share/java debian/vtk-doc.compress0000664000000000000000000000005612250600354012312 0ustar find usr/share/doc/vtk-doc -name "changelog*" debian/libvtk5-dev.install0000664000000000000000000000324412250600354012714 0ustar usr/bin/vtkEncodeString usr/bin/vtkWrapHierarchy usr/include/vtk-5.8 usr/include usr/lib/libCosmo.so usr/lib/libVPIC.so usr/lib/libvtkalglib.so usr/lib/libvtkCharts.so usr/lib/libvtkCommon.so usr/lib/libvtkDICOMParser.so usr/lib/libvtkexoIIc.so usr/lib/libvtkFiltering.so usr/lib/libvtkftgl.so usr/lib/libvtkGenericFiltering.so usr/lib/libvtkGeovis.so usr/lib/libvtkGraphics.so usr/lib/libvtkHybrid.so usr/lib/libvtkImaging.so usr/lib/libvtkInfovis.so usr/lib/libvtkIO.so usr/lib/libvtkmetaio.so usr/lib/libvtkParallel.so usr/lib/libvtkproj4.so usr/lib/libvtkRendering.so usr/lib/libvtksys.so usr/lib/libvtkverdict.so usr/lib/libvtkViews.so usr/lib/libvtkVolumeRendering.so usr/lib/libvtkWidgets.so usr/lib/vtk-5.8/CMake usr/lib/vtk-5.8/hints usr/lib/vtk-5.8/UseVTK.cmake usr/lib/vtk-5.8/VTKBuildSettings.cmake usr/lib/vtk-5.8/vtkChartsKit.cmake usr/lib/vtk-5.8/vtkCommonKit.cmake usr/lib/vtk-5.8/VTKConfig.cmake usr/lib/vtk-5.8/VTKConfigVersion.cmake usr/lib/vtk-5.8/vtkFilteringKit.cmake usr/lib/vtk-5.8/vtkGenericFilteringKit.cmake usr/lib/vtk-5.8/vtkGeovisKit.cmake usr/lib/vtk-5.8/vtkGraphicsKit.cmake usr/lib/vtk-5.8/vtkHybridKit.cmake usr/lib/vtk-5.8/vtkImagingKit.cmake usr/lib/vtk-5.8/vtkInfovisKit.cmake usr/lib/vtk-5.8/vtkIOKit.cmake usr/lib/vtk-5.8/vtkParallelKit.cmake usr/lib/vtk-5.8/vtkRenderingKit.cmake usr/lib/vtk-5.8/VTKTargets.cmake usr/lib/vtk-5.8/VTKTargets-release.cmake usr/lib/vtk-5.8/vtkViewsKit.cmake usr/lib/vtk-5.8/vtkVolumeRenderingKit.cmake usr/lib/vtk-5.8/vtkWidgetsKit.cmake ../../Common/vtkTemplateAliasMacro.h usr/include/vtk-5.8 ../../Utilities/DICOMParser/Copyright.txt usr/share/doc/libvtk5-dev/copyright.DICOMParser debian/rules0000775000000000000000000002013412313366371010255 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/architecture.mk export LD_LIBRARY_PATH+=:$(CURDIR)/Build/bin export TCLLIBPATH=$(CURDIR)/Build/Wrapping/Tcl/ # export JAVA_HOME to help FindJava.cmake and FindJNI.cmake export JAVA_HOME=/usr/lib/jvm/default-java # set the number of build jobs ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif PYVERS=$(shell pyversions -r debian/control) MAJOR=5 MINOR=8 PATCH=0 # Automagically set BUILDNAME and version dependent items DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/') configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. # pre-load the cache to avoid setting rpath: mkdir -p Build cp debian/CMakeCache.txt.debian Build/CMakeCache.txt # echo CMAKE_X_CFLAGS:STRING=-I/usr/X11R6/include >> Build/CMakeCache.txt echo CMAKE_BUILD_TYPE:STRING=RELEASE >> Build/CMakeCache.txt echo CMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) >> Build/CMakeCache.txt echo BUILDNAME:STRING=Debian-vtk_$(DEBVERSION)_$(DEB_HOST_ARCH).deb >> Build/CMakeCache.txt echo VTK_WRAP_HINTS:FILEPATH=$(CURDIR)/Wrapping/hints >> Build/CMakeCache.txt echo VTK_WRAP_PYTHON_EXE:FILEPATH=$(CURDIR)/Build/bin/vtkWrapPython >> Build/CMakeCache.txt echo VTK_WRAP_TCL_EXE:FILEPATH=$(CURDIR)/Build/bin/vtkWrapTcl >> Build/CMakeCache.txt # defines are for tcl 8.6 compat echo CMAKE_C_FLAGS:STRING="$$CFLAGS -DUSE_INTERP_ERRORLINE" >> Build/CMakeCache.txt echo CMAKE_CXX_FLAGS:STRING="$$CXXFLAGS -DUSE_INTERP_ERRORLINE" >> Build/CMakeCache.txt # enable VTK GUI support, enable Qt support echo VTK_USE_GUISUPPORT:BOOL=ON >> Build/CMakeCache.txt echo VTK_USE_QT:BOOL=ON >> Build/CMakeCache.txt # do not rebuild targets when CMakefiles change to speed up future # compilation of Qt modules # echo CMAKE_SKIP_RULE_DEPENDENCY:BOOL=ON >> Build/CMakeCache.txt # -DDESIRED_QT_VERSION=4 -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake-qt4 \ # -DQT_MOC_EXECUTABLE=/usr/bin/moc-qt4 -DQT_INCLUDE_DIR=/usr/include/qt4 \ # -DVTK_USE_GUISUPPORT:BOOL=ON -DVTK_USE_QT:BOOL=ON \ # -UQT_QT_LIBRARY -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=/usr echo PYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) >> Build/CMakeCache.txt echo PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$(PYVERS).so >> Build/CMakeCache.txt echo FREETYPE_LIBRARY:FILEPATH=$(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libfreetype*.so) >> Build/CMakeCache.txt echo TCL_LIBRARY:FILEPATH=$(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libtcl*.so) >> Build/CMakeCache.txt echo TK_LIBRARY:FILEPATH=$(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libtk*.so) >> Build/CMakeCache.txt echo CMAKE_INSTALL_PREFIX:PATH=$(CURDIR)/debian/tmp/usr >> Build/CMakeCache.txt echo VTK_INSTALL_LIB_DIR:PATH=/lib/ >> Build/CMakeCache.txt echo VTK_INSTALL_PACKAGE_DIR:PATH=/lib/vtk-$(MAJOR).$(MINOR) >> Build/CMakeCache.txt if [ "X$(DARTP)" = XUSE_DART ]; then echo DART_ROOT:PATH=/usr/share/Dart >> Build/CMakeCache.txt; fi echo VTK_PYTHON_SETUP_ARGS:STRING=--install-layout=deb --root=$(CURDIR)/debian/tmp/ >> Build/CMakeCache.txt cd Build && cmake .. chmod +x debian/xvfb-run touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. #if [ "X$(DARTP)" = XUSE_DART ]; then cd Build && ../debian/xvfb-run $(MAKE) Experimental; else cd Build && $(MAKE);fi if [ "X$(DARTP)" = XUSE_DART ]; then cd Build && xvfb-run -s "-screen 0 1024x768x24" $(MAKE) $(JOBS) Experimental; else cd Build && $(MAKE) $(JOBS);fi if [ "X$(DARTP)" = XUSE_DART ]; then cd Build && $(MAKE) $(JOBS) ExperimentalSubmit; fi sed -i -e "s#/usr/lib/\(`dpkg-architecture -qDEB_HOST_MULTIARCH`/\)\?lib\([^;]*\)\.so#\2#g" Build/Utilities/LastConfigureStep/CMakeFiles/Export/lib/vtk-5.8/VTKTargets-release.cmake sed -i -e "s/FATAL_ERROR/STATUS/g" Build/Utilities/LastConfigureStep/CMakeFiles/Export/lib/vtk-5.8/VTKTargets-release.cmake sed -i -e "s/FATAL_ERROR/STATUS/g" Build/Utilities/LastConfigureStep/CMakeFiles/Export/lib/vtk-5.8/VTKTargets.cmake touch build-stamp build-docs: docs-stamp docs-stamp: dh_testdir cd Build/Utilities/Doxygen && $(MAKE) DoxygenDoc # remove zero byte files find Build/Utilities/Doxygen/ -depth -empty | xargs rm -rf # remove .md5 files find Build/Utilities/Doxygen/doc/html/ -name "*.md5" | xargs rm -f touch docs-stamp clean: dh_testdir dh_testroot rm -rf Utilities/vtknetcdf rm -f build-stamp configure-stamp docs-stamp install-stamp rm -rf Build rm -rf Testing rm -f CMake/*.o CMake/*.so rm -f Wrapping/Python/vtkGetDataRoot.pyc rm -f Wrapping/Python/vtkpython.pyc rm -f Xauthority rm -f current dh_clean install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot dh_prep dh_installdirs # Add here commands to install the package into debian/tmp. $(MAKE) $(JOBS) -C Build install touch install-stamp # Build architecture-independent files here. # (vtk-doc) binary-indep: build-docs dh_testdir -i dh_testroot -i # dh_installdebconf -i dh_installdocs -i # make sure debian/tmp exists mkdir -p $(CURDIR)/debian/tmp dh_install -i --sourcedir=$(CURDIR)/debian/tmp --list-missing dh_lintian -i dh_installexamples chmod -x debian/vtk-examples/usr/share/vtk/Rendering/Tcl/keyBottle.tcl chmod +x debian/vtk-examples/usr/share/vtk/Build/vtkMy/Wrapping/Tcl/MakePackages.tcl find debian/vtk-examples/usr/share/vtk -name *.py -exec chmod +x \{\} \; chmod -x debian/vtk-examples/usr/share/vtk/GUI/Python/OrthogonalPlanesWithTkPhoto.py chmod -x debian/vtk-examples/usr/share/vtk/ParallelProcessing/MPI/Python/ParallelCone.py chmod -x debian/vtk-examples/usr/share/vtk/Tutorial/Step5/Java/Cone5.java chmod -x debian/vtk-examples/usr/share/vtk/VolumeRendering/Tcl/IntermixedUnstructuredGrid.tcl chmod -x debian/vtk-examples/usr/share/vtk/GUI/Tcl/CameraAndSliderWidgets.tcl chmod -x debian/vtk-examples/usr/share/vtk/GUI/Tcl/AffineWidget.tcl chmod -x debian/vtk-examples/usr/share/vtk/GUI/Qt/CTestCustom.ctest.in chmod -x debian/vtk-examples/usr/share/vtk/GUI/Tcl/AngleWidget.tcl chmod -x debian/vtk-examples/usr/share/vtk/Infovis/Python/* dh_installmenu -i dh_installman -i dh_installinfo -i dh_installchangelogs -i dh_link -i dh_strip -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. binary-arch: install-stamp dh_testdir -a dh_testroot -a #dh_installdebconf -a dh_installdocs -a -n dh_install -a --sourcedir=$(CURDIR)/debian/tmp --list-missing dh_lintian -a rm -f $(CURDIR)/debian/libvtk5-dev/usr/include/vtk-$(MAJOR).$(MINOR)/vtkJavaUtil.h find $(CURDIR)/debian/python-vtk -name \*.pyc -exec rm \{\} \; # cd debian/libvtk-java/usr/share/java && ln -s vtk-$(MAJOR).$(MINOR).$(PATCH).jar vtk.jar chmod +x debian/tcl-vtk/usr/share/tcltk/tcl8.6/vtk/FindString.tcl chmod +x debian/python-vtk/usr/lib/vtk-$(MAJOR).$(MINOR)/testing/*py dh_installmenu -a dh_installman -a dh_installinfo -a dh_installchangelogs -a dh_link -a dh_strip -a dh_compress -a dh_fixperms -a dh_makeshlibs -a dh_pysupport -a dh_installdeb -a # dh_shlibdeps -a -l /usr/lib/jvm/default-java/lib:/usr/lib/jvm/default-java/jre/lib/i386:/usr/lib/jvm/default-java/jre/lib/i386/client dh_shlibdeps -a -l /usr/lib/jvm/default-java/lib dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-arch binary-indep get-orig-source: ./debian/get-orig-source debian/%.1: debian/vtk_common.1.in help2man --include=$< --output=$@ --name="Command line tool for `basename $@ .1`" --no-info `basename $@ .1` --no-discard-stderr --version-string=5.8.0 allmanpages: debian/vtkParseJava.1 debian/vtkWrapJava.1 debian/vtkEncodeString.1 debian/vtkWrapHierarchy.1 debian/vtkWrapPython.1 debian/vtkWrapPythonInit.1 debian/vtkWrapTcl.1 debian/vtkWrapTclInit.1 .PHONY: build clean binary-indep binary-arch binary install configure allmanpages debian/libvtk5.8.install0000664000000000000000000000234212250600354012304 0ustar usr/lib/libCosmo.so.* usr/lib usr/lib/libVPIC.so.* usr/lib usr/lib/libvtkalglib.so.* usr/lib usr/lib/libvtkCharts.so.* usr/lib usr/lib/libvtkCommon.so.* usr/lib usr/lib/libvtkDICOMParser.so.* usr/lib usr/lib/libvtkexoIIc.so.* usr/lib usr/lib/libvtkFiltering.so.* usr/lib usr/lib/libvtkftgl.so.* usr/lib usr/lib/libvtkGenericFiltering.so.* usr/lib usr/lib/libvtkGeovis.so.* usr/lib usr/lib/libvtkGraphics.so.* usr/lib usr/lib/libvtkHybrid.so.* usr/lib usr/lib/libvtkImaging.so.* usr/lib usr/lib/libvtkInfovis.so.* usr/lib usr/lib/libvtkIO.so.* usr/lib usr/lib/libvtkmetaio.so.* usr/lib usr/lib/libvtkParallel.so.* usr/lib usr/lib/libvtkproj4.so.* usr/lib usr/lib/libvtkRendering.so.* usr/lib usr/lib/libvtksys.so.* usr/lib usr/lib/libvtkverdict.so.* usr/lib usr/lib/libvtkViews.so.* usr/lib usr/lib/libvtkVolumeRendering.so.* usr/lib usr/lib/libvtkWidgets.so.* usr/lib debian/get-orig-source0000775000000000000000000000106312250600354012126 0ustar #!/bin/sh PACKAGE=vtk VERSION=${VERSION:-$2} TARFILE=${TARFILE:-$3} if [ -z ${VERSION}]; then VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'` fi REVISION=`echo $VERSION | sed -e 's/^.*git//g'` if [ -z ${TARFILE}]; then TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz fi FOLDER=${PACKAGE}-${VERSION} # as of Sept 1, 2011, tag v5.8.0 points to commit id 2380face149471e2d8872f52c5a5f6b68fa87885 git clone git://vtk.org/VTK.git $FOLDER cd $FOLDER git checkout $REVISION rm -rf .git cd .. GZIP="--best --no-name" tar cfz $TARFILE $FOLDER