[paraview] 04/07: Update patches, remove applied by upstream.
Anton Gladky
gladk at moszumanska.debian.org
Wed Feb 3 13:48:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch 5.0v2
in repository paraview.
commit 95e89946f22de7c8329b4039edac455be88c214a
Author: Anton Gladky <gladk at debian.org>
Date: Wed Feb 3 14:46:02 2016 +0100
Update patches, remove applied by upstream.
---
debian/patches/ffmpeg_2.9.patch | 98 ------
debian/patches/fix_FTBFS_KWSys.patch | 81 -----
debian/patches/fix_GLintptr_FTBFS.patch | 31 --
debian/patches/fix_ftbfs_freetype.patch | 27 --
debian/patches/fix_ftbfs_gcc49.patch | 26 +-
debian/patches/fix_libav10.patch | 24 --
debian/patches/fix_manpages_errors.patch | 246 +++++++++------
debian/patches/fix_path_paraview.patch | 10 +-
debian/patches/fix_rescale_over_time.patch | 35 ---
debian/patches/reduce_cmake_error.cmake | 6 +-
debian/patches/remove_webgl.patch | 44 +++
debian/patches/series | 9 +-
debian/patches/use_system_sqlite.patch | 478 +++++++++++++++++++++++++++++
debian/patches/use_system_xdmf.patch | 102 ++++++
14 files changed, 802 insertions(+), 415 deletions(-)
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index 4c4df8f..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-11-02>
-
-Index: paraview/VTK/CMake/vtkTestFFMPEG.cmake
-===================================================================
---- paraview.orig/VTK/CMake/vtkTestFFMPEG.cmake
-+++ paraview/VTK/CMake/vtkTestFFMPEG.cmake
-@@ -32,8 +32,8 @@ if(FFMPEG_INCLUDE_DIR)
- #include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h>
- int main()
- {
-- img_convert(0, PIX_FMT_RGB24,
-- 0, PIX_FMT_RGB24,
-+ img_convert(0, AV_PIX_FMT_RGB24,
-+ 0, AV_PIX_FMT_RGB24,
- 0, 0);
- return 0;
- }\n")
-Index: paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-===================================================================
---- paraview.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -188,11 +188,11 @@ int vtkFFMPEGWriterInternal::Start()
- c->height = this->Dim[1];
- if (this->Writer->GetCompression())
- {
-- c->pix_fmt = PIX_FMT_YUVJ422P;
-+ c->pix_fmt = AV_PIX_FMT_YUVJ422P;
- }
- else
- {
-- c->pix_fmt = PIX_FMT_BGR24;
-+ c->pix_fmt = AV_PIX_FMT_BGR24;
- }
-
- //to do playback at actual recorded rate, this will need more work see also below
-@@ -271,13 +271,13 @@ int vtkFFMPEGWriterInternal::Start()
- #endif
-
- //for the output of the writer's input...
-- this->rgbInput = avcodec_alloc_frame();
-+ this->rgbInput = av_frame_alloc();
- if (!this->rgbInput)
- {
- vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
- return 0;
- }
-- int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height);
-+ int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height);
- unsigned char *rgb = new unsigned char[RGBsize];
- if (!rgb)
- {
-@@ -285,10 +285,10 @@ int vtkFFMPEGWriterInternal::Start()
- return 0;
- }
- //The rgb buffer should get deleted when this->rgbInput is.
-- avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
-+ avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height);
-
- //and for the output to the codec's input.
-- this->yuvOutput = avcodec_alloc_frame();
-+ this->yuvOutput = av_frame_alloc();
- if (!this->yuvOutput)
- {
- vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
-@@ -346,12 +346,12 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
- //convert that to YUV for input to the codec
- #ifdef VTK_FFMPEG_HAS_IMG_CONVERT
- img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt,
-- (AVPicture *)this->rgbInput, PIX_FMT_RGB24,
-+ (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24,
- cc->width, cc->height);
- #else
- //convert that to YUV for input to the codec
- SwsContext* convert_ctx = sws_getContext(
-- cc->width, cc->height, PIX_FMT_RGB24,
-+ cc->width, cc->height, AV_PIX_FMT_RGB24,
- cc->width, cc->height, cc->pix_fmt,
- SWS_BICUBIC, NULL, NULL, NULL);
-
-@@ -490,14 +490,14 @@ void vtkFFMPEGWriterInternal::End()
- if (this->yuvOutput)
- {
- av_free(this->yuvOutput->data[0]);
-- av_free(this->yuvOutput);
-+ av_frame_free(&this->yuvOutput);
- this->yuvOutput = NULL;
- }
-
- if (this->rgbInput)
- {
- av_free(this->rgbInput->data[0]);
-- av_free(this->rgbInput);
-+ av_frame_free(&this->rgbInput);
- this->rgbInput = NULL;
- }
-
diff --git a/debian/patches/fix_FTBFS_KWSys.patch b/debian/patches/fix_FTBFS_KWSys.patch
deleted file mode 100644
index 4b51dc7..0000000
--- a/debian/patches/fix_FTBFS_KWSys.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Description: fix FTBFS on many platforms
-Origin: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=397bccba
-Bug-Debian: https://bugs.debian.org/748889
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-05-23
-
-Index: paraview-4.1.0+dfsg/VTK/Utilities/KWSys/vtksys/SystemInformation.cxx
-===================================================================
---- paraview-4.1.0+dfsg.orig/VTK/Utilities/KWSys/vtksys/SystemInformation.cxx
-+++ paraview-4.1.0+dfsg/VTK/Utilities/KWSys/vtksys/SystemInformation.cxx
-@@ -88,15 +88,6 @@ typedef int siginfo_t;
- # include <ifaddrs.h>
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
--# include <execinfo.h>
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
--# include <cxxabi.h>
--# endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
--# include <dlfcn.h>
--# endif
--# endif
- #endif
-
- #if defined(__OpenBSD__) || defined(__NetBSD__)
-@@ -126,16 +117,8 @@ typedef int siginfo_t;
- # include <ifaddrs.h>
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
--# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
--# include <execinfo.h>
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
--# include <cxxabi.h>
--# endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
--# include <dlfcn.h>
--# endif
--# endif
-+# if !(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050)
-+# undef KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE
- # endif
- #endif
-
-@@ -150,15 +133,6 @@ typedef int siginfo_t;
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
- # endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
--# include <execinfo.h>
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
--# include <cxxabi.h>
--# endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
--# include <dlfcn.h>
--# endif
--# endif
- # if defined(KWSYS_CXX_HAS_RLIMIT64)
- typedef struct rlimit64 ResourceLimitType;
- # define GetResourceLimit getrlimit64
-@@ -178,6 +152,19 @@ typedef struct rlimit ResourceLimitType;
- # include <OS.h>
- #endif
-
-+#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
-+# include <execinfo.h>
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
-+# include <cxxabi.h>
-+# endif
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
-+# include <dlfcn.h>
-+# endif
-+#else
-+# undef KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE
-+# undef KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP
-+#endif
-+
- #include <memory.h>
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/debian/patches/fix_GLintptr_FTBFS.patch b/debian/patches/fix_GLintptr_FTBFS.patch
deleted file mode 100644
index fc4da77..0000000
--- a/debian/patches/fix_GLintptr_FTBFS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: fixes FTBFS against new libjpeg-turbo
-Author: Ondřej Surý <ondrej at debian.org>
-Bug-Debian: https://bugs.debian.org/765939
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-10-20
-
-Index: paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkOpenGL.h
-===================================================================
---- paraview-4.1.0+dfsg.orig/VTK/Rendering/OpenGL/vtkOpenGL.h
-+++ paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkOpenGL.h
-@@ -20,6 +20,7 @@
-
- // To prevent gl.h to include glext.h provided by the system
- #define GL_GLEXT_LEGACY
-+#define GLX_GLEXT_LEGACY
- #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA))
- # include <OpenGL/gl.h> // Include OpenGL API.
- #else
-Index: paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
-===================================================================
---- paraview-4.1.0+dfsg.orig/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
-+++ paraview-4.1.0+dfsg/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
-@@ -27,7 +27,7 @@
-
- // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
- // the system
--//#define GLX_GLXEXT_LEGACY
-+#define GLX_GLXEXT_LEGACY
- #include "GL/glx.h"
-
- #include "vtkgl.h"
diff --git a/debian/patches/fix_ftbfs_freetype.patch b/debian/patches/fix_ftbfs_freetype.patch
deleted file mode 100644
index e21e807..0000000
--- a/debian/patches/fix_ftbfs_freetype.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS against new freetype
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/783842
-Last-Update: 2015-05-05
-
---- paraview-4.1.0+dfsg+1.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
-+++ paraview-4.1.0+dfsg+1/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding
- if (bitmap)
- {
- metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
-- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+ metaData.descent = std::min(-static_cast<int>(bitmap->rows - (bitmapGlyph->top - 1)),
- metaData.descent);
- }
- ++heightString;
-@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
- if (bitmap)
- {
- bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
-- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
-- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
-+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
-+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
- bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
- }
- else
diff --git a/debian/patches/fix_ftbfs_gcc49.patch b/debian/patches/fix_ftbfs_gcc49.patch
index ba33389..655946c 100644
--- a/debian/patches/fix_ftbfs_gcc49.patch
+++ b/debian/patches/fix_ftbfs_gcc49.patch
@@ -4,9 +4,11 @@ Bug-Debian: http://bugs.debian.org/#746896
Forwarded: https://github.com/Kitware/VTK/pull/7
Last-Update: 2014-05-30
---- vtk6-6.1.0+dfsg.orig/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ vtk6-6.1.0+dfsg/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1094,7 +1094,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
+Index: ParaView-v5.0.0-source/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ ParaView-v5.0.0-source/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+@@ -1112,7 +1112,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
vtkIdType cellsPerNode = numTotalCells / nprocs;
vtkIdList **sendCells = new vtkIdList * [ nprocs ];
@@ -18,7 +20,7 @@ Last-Update: 2014-05-30
if (numConsumers == nprocs - 1)
{
-@@ -1585,7 +1588,9 @@ vtkFloatArray **
+@@ -1597,7 +1600,9 @@ vtkFloatArray **
// Exchange int arrays
float **recvArrays = new float * [nprocs];
@@ -29,7 +31,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -1706,7 +1711,9 @@ vtkIdTypeArray **
+@@ -1719,7 +1724,9 @@ vtkIdTypeArray **
// Exchange int arrays
vtkIdType **recvArrays = new vtkIdType * [nprocs];
@@ -40,7 +42,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -2810,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2788,7 +2795,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [npoints];
@@ -51,7 +53,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -2830,7 +2839,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2808,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [ncells];
@@ -62,7 +64,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -3027,7 +3038,9 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3007,7 +3018,9 @@ int vtkDistributedDataFilter::AssignGlob
vtkIdType nGridPoints = grid->GetNumberOfPoints();
vtkIdType *numPointsOutside = new vtkIdType [nprocs];
@@ -73,7 +75,7 @@ Last-Update: 2014-05-30
vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
globalIds->SetNumberOfValues(nGridPoints);
-@@ -3109,10 +3122,16 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3089,10 +3102,16 @@ int vtkDistributedDataFilter::AssignGlob
// global ID back?
vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
@@ -92,7 +94,7 @@ Last-Update: 2014-05-30
vtkIdType *next = new vtkIdType [nprocs];
vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3287,7 +3306,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3267,7 +3286,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
{
// There are no cells in my assigned region
@@ -103,7 +105,7 @@ Last-Update: 2014-05-30
return gids;
}
-@@ -3492,7 +3513,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3472,7 +3493,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
std::multimap<int, int>::iterator mapIt;
vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
@@ -115,7 +117,7 @@ Last-Update: 2014-05-30
for (int i=0; i<nprocs; i++)
{
-@@ -3582,7 +3606,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3562,7 +3586,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
vtkIdType numPoints = grid->GetNumberOfPoints();
vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
diff --git a/debian/patches/fix_libav10.patch b/debian/patches/fix_libav10.patch
deleted file mode 100644
index 0c95987..0000000
--- a/debian/patches/fix_libav10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: fix libav10 compilation
-Author: Anton Khirnov <anton at khirnov.net>, Sebastian Ramacher <sramacher at debian.org>
-Applied-Upstream: http://review.source.kitware.com/#/c/14289/
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-05-14
-
-Index: ParaView-v4.1.0/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-===================================================================
---- ParaView-v4.1.0.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ ParaView-v4.1.0/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -143,11 +143,11 @@ int vtkFFMPEGWriterInternal::Start()
- if (this->Writer->GetCompression())
- {
- //choose a codec that is easily playable on windows
-- this->avOutputFormat->video_codec = CODEC_ID_MJPEG;
-+ this->avOutputFormat->video_codec = AV_CODEC_ID_MJPEG;
- }
- else
- {
-- this->avOutputFormat->video_codec = CODEC_ID_RAWVIDEO;
-+ this->avOutputFormat->video_codec = AV_CODEC_ID_RAWVIDEO;
- }
-
- //assign the format to the context
diff --git a/debian/patches/fix_manpages_errors.patch b/debian/patches/fix_manpages_errors.patch
index 2fb6db1..67987e2 100644
--- a/debian/patches/fix_manpages_errors.patch
+++ b/debian/patches/fix_manpages_errors.patch
@@ -3,9 +3,11 @@ Description: rough editing of manpages, shipped with sources to fix
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-25
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
-@@ -29,8 +29,7 @@
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
+@@ -29,8 +29,7 @@ l l l .
.PP
The \fBicetCreateContext\fP
@@ -15,9 +17,11 @@ Last-Update: 2012-11-25
context, makes it current, and returns a
handle to the new context. The handle returned is of type
\fBIceTContext\fP\&.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
-@@ -46,7 +46,7 @@
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
+@@ -46,7 +46,7 @@ enumerated values:
Automatically
chooses which single image strategy to use based on the number of
processes participating in the composition.
@@ -26,7 +30,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_SINGLE_IMAGE_STRATEGY_BSWAP\fP
The classic binary swap
-@@ -55,7 +55,6 @@
+@@ -55,7 +55,6 @@ partners with another, sends half of its
receives the opposite half from its partner. The processes are then
partitioned into two groups that each have the same image part, and the
algorithm recurses.
@@ -34,7 +38,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_SINGLE_IMAGE_STRATEGY_RADIXK\fP
The radix\-k
-@@ -71,7 +70,6 @@
+@@ -71,7 +70,6 @@ variable or CMake variable.
process partners with another, and one of the processes sends its entire
image to the other. The algorithm recurses with the group of processes
that received images until only one process has an image.
@@ -42,8 +46,10 @@ Last-Update: 2012-11-25
.PP
By default \fBIceT \fPsets the single image strategy to
\fBICET_SINGLE_IMAGE_STRATEGY_AUTOMATIC\fP
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -53,15 +59,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
@@ -15,8 +15,6 @@
\fBicetImageGetColorFormat\fP,\fBicetImageGetDepthFormat\fP\-\- get the format of image buffers
@@ -71,16 +79,18 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -109,6 +107,5 @@
+@@ -109,6 +107,5 @@ This source code is released under the N
\fIicetSetColorFormat\fP(3),
\fIicetSetDepthFormat\fP(3)
.PP
-.igicetImageGetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
-@@ -45,8 +45,7 @@
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
+@@ -45,8 +45,7 @@ is one of the following enumerations:
.PP
.TP
\fBICET_COMPOSITE_MODE_Z_BUFFER\fP
@@ -90,7 +100,7 @@ Last-Update: 2012-11-25
hidden\-surface removal operation. The
compositing operation compares the distance of pixel fragments from the
viewpoint and passes the fragment closest to the user. In order for
-@@ -55,8 +54,7 @@
+@@ -55,8 +54,7 @@ this operation to work, images must have
.TP
\fBICET_COMPOSITE_MODE_BLEND\fP
Blend two fragments together
@@ -100,8 +110,10 @@ Last-Update: 2012-11-25
operator. in
order for this operation to work, images must have a color buffer (set
with \fBicetSetColorFormat\fP)that has an alpha channel and there must be
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -114,7 +126,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -85,8 +81,6 @@
+@@ -85,8 +81,6 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
@@ -123,8 +135,10 @@ Last-Update: 2012-11-25
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
@@ -15,8 +15,6 @@
\fBicetSetColorFormat\fP,\fBicetSetDepthFormat\fP\-\- specifies the buffer formats for \fBIceT \fPto use when creating images
@@ -134,15 +148,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -134,6 +132,5 @@
+@@ -138,6 +136,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetSetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -152,15 +168,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
@@ -15,8 +15,7 @@
\fBicetEnable\fP,\fBicetDisable\fP\-\- enable/disable an \fBIceT \fPfeature.
@@ -171,15 +189,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -177,6 +176,5 @@
+@@ -199,6 +198,5 @@ This source code is released under the N
.PP
\fIicetIsEnabled\fP(3)
.PP
-.igicetDisable|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
@@ -18,18 +18,6 @@
.SH Synopsis
@@ -199,7 +219,7 @@ Last-Update: 2012-11-25
.TS H
l l l .
void \fBicetDrawCallback\fP( \fBIceTDrawCallbackType\fP \fIcallback\fP );
-@@ -70,8 +58,7 @@
+@@ -70,8 +58,7 @@ takes two projection matrices: \fIprojec
and \fImodelview_matrix\fP\&.
Each of these arguments is a 16\-value
array that represents a $4 *4$ transformation of homogeneous
@@ -209,8 +229,10 @@ Last-Update: 2012-11-25
order.
.PP
Note that the \fIprojection_matrix\fP
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
@@ -15,8 +15,7 @@
\fBicetEnable\fP,\fBicetDisable\fP\-\- enable/disable an \fBIceT \fPfeature.
@@ -221,15 +243,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -177,6 +176,5 @@
+@@ -199,6 +198,5 @@ This source code is released under the N
.PP
\fIicetIsEnabled\fP(3)
.PP
-.igicetDisable|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -239,15 +263,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -257,15 +283,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -275,15 +303,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -293,15 +323,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
@@ -15,8 +15,6 @@
\fBicetImageGetColorFormat\fP,\fBicetImageGetDepthFormat\fP\-\- get the format of image buffers
@@ -311,15 +343,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -109,6 +107,5 @@
+@@ -109,6 +107,5 @@ This source code is released under the N
\fIicetSetColorFormat\fP(3),
\fIicetSetDepthFormat\fP(3)
.PP
-.igicetImageGetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -329,15 +363,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -347,15 +383,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -368,7 +406,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -85,8 +81,6 @@
+@@ -85,8 +81,6 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
@@ -377,9 +415,11 @@ Last-Update: 2012-11-25
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
-@@ -48,7 +48,6 @@
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
+@@ -50,7 +50,6 @@ whether they draw into it, this strategy
compositing for more than one tile, but is recommended for the single
tile case because it bypasses some of the communication necessary for
the other multi\-tile strategies.
@@ -387,7 +427,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_DIRECT\fP
As each process renders an image
-@@ -56,7 +55,7 @@
+@@ -58,7 +57,7 @@ for a tile, that image is sent directly
display that tile. This usually results in a few processes receiving
and processing the majority of the data, and is therefore usually an
inefficient strategy.
@@ -396,7 +436,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_SPLIT\fP
Like \fBICET_STRATEGY_DIRECT\fP,
-@@ -65,7 +64,7 @@
+@@ -67,7 +66,7 @@ piece of a tile in such a way that each
about the same amount of data. This strategy is often very efficient,
but due to the large amount of messages passed, it has not proven to be
very scalable or robust.
@@ -405,7 +445,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_REDUCE\fP
A two phase algorithm. In the
-@@ -77,7 +76,6 @@
+@@ -79,7 +78,6 @@ simultaneously. This is a well rounded s
well in a wide variety of multi\-tile applications. (However, in the
special case where only one tile is defined, the sequential strategy is
probably better.)
@@ -413,7 +453,7 @@ Last-Update: 2012-11-25
.TP
\fBICET_STRATEGY_VTREE\fP
An extension to the binary tree
-@@ -89,7 +87,7 @@
+@@ -91,7 +89,7 @@ between trees. This strategy is not quit
or \fBICET_STRATEGY_SPLIT\fP,
but
has very well behaved network communication.
@@ -422,8 +462,10 @@ Last-Update: 2012-11-25
.PP
Not all of the strategies support ordered image composition.
\fBICET_STRATEGY_SEQUENTIAL\fP,
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -433,15 +475,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -451,15 +495,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -129,6 +127,5 @@
+@@ -129,6 +127,5 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -472,7 +518,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -85,8 +81,6 @@
+@@ -85,8 +81,6 @@ This source code is released under the N
\fIicetImageGetColor\fP(3),
\fIicetImageGetDepth\fP(3)
.PP
@@ -481,8 +527,10 @@ Last-Update: 2012-11-25
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
@@ -15,8 +15,6 @@
\fBicetSetColorFormat\fP,\fBicetSetDepthFormat\fP\-\- specifies the buffer formats for \fBIceT \fPto use when creating images
@@ -492,15 +540,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -134,6 +132,5 @@
+@@ -138,6 +136,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetSetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -510,15 +560,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -528,15 +580,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -546,15 +600,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -564,15 +620,17 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
---- a/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
-+++ b/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
+Index: ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
+===================================================================
+--- ParaView-v5.0.0-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
++++ ParaView-v5.0.0-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -582,7 +640,7 @@ Last-Update: 2012-11-25
.PP
.SH Synopsis
-@@ -154,6 +152,5 @@
+@@ -154,6 +152,5 @@ This source code is released under the N
\fIicetImageGetColorFormat\fP(3),
\fIicetImageGetDepthFormat\fP(3)
.PP
diff --git a/debian/patches/fix_path_paraview.patch b/debian/patches/fix_path_paraview.patch
index 9270bb3..946628c 100644
--- a/debian/patches/fix_path_paraview.patch
+++ b/debian/patches/fix_path_paraview.patch
@@ -25,10 +25,12 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- paraview-4.1.0.orig/Wrapping/Python/paraview/__init__.py
-+++ paraview-4.1.0/Wrapping/Python/paraview/__init__.py
-@@ -9,6 +9,10 @@ it provides:
- simple
+Index: ParaView-v5.0.0-source/Wrapping/Python/paraview/__init__.py
+===================================================================
+--- ParaView-v5.0.0-source.orig/Wrapping/Python/paraview/__init__.py
++++ ParaView-v5.0.0-source/Wrapping/Python/paraview/__init__.py
+@@ -17,6 +17,10 @@ ParaView modules to force backwards comp
+ from paraview.simple import *
"""
+import sys
diff --git a/debian/patches/fix_rescale_over_time.patch b/debian/patches/fix_rescale_over_time.patch
deleted file mode 100644
index 0fde993..0000000
--- a/debian/patches/fix_rescale_over_time.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b3c276ee364710cce74599cdaf781e31c78a68a9 Mon Sep 17 00:00:00 2001
-From: Joachim Pouderoux <joachim.pouderoux at kitware.com>
-Date: Thu, 16 Jan 2014 17:15:48 +0100
-Subject: [PATCH] BUG: Fix rescale over time in color map editor
-
-Rename some function calls which were performed on the
-non-over-time version.
-
-The functionnality was broken in PV - since July 2013 I guess.
-
-Change-Id: I90abb87fc16067aed0ee4a8cd167282595948d07
----
-
-Index: paraview/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h
-===================================================================
---- paraview.orig/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h
-+++ paraview/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h
-@@ -117,7 +117,7 @@ public:
- {
- vtkSMPVRepresentationProxy* self =
- vtkSMPVRepresentationProxy::SafeDownCast(proxy);
-- return self? self->RescaleTransferFunctionToDataRange() : false;
-+ return self? self->RescaleTransferFunctionToDataRangeOverTime() : false;
- }
-
- // Description:
-@@ -129,7 +129,7 @@ public:
- vtkSMPVRepresentationProxy* self =
- vtkSMPVRepresentationProxy::SafeDownCast(proxy);
- return self?
-- self->RescaleTransferFunctionToDataRange(arrayname, attribute_type) : false;
-+ self->RescaleTransferFunctionToDataRangeOverTime(arrayname, attribute_type) : false;
- }
-
- protected:
diff --git a/debian/patches/reduce_cmake_error.cmake b/debian/patches/reduce_cmake_error.cmake
index b99ee3d..aab7b2b 100644
--- a/debian/patches/reduce_cmake_error.cmake
+++ b/debian/patches/reduce_cmake_error.cmake
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: https://bugs.debian.org/783797
Last-Update: 2015-05-05
-Index: paraview-4.1.0+dfsg+1/VTK/CMake/vtkModuleAPI.cmake
+Index: ParaView-v5.0.0-source/VTK/CMake/vtkModuleAPI.cmake
===================================================================
---- paraview-4.1.0+dfsg+1.orig/VTK/CMake/vtkModuleAPI.cmake
-+++ paraview-4.1.0+dfsg+1/VTK/CMake/vtkModuleAPI.cmake
+--- ParaView-v5.0.0-source.orig/VTK/CMake/vtkModuleAPI.cmake
++++ ParaView-v5.0.0-source/VTK/CMake/vtkModuleAPI.cmake
@@ -50,7 +50,7 @@ macro(vtk_module_load mod)
include(${mod} OPTIONAL)
endif()
diff --git a/debian/patches/remove_webgl.patch b/debian/patches/remove_webgl.patch
new file mode 100644
index 0000000..4bec005
--- /dev/null
+++ b/debian/patches/remove_webgl.patch
@@ -0,0 +1,44 @@
+Description: <short summary of the patch>
+ 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.
+ .
+ paraview (4.3.1+dfsg+1-1) unstable; urgency=medium
+ .
+ * [130e468] Add python-matplotlib into Depends. (Closes: #761297)
+ * [183704d] Fix FTBFS against new libjpeg. (Closes: #765939)
+ * [1b234ad] Use dh_python2 instead of python-support in BD.
+ * [8dea743] Update d/copyright. Remove all chm-files, fix lintian warnings.
+ * [e42b9b1] Imported Upstream version 4.1.0+dfsg+1
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/761297
+Bug-Debian: https://bugs.debian.org/765939
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: ParaView-v5.0.0-source/ParaViewCore/ClientServerCore/Rendering/module.cmake
+===================================================================
+--- ParaView-v5.0.0-source.orig/ParaViewCore/ClientServerCore/Rendering/module.cmake
++++ ParaView-v5.0.0-source/ParaViewCore/ClientServerCore/Rendering/module.cmake
+@@ -3,7 +3,7 @@ if(PARAVIEW_USE_PISTON)
+ list(APPEND __dependencies vtkAcceleratorsPiston)
+ endif()
+ if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL")
+- list(APPEND __dependencies vtkWebGLExporter vtkRenderingVolumeAMR)
++ list(APPEND __dependencies vtkRenderingVolumeAMR)
+ endif()
+
+ vtk_module(vtkPVClientServerCoreRendering
diff --git a/debian/patches/series b/debian/patches/series
index 9188579..47d6104 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,7 @@
fix_manpages_errors.patch
-fix_libav10.patch
fix_path_paraview.patch
-fix_FTBFS_KWSys.patch
fix_ftbfs_gcc49.patch
-fix_GLintptr_FTBFS.patch
-fix_ftbfs_freetype.patch
reduce_cmake_error.cmake
-ffmpeg_2.9.patch
-fix_rescale_over_time.patch
+use_system_sqlite.patch
+use_system_xdmf.patch
+remove_webgl.patch
diff --git a/debian/patches/use_system_sqlite.patch b/debian/patches/use_system_sqlite.patch
new file mode 100644
index 0000000..80dc5dd
--- /dev/null
+++ b/debian/patches/use_system_sqlite.patch
@@ -0,0 +1,478 @@
+Description: Use system sqlite
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/750183
+Last-Update: 2014-06-03
+
+Index: ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteDatabase.cxx
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/IO/SQL/vtkSQLiteDatabase.cxx
++++ ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteDatabase.cxx
+@@ -29,7 +29,7 @@
+ #include <fstream>
+ #include <sstream>
+
+-#include <vtksqlite/vtk_sqlite3.h>
++#include <sqlite3.h>
+
+ vtkStandardNewMacro(vtkSQLiteDatabase);
+
+@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char*
+ }
+ }
+
+- 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 @@ void vtkSQLiteDatabase::Close()
+ }
+ 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 @@ vtkStringArray * vtkSQLiteDatabase::GetT
+ 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 @@ vtkStringArray * vtkSQLiteDatabase::GetR
+ 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::ParseURL(const c
+ // ----------------------------------------------------------------------
+ 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: ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteQuery.cxx
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/IO/SQL/vtkSQLiteQuery.cxx
++++ ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteQuery.cxx
+@@ -25,7 +25,7 @@
+ #include "vtkVariant.h"
+ #include "vtkVariantArray.h"
+
+-#include <vtksqlite/vtk_sqlite3.h>
++#include <sqlite3.h>
+
+ #include <cassert>
+
+@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery()
+ {
+ 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 @@ vtkSQLiteQuery::~vtkSQLiteQuery()
+ {
+ if (this->Database != NULL)
+ {
+- vtk_sqlite3_finalize(this->Statement);
++ sqlite3_finalize(this->Statement);
+ this->Statement = NULL;
+ }
+ }
+@@ -128,8 +128,8 @@ bool vtkSQLiteQuery::SetQuery(const char
+ 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);
+@@ -148,19 +148,19 @@ bool vtkSQLiteQuery::SetQuery(const char
+ 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<int>(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 << "'");
+@@ -191,31 +191,31 @@ bool vtkSQLiteQuery::Execute()
+ }
+ 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;
+@@ -236,7 +236,7 @@ int vtkSQLiteQuery::GetNumberOfFields()
+ }
+ else
+ {
+- return vtk_sqlite3_column_count(this->Statement);
++ return sqlite3_column_count(this->Statement);
+ }
+ }
+
+@@ -256,7 +256,7 @@ const char * vtkSQLiteQuery::GetFieldNam
+ }
+ else
+ {
+- return vtk_sqlite3_column_name(this->Statement, column);
++ return sqlite3_column_name(this->Statement, column);
+ }
+ }
+
+@@ -276,22 +276,22 @@ int vtkSQLiteQuery::GetFieldType(int col
+ }
+ 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;
+ }
+@@ -312,7 +312,7 @@ bool vtkSQLiteQuery::NextRow()
+ {
+ vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
+ this->InitialFetch = false;
+- if (this->InitialFetchResult == VTK_SQLITE_DONE)
++ if (this->InitialFetchResult == SQLITE_DONE)
+ {
+ return false;
+ }
+@@ -323,12 +323,12 @@ bool vtkSQLiteQuery::NextRow()
+ }
+ 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;
+ }
+@@ -336,8 +336,8 @@ bool vtkSQLiteQuery::NextRow()
+ {
+ 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());
+@@ -420,11 +420,11 @@ bool vtkSQLiteQuery::BeginTransaction()
+ 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);
+@@ -448,7 +448,7 @@ bool vtkSQLiteQuery::CommitTransaction()
+ {
+ if (this->Statement)
+ {
+- vtk_sqlite3_finalize(this->Statement);
++ sqlite3_finalize(this->Statement);
+ this->Statement = NULL;
+ }
+
+@@ -460,11 +460,11 @@ bool vtkSQLiteQuery::CommitTransaction()
+
+ 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);
+@@ -496,11 +496,11 @@ bool vtkSQLiteQuery::RollbackTransaction
+
+ 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);
+@@ -644,11 +644,11 @@ bool vtkSQLiteQuery::BindIntegerParamete
+ 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)
+ {
+ std::ostringstream errormessage;
+ errormessage << "sqlite_bind_int returned error: " << status;
+@@ -673,11 +673,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(
+ 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<vtk_sqlite_int64>(value));
++ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value));
+
+- if (status != VTK_SQLITE_OK)
++ if (status != SQLITE_OK)
+ {
+ std::ostringstream errormessage;
+ errormessage << "sqlite_bind_int64 returned error: " << status;
+@@ -702,12 +702,12 @@ bool vtkSQLiteQuery::BindDoubleParameter
+ 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)
+ {
+ std::ostringstream errormessage;
+ errormessage << "sqlite_bind_double returned error: " << status;
+@@ -731,12 +731,12 @@ bool vtkSQLiteQuery::BindStringParameter
+ 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)
+ {
+ std::ostringstream errormessage;
+ errormessage << "sqlite_bind_text returned error: " << status;
+@@ -760,17 +760,17 @@ bool vtkSQLiteQuery::BindBlobParameter(i
+ 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)
+ {
+ std::ostringstream errormessage;
+ errormessage << "sqlite_bind_blob returned error: " << status;
+@@ -794,12 +794,12 @@ bool vtkSQLiteQuery::ClearParameterBindi
+ 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)
+ {
+ std::ostringstream errormessage;
+ errormessage << "sqlite_clear_bindings returned error: " << status;
+Index: ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteQuery.h
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/IO/SQL/vtkSQLiteQuery.h
++++ ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteQuery.h
+@@ -47,7 +47,7 @@
+ class vtkSQLiteDatabase;
+ class vtkVariant;
+ class vtkVariantArray;
+-struct vtk_sqlite3_stmt;
++struct sqlite3_stmt;
+
+ class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
+ {
+@@ -155,7 +155,7 @@ private:
+ 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: ParaView-v5.0.0-source/VTK/ThirdParty/sqlite/CMakeLists.txt
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/ThirdParty/sqlite/CMakeLists.txt
++++ ParaView-v5.0.0-source/VTK/ThirdParty/sqlite/CMakeLists.txt
+@@ -1,4 +1,3 @@
+ set(vtksqlite_THIRD_PARTY 1)
+-set(vtksqlite_LIBRARIES vtksqlite)
++set(vtksqlite_LIBRARIES sqlite3)
+ vtk_module_export_info()
+-add_subdirectory(vtksqlite)
+Index: ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteDatabase.h
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/IO/SQL/vtkSQLiteDatabase.h
++++ ParaView-v5.0.0-source/VTK/IO/SQL/vtkSQLiteDatabase.h
+@@ -49,7 +49,7 @@
+ class vtkSQLQuery;
+ class vtkSQLiteQuery;
+ class vtkStringArray;
+-struct vtk_sqlite3;
++struct sqlite3;
+
+ class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
+ {
+@@ -147,7 +147,7 @@ protected:
+ 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
diff --git a/debian/patches/use_system_xdmf.patch b/debian/patches/use_system_xdmf.patch
new file mode 100644
index 0000000..5821a14
--- /dev/null
+++ b/debian/patches/use_system_xdmf.patch
@@ -0,0 +1,102 @@
+Description: Use system xdmf
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/750182
+Last-Update: 2014-06-02
+
+Index: ParaView-v5.0.0-source/VTK/ThirdParty/xdmf2/CMakeLists.txt
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/ThirdParty/xdmf2/CMakeLists.txt
++++ ParaView-v5.0.0-source/VTK/ThirdParty/xdmf2/CMakeLists.txt
+@@ -1,44 +1,7 @@
+ vtk_module_third_party(xdmf2
+- LIBRARIES vtkxdmf2
++ LIBRARIES Xdmf
+ INCLUDE_DIRS
+ ${CMAKE_CURRENT_SOURCE_DIR}/vtkxdmf2/libsrc
+ ${CMAKE_CURRENT_BINARY_DIR}/vtkxdmf2/libsrc
+ NO_ADD_SUBDIRECTORY
+ )
+-
+-if(VTK_USE_SYSTEM_XDMF2)
+- return()
+-endif()
+-
+-#########################################################################
+-# Set Xdmf build environment options the way VTK wants them
+-
+-# build options
+-option(VTK_XDMF_USE_MPI "Build Xdmf with MPI" OFF)
+-mark_as_advanced(VTK_XDMF_USE_MPI)
+-set (XDMF_BUILD_MPI ${VTK_XDMF_USE_MPI})
+-
+-# wrapping
+-# VTK doesn't wrap libxdmf itself (either with vtk's wrapping or swig)
+-set(XDMF_WRAP_TCL OFF CACHE INTERNAL "")
+-set(XDMF_WRAP_PYTHON OFF CACHE INTERNAL "")
+-set(XDMF_WRAP_PYTHON_INSTALL_DIR ${VTK_INSTALL_LIBRARY_DIR}/site-packages/Xdmf)
+-set(XDMF_WRAP_CSHARP OFF CACHE INTERNAL "")
+-set(XDMF_REGENERATE_WRAPPERS OFF CACHE INTERNAL "")
+-set(XDMF_REGENERATE_YACCLEX OFF CACHE INTERNAL "")
+-
+-# packaging
+-set(XDMF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
+-set(XDMF_INSTALL_BIN_DIR ${VTK_INSTALL_RUNTIME_DIR})
+-set(XDMF_INSTALL_INCLUDE_DIR "${VTK_INSTALL_INCLUDE_DIR}/vtkxdmf2")
+-set(XDMF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
+-set(XDMF_INSTALL_NO_DEVELOPMENT ${VTK_INSTALL_NO_DEVELOPMENT})
+-set(XDMF_INSTALL_NO_RUNTIME ${VTK_INSTALL_NO_RUNTIME})
+-
+-vtk_module_export_info()
+-
+-#now configure the libxdmf build per the above settings
+-set(XDMF_BUILT_INVTK 1)
+-add_subdirectory(vtkxdmf2)
+-
+-vtk_target(vtkxdmf2 NO_INSTALL)
+Index: ParaView-v5.0.0-source/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
++++ ParaView-v5.0.0-source/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
+@@ -15,5 +15,6 @@
+ #ifndef vtk_xdmf2_h
+ #define vtk_xdmf2_h
+
++# include <Xdmf.h>
+
+ #endif
+Index: ParaView-v5.0.0-source/VTK/IO/Xdmf2/CMakeLists.txt
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/IO/Xdmf2/CMakeLists.txt
++++ ParaView-v5.0.0-source/VTK/IO/Xdmf2/CMakeLists.txt
+@@ -19,6 +19,3 @@ set_source_files_properties(
+ vtkXdmfReaderInternal
+ PROPERTIES WRAP_EXCLUDE_PYTHON 1
+ )
+-
+-#set(${vtk-module}_NO_HeaderTest 1) # TODO: helper classes and reenable
+-vtk_module_library(vtkIOXdmf2 ${Module_SRCS})
+Index: ParaView-v5.0.0-source/VTK/IO/Xdmf3/CMakeLists.txt
+===================================================================
+--- ParaView-v5.0.0-source.orig/VTK/IO/Xdmf3/CMakeLists.txt
++++ ParaView-v5.0.0-source/VTK/IO/Xdmf3/CMakeLists.txt
+@@ -18,6 +18,3 @@ set_source_files_properties(
+ vtkXdmf3SILBuilder
+ WRAP_EXCLUDE
+ )
+-
+-include_directories(${XdmfCore_INCLUDE_DIRS} ${XdmfDSM_INCLUDE_DIRS})
+-vtk_module_library(vtkIOXdmf3 ${Module_SRCS})
+Index: ParaView-v5.0.0-source/CMake/VTKModules.cmake
+===================================================================
+--- ParaView-v5.0.0-source.orig/CMake/VTKModules.cmake
++++ ParaView-v5.0.0-source/CMake/VTKModules.cmake
+@@ -324,9 +324,6 @@ set(_vtk_modules
+ # vtkXMLMultiBlockDataWriter
+ # vtkXMLHierarchicalBoxDataWriter
+
+- vtkIOXdmf2
+- # Needed for xdmf support.
+-
+ vtkIOAMR
+ # Needed for AMR Readers.
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git
More information about the debian-science-commits
mailing list