[vtk6] 04/06: Update patchset for new version
Gert Wollny
gert-guest at moszumanska.debian.org
Tue Apr 5 14:28:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository vtk6.
commit 1033ba01d52e19b07146ef01967747a53ddd3668
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Tue Apr 5 09:40:20 2016 +0000
Update patchset for new version
* add patch to remove forcing the embedded glew version. it seems the
debian version is newer than the embedded one.
* remove patch 96 since it was applied upstream
---
debian/patches/104_fix_gcc_version_6.patch | 10 +-
debian/patches/105_unforce_embedded_glew.patch | 16 ++
debian/patches/10_allpatches.patch | 12 --
debian/patches/30_matplotlib.patch | 18 +-
debian/patches/40_use_system_sqlite.patch | 88 ++++-----
debian/patches/60_use_system_mpi4py.patch | 12 +-
debian/patches/70_fix_ftbfs_gcc49.patch | 26 ++-
debian/patches/80_fix_arm_compilation.patch | 6 +-
debian/patches/95_ffmpeg_2.9.patch | 20 +--
.../96_concurrent_vtkLookupTableMapData_fix.patch | 198 ---------------------
debian/patches/97_fix_latex_doxygen.patch | 4 +-
debian/patches/series | 4 +-
12 files changed, 103 insertions(+), 311 deletions(-)
diff --git a/debian/patches/104_fix_gcc_version_6.patch b/debian/patches/104_fix_gcc_version_6.patch
index 390152c..7982e50 100644
--- a/debian/patches/104_fix_gcc_version_6.patch
+++ b/debian/patches/104_fix_gcc_version_6.patch
@@ -2,8 +2,8 @@ Description: Fix to be able to compile with gcc-6
Author: Gerardo Malazdrewicz <gerardo at malazdrewicz.com.ar>
Bug: https://bugs.debian.org/812296
---- a/CMake/GenerateExportHeader.cmake 2016-02-10 23:14:42.395094043 -0400
-+++ b/CMake/GenerateExportHeader.cmake 2016-02-10 23:10:16.756787993 -0400
+--- a/CMake/GenerateExportHeader.cmake
++++ b/CMake/GenerateExportHeader.cmake
@@ -166,7 +166,7 @@
execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
OUTPUT_VARIABLE _gcc_version_info
@@ -13,9 +13,9 @@ Bug: https://bugs.debian.org/812296
_gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
# patch level, handle this here:
---- a/CMake/vtkCompilerExtras.cmake 2016-02-10 23:14:47.587139148 -0400
-+++ b/CMake/vtkCompilerExtras.cmake 2016-02-10 23:07:47.667495203 -0400
-@@ -27,7 +27,7 @@
+--- a/CMake/vtkCompilerExtras.cmake
++++ b/CMake/vtkCompilerExtras.cmake
+@@ -32,7 +32,7 @@
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info)
diff --git a/debian/patches/105_unforce_embedded_glew.patch b/debian/patches/105_unforce_embedded_glew.patch
new file mode 100644
index 0000000..be7d9b7
--- /dev/null
+++ b/debian/patches/105_unforce_embedded_glew.patch
@@ -0,0 +1,16 @@
+Description: Remove the FORCE from the use_system_glew=off option
+ The embedded version of GLEW seems to be older than the version
+ provided by Debian, so I assume that the fixes have been applied.
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -207,7 +207,7 @@
+ endif()
+
+ # default to not using the system GLEW as ours has fixes in it right now
+-set(VTK_USE_SYSTEM_GLEW OFF CACHE BOOL "do not use a system glew" FORCE)
++set(VTK_USE_SYSTEM_GLEW OFF CACHE BOOL "do not use a system glew" ON)
+
+ set(VTK_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+
diff --git a/debian/patches/10_allpatches.patch b/debian/patches/10_allpatches.patch
index 16d7b78..788f74c 100644
--- a/debian/patches/10_allpatches.patch
+++ b/debian/patches/10_allpatches.patch
@@ -30,18 +30,6 @@ 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: VTK-6.2.0/Utilities/Doxygen/doxyfile.in
-===================================================================
---- VTK-6.2.0.orig/Utilities/Doxygen/doxyfile.in
-+++ VTK-6.2.0/Utilities/Doxygen/doxyfile.in
-@@ -22,6 +22,7 @@ PDF_HYPERLINKS = YES
-
- HAVE_DOT = @HAVE_DOT_YESNO@
- DOT_PATH = "@DOT_PATH@"
-+DOT_IMAGE_FORMAT = svg
- CLASS_GRAPH = YES
- COLLABORATION_GRAPH = YES
- TEMPLATE_RELATIONS = YES
Index: VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx
===================================================================
--- VTK-6.2.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx
diff --git a/debian/patches/30_matplotlib.patch b/debian/patches/30_matplotlib.patch
index d2e45d7..3e1e54f 100644
--- a/debian/patches/30_matplotlib.patch
+++ b/debian/patches/30_matplotlib.patch
@@ -1,15 +1,13 @@
-Index: VTK-6.2.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-===================================================================
---- VTK-6.2.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ VTK-6.2.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -132,6 +132,10 @@ protected:
- // Function used to check MPL availability and update MPLMathTextAvailable.
- // This will do tests only the first time this method is called.
- static void CheckMPLAvailability();
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -143,6 +143,10 @@
+ // is called internally when matplotlib rendering is first needed and is used
+ // to implement IsAvailable.
+ static Availability CheckMPLAvailability();
+ static void DisableMPL()
+ {
+ MPLMathTextAvailable = UNAVAILABLE;
+ };
- private:
- vtkMatplotlibMathTextUtilities(const vtkMatplotlibMathTextUtilities&); // Not implemented.
+ // Description:
+ // Cache the availability of matplotlib in the current python session.
diff --git a/debian/patches/40_use_system_sqlite.patch b/debian/patches/40_use_system_sqlite.patch
index f0e3222..f3e4b06 100644
--- a/debian/patches/40_use_system_sqlite.patch
+++ b/debian/patches/40_use_system_sqlite.patch
@@ -3,10 +3,8 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/750183
Last-Update: 2014-06-03
-Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
-===================================================================
---- VTK-6.2.0.orig/IO/SQL/vtkSQLiteDatabase.cxx
-+++ VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
+--- a/IO/SQL/vtkSQLiteDatabase.cxx
++++ b/IO/SQL/vtkSQLiteDatabase.cxx
@@ -29,7 +29,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
@@ -16,7 +14,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
vtkStandardNewMacro(vtkSQLiteDatabase);
-@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char*
+@@ -307,15 +307,15 @@
}
}
@@ -36,7 +34,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
return false;
}
else
-@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close()
+@@ -334,8 +334,8 @@
}
else
{
@@ -47,7 +45,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
{
vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
}
-@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetT
+@@ -374,7 +374,7 @@
if (!status)
{
vtkErrorMacro(<< "GetTables(): Database returned error: "
@@ -56,7 +54,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
query->Delete();
return this->Tables;
}
-@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetR
+@@ -403,7 +403,7 @@
if (!status)
{
vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
@@ -65,7 +63,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
query->Delete();
return NULL;
}
-@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const c
+@@ -467,10 +467,10 @@
// ----------------------------------------------------------------------
bool vtkSQLiteDatabase::HasError()
{
@@ -78,10 +76,8 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.cxx
- return vtk_sqlite3_errmsg(this->SQLiteInstance);
+ return sqlite3_errmsg(this->SQLiteInstance);
}
-Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
-===================================================================
---- VTK-6.2.0.orig/IO/SQL/vtkSQLiteQuery.cxx
-+++ VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
+--- a/IO/SQL/vtkSQLiteQuery.cxx
++++ b/IO/SQL/vtkSQLiteQuery.cxx
@@ -25,7 +25,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
@@ -91,7 +87,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
#include <cassert>
-@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery()
+@@ -43,7 +43,7 @@
{
this->Statement = NULL;
this->InitialFetch = true;
@@ -100,7 +96,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
this->LastErrorText = NULL;
this->TransactionInProgress = false;
}
-@@ -61,7 +61,7 @@ vtkSQLiteQuery::~vtkSQLiteQuery()
+@@ -61,7 +61,7 @@
{
if (this->Database != NULL)
{
@@ -109,7 +105,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
this->Statement = NULL;
}
}
-@@ -131,8 +131,8 @@ bool vtkSQLiteQuery::SetQuery(const char
+@@ -128,8 +128,8 @@
if (this->Statement)
{
vtkDebugMacro(<<"Finalizing old statement");
@@ -120,7 +116,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
<< finalizeStatus);
-@@ -151,19 +151,19 @@ bool vtkSQLiteQuery::SetQuery(const char
+@@ -148,19 +148,19 @@
return false;
}
@@ -145,7 +141,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
<< this->GetLastErrorText()
<< " on statement: '"
<< this->Query << "'");
-@@ -194,31 +194,31 @@ bool vtkSQLiteQuery::Execute()
+@@ -191,31 +191,31 @@
}
else
{
@@ -184,7 +180,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
<< this->GetLastErrorText());
this->Active = false;
return false;
-@@ -239,7 +239,7 @@ int vtkSQLiteQuery::GetNumberOfFields()
+@@ -236,7 +236,7 @@
}
else
{
@@ -193,7 +189,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
}
}
-@@ -259,7 +259,7 @@ const char * vtkSQLiteQuery::GetFieldNam
+@@ -256,7 +256,7 @@
}
else
{
@@ -202,7 +198,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
}
}
-@@ -279,22 +279,22 @@ int vtkSQLiteQuery::GetFieldType(int col
+@@ -276,22 +276,22 @@
}
else
{
@@ -232,7 +228,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
<<" from SQLite.");
return VTK_VOID;
}
-@@ -315,7 +315,7 @@ bool vtkSQLiteQuery::NextRow()
+@@ -312,7 +312,7 @@
{
vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
this->InitialFetch = false;
@@ -241,7 +237,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
return false;
}
-@@ -326,12 +326,12 @@ bool vtkSQLiteQuery::NextRow()
+@@ -323,12 +323,12 @@
}
else
{
@@ -257,7 +253,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
return true;
}
-@@ -339,8 +339,8 @@ bool vtkSQLiteQuery::NextRow()
+@@ -336,8 +336,8 @@
{
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -268,7 +264,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
vtkErrorMacro(<<"NextRow(): Database returned error code "
<< result << " with the following message: "
<< this->GetLastErrorText());
-@@ -366,33 +366,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtk
+@@ -363,33 +363,33 @@
}
else
{
@@ -313,7 +309,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
default:
return vtkVariant();
}
-@@ -423,11 +423,11 @@ bool vtkSQLiteQuery::BeginTransaction()
+@@ -420,11 +420,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -328,7 +324,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
this->TransactionInProgress = true;
this->SetLastErrorText(NULL);
-@@ -451,7 +451,7 @@ bool vtkSQLiteQuery::CommitTransaction()
+@@ -448,7 +448,7 @@
{
if (this->Statement)
{
@@ -337,7 +333,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
this->Statement = NULL;
}
-@@ -463,11 +463,11 @@ bool vtkSQLiteQuery::CommitTransaction()
+@@ -460,11 +460,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -352,7 +348,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
-@@ -499,11 +499,11 @@ bool vtkSQLiteQuery::RollbackTransaction
+@@ -496,11 +496,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -367,7 +363,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
-@@ -647,11 +647,11 @@ bool vtkSQLiteQuery::BindIntegerParamete
+@@ -644,11 +644,11 @@
if (this->Active)
{
this->Active = false;
@@ -382,7 +378,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int returned error: " << status;
-@@ -676,11 +676,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(
+@@ -673,11 +673,11 @@
if (this->Active)
{
this->Active = false;
@@ -397,7 +393,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int64 returned error: " << status;
-@@ -705,12 +705,12 @@ bool vtkSQLiteQuery::BindDoubleParameter
+@@ -702,12 +702,12 @@
if (this->Active)
{
this->Active = false;
@@ -413,7 +409,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_double returned error: " << status;
-@@ -734,12 +734,12 @@ bool vtkSQLiteQuery::BindStringParameter
+@@ -731,12 +731,12 @@
if (this->Active)
{
this->Active = false;
@@ -429,7 +425,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_text returned error: " << status;
-@@ -763,17 +763,17 @@ bool vtkSQLiteQuery::BindBlobParameter(i
+@@ -760,17 +760,17 @@
if (this->Active)
{
this->Active = false;
@@ -451,7 +447,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_blob returned error: " << status;
-@@ -797,12 +797,12 @@ bool vtkSQLiteQuery::ClearParameterBindi
+@@ -794,12 +794,12 @@
if (this->Active)
{
this->Active = false;
@@ -467,10 +463,8 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.cxx
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
-Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.h
-===================================================================
---- VTK-6.2.0.orig/IO/SQL/vtkSQLiteQuery.h
-+++ VTK-6.2.0/IO/SQL/vtkSQLiteQuery.h
+--- a/IO/SQL/vtkSQLiteQuery.h
++++ b/IO/SQL/vtkSQLiteQuery.h
@@ -47,7 +47,7 @@
class vtkSQLiteDatabase;
class vtkVariant;
@@ -480,7 +474,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.h
class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
{
-@@ -155,7 +155,7 @@ private:
+@@ -155,7 +155,7 @@
vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
void operator=(const vtkSQLiteQuery &); // Not implemented.
@@ -489,20 +483,16 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteQuery.h
bool InitialFetch;
int InitialFetchResult;
char *LastErrorText;
-Index: VTK-6.2.0/ThirdParty/sqlite/CMakeLists.txt
-===================================================================
---- VTK-6.2.0.orig/ThirdParty/sqlite/CMakeLists.txt
-+++ VTK-6.2.0/ThirdParty/sqlite/CMakeLists.txt
+--- a/ThirdParty/sqlite/CMakeLists.txt
++++ b/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: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.h
-===================================================================
---- VTK-6.2.0.orig/IO/SQL/vtkSQLiteDatabase.h
-+++ VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.h
+--- a/IO/SQL/vtkSQLiteDatabase.h
++++ b/IO/SQL/vtkSQLiteDatabase.h
@@ -49,7 +49,7 @@
class vtkSQLQuery;
class vtkSQLiteQuery;
@@ -512,7 +502,7 @@ Index: VTK-6.2.0/IO/SQL/vtkSQLiteDatabase.h
class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
{
-@@ -147,7 +147,7 @@ protected:
+@@ -147,7 +147,7 @@
virtual bool ParseURL(const char* url);
private:
diff --git a/debian/patches/60_use_system_mpi4py.patch b/debian/patches/60_use_system_mpi4py.patch
index f4810a2..b0bfbb0 100644
--- a/debian/patches/60_use_system_mpi4py.patch
+++ b/debian/patches/60_use_system_mpi4py.patch
@@ -2,9 +2,9 @@ Description: use system mpi4py
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-03-24
---- vtk6-6.2.0.orig/Parallel/MPI4Py/CMakeLists.txt
-+++ vtk6-6.2.0/Parallel/MPI4Py/CMakeLists.txt
-@@ -17,7 +17,7 @@ if(VTK_USE_SYSTEM_MPI4PY)
+--- a/Parallel/MPI4Py/CMakeLists.txt
++++ b/Parallel/MPI4Py/CMakeLists.txt
+@@ -18,7 +18,7 @@
mark_as_advanced(MPI4PY_INCLUDE_DIR)
endif()
else()
@@ -13,9 +13,9 @@ Last-Update: 2015-03-24
endif()
include_directories("${MPI4PY_INCLUDE_DIR}")
---- vtk6-6.2.0.orig/Parallel/MPI4Py/module.cmake
-+++ vtk6-6.2.0/Parallel/MPI4Py/module.cmake
-@@ -5,8 +5,6 @@ if (VTK_WRAP_PYTHON)
+--- a/Parallel/MPI4Py/module.cmake
++++ b/Parallel/MPI4Py/module.cmake
+@@ -5,8 +5,6 @@
DEPENDS
vtkParallelMPI
vtkPython
diff --git a/debian/patches/70_fix_ftbfs_gcc49.patch b/debian/patches/70_fix_ftbfs_gcc49.patch
index e1dd6ec..5923b1c 100644
--- a/debian/patches/70_fix_ftbfs_gcc49.patch
+++ b/debian/patches/70_fix_ftbfs_gcc49.patch
@@ -4,11 +4,9 @@ Bug-Debian: http://bugs.debian.org/746923
Forwarded: https://github.com/Kitware/VTK/pull/7
Last-Update: 2014-05-30
-Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-===================================================================
---- VTK-6.2.0.orig/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1079,7 +1079,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
+--- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+@@ -1112,7 +1112,10 @@
vtkIdType cellsPerNode = numTotalCells / nprocs;
vtkIdList **sendCells = new vtkIdList * [ nprocs ];
@@ -20,7 +18,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
if (numConsumers == nprocs - 1)
{
-@@ -1564,7 +1567,9 @@ vtkFloatArray **
+@@ -1597,7 +1600,9 @@
// Exchange int arrays
float **recvArrays = new float * [nprocs];
@@ -31,7 +29,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
if (sendSize[me] > 0) // sent myself an array
{
-@@ -1686,7 +1691,9 @@ vtkIdTypeArray **
+@@ -1719,7 +1724,9 @@
// Exchange int arrays
vtkIdType **recvArrays = new vtkIdType * [nprocs];
@@ -42,7 +40,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
if (sendSize[me] > 0) // sent myself an array
{
-@@ -2789,7 +2796,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2788,7 +2795,9 @@
unsigned char *vals = new unsigned char [npoints];
@@ -53,7 +51,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -2809,7 +2818,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2808,7 +2817,9 @@
unsigned char *vals = new unsigned char [ncells];
@@ -64,7 +62,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -3008,7 +3019,9 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3007,7 +3018,9 @@
vtkIdType nGridPoints = grid->GetNumberOfPoints();
vtkIdType *numPointsOutside = new vtkIdType [nprocs];
@@ -75,7 +73,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
globalIds->SetNumberOfValues(nGridPoints);
-@@ -3090,10 +3103,16 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3089,10 +3102,16 @@
// global ID back?
vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
@@ -94,7 +92,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkIdType *next = new vtkIdType [nprocs];
vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3268,7 +3287,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3267,7 +3286,9 @@
{
// There are no cells in my assigned region
@@ -105,7 +103,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
return gids;
}
-@@ -3473,7 +3494,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3472,7 +3493,10 @@
std::multimap<int, int>::iterator mapIt;
vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
@@ -117,7 +115,7 @@ Index: VTK-6.2.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
for (int i=0; i<nprocs; i++)
{
-@@ -3563,7 +3587,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+@@ -3562,7 +3586,9 @@
vtkIdType numPoints = grid->GetNumberOfPoints();
vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
diff --git a/debian/patches/80_fix_arm_compilation.patch b/debian/patches/80_fix_arm_compilation.patch
index 62b1fe0..d4583df 100644
--- a/debian/patches/80_fix_arm_compilation.patch
+++ b/debian/patches/80_fix_arm_compilation.patch
@@ -5,9 +5,9 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: https://bugs.debian.org/793304
Last-Update: 2015-07-29
---- vtk6-6.2.0+dfsg1.orig/Examples/Infovis/Cxx/CMakeLists.txt
-+++ vtk6-6.2.0+dfsg1/Examples/Infovis/Cxx/CMakeLists.txt
-@@ -26,11 +26,6 @@ if(vtkViewsInfovis_LOADED)
+--- a/Examples/Infovis/Cxx/CMakeLists.txt
++++ b/Examples/Infovis/Cxx/CMakeLists.txt
+@@ -26,11 +26,6 @@
endif()
# If Qt is enabled include the QT based examples
diff --git a/debian/patches/95_ffmpeg_2.9.patch b/debian/patches/95_ffmpeg_2.9.patch
index e2394ba..0da599c 100644
--- a/debian/patches/95_ffmpeg_2.9.patch
+++ b/debian/patches/95_ffmpeg_2.9.patch
@@ -2,9 +2,9 @@ Description: Replace deprecated FFmpeg API
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Last-Update: <2015-11-02>
---- vtk6-6.2.0+dfsg1.orig/CMake/vtkTestFFMPEG.cmake
-+++ vtk6-6.2.0+dfsg1/CMake/vtkTestFFMPEG.cmake
-@@ -32,8 +32,8 @@ if(FFMPEG_INCLUDE_DIR)
+--- a/CMake/vtkTestFFMPEG.cmake
++++ b/CMake/vtkTestFFMPEG.cmake
+@@ -32,8 +32,8 @@
#include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h>
int main()
{
@@ -15,9 +15,9 @@ Last-Update: <2015-11-02>
0, 0);
return 0;
}\n")
---- vtk6-6.2.0+dfsg1.orig/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ vtk6-6.2.0+dfsg1/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -189,11 +189,11 @@ int vtkFFMPEGWriterInternal::Start()
+--- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
++++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx
+@@ -191,11 +191,11 @@
c->height = this->Dim[1];
if (this->Writer->GetCompression())
{
@@ -31,7 +31,7 @@ Last-Update: <2015-11-02>
}
//to do playback at actual recorded rate, this will need more work see also below
-@@ -272,13 +272,13 @@ int vtkFFMPEGWriterInternal::Start()
+@@ -274,13 +274,13 @@
#endif
//for the output of the writer's input...
@@ -47,7 +47,7 @@ Last-Update: <2015-11-02>
unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize);
if (!rgb)
{
-@@ -286,10 +286,10 @@ int vtkFFMPEGWriterInternal::Start()
+@@ -288,10 +288,10 @@
return 0;
}
//The rgb buffer should get deleted when this->rgbInput is.
@@ -60,7 +60,7 @@ Last-Update: <2015-11-02>
if (!this->yuvOutput)
{
vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
-@@ -347,12 +347,12 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+@@ -349,12 +349,12 @@
//convert that to YUV for input to the codec
#ifdef VTK_FFMPEG_HAS_IMG_CONVERT
img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt,
@@ -75,7 +75,7 @@ Last-Update: <2015-11-02>
cc->width, cc->height, cc->pix_fmt,
SWS_BICUBIC, NULL, NULL, NULL);
-@@ -445,14 +445,14 @@ void vtkFFMPEGWriterInternal::End()
+@@ -447,14 +447,14 @@
if (this->yuvOutput)
{
av_free(this->yuvOutput->data[0]);
diff --git a/debian/patches/96_concurrent_vtkLookupTableMapData_fix.patch b/debian/patches/96_concurrent_vtkLookupTableMapData_fix.patch
deleted file mode 100644
index 242b2f3..0000000
--- a/debian/patches/96_concurrent_vtkLookupTableMapData_fix.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-Description: Fix crash in function called from multiple threads
- vtkLookupTableMapData() was not thread safe and could lead to
- crashes when accessed from multiple threads. Added a mutex around
- the logic to determine if the color table size needed to be
- increased.
- .
- Added a multi-threaded test that crashes on occasion prior
- to this patch, but does not crash with this patch applied.
-Author: Cory Quammen <cory.quammen at kitware.com>
-Last-Update: 2016-01-31
-Bug: http://www.vtk.org/Bug/view.php?id=15365
-
-diff --git a/Common/Core/Testing/Cxx/CMakeLists.txt b/Common/Core/Testing/Cxx/CMakeLists.txt
---- a/Common/Core/Testing/Cxx/CMakeLists.txt
-+++ b/Common/Core/Testing/Cxx/CMakeLists.txt
-@@ -32,6 +32,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
- TestGarbageCollector.cxx
- # TestInstantiator.cxx # Have not enabled instantiators.
- TestLookupTable.cxx
-+ TestLookupTableThreaded.cxx
- TestMath.cxx
- TestMinimalStandardRandomSequence.cxx
- TestNew.cxx
-diff --git a/Common/Core/Testing/Cxx/TestLookupTableThreaded.cxx b/Common/Core/Testing/Cxx/TestLookupTableThreaded.cxx
-new file mode 100644
-index 0000000..4330609
---- /dev/null
-+++ b/Common/Core/Testing/Cxx/TestLookupTableThreaded.cxx
-@@ -0,0 +1,57 @@
-+/*=========================================================================
-+
-+ Program: Visualization Toolkit
-+ Module: TestLookupTableThreaded.cxx
-+
-+ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
-+ All rights reserved.
-+ See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-+
-+ This software is distributed WITHOUT ANY WARRANTY; without even
-+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-+ PURPOSE. See the above copyright notice for more information.
-+
-+=========================================================================*/
-+
-+#include "vtkLookupTable.h"
-+#include "vtkMultiThreader.h"
-+#include "vtkNew.h"
-+
-+namespace {
-+
-+vtkLookupTable * lut;
-+
-+VTK_THREAD_RETURN_TYPE ThreadedMethod(void *)
-+{
-+ int numberOfValues = 25;
-+ double* input = new double[numberOfValues];
-+ unsigned char* output = new unsigned char[4*numberOfValues];
-+ int inputType = VTK_DOUBLE;
-+ int inputIncrement = 1;
-+ int outputFormat = VTK_RGBA;
-+
-+ lut->MapScalarsThroughTable2(input, output, inputType, numberOfValues,
-+ inputIncrement, outputFormat);
-+
-+ delete[] input;
-+ delete[] output;
-+
-+ return VTK_THREAD_RETURN_VALUE;
-+}
-+
-+} // end anonymous namespace
-+
-+int TestLookupTableThreaded(int, char* [])
-+{
-+ lut = vtkLookupTable::New();
-+ lut->SetNumberOfTableValues( 1024 );
-+
-+ vtkNew<vtkMultiThreader> threader;
-+ threader->SetSingleMethod( ThreadedMethod, NULL );
-+ threader->SetNumberOfThreads( 4 );
-+ threader->SingleMethodExecute();
-+
-+ lut->Delete();
-+
-+ return EXIT_SUCCESS;
-+}
-diff --git a/Common/Core/vtkLookupTable.cxx b/Common/Core/vtkLookupTable.cxx
-index 53d9663..2d90054 100644
---- a/Common/Core/vtkLookupTable.cxx
-+++ b/Common/Core/vtkLookupTable.cxx
-@@ -18,6 +18,7 @@
- #include "vtkBitArray.h"
- #include "vtkMath.h"
- #include "vtkMathConfigure.h"
-+#include "vtkMutexLock.h"
- #include "vtkObjectFactory.h"
- #include "vtkStringArray.h"
- #include "vtkVariantArray.h"
-@@ -81,6 +82,8 @@ vtkLookupTable::vtkLookupTable(int sze, int ext)
- this->Scale = VTK_SCALE_LINEAR;
-
- this->OpaqueFlag=1;
-+
-+ this->ResizeMutex = vtkSimpleMutexLock::New();
- }
-
- //----------------------------------------------------------------------------
-@@ -88,6 +91,7 @@ vtkLookupTable::~vtkLookupTable()
- {
- this->Table->UnRegister( this );
- this->Table = NULL;
-+ this->ResizeMutex->Delete();
- }
-
- //----------------------------------------------------------------------------
-@@ -641,8 +645,8 @@ namespace {
-
- //----------------------------------------------------------------------------
- template<class T>
--void vtkLookupTableMapData(vtkLookupTable *self, T *input,
-- unsigned char *output, int length,
-+void vtkLookupTableMapData(vtkLookupTable *self, vtkSimpleMutexLock *mutex,
-+ T *input, unsigned char *output, int length,
- int inIncr, int outFormat, TableParameters & p)
- {
- int i = length;
-@@ -654,14 +658,24 @@ void vtkLookupTableMapData(vtkLookupTable *self, T *input,
- // end. When this function is called repeatedly with the same size
- // lookup table, memory reallocation will be done only one the first
- // call if at all.
-+
- vtkUnsignedCharArray* lookupTable = self->GetTable();
- vtkIdType numberOfColors = lookupTable->GetNumberOfTuples();
- vtkIdType neededSize = (numberOfColors + vtkLookupTable::NUMBER_OF_SPECIAL_COLORS) *
- lookupTable->GetNumberOfComponents();
-+
-+ // Since this involves a potential array resize and this function
-+ // might be accessed concurently from more than one thread, we need a
-+ // mutex here. This shouldn't affect performance much if this function
-+ // is used to map many input values, but if it is called repeatedly
-+ // with short input arrays, performance may be much worse.
-+ mutex->Lock();
- if (lookupTable->GetSize() < neededSize)
- {
- lookupTable->Resize(numberOfColors + vtkLookupTable::NUMBER_OF_SPECIAL_COLORS);
- }
-+ mutex->Unlock();
-+
- unsigned char* table = lookupTable->GetPointer(0);
-
- // Writing directly to the memory location instead of adding them
-@@ -1159,7 +1173,7 @@ void vtkLookupTable::MapScalarsThroughTable2(void *input,
- {
- newInput->SetValue(i, bitArray->GetValue(id));
- }
-- vtkLookupTableMapData(this,
-+ vtkLookupTableMapData(this, this->ResizeMutex,
- static_cast<unsigned char*>(newInput->GetPointer(0)),
- output, numberOfValues,
- inputIncrement, outputFormat, p);
-@@ -1169,7 +1183,7 @@ void vtkLookupTable::MapScalarsThroughTable2(void *input,
- break;
-
- vtkTemplateMacro(
-- vtkLookupTableMapData(this,static_cast<VTK_TT*>(input),output,
-+ vtkLookupTableMapData(this, this->ResizeMutex, static_cast<VTK_TT*>(input),output,
- numberOfValues, inputIncrement, outputFormat, p)
- );
- default:
-diff --git a/Common/Core/vtkLookupTable.h b/Common/Core/vtkLookupTable.h
-index f233c85..d0401df 100644
---- a/Common/Core/vtkLookupTable.h
-+++ b/Common/Core/vtkLookupTable.h
-@@ -56,6 +56,8 @@
-
- #include "vtkUnsignedCharArray.h" // Needed for inline method
-
-+class vtkSimpleMutexLock;
-+
- #define VTK_RAMP_LINEAR 0
- #define VTK_RAMP_SCURVE 1
- #define VTK_RAMP_SQRT 2
-@@ -359,6 +361,8 @@ protected:
- int OpaqueFlag;
- vtkTimeStamp OpaqueFlagBuildTime;
-
-+ vtkSimpleMutexLock* ResizeMutex;
-+
- private:
- vtkLookupTable(const vtkLookupTable&); // Not implemented.
- void operator=(const vtkLookupTable&); // Not implemented.
-@@ -373,6 +377,3 @@ inline unsigned char *vtkLookupTable::WritePointer(const vtkIdType id,
- }
-
- #endif
--
--
--
diff --git a/debian/patches/97_fix_latex_doxygen.patch b/debian/patches/97_fix_latex_doxygen.patch
index 9cf5c2b..2767429 100644
--- a/debian/patches/97_fix_latex_doxygen.patch
+++ b/debian/patches/97_fix_latex_doxygen.patch
@@ -4,7 +4,7 @@ Last-Update: 2016-02-02
Forwardedd: no
--- a/Common/Core/vtkAbstractArray.h
+++ b/Common/Core/vtkAbstractArray.h
-@@ -381,7 +381,7 @@
+@@ -384,7 +384,7 @@
// prominence P, we sample N values, with N = f(T; P, U).
// We want f to be sublinear in T in order to interactively handle large
// arrays; in practice, we can make f independent of T:
@@ -15,7 +15,7 @@ Forwardedd: no
// 1 out of every 1000 samples with a confidence of 0.999999 (= 1 - 1e6).
--- a/Common/Core/vtkMath.h
+++ b/Common/Core/vtkMath.h
-@@ -669,14 +669,14 @@
+@@ -661,14 +661,14 @@
// The output is provided by overwriting the input A with a matrix of the same size as
// A containing all of the information about L and U. If the output matrix is
// \f$ A* = \left( \begin{array}{cc}
diff --git a/debian/patches/series b/debian/patches/series
index 389a453..5d6041f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,9 +8,9 @@
80_fix_arm_compilation.patch
90_gdal-2.0.patch
95_ffmpeg_2.9.patch
-96_concurrent_vtkLookupTableMapData_fix.patch
97_fix_latex_doxygen.patch
100_javac-heap.patch
101_java_install_path.patch
-#102_enable_system_proj4_lib.patch
+102_enable_system_proj4_lib.patch
104_fix_gcc_version_6.patch
+105_unforce_embedded_glew.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list