[paraview] 03/05: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Tue Jul 5 19:31:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository paraview.
commit f0f4b57c46b99d96a8f504276af37c4855da7726
Author: Anton Gladky <gladk at debian.org>
Date: Tue Jul 5 21:21:51 2016 +0200
Refresh patches.
---
debian/patches/ffmpeg.patch | 67 ------------
debian/patches/fix-ftbfs-kfreebsd.patch | 18 ----
debian/patches/fix_ftbfs_gcc49.patch | 6 +-
debian/patches/fix_manpages_errors.patch | 174 +++++++++++++++----------------
debian/patches/fix_path_paraview.patch | 6 +-
debian/patches/reduce_cmake_error.cmake | 6 +-
debian/patches/remove_webgl.patch | 10 +-
debian/patches/series | 5 +-
debian/patches/use_system_eigen3.patch | 15 +++
debian/patches/use_system_mpi4py.patch | 18 ++--
debian/patches/use_system_sqlite.patch | 34 +++---
debian/patches/use_system_utf8.patch | 12 +--
debian/patches/use_system_xdmf.patch | 32 +++---
13 files changed, 167 insertions(+), 236 deletions(-)
diff --git a/debian/patches/ffmpeg.patch b/debian/patches/ffmpeg.patch
deleted file mode 100644
index 1e34597..0000000
--- a/debian/patches/ffmpeg.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: fix compilation againts ffmpeg_3.0
-Origin: http://www.paraview.org/Bug/view.php?id=16001
-Acked-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-04-20
-
-Index: paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-===================================================================
---- paraview.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -195,11 +195,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
-@@ -278,13 +278,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 = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize);
- if (!rgb)
- {
-@@ -292,10 +292,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." );
-@@ -353,12 +353,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);
-
diff --git a/debian/patches/fix-ftbfs-kfreebsd.patch b/debian/patches/fix-ftbfs-kfreebsd.patch
deleted file mode 100644
index 6e18f44..0000000
--- a/debian/patches/fix-ftbfs-kfreebsd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS on kfreeBSD and hurd
- also include the linux headers for this arch
-Author: Tobias Frost <tobi at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822266
-Last-Update: 2014-04-24
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Plugins/CDIReader/cdilib.c
-+++ b/Plugins/CDIReader/cdilib.c
-@@ -47,7 +47,7 @@
- #define _XOPEN_SOURCE 600
- #endif
-
--#ifdef __linux__
-+#if defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__GNU__)
- #include <unistd.h>
- #include <stdbool.h>
- #include <sys/types.h>
diff --git a/debian/patches/fix_ftbfs_gcc49.patch b/debian/patches/fix_ftbfs_gcc49.patch
index 298e866..7fb9a5e 100644
--- a/debian/patches/fix_ftbfs_gcc49.patch
+++ b/debian/patches/fix_ftbfs_gcc49.patch
@@ -4,10 +4,10 @@ Bug-Debian: http://bugs.debian.org/#746896
Forwarded: https://github.com/Kitware/VTK/pull/7
Last-Update: 2014-05-30
-Index: ParaView-v5.0.1-source/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+Index: ParaView-v5.1.0/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ ParaView-v5.0.1-source/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+--- ParaView-v5.1.0.orig/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ ParaView-v5.1.0/VTK/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
@@ -1112,7 +1112,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
vtkIdType cellsPerNode = numTotalCells / nprocs;
diff --git a/debian/patches/fix_manpages_errors.patch b/debian/patches/fix_manpages_errors.patch
index 94b31d9..0c6b86e 100644
--- a/debian/patches/fix_manpages_errors.patch
+++ b/debian/patches/fix_manpages_errors.patch
@@ -3,10 +3,10 @@ Description: rough editing of manpages, shipped with sources to fix
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-25
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateContext.3
@@ -29,8 +29,7 @@ l l l .
.PP
@@ -17,10 +17,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCreateCon
context, makes it current, and returns a
handle to the new context. The handle returned is of type
\fBIceTContext\fP\&.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleImageStrategy.3
++++ ParaView-v5.1.0/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
@@ -46,10 +46,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSingleIma
.PP
By default \fBIceT \fPsets the single image strategy to
\fBICET_SINGLE_IMAGE_STRATEGY_AUTOMATIC\fP
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -66,10 +66,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetD
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthFormat.3
@@ -15,8 +15,6 @@
\fBicetImageGetColorFormat\fP,\fBicetImageGetDepthFormat\fP\-\- get the format of image buffers
@@ -86,10 +86,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetD
-.igicetImageGetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetCompositeMode.3
@@ -45,8 +45,7 @@ is one of the following enumerations:
.PP
.TP
@@ -110,10 +110,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetComposite
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
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetHeight.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -135,10 +135,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetH
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorFormat.3
++++ ParaView-v5.1.0/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
@@ -155,10 +155,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetColorF
-.igicetSetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorui.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -175,10 +175,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetC
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
@@ -15,8 +15,7 @@
\fBicetEnable\fP,\fBicetDisable\fP\-\- enable/disable an \fBIceT \fPfeature.
@@ -196,10 +196,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDisable.3
-.igicetDisable|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallback.3
@@ -18,18 +18,6 @@
.SH Synopsis
@@ -229,10 +229,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetDrawCallb
order.
.PP
Note that the \fIprojection_matrix\fP
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
@@ -15,8 +15,7 @@
\fBicetEnable\fP,\fBicetDisable\fP\-\- enable/disable an \fBIceT \fPfeature.
@@ -250,10 +250,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetEnable.3
-.igicetDisable|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorub.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -270,10 +270,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopy
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepthf.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -290,10 +290,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopy
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepth.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -310,10 +310,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetD
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorub.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -330,10 +330,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetC
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorFormat.3
@@ -15,8 +15,6 @@
\fBicetImageGetColorFormat\fP,\fBicetImageGetDepthFormat\fP\-\- get the format of image buffers
@@ -350,10 +350,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetC
-.igicetImageGetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -370,10 +370,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetC
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColorf.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -390,10 +390,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopy
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetWidth.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -415,10 +415,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetW
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.3
++++ ParaView-v5.1.0/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
@@ -462,10 +462,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetStrategy.
.PP
Not all of the strategies support ordered image composition.
\fBICET_STRATEGY_SEQUENTIAL\fP,
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyColor.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -482,10 +482,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopy
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopyDepth.3
@@ -15,8 +15,6 @@
\fBicetImageCopyColor\fP,\fBicetImageCopyDepth\fP\-\- retrieve pixel data from image
@@ -502,10 +502,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageCopy
-.igicetImageCopyDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetNumPixels.3
@@ -15,11 +15,7 @@
\fBicetImageGetWidth\fP,\fBicetImageGetHeight\fP,\fBicetImageGetNumPixels\fP\-\- get dimensions of an image
@@ -527,10 +527,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetN
-.igicetImageGetHeight|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthFormat.3
++++ ParaView-v5.1.0/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
@@ -547,10 +547,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetSetDepthF
-.igicetSetDepthFormat|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColor.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -567,10 +567,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetC
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -587,10 +587,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetC
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetDepthcf.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -607,10 +607,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetD
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcui.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
@@ -627,10 +627,10 @@ Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetC
-.igicetImageGetDepth|)textbf
.PP
.\" NOTE: This file is generated, DO NOT EDIT.
-Index: ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
+Index: ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
===================================================================
---- ParaView-v5.0.1-source.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
-+++ ParaView-v5.0.1-source/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
+--- ParaView-v5.1.0.orig/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
++++ ParaView-v5.1.0/ThirdParty/IceT/vtkicet/doc/man/man3/icetImageGetColorcub.3
@@ -15,8 +15,6 @@
\fBicetImageGetColor , \fBicetImageGetDepth\fP\-\- retrieve pixel data buffer from image\fP
diff --git a/debian/patches/fix_path_paraview.patch b/debian/patches/fix_path_paraview.patch
index 5b845a9..6b3153b 100644
--- a/debian/patches/fix_path_paraview.patch
+++ b/debian/patches/fix_path_paraview.patch
@@ -2,10 +2,10 @@ Description: Fix python path
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-02-03
-Index: ParaView-v5.0.1-source/Wrapping/Python/paraview/__init__.py
+Index: ParaView-v5.1.0/Wrapping/Python/paraview/__init__.py
===================================================================
---- ParaView-v5.0.1-source.orig/Wrapping/Python/paraview/__init__.py
-+++ ParaView-v5.0.1-source/Wrapping/Python/paraview/__init__.py
+--- ParaView-v5.1.0.orig/Wrapping/Python/paraview/__init__.py
++++ ParaView-v5.1.0/Wrapping/Python/paraview/__init__.py
@@ -17,6 +17,10 @@ ParaView modules to force backwards comp
from paraview.simple import *
"""
diff --git a/debian/patches/reduce_cmake_error.cmake b/debian/patches/reduce_cmake_error.cmake
index 7e95318..ec12b69 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-v5.0.1-source/VTK/CMake/vtkModuleAPI.cmake
+Index: ParaView-v5.1.0/VTK/CMake/vtkModuleAPI.cmake
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/CMake/vtkModuleAPI.cmake
-+++ ParaView-v5.0.1-source/VTK/CMake/vtkModuleAPI.cmake
+--- ParaView-v5.1.0.orig/VTK/CMake/vtkModuleAPI.cmake
++++ ParaView-v5.1.0/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
index fbdfba9..5744fbe 100644
--- a/debian/patches/remove_webgl.patch
+++ b/debian/patches/remove_webgl.patch
@@ -2,10 +2,10 @@ Description: Disable WebGL support (requires separate packaging)
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-02-03
-Index: ParaView-v5.0.1-source/ParaViewCore/ClientServerCore/Rendering/module.cmake
+Index: ParaView-v5.1.0/ParaViewCore/ClientServerCore/Rendering/module.cmake
===================================================================
---- ParaView-v5.0.1-source.orig/ParaViewCore/ClientServerCore/Rendering/module.cmake
-+++ ParaView-v5.0.1-source/ParaViewCore/ClientServerCore/Rendering/module.cmake
+--- ParaView-v5.1.0.orig/ParaViewCore/ClientServerCore/Rendering/module.cmake
++++ ParaView-v5.1.0/ParaViewCore/ClientServerCore/Rendering/module.cmake
@@ -3,7 +3,7 @@ if(PARAVIEW_USE_PISTON)
list(APPEND __dependencies vtkAcceleratorsPiston)
endif()
@@ -13,5 +13,5 @@ Index: ParaView-v5.0.1-source/ParaViewCore/ClientServerCore/Rendering/module.cma
- list(APPEND __dependencies vtkWebGLExporter vtkRenderingVolumeAMR)
+ list(APPEND __dependencies vtkRenderingVolumeAMR)
endif()
-
- vtk_module(vtkPVClientServerCoreRendering
+ if(PARAVIEW_USE_OSPRAY)
+ list(APPEND __dependencies vtkRenderingOSPRay)
diff --git a/debian/patches/series b/debian/patches/series
index a1a0769..4973c7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,6 @@ use_system_xdmf.patch
use_system_utf8.patch
use_system_mpi4py.patch
remove_webgl.patch
-ffmpeg.patch
-fix-ftbfs-kfreebsd.patch
+#ffmpeg.patch
+#fix-ftbfs-kfreebsd.patch
+use_system_eigen3.patch
diff --git a/debian/patches/use_system_eigen3.patch b/debian/patches/use_system_eigen3.patch
new file mode 100644
index 0000000..73397d2
--- /dev/null
+++ b/debian/patches/use_system_eigen3.patch
@@ -0,0 +1,15 @@
+Description: Use system eigen3 instead of embedded one
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-07-05
+
+--- paraview-5.1.0+dfsg1.orig/Plugins/SciberQuestToolKit/SciberQuest/EigenConfig.cmake
++++ paraview-5.1.0+dfsg1/Plugins/SciberQuestToolKit/SciberQuest/EigenConfig.cmake
+@@ -6,7 +6,7 @@
+ # Copyright 2012 SciberQuest Inc.
+ #
+ set(Eigen_DIR
+- ${SciberQuestToolKit_SOURCE_DIR}/eigen-3.0.3/eigen-eigen-3.0.3
++ /usr/include/eigen3/
+ CACHE FILEPATH
+ "Path to Eigen install.")
+ mark_as_advanced(Eigen_DIR)
diff --git a/debian/patches/use_system_mpi4py.patch b/debian/patches/use_system_mpi4py.patch
index 7fb709d..9b3c791 100644
--- a/debian/patches/use_system_mpi4py.patch
+++ b/debian/patches/use_system_mpi4py.patch
@@ -2,10 +2,10 @@ Description: use system mpi4py
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-03-24
-Index: ParaView-v5.0.1-source/VTK/Parallel/MPI4Py/CMakeLists.txt
+Index: ParaView-v5.1.0/VTK/Parallel/MPI4Py/CMakeLists.txt
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/Parallel/MPI4Py/CMakeLists.txt
-+++ ParaView-v5.0.1-source/VTK/Parallel/MPI4Py/CMakeLists.txt
+--- ParaView-v5.1.0.orig/VTK/Parallel/MPI4Py/CMakeLists.txt
++++ ParaView-v5.1.0/VTK/Parallel/MPI4Py/CMakeLists.txt
@@ -18,7 +18,7 @@ if(VTK_USE_SYSTEM_MPI4PY)
mark_as_advanced(MPI4PY_INCLUDE_DIR)
endif()
@@ -15,10 +15,10 @@ Index: ParaView-v5.0.1-source/VTK/Parallel/MPI4Py/CMakeLists.txt
endif()
include_directories("${MPI4PY_INCLUDE_DIR}")
-Index: ParaView-v5.0.1-source/VTK/Parallel/MPI4Py/module.cmake
+Index: ParaView-v5.1.0/VTK/Parallel/MPI4Py/module.cmake
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/Parallel/MPI4Py/module.cmake
-+++ ParaView-v5.0.1-source/VTK/Parallel/MPI4Py/module.cmake
+--- ParaView-v5.1.0.orig/VTK/Parallel/MPI4Py/module.cmake
++++ ParaView-v5.1.0/VTK/Parallel/MPI4Py/module.cmake
@@ -5,8 +5,6 @@ if (VTK_WRAP_PYTHON)
DEPENDS
vtkParallelMPI
@@ -28,10 +28,10 @@ Index: ParaView-v5.0.1-source/VTK/Parallel/MPI4Py/module.cmake
EXCLUDE_FROM_TCL_WRAPPING
EXCLUDE_FROM_JAVA_WRAPPING
KIT
-Index: ParaView-v5.0.1-source/ParaViewCore/ClientServerCore/Core/module.cmake
+Index: ParaView-v5.1.0/ParaViewCore/ClientServerCore/Core/module.cmake
===================================================================
---- ParaView-v5.0.1-source.orig/ParaViewCore/ClientServerCore/Core/module.cmake
-+++ ParaView-v5.0.1-source/ParaViewCore/ClientServerCore/Core/module.cmake
+--- ParaView-v5.1.0.orig/ParaViewCore/ClientServerCore/Core/module.cmake
++++ ParaView-v5.1.0/ParaViewCore/ClientServerCore/Core/module.cmake
@@ -11,9 +11,6 @@ if (PARAVIEW_ENABLE_PYTHON)
endif ()
diff --git a/debian/patches/use_system_sqlite.patch b/debian/patches/use_system_sqlite.patch
index 32ea234..da7be94 100644
--- a/debian/patches/use_system_sqlite.patch
+++ b/debian/patches/use_system_sqlite.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/750183
Last-Update: 2014-06-03
-Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteDatabase.cxx
+Index: ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteDatabase.cxx
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/IO/SQL/vtkSQLiteDatabase.cxx
-+++ ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteDatabase.cxx
+--- ParaView-v5.1.0.orig/VTK/IO/SQL/vtkSQLiteDatabase.cxx
++++ ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteDatabase.cxx
@@ -29,7 +29,7 @@
#include <fstream>
#include <sstream>
@@ -78,10 +78,10 @@ Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteDatabase.cxx
- return vtk_sqlite3_errmsg(this->SQLiteInstance);
+ return sqlite3_errmsg(this->SQLiteInstance);
}
-Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteQuery.cxx
+Index: ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteQuery.cxx
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/IO/SQL/vtkSQLiteQuery.cxx
-+++ ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteQuery.cxx
+--- ParaView-v5.1.0.orig/VTK/IO/SQL/vtkSQLiteQuery.cxx
++++ ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteQuery.cxx
@@ -25,7 +25,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
@@ -422,10 +422,10 @@ Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteQuery.cxx
{
std::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
-Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteQuery.h
+Index: ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteQuery.h
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/IO/SQL/vtkSQLiteQuery.h
-+++ ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteQuery.h
+--- ParaView-v5.1.0.orig/VTK/IO/SQL/vtkSQLiteQuery.h
++++ ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteQuery.h
@@ -47,7 +47,7 @@
class vtkSQLiteDatabase;
class vtkVariant;
@@ -435,7 +435,7 @@ Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteQuery.h
class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
{
-@@ -155,7 +155,7 @@ private:
+@@ -154,7 +154,7 @@ private:
vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
void operator=(const vtkSQLiteQuery &); // Not implemented.
@@ -444,20 +444,20 @@ Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteQuery.h
bool InitialFetch;
int InitialFetchResult;
char *LastErrorText;
-Index: ParaView-v5.0.1-source/VTK/ThirdParty/sqlite/CMakeLists.txt
+Index: ParaView-v5.1.0/VTK/ThirdParty/sqlite/CMakeLists.txt
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/ThirdParty/sqlite/CMakeLists.txt
-+++ ParaView-v5.0.1-source/VTK/ThirdParty/sqlite/CMakeLists.txt
+--- ParaView-v5.1.0.orig/VTK/ThirdParty/sqlite/CMakeLists.txt
++++ ParaView-v5.1.0/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.1-source/VTK/IO/SQL/vtkSQLiteDatabase.h
+Index: ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteDatabase.h
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/IO/SQL/vtkSQLiteDatabase.h
-+++ ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteDatabase.h
+--- ParaView-v5.1.0.orig/VTK/IO/SQL/vtkSQLiteDatabase.h
++++ ParaView-v5.1.0/VTK/IO/SQL/vtkSQLiteDatabase.h
@@ -49,7 +49,7 @@
class vtkSQLQuery;
class vtkSQLiteQuery;
@@ -467,7 +467,7 @@ Index: ParaView-v5.0.1-source/VTK/IO/SQL/vtkSQLiteDatabase.h
class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
{
-@@ -147,7 +147,7 @@ protected:
+@@ -144,7 +144,7 @@ protected:
virtual bool ParseURL(const char* url);
private:
diff --git a/debian/patches/use_system_utf8.patch b/debian/patches/use_system_utf8.patch
index 9dd244c..362c19a 100644
--- a/debian/patches/use_system_utf8.patch
+++ b/debian/patches/use_system_utf8.patch
@@ -2,10 +2,10 @@ Description: Use system utf8
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-02-04
-Index: ParaView-v5.0.1-source/VTK/Common/Core/vtkUnicodeString.cxx
+Index: ParaView-v5.1.0/VTK/Common/Core/vtkUnicodeString.cxx
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/Common/Core/vtkUnicodeString.cxx
-+++ ParaView-v5.0.1-source/VTK/Common/Core/vtkUnicodeString.cxx
+--- ParaView-v5.1.0.orig/VTK/Common/Core/vtkUnicodeString.cxx
++++ ParaView-v5.1.0/VTK/Common/Core/vtkUnicodeString.cxx
@@ -41,7 +41,7 @@ vtkUnicodeString::const_iterator::const_
vtkUnicodeString::value_type vtkUnicodeString::const_iterator::operator*() const
@@ -185,10 +185,10 @@ Index: ParaView-v5.0.1-source/VTK/Common/Core/vtkUnicodeString.cxx
return vtkUnicodeString(from, to);
}
-Index: ParaView-v5.0.1-source/VTK/IO/Core/vtkUTF8TextCodec.cxx
+Index: ParaView-v5.1.0/VTK/IO/Core/vtkUTF8TextCodec.cxx
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/IO/Core/vtkUTF8TextCodec.cxx
-+++ ParaView-v5.0.1-source/VTK/IO/Core/vtkUTF8TextCodec.cxx
+--- ParaView-v5.1.0.orig/VTK/IO/Core/vtkUTF8TextCodec.cxx
++++ ParaView-v5.1.0/VTK/IO/Core/vtkUTF8TextCodec.cxx
@@ -124,7 +124,7 @@ vtkUnicodeString::value_type vtkUTF8Text
throw(std::string("End of Input"));
}
diff --git a/debian/patches/use_system_xdmf.patch b/debian/patches/use_system_xdmf.patch
index 9f31fa6..d4eb43a 100644
--- a/debian/patches/use_system_xdmf.patch
+++ b/debian/patches/use_system_xdmf.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/750182
Last-Update: 2014-06-02
-Index: ParaView-v5.0.1-source/VTK/ThirdParty/xdmf2/CMakeLists.txt
+Index: ParaView-v5.1.0/VTK/ThirdParty/xdmf2/CMakeLists.txt
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/ThirdParty/xdmf2/CMakeLists.txt
-+++ ParaView-v5.0.1-source/VTK/ThirdParty/xdmf2/CMakeLists.txt
+--- ParaView-v5.1.0.orig/VTK/ThirdParty/xdmf2/CMakeLists.txt
++++ ParaView-v5.1.0/VTK/ThirdParty/xdmf2/CMakeLists.txt
@@ -1,44 +1,7 @@
vtk_module_third_party(xdmf2
- LIBRARIES vtkxdmf2
@@ -53,10 +53,10 @@ Index: ParaView-v5.0.1-source/VTK/ThirdParty/xdmf2/CMakeLists.txt
-add_subdirectory(vtkxdmf2)
-
-vtk_target(vtkxdmf2 NO_INSTALL)
-Index: ParaView-v5.0.1-source/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
+Index: ParaView-v5.1.0/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
-+++ ParaView-v5.0.1-source/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
+--- ParaView-v5.1.0.orig/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
++++ ParaView-v5.1.0/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
@@ -15,5 +15,6 @@
#ifndef vtk_xdmf2_h
#define vtk_xdmf2_h
@@ -64,10 +64,10 @@ Index: ParaView-v5.0.1-source/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
+# include <Xdmf.h>
#endif
-Index: ParaView-v5.0.1-source/VTK/IO/Xdmf2/CMakeLists.txt
+Index: ParaView-v5.1.0/VTK/IO/Xdmf2/CMakeLists.txt
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/IO/Xdmf2/CMakeLists.txt
-+++ ParaView-v5.0.1-source/VTK/IO/Xdmf2/CMakeLists.txt
+--- ParaView-v5.1.0.orig/VTK/IO/Xdmf2/CMakeLists.txt
++++ ParaView-v5.1.0/VTK/IO/Xdmf2/CMakeLists.txt
@@ -19,6 +19,3 @@ set_source_files_properties(
vtkXdmfReaderInternal
PROPERTIES WRAP_EXCLUDE_PYTHON 1
@@ -75,10 +75,10 @@ Index: ParaView-v5.0.1-source/VTK/IO/Xdmf2/CMakeLists.txt
-
-#set(${vtk-module}_NO_HeaderTest 1) # TODO: helper classes and reenable
-vtk_module_library(vtkIOXdmf2 ${Module_SRCS})
-Index: ParaView-v5.0.1-source/VTK/IO/Xdmf3/CMakeLists.txt
+Index: ParaView-v5.1.0/VTK/IO/Xdmf3/CMakeLists.txt
===================================================================
---- ParaView-v5.0.1-source.orig/VTK/IO/Xdmf3/CMakeLists.txt
-+++ ParaView-v5.0.1-source/VTK/IO/Xdmf3/CMakeLists.txt
+--- ParaView-v5.1.0.orig/VTK/IO/Xdmf3/CMakeLists.txt
++++ ParaView-v5.1.0/VTK/IO/Xdmf3/CMakeLists.txt
@@ -18,6 +18,3 @@ set_source_files_properties(
vtkXdmf3SILBuilder
WRAP_EXCLUDE
@@ -86,11 +86,11 @@ Index: ParaView-v5.0.1-source/VTK/IO/Xdmf3/CMakeLists.txt
-
-include_directories(${XdmfCore_INCLUDE_DIRS} ${XdmfDSM_INCLUDE_DIRS})
-vtk_module_library(vtkIOXdmf3 ${Module_SRCS})
-Index: ParaView-v5.0.1-source/CMake/VTKModules.cmake
+Index: ParaView-v5.1.0/CMake/VTKModules.cmake
===================================================================
---- ParaView-v5.0.1-source.orig/CMake/VTKModules.cmake
-+++ ParaView-v5.0.1-source/CMake/VTKModules.cmake
-@@ -319,9 +319,6 @@ set(_vtk_modules
+--- ParaView-v5.1.0.orig/CMake/VTKModules.cmake
++++ ParaView-v5.1.0/CMake/VTKModules.cmake
+@@ -325,9 +325,6 @@ set(_vtk_modules
# vtkXMLMultiBlockDataWriter
# vtkXMLHierarchicalBoxDataWriter
--
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