Merge updates from master

This commit is contained in:
Repository QA checks
2015-09-20 00:21:49 -04:00
3 changed files with 851 additions and 0 deletions
+1
View File
@@ -1 +1,2 @@
DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
@@ -0,0 +1,550 @@
diff --git a/VTK/IO/SQL/CMakeLists.txt b/VTK/IO/SQL/CMakeLists.txt
index a62a0b3..25089d9 100644
--- a/VTK/IO/SQL/CMakeLists.txt
+++ b/VTK/IO/SQL/CMakeLists.txt
@@ -28,3 +28,4 @@ set_source_files_properties(
)
vtk_module_library(vtkIOSQL ${Module_SRCS} ${SQLite_SRCS})
+target_link_libraries(vtkIOSQL -lsqlite3)
diff --git a/VTK/IO/SQL/module.cmake b/VTK/IO/SQL/module.cmake
index f00bfd0..db7792f 100644
--- a/VTK/IO/SQL/module.cmake
+++ b/VTK/IO/SQL/module.cmake
@@ -5,7 +5,7 @@ vtk_module(vtkIOSQL
vtkIOCore
PRIVATE_DEPENDS
vtksys
- vtksqlite # We should consider splitting this into a module.
+# vtksqlite # We should consider splitting this into a module.
TEST_DEPENDS
vtkIOLegacy
vtkTestingIOSQL
diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.cxx b/VTK/IO/SQL/vtkSQLiteDatabase.cxx
index 8651670..07acfc2 100644
--- a/VTK/IO/SQL/vtkSQLiteDatabase.cxx
+++ b/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* password, int mode)
}
}
- 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::GetTables()
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::GetRecord(const char *table)
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 char* URL)
// ----------------------------------------------------------------------
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);
}
diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.h b/VTK/IO/SQL/vtkSQLiteDatabase.h
index 640355a..3e8cd57 100644
--- a/VTK/IO/SQL/vtkSQLiteDatabase.h
+++ b/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/VTK/IO/SQL/vtkSQLiteQuery.cxx b/VTK/IO/SQL/vtkSQLiteQuery.cxx
index 31a15f1..ea12405 100644
--- a/VTK/IO/SQL/vtkSQLiteQuery.cxx
+++ b/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 *newQuery)
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 *newQuery)
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::GetFieldName(int column)
}
else
{
- return vtk_sqlite3_column_name(this->Statement, column);
+ return sqlite3_column_name(this->Statement, column);
}
}
@@ -276,22 +276,22 @@ int vtkSQLiteQuery::GetFieldType(int column)
}
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());
@@ -363,33 +363,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtkIdType column)
}
else
{
- switch (vtk_sqlite3_column_type(this->Statement, column))
+ switch (sqlite3_column_type(this->Statement, column))
{
- case VTK_SQLITE_INTEGER:
- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
+ case SQLITE_INTEGER:
+ return vtkVariant(sqlite3_column_int(this->Statement, column));
- case VTK_SQLITE_FLOAT:
- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
+ case SQLITE_FLOAT:
+ return vtkVariant(sqlite3_column_double(this->Statement, column));
- case VTK_SQLITE_TEXT:
+ case SQLITE_TEXT:
{
std::ostringstream str;
- str << vtk_sqlite3_column_text(this->Statement, column);
+ str << sqlite3_column_text(this->Statement, column);
return vtkVariant(vtkStdString(str.str()));
}
- case VTK_SQLITE_BLOB:
+ case SQLITE_BLOB:
{
// This is a hack ... by passing the BLOB to vtkStdString with an explicit
// byte count, we ensure that the string will store all of the BLOB's bytes,
// even if there are NULL values.
return vtkVariant(vtkStdString(
- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
- vtk_sqlite3_column_bytes(this->Statement, column)));
+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
+ sqlite3_column_bytes(this->Statement, column)));
}
- case VTK_SQLITE_NULL:
+ case SQLITE_NULL:
default:
return vtkVariant();
}
@@ -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::BindIntegerParameter(int index, int value)
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(int index, vtkTypeInt64 value)
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(int index, double value)
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(int index, const char *value, int lengt
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(int index, const void *data, int length)
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::ClearParameterBindings()
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;
diff --git a/VTK/IO/SQL/vtkSQLiteQuery.h b/VTK/IO/SQL/vtkSQLiteQuery.h
index bfab39a..db4deb4 100644
--- a/VTK/IO/SQL/vtkSQLiteQuery.h
+++ b/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;
diff --git a/VTK/ThirdParty/sqlite/CMakeLists.txt b/VTK/ThirdParty/sqlite/CMakeLists.txt
index 9e1c067..a55764b 100644
--- a/VTK/ThirdParty/sqlite/CMakeLists.txt
+++ b/VTK/ThirdParty/sqlite/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(vtksqlite_THIRD_PARTY 1)
-set(vtksqlite_LIBRARIES vtksqlite)
-vtk_module_export_info()
-add_subdirectory(vtksqlite)
+#set(vtksqlite_THIRD_PARTY 1)
+#set(vtksqlite_LIBRARIES sqlite3)
+#vtk_module_export_info()
+#add_subdirectory(vtksqlite)
diff --git a/VTK/ThirdParty/sqlite/module.cmake b/VTK/ThirdParty/sqlite/module.cmake
index 8dbb3a7..db837c5 100644
--- a/VTK/ThirdParty/sqlite/module.cmake
+++ b/VTK/ThirdParty/sqlite/module.cmake
@@ -1 +1 @@
-vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)
+#vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)
@@ -0,0 +1,300 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils multilib versionator python-single-r1 cmake-utils
MAIN_PV=$(get_major_version)
MAJOR_PV=$(get_version_component_range 1-2)
MY_P="ParaView-v${PV}-source"
DESCRIPTION="ParaView is a powerful scientific data visualization application"
HOMEPAGE="http://www.paraview.org"
SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
RESTRICT="mirror"
LICENSE="paraview GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk"
RESTRICT="test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
RDEPEND="
dev-libs/expat
>=dev-libs/jsoncpp-0.10.1
dev-libs/libxml2:2
dev-libs/protobuf
media-libs/freetype
media-libs/libpng:0
media-libs/libtheora
media-libs/tiff:0=
sci-libs/hdf5[mpi=]
>=sci-libs/netcdf-4.2[hdf5]
>=sci-libs/netcdf-cxx-4.2:3
sys-libs/zlib
virtual/jpeg:0
virtual/opengl
>=x11-libs/gl2ps-1.3.8
x11-libs/libX11
x11-libs/libXext
x11-libs/libXmu
x11-libs/libXt
coprocessing? (
plugins? (
dev-python/PyQt4
dev-qt/qtgui:4
)
)
ffmpeg? ( virtual/ffmpeg )
mpi? ( virtual/mpi[cxx,romio] )
mysql? ( virtual/mysql )
python? (
${PYTHON_DEPS}
dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/sip[${PYTHON_USEDEP}]
dev-python/twisted-core
dev-python/zope-interface[${PYTHON_USEDEP}]
mpi? ( dev-python/mpi4py )
qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] )
)
qt4? (
dev-qt/designer:4
dev-qt/qtgui:4
dev-qt/qtopengl:4
dev-qt/qthelp:4[compat]
dev-qt/qtsql:4
dev-qt/qtwebkit:4
)
sqlite? ( dev-db/sqlite:3 )
tcl? ( dev-lang/tcl:0= )
tk? ( dev-lang/tk:0= )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
doc? ( app-doc/doxygen )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
python-single-r1_pkg_setup
PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
}
src_prepare() {
# see patch headers for description
epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \
"${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
"${FILESDIR}"/${PN}-4.2.0-protobuf.patch \
"${FILESDIR}"/${PN}-4.3.1-fix-development-install.patch \
"${FILESDIR}"/${PN}-4.3.1-protobuf-2.6.patch \
"${FILESDIR}"/${P}-removesqlite.patch
# lib64 fixes
sed -i \
-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die
sed -i \
-e "s:\/lib\/python:\/$(get_libdir)\/python:g" \
VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die
sed -i \
-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
CMakeLists.txt \
Plugins/SciberQuestToolKit/CMakeLists.txt \
ParaViewConfig.cmake.in \
CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \
Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \
Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die
# no proper switch
use nvcontrol || {
sed -i \
-e '/VTK_USE_NVCONTROL/s#1#0#' \
VTK/Rendering/OpenGL/CMakeLists.txt || die
}
}
src_configure() {
local mysql_lib mysql_includedir
if use mysql ; then
if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then
mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so"
mysql_includedir="/usr/include/mysql"
else
mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so"
mysql_includedir="$(mysql_config --variable=pkgincludedir)"
fi
fi
# VTK_USE_SYSTEM_QTTESTING
# PARAVIEW_USE_SYSTEM_AUTOBAHN
local mycmakeargs=(
-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
-DBUILD_SHARED_LIBS=ON
-DVTK_USE_SYSTEM_EXPAT=ON
-DVTK_USE_SYSTEM_FREETYPE=ON
-DVTK_USE_SYSTEM_GL2PS=ON
-DVTK_USE_SYSTEM_HDF5=ON
-DVTK_USE_SYSTEM_JPEG=ON
-DVTK_USE_SYSTEM_JSONCPP=ON
-DVTK_USE_SYSTEM_LIBXML2=ON
-DVTK_USE_SYSTEM_NETCDF=ON
-DVTK_USE_SYSTEM_OGGTHEORA=ON
-DVTK_USE_SYSTEM_PNG=ON
-DVTK_USE_SYSTEM_PROTOBUF=ON
-DVTK_USE_SYSTEM_TIFF=ON
-DVTK_USE_SYSTEM_XDMF2=OFF
-DVTK_USE_SYSTEM_ZLIB=ON
-DPARAVIEW_USE_SYSTEM_MPI4PY=ON
-DVTK_USE_SYSTEM_ZOPE=ON
-DVTK_USE_SYSTEM_TWISTED=ON
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_COLOR_MAKEFILE=TRUE
-DVTK_USE_OFFSCREEN=TRUE
-DCMAKE_USE_PTHREADS=ON
-DVTK_USE_FFMPEG_ENCODER=OFF
-DPROTOC_LOCATION=$(type -P protoc)
-DVTK_Group_StandAlone=ON
-DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")"
-DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")"
# force this module due to incorrect build system deps
# wrt bug 460528
-DModule_vtkUtilitiesProcessXML=ON
)
# TODO: XDMF_USE_MYSQL?
# VTK_WRAP_JAVA
mycmakeargs+=(
$(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES)
$(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI)
$(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL)
$(cmake-utils_use qt4 Module_vtkGUISupportQtSQL)
$(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit)
$(cmake-utils_use qt4 Module_vtkRenderingQt)
$(cmake-utils_use qt4 Module_vtkViewsQt)
$(cmake-utils_use qt4 VTK_Group_ParaViewQt)
$(cmake-utils_use qt4 VTK_Group_Qt)
$(cmake-utils_use !qt4 PQWIDGETS_DISABLE_QTWEBKIT)
$(cmake-utils_use boost Module_vtkInfovisBoost)
$(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg)
$(cmake-utils_use mpi PARAVIEW_USE_MPI)
$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
$(cmake-utils_use mpi PARAVIEW_USE_ICE_T)
$(cmake-utils_use mpi VTK_Group_MPI)
$(cmake-utils_use mpi VTK_XDMF_USE_MPI)
$(cmake-utils_use mpi XDMF_BUILD_MPI)
$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
$(cmake-utils_use python VTK_Group_ParaViewPython)
$(cmake-utils_use python XDMF_WRAP_PYTHON)
$(cmake-utils_use python Module_vtkPython)
$(cmake-utils_use python Module_pqPython)
$(cmake-utils_use python Module_vtkWrappingPythonCore)
$(cmake-utils_use python Module_vtkPVPythonSupport)
$(cmake-utils_use python Module_AutobahnPython)
$(cmake-utils_use python Module_Twisted)
$(cmake-utils_use python Module_ZopeInterface)
$(cmake-utils_use python Module_vtkmpi4py)
$(usex qt4 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF")
$(cmake-utils_use doc BUILD_DOCUMENTATION)
$(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION)
$(cmake-utils_use examples BUILD_EXAMPLES)
$(cmake-utils_use cg VTK_USE_CG_SHADERS)
$(cmake-utils_use mysql Module_vtkIOMySQL)
$(cmake-utils_use sqlite Module_vtksqlite)
$(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST)
$(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG)
$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
$(cmake-utils_use ffmpeg Module_vtkIOFFMPEG)
$(cmake-utils_use tk VTK_Group_Tk)
$(cmake-utils_use tk VTK_USE_TK)
$(cmake-utils_use tk Module_vtkRenderingTk)
$(cmake-utils_use tcl Module_vtkTclTk)
$(cmake-utils_use tcl Module_vtkWrappingTcl)
$(cmake-utils_use test BUILD_TESTING)
)
if use qt4 ; then
mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer )
if use python ; then
# paraview cannot guess sip directory properly
mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" )
fi
fi
# TODO: MantaView VaporPlugin VRPlugin
mycmakeargs+=(
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
$(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering)
# these are always needed for plugins
$(cmake-utils_use plugins Module_vtkFiltersFlowPaths)
$(cmake-utils_use plugins Module_vtkPVServerManagerApplication)
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
}
src_install() {
cmake-utils_src_install
# set up the environment
echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN}
newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
make_desktop_entry paraview "Paraview" paraview
use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
}
pkg_postinst() {
# with Qt4.5 there seem to be issues reading data files
# under certain locales. Setting LC_ALL=C should fix these.
elog ""
elog "If you experience data corruption during parsing of"
elog "data files with paraview please try setting your"
elog "locale to LC_ALL=C."
elog "If you plan to use paraview component from an existing shell"
elog "you should run env-update and . /etc/profile first"
elog ""
elog "paraview no longer exports bundled python modules in PYTHONPATH"
elog "globally due to clashes of bundled packages with system-wide"
elog "site-packages. If you want to use paraview's python modules"
elog "export"
elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages"
elog "as needed."
}