Compare commits
30 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
f893d0e5ef | ||
|
699b032dab | ||
|
7e7a9f7afe | ||
|
f4b5ee3a09 | ||
|
cb07a45afb | ||
|
8877cff153 | ||
|
322fa6f351 | ||
|
5b6573e318 | ||
|
6c207e504c | ||
|
722af9e012 | ||
|
29345ab693 | ||
|
1d043a43e0 | ||
|
4888dabcbb | ||
|
6911e8921c | ||
|
a1d022bddf | ||
|
8fe6b10a69 | ||
|
2639d96baa | ||
|
d727be173a | ||
|
9c6c2d7f86 | ||
|
ef355e1f39 | ||
|
79c5bd8348 | ||
|
f46de28d6a | ||
|
43f44a45a6 | ||
|
bce6413e7a | ||
|
ac996192fd | ||
|
da7173c6de | ||
|
ff465380c5 | ||
|
c3d0dd10ec | ||
|
1a2f805dad | ||
|
48b5f15e37 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -13,3 +13,7 @@ vtk-5.6.0.tar.gz
|
||||
/VTKData-7.1.0.tar.gz
|
||||
/VTK-7.1.1.tar.gz
|
||||
/VTKData-7.1.1.tar.gz
|
||||
/VTK-8.1.1.tar.gz
|
||||
/VTKData-8.1.1.tar.gz
|
||||
/VTK-8.2.0.tar.gz
|
||||
/VTKData-8.2.0.tar.gz
|
||||
|
176
5883.patch
Normal file
176
5883.patch
Normal file
@ -0,0 +1,176 @@
|
||||
From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
|
||||
From: David Gobbi <david.gobbi@gmail.com>
|
||||
Date: Tue, 20 Aug 2019 17:02:24 -0600
|
||||
Subject: [PATCH] Compatibility for Python 3.8
|
||||
|
||||
The PyTypeObject struct was modified in Python 3.8, this change is
|
||||
required to avoid compile errors.
|
||||
---
|
||||
.../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++
|
||||
Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +-
|
||||
Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +-
|
||||
Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++----
|
||||
Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +-
|
||||
Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++-
|
||||
Wrapping/Tools/vtkWrapPythonClass.c | 2 +-
|
||||
Wrapping/Tools/vtkWrapPythonEnum.c | 2 +-
|
||||
Wrapping/Tools/vtkWrapPythonType.c | 2 +-
|
||||
9 files changed, 23 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
|
||||
index b1c12c83de..14ccfbe928 100644
|
||||
--- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
|
||||
+++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
|
||||
@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = {
|
||||
#if PY_VERSION_HEX >= 0x03040000
|
||||
0, // tp_finalize
|
||||
#endif
|
||||
+#if PY_VERSION_HEX >= 0x03080000
|
||||
+ 0, // tp_vectorcall
|
||||
+#if PY_VERSION_HEX < 0x03090000
|
||||
+ 0, // tp_print
|
||||
+#endif
|
||||
+#endif
|
||||
};
|
||||
|
||||
static PyObject* vtkWrite(PyObject* self, PyObject* args)
|
||||
diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
|
||||
index 2b0d443537..3840038498 100644
|
||||
--- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
|
||||
+++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
|
||||
@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
|
||||
sizeof(PyMethodDescrObject), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
PyVTKMethodDescriptor_Delete, // tp_dealloc
|
||||
- nullptr, // tp_print
|
||||
+ 0, // tp_vectorcall_offset
|
||||
nullptr, // tp_getattr
|
||||
nullptr, // tp_setattr
|
||||
nullptr, // tp_compare
|
||||
diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx
|
||||
index 71ee2a3516..5cf5bfbe6b 100644
|
||||
--- a/Wrapping/PythonCore/PyVTKNamespace.cxx
|
||||
+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx
|
||||
@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
|
||||
0, // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
PyVTKNamespace_Delete, // tp_dealloc
|
||||
- nullptr, // tp_print
|
||||
+ 0, // tp_vectorcall_offset
|
||||
nullptr, // tp_getattr
|
||||
nullptr, // tp_setattr
|
||||
nullptr, // tp_compare
|
||||
diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx
|
||||
index 943ac71080..b7104091c0 100644
|
||||
--- a/Wrapping/PythonCore/PyVTKReference.cxx
|
||||
+++ b/Wrapping/PythonCore/PyVTKReference.cxx
|
||||
@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
|
||||
sizeof(PyVTKReference), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
PyVTKReference_Delete, // tp_dealloc
|
||||
- nullptr, // tp_print
|
||||
+ 0, // tp_vectorcall_offset
|
||||
nullptr, // tp_getattr
|
||||
nullptr, // tp_setattr
|
||||
nullptr, // tp_compare
|
||||
@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
|
||||
sizeof(PyVTKReference), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
PyVTKReference_Delete, // tp_dealloc
|
||||
- nullptr, // tp_print
|
||||
+ 0, // tp_vectorcall_offset
|
||||
nullptr, // tp_getattr
|
||||
nullptr, // tp_setattr
|
||||
nullptr, // tp_compare
|
||||
@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = {
|
||||
sizeof(PyVTKReference), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
PyVTKReference_Delete, // tp_dealloc
|
||||
- nullptr, // tp_print
|
||||
+ 0, // tp_vectorcall_offset
|
||||
nullptr, // tp_getattr
|
||||
nullptr, // tp_setattr
|
||||
nullptr, // tp_compare
|
||||
@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = {
|
||||
sizeof(PyVTKReference), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
PyVTKReference_Delete, // tp_dealloc
|
||||
- nullptr, // tp_print
|
||||
+ 0, // tp_vectorcall_offset
|
||||
nullptr, // tp_getattr
|
||||
nullptr, // tp_setattr
|
||||
nullptr, // tp_compare
|
||||
diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx
|
||||
index be200985b3..340fe7953b 100644
|
||||
--- a/Wrapping/PythonCore/PyVTKTemplate.cxx
|
||||
+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx
|
||||
@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
|
||||
0, // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
nullptr, // tp_dealloc
|
||||
- nullptr, // tp_print
|
||||
+ 0, // tp_vectorcall_offset
|
||||
nullptr, // tp_getattr
|
||||
nullptr, // tp_setattr
|
||||
nullptr, // tp_compare
|
||||
diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h
|
||||
index 4a767844a6..be208faeef 100644
|
||||
--- a/Wrapping/PythonCore/vtkPythonCompatibility.h
|
||||
+++ b/Wrapping/PythonCore/vtkPythonCompatibility.h
|
||||
@@ -64,7 +64,13 @@
|
||||
#endif
|
||||
|
||||
// PyTypeObject compatibility
|
||||
-#if PY_VERSION_HEX >= 0x03040000
|
||||
+#if PY_VERSION_HEX >= 0x03090000
|
||||
+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
|
||||
+ 0, 0, 0, 0,
|
||||
+#elif PY_VERSION_HEX >= 0x03080000
|
||||
+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
|
||||
+ 0, 0, 0, 0, 0,
|
||||
+#elif PY_VERSION_HEX >= 0x03040000
|
||||
#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
|
||||
0, 0, 0,
|
||||
#else
|
||||
diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c
|
||||
index b1e45f8e80..4d558ea081 100644
|
||||
--- a/Wrapping/Tools/vtkWrapPythonClass.c
|
||||
+++ b/Wrapping/Tools/vtkWrapPythonClass.c
|
||||
@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
|
||||
" sizeof(PyVTKObject), // tp_basicsize\n"
|
||||
" 0, // tp_itemsize\n"
|
||||
" PyVTKObject_Delete, // tp_dealloc\n"
|
||||
- " nullptr, // tp_print\n"
|
||||
+ " 0, // tp_vectorcall_offset\n"
|
||||
" nullptr, // tp_getattr\n"
|
||||
" nullptr, // tp_setattr\n"
|
||||
" nullptr, // tp_compare\n"
|
||||
diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c
|
||||
index b933702242..1249362854 100644
|
||||
--- a/Wrapping/Tools/vtkWrapPythonEnum.c
|
||||
+++ b/Wrapping/Tools/vtkWrapPythonEnum.c
|
||||
@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
|
||||
" sizeof(PyIntObject), // tp_basicsize\n"
|
||||
" 0, // tp_itemsize\n"
|
||||
" nullptr, // tp_dealloc\n"
|
||||
- " nullptr, // tp_print\n"
|
||||
+ " 0, // tp_vectorcall_offset\n"
|
||||
" nullptr, // tp_getattr\n"
|
||||
" nullptr, // tp_setattr\n"
|
||||
" nullptr, // tp_compare\n"
|
||||
diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
|
||||
index 744cb1b9d3..0a1375e541 100644
|
||||
--- a/Wrapping/Tools/vtkWrapPythonType.c
|
||||
+++ b/Wrapping/Tools/vtkWrapPythonType.c
|
||||
@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
|
||||
" sizeof(PyVTKSpecialObject), // tp_basicsize\n"
|
||||
" 0, // tp_itemsize\n"
|
||||
" Py%s_Delete, // tp_dealloc\n"
|
||||
- " nullptr, // tp_print\n"
|
||||
+ " 0, // tp_vectorcall_offset\n"
|
||||
" nullptr, // tp_getattr\n"
|
||||
" nullptr, // tp_setattr\n"
|
||||
" nullptr, // tp_compare\n"
|
||||
--
|
||||
2.21.0
|
||||
|
66
FindPEGTL.cmake
Normal file
66
FindPEGTL.cmake
Normal file
@ -0,0 +1,66 @@
|
||||
# - Try to find PEGTL lib
|
||||
#
|
||||
# This module supports requiring a minimum version, e.g. you can do
|
||||
# find_package(PEGTL 3.1.2)
|
||||
# to require version 3.1.2 or newer of PEGTL.
|
||||
#
|
||||
# Once done this will define
|
||||
#
|
||||
# PEGTL_FOUND - system has eigen lib with correct version
|
||||
# PEGTL_INCLUDE_DIR - the eigen include directory
|
||||
# PEGTL_VERSION - eigen version
|
||||
|
||||
# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
|
||||
# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
|
||||
# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
|
||||
# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
|
||||
|
||||
if(NOT PEGTL_FIND_VERSION)
|
||||
if(NOT PEGTL_FIND_VERSION_MAJOR)
|
||||
set(PEGTL_FIND_VERSION_MAJOR 2)
|
||||
endif()
|
||||
if(NOT PEGTL_FIND_VERSION_MINOR)
|
||||
set(PEGTL_FIND_VERSION_MINOR 4)
|
||||
endif()
|
||||
if(NOT PEGTL_FIND_VERSION_PATCH)
|
||||
set(PEGTL_FIND_VERSION_PATCH 0)
|
||||
endif()
|
||||
|
||||
set(PEGTL_FIND_VERSION "${PEGTL_FIND_VERSION_MAJOR}.${PEGTL_FIND_VERSION_MINOR}.${PEGTL_FIND_VERSION_PATCH}")
|
||||
endif()
|
||||
|
||||
macro(_pegtl_check_version)
|
||||
file(READ "${PEGTL_INCLUDE_DIR}/tao/pegtl/version.hpp" _pegtl_version_header)
|
||||
string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}")
|
||||
set(PEGTL_VERSION ${CMAKE_MATCH_1})
|
||||
if(${PEGTL_VERSION} VERSION_LESS ${PEGTL_FIND_VERSION})
|
||||
set(PEGTL_VERSION_OK FALSE)
|
||||
else()
|
||||
set(PEGTL_VERSION_OK TRUE)
|
||||
endif()
|
||||
|
||||
if(NOT PEGTL_VERSION_OK)
|
||||
message(STATUS "PEGTL version ${PEGTL_VERSION} found in ${PEGTL_INCLUDE_DIR}, "
|
||||
"but at least version ${PEGTL_FIND_VERSION} is required")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
if (PEGTL_INCLUDE_DIR)
|
||||
# in cache already
|
||||
_pegtl_check_version()
|
||||
set(PEGTL_FOUND ${PEGTL_VERSION_OK})
|
||||
else ()
|
||||
find_path(PEGTL_INCLUDE_DIR NAMES tao
|
||||
PATHS
|
||||
${CMAKE_INSTALL_PREFIX}/include
|
||||
)
|
||||
|
||||
if(PEGTL_INCLUDE_DIR)
|
||||
_pegtl_check_version()
|
||||
endif()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(PEGTL DEFAULT_MSG PEGTL_INCLUDE_DIR PEGTL_VERSION_OK)
|
||||
|
||||
mark_as_advanced(PEGTL_INCLUDE_DIR)
|
||||
endif()
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (VTK-7.1.1.tar.gz) = 34a068801fe45f98325e5334d2569fc9b15ed38620386f1b5b860c9735e5fb8510953b50a3340d3ef9795e22fecf798c25bf750215b2ff1ff1eb7a1ecd87b623
|
||||
SHA512 (VTKData-7.1.1.tar.gz) = 9fb2d10ee87d4aaa57aa31941ba2753d844658fb39fe84808500690ca4f74b87fdd68a31f4680789b7e57bb1edd3de9163ca533e54a7121348de7eac6165b988
|
||||
SHA512 (VTK-8.2.0.tar.gz) = 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
|
||||
SHA512 (VTKData-8.2.0.tar.gz) = 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt.format VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt
|
||||
--- VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt.format 2017-03-20 09:26:17.000000000 -0600
|
||||
+++ VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt 2017-05-07 14:10:46.231254800 -0600
|
||||
@@ -10,7 +10,7 @@ endif()
|
||||
# Suppress printf/scanf format warnings; we test if the sizes match.
|
||||
foreach(lang C CXX)
|
||||
if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
|
||||
- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format")
|
||||
+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format -Wno-format-security")
|
||||
endif()
|
||||
endforeach()
|
||||
|
32
vtk-gcc10.patch
Normal file
32
vtk-gcc10.patch
Normal file
@ -0,0 +1,32 @@
|
||||
diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
|
||||
--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700
|
||||
+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c 2020-05-08 21:38:46.401363001 -0600
|
||||
@@ -614,5 +614,5 @@ int ex_create_par_int(const char *path,
|
||||
* Prevent warning in some versions of ranlib(1) because the object
|
||||
* file has no symbols.
|
||||
*/
|
||||
-const char exodus_unused_symbol_dummy_1;
|
||||
+const char exodus_unused_symbol_dummy_ex_create_par;
|
||||
#endif
|
||||
diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
|
||||
--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700
|
||||
+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c 2020-05-08 21:38:46.402363007 -0600
|
||||
@@ -474,5 +474,5 @@ int ex_open_par_int(const char *path, in
|
||||
* Prevent warning in some versions of ranlib(1) because the object
|
||||
* file has no symbols.
|
||||
*/
|
||||
-const char exodus_unused_symbol_dummy_1;
|
||||
+const char exodus_unused_symbol_dummy_ex_open_par;
|
||||
#endif
|
||||
diff -up VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake
|
||||
--- VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 2019-01-30 10:15:13.000000000 -0700
|
||||
+++ VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake 2020-05-26 21:07:24.625840251 -0600
|
||||
@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibili
|
||||
execute_process(COMMAND ${CMAKE_C_COMPILER} --version
|
||||
OUTPUT_VARIABLE _gcc_version_info
|
||||
ERROR_VARIABLE _gcc_version_info)
|
||||
- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
|
||||
+ string(REGEX MATCH "[1-9][0-9]*\\.[0-9]+\\.[0-9]+"
|
||||
_gcc_version "${_gcc_version_info}")
|
||||
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
|
||||
# patch level, handle this here:
|
264
vtk-proj6_compat.patch
Normal file
264
vtk-proj6_compat.patch
Normal file
@ -0,0 +1,264 @@
|
||||
--- a/CMake/FindLibPROJ.cmake
|
||||
+++ b/CMake/FindLibPROJ.cmake
|
||||
@@ -30,7 +30,7 @@ if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibP
|
||||
)
|
||||
|
||||
find_path( LibPROJ_INCLUDE_DIR
|
||||
- NAMES proj_api.h
|
||||
+ NAMES proj_api.h proj.h
|
||||
HINTS
|
||||
${_LibPROJ_DIR}
|
||||
${_LibPROJ_DIR}/include
|
||||
--- a/Geovis/Core/vtkGeoProjection.cxx
|
||||
+++ b/Geovis/Core/vtkGeoProjection.cxx
|
||||
@@ -72,6 +72,9 @@ public:
|
||||
}
|
||||
|
||||
std::map< std::string, std::string > OptionalParameters;
|
||||
+#if PROJ_VERSION_MAJOR >= 5
|
||||
+ PJ_PROJ_INFO ProjInfo;
|
||||
+#endif
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -80,7 +83,7 @@ int vtkGeoProjection::GetNumberOfProject
|
||||
if ( vtkGeoProjectionNumProj < 0 )
|
||||
{
|
||||
vtkGeoProjectionNumProj = 0;
|
||||
- for ( const PJ_LIST* pj = pj_get_list_ref(); pj && pj->id; ++ pj )
|
||||
+ for ( const PJ_LIST* pj = proj_list_operations(); pj && pj->id; ++ pj )
|
||||
++ vtkGeoProjectionNumProj;
|
||||
}
|
||||
return vtkGeoProjectionNumProj;
|
||||
@@ -91,7 +94,7 @@ const char* vtkGeoProjection::GetProject
|
||||
if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() )
|
||||
return nullptr;
|
||||
|
||||
- return pj_get_list_ref()[projection].id;
|
||||
+ return proj_list_operations()[projection].id;
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
const char* vtkGeoProjection::GetProjectionDescription( int projection )
|
||||
@@ -99,7 +102,7 @@ const char* vtkGeoProjection::GetProject
|
||||
if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() )
|
||||
return nullptr;
|
||||
|
||||
- return pj_get_list_ref()[projection].descr[0];
|
||||
+ return proj_list_operations()[projection].descr[0];
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
vtkGeoProjection::vtkGeoProjection()
|
||||
@@ -144,7 +147,7 @@ void vtkGeoProjection::PrintSelf( ostrea
|
||||
int vtkGeoProjection::GetIndex()
|
||||
{
|
||||
int i = 0;
|
||||
- for ( const PJ_LIST* proj = pj_get_list_ref(); proj && proj->id; ++ proj, ++ i )
|
||||
+ for ( const PJ_LIST* proj = proj_list_operations(); proj && proj->id; ++ proj, ++ i )
|
||||
{
|
||||
if ( ! strcmp( proj->id, this->Name ) )
|
||||
{
|
||||
@@ -161,7 +164,11 @@ const char* vtkGeoProjection::GetDescrip
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
+#if PROJ_VERSION_MAJOR >= 5
|
||||
+ return this->Internals->ProjInfo.description;
|
||||
+#else
|
||||
return this->Projection->descr;
|
||||
+#endif
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
projPJ vtkGeoProjection::GetProjection()
|
||||
@@ -232,6 +239,9 @@ int vtkGeoProjection::UpdateProjection()
|
||||
this->ProjectionMTime = this->GetMTime();
|
||||
if ( this->Projection )
|
||||
{
|
||||
+#if PROJ_VERSION_MAJOR >= 5
|
||||
+ this->Internals->ProjInfo = proj_pj_info(this->Projection);
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
--- a/Geovis/Core/vtkGeoTransform.cxx
|
||||
+++ b/Geovis/Core/vtkGeoTransform.cxx
|
||||
@@ -167,9 +167,17 @@ void vtkGeoTransform::InternalTransformP
|
||||
double* coord = x;
|
||||
for ( vtkIdType i = 0; i < numPts; ++ i )
|
||||
{
|
||||
+#if PROJ_VERSION_MAJOR >= 5
|
||||
+ xy.x = coord[0]; xy.y = coord[1];
|
||||
+#else
|
||||
xy.u = coord[0]; xy.v = coord[1];
|
||||
+#endif
|
||||
lp = pj_inv( xy, src );
|
||||
+#if PROJ_VERSION_MAJOR >= 5
|
||||
+ coord[0] = lp.lam; coord[1] = lp.phi;
|
||||
+#else
|
||||
coord[0] = lp.u; coord[1] = lp.v;
|
||||
+#endif
|
||||
coord += stride;
|
||||
}
|
||||
}
|
||||
@@ -191,9 +199,17 @@ void vtkGeoTransform::InternalTransformP
|
||||
double* coord = x;
|
||||
for ( vtkIdType i = 0; i < numPts; ++ i )
|
||||
{
|
||||
+#if PROJ_VERSION_MAJOR >= 5
|
||||
+ lp.lam = coord[0]; lp.phi = coord[1];
|
||||
+#else
|
||||
lp.u = coord[0]; lp.v = coord[1];
|
||||
+#endif
|
||||
xy = pj_fwd( lp, dst );
|
||||
+#if PROJ_VERSION_MAJOR >= 5
|
||||
+ coord[0] = xy.x; coord[1] = xy.y;
|
||||
+#else
|
||||
coord[0] = xy.u; coord[1] = xy.v;
|
||||
+#endif
|
||||
coord += stride;
|
||||
}
|
||||
}
|
||||
--- a/ThirdParty/libproj/vtk_libproj.h.in
|
||||
+++ b/ThirdParty/libproj/vtk_libproj.h.in
|
||||
@@ -15,10 +15,20 @@
|
||||
#ifndef vtk_libproj_h
|
||||
#define vtk_libproj_h
|
||||
|
||||
+#define VTK_LibPROJ_MAJOR_VERSION @LibPROJ_MAJOR_VERSION@
|
||||
+
|
||||
/* Use the libproj library configured for VTK. */
|
||||
#cmakedefine VTK_USE_SYSTEM_LIBPROJ
|
||||
#ifdef VTK_USE_SYSTEM_LIBPROJ
|
||||
-# include <projects.h>
|
||||
+# if VTK_LibPROJ_MAJOR_VERSION >= 5
|
||||
+# include <proj.h>
|
||||
+# endif
|
||||
+# if VTK_LibPROJ_MAJOR_VERSION < 6
|
||||
+# include <projects.h>
|
||||
+# endif
|
||||
+# if VTK_LibPROJ_MAJOR_VERSION >= 6
|
||||
+# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
|
||||
+# endif
|
||||
# include <proj_api.h>
|
||||
# include <geodesic.h>
|
||||
#else
|
||||
--- VTK-8.2.0/CMake/FindLibPROJ.cmake 2019-09-11 22:13:29.493741215 -0600
|
||||
+++ vtk/CMake/FindLibPROJ.cmake 2019-09-11 19:56:57.465802610 -0600
|
||||
@@ -1,55 +1,67 @@
|
||||
-# Find LibPROJ library and header file
|
||||
-# Sets
|
||||
-# LibPROJ_FOUND to 0 or 1 depending on the result
|
||||
-# LibPROJ_INCLUDE_DIR to directories required for using libproj4
|
||||
-# LibPROJ_LIBRARIES to libproj4 and any dependent libraries
|
||||
-# If LibPROJ_REQUIRED is defined, then a fatal error message will be generated if libproj4 is not found
|
||||
-
|
||||
-if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibPROJ_LIBRARIES OR NOT LibPROJ_FOUND )
|
||||
+find_path(LibPROJ_INCLUDE_DIR
|
||||
+ NAMES proj_api.h proj.h
|
||||
+ DOC "libproj include directories")
|
||||
+mark_as_advanced(LibPROJ_INCLUDE_DIR)
|
||||
|
||||
- if ( $ENV{LibPROJ_DIR} )
|
||||
- file( TO_CMAKE_PATH "$ENV{LibPROJ_DIR}" _LibPROJ_DIR )
|
||||
+find_library(LibPROJ_LIBRARY_RELEASE
|
||||
+ NAMES proj
|
||||
+ DOC "libproj release library")
|
||||
+mark_as_advanced(LibPROJ_LIBRARY_RELEASE)
|
||||
+
|
||||
+find_library(LibPROJ_LIBRARY_DEBUG
|
||||
+ NAMES projd
|
||||
+ DOC "libproj debug library")
|
||||
+mark_as_advanced(LibPROJ_LIBRARY_DEBUG)
|
||||
+
|
||||
+include(SelectLibraryConfigurations)
|
||||
+select_library_configurations(LibPROJ)
|
||||
+
|
||||
+if (LibPROJ_INCLUDE_DIR)
|
||||
+ if (EXISTS "${LibPROJ_INCLUDE_DIR}/proj.h")
|
||||
+ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj.h" _libproj_version_lines REGEX "#define[ \t]+PROJ_VERSION_(MAJOR|MINOR|PATCH)")
|
||||
+ string(REGEX REPLACE ".*PROJ_VERSION_MAJOR *\([0-9]*\).*" "\\1" _libproj_version_major "${_libproj_version_lines}")
|
||||
+ string(REGEX REPLACE ".*PROJ_VERSION_MINOR *\([0-9]*\).*" "\\1" _libproj_version_minor "${_libproj_version_lines}")
|
||||
+ string(REGEX REPLACE ".*PROJ_VERSION_PATCH *\([0-9]*\).*" "\\1" _libproj_version_patch "${_libproj_version_lines}")
|
||||
+ else ()
|
||||
+ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj_api.h" _libproj_version_lines REGEX "#define[ \t]+PJ_VERSION")
|
||||
+ string(REGEX REPLACE ".*PJ_VERSION *\([0-9]*\).*" "\\1" _libproj_version "${_libproj_version_lines}")
|
||||
+ math(EXPR _libproj_version_major "${_libproj_version} / 100")
|
||||
+ math(EXPR _libproj_version_minor "(${_libproj_version} % 100) / 10")
|
||||
+ math(EXPR _libproj_version_patch "${_libproj_version} % 10")
|
||||
endif ()
|
||||
-
|
||||
- set(LibPROJ_LIBRARY_SEARCH_PATHS
|
||||
- ${_LibPROJ_DIR}
|
||||
- ${_LibPROJ_DIR}/lib64
|
||||
- ${_LibPROJ_DIR}/lib
|
||||
- )
|
||||
-
|
||||
- find_library( LibPROJ_LIBRARY_RELEASE
|
||||
- NAMES proj
|
||||
- HINTS
|
||||
- ${LibPROJ_LIBRARY_SEARCH_PATHS}
|
||||
- )
|
||||
-
|
||||
- find_library( LibPROJ_LIBRARY_DEBUG
|
||||
- NAMES projd
|
||||
- PATHS
|
||||
- ${LibPROJ_LIBRARY_SEARCH_PATHS}
|
||||
- )
|
||||
-
|
||||
- find_path( LibPROJ_INCLUDE_DIR
|
||||
- NAMES proj_api.h proj.h
|
||||
- HINTS
|
||||
- ${_LibPROJ_DIR}
|
||||
- ${_LibPROJ_DIR}/include
|
||||
- )
|
||||
-
|
||||
- include(SelectLibraryConfigurations)
|
||||
- select_library_configurations(LibPROJ)
|
||||
-
|
||||
- include(FindPackageHandleStandardArgs)
|
||||
- find_package_handle_standard_args(LibPROJ
|
||||
- REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR)
|
||||
-
|
||||
- if(LibPROJ_FOUND)
|
||||
- set(LibPROJ_INCLUDE_DIRS ${LibPROJ_INCLUDE_DIR})
|
||||
-
|
||||
- if(NOT LibPROJ_LIBRARIES)
|
||||
- set(LibPROJ_LIBRARIES ${LibPROJ_LIBRARY})
|
||||
- endif()
|
||||
- endif()
|
||||
+ set(LibPROJ_VERSION "${_libproj_version_major}.${_libproj_version_minor}.${_libproj_version_patch}")
|
||||
+ set(LibPROJ_MAJOR_VERSION "${_libproj_version_major}")
|
||||
+ unset(_libproj_version_major)
|
||||
+ unset(_libproj_version_minor)
|
||||
+ unset(_libproj_version_patch)
|
||||
+ unset(_libproj_version)
|
||||
+ unset(_libproj_version_lines)
|
||||
endif ()
|
||||
|
||||
-mark_as_advanced(LibPROJ_INCLUDE_DIR)
|
||||
+include(FindPackageHandleStandardArgs)
|
||||
+find_package_handle_standard_args(LibPROJ
|
||||
+ REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR
|
||||
+ VERSION_VAR LibPROJ_VERSION)
|
||||
+
|
||||
+if (LibPROJ_FOUND)
|
||||
+ set(LibPROJ_INCLUDE_DIRS "${LibPROJ_INCLUDE_DIR}")
|
||||
+ set(LibPROJ_LIBRARIES "${LibPROJ_LIBRARY}")
|
||||
+
|
||||
+ if (NOT TARGET LibPROJ::LibPROJ)
|
||||
+ add_library(LibPROJ::LibPROJ UNKNOWN IMPORTED)
|
||||
+ set_target_properties(LibPROJ::LibPROJ PROPERTIES
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${LibPROJ_INCLUDE_DIR}")
|
||||
+ if (LibPROJ_LIBRARY_RELEASE)
|
||||
+ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY
|
||||
+ IMPORTED_CONFIGURATIONS RELEASE)
|
||||
+ set_target_properties(LibPROJ::LibPROJ PROPERTIES
|
||||
+ IMPORTED_LOCATION_RELEASE "${LibPROJ_LIBRARY_RELEASE}")
|
||||
+ endif ()
|
||||
+ if (LibPROJ_LIBRARY_DEBUG)
|
||||
+ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY
|
||||
+ IMPORTED_CONFIGURATIONS DEBUG)
|
||||
+ set_target_properties(LibPROJ::LibPROJ PROPERTIES
|
||||
+ IMPORTED_LOCATION_DEBUG "${LibPROJ_LIBRARY_DEBUG}")
|
||||
+ endif ()
|
||||
+ endif ()
|
||||
+endif ()
|
@ -1,36 +0,0 @@
|
||||
diff -up VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt.tcllib VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt
|
||||
--- VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt.tcllib 2015-02-16 15:08:49.121229694 -0700
|
||||
+++ VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt 2015-02-16 15:09:38.793971979 -0700
|
||||
@@ -264,7 +264,7 @@ endforeach()
|
||||
# Configure the Tcl package index file for the install tree.
|
||||
SET(VTK_TCL_SCRIPT_DIR "[file dirname [info script]]")
|
||||
IF(UNIX)
|
||||
- SET(VTK_TCL_LIBRARY_DIR "[file dirname [file dirname [file dirname [info script]]]]")
|
||||
+ SET(VTK_TCL_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${VTK_INSTALL_LIBRARY_DIR}")
|
||||
ELSE()
|
||||
SET(VTK_TCL_LIBRARY_DIR
|
||||
"[file join [file dirname [file dirname [file dirname [file dirname [info script]]]]] bin]")
|
||||
diff -up VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in.tcllib VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in
|
||||
--- VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in.tcllib 2015-02-16 12:03:08.000000000 -0700
|
||||
+++ VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in 2015-02-16 15:08:49.121229694 -0700
|
||||
@@ -7,7 +7,7 @@ package ifneeded vtkinit {@VTK_MAJOR_VER
|
||||
if {[catch "load {} $libName"]} {
|
||||
set libExt [info sharedlibextension]
|
||||
set currentDirectory [pwd]
|
||||
- set libFile [file join $libPath "$libPrefix$libName-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@$libExt"]
|
||||
+ set libFile [file join $libPath "$libPrefix$libName$libExt"]
|
||||
if {[catch "cd {$libPath}; load {$libFile}" errorMessage]} {
|
||||
puts $errorMessage
|
||||
}
|
||||
diff -up VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in
|
||||
--- VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib 2015-02-16 12:03:08.000000000 -0700
|
||||
+++ VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in 2015-02-16 15:08:49.122229706 -0700
|
||||
@@ -44,7 +44,7 @@ namespace eval ::vtk {
|
||||
}
|
||||
|
||||
foreach dir $dirs {
|
||||
- set libname [file join $dir ${prefix}${name}-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@${ext}]
|
||||
+ set libname [file join $dir ${prefix}${name}${ext}]
|
||||
if {[file exists $libname]} {
|
||||
if {![catch {load $libname} errormsg]} {
|
||||
# WARNING: it HAS to be "" so that pkg_mkIndex work (since
|
536
vtk.spec
536
vtk.spec
@ -2,34 +2,44 @@
|
||||
%bcond_without OSMesa
|
||||
%bcond_without java
|
||||
%bcond_without mpich
|
||||
# Need to coordinate with other qt users first
|
||||
%bcond_with qt5
|
||||
%bcond_without qt5
|
||||
%bcond_without openmpi
|
||||
# s390x on EL8 does not have xorg-x11-drv-dummy
|
||||
%if 0%{?rhel}
|
||||
%ifarch s390x
|
||||
%bcond_with xdummy
|
||||
%else
|
||||
%bcond_without xdummy
|
||||
%endif
|
||||
%else
|
||||
%bcond_without xdummy
|
||||
%endif
|
||||
|
||||
# VTK currently is carrying local modifications to gl2ps
|
||||
%bcond_with gl2ps
|
||||
%if !%{with gl2ps}
|
||||
%global vtk_use_system_gl2ps -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF
|
||||
%endif
|
||||
|
||||
%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
|
||||
%{!?tcl_sitelib: %global tcl_sitelib %{_datadir}/tcl%{tcl_version}}
|
||||
|
||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||
Name: vtk
|
||||
Version: 7.1.1
|
||||
Release: 12%{?dist}
|
||||
Version: 8.2.0
|
||||
Release: 17%{?dist}
|
||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||
# For all intents, it has the same rights and restrictions as BSD.
|
||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||
License: BSD
|
||||
Source0: http://www.vtk.org/files/release/7.1/VTK-%{version}.tar.gz
|
||||
Source1: http://www.vtk.org/files/release/7.1/VTKData-%{version}.tar.gz
|
||||
Source0: http://www.vtk.org/files/release/8.2/VTK-%{version}.tar.gz
|
||||
Source1: http://www.vtk.org/files/release/8.2/VTKData-%{version}.tar.gz
|
||||
Source2: xorg.conf
|
||||
# Also set -Wno-format-security when setting -Wno-format
|
||||
Patch0: vtk-format.patch
|
||||
# Fix tcl library loading
|
||||
# http://www.vtk.org/Bug/view.php?id=15279
|
||||
Patch5: vtk-tcllib.patch
|
||||
Source3: FindPEGTL.cmake
|
||||
# Python 3.8 support
|
||||
Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch
|
||||
# Proj 6 support
|
||||
Patch1: vtk-proj6_compat.patch
|
||||
# GCC 10 support based on:
|
||||
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6420
|
||||
Patch2: vtk-gcc10.patch
|
||||
|
||||
URL: http://vtk.org/
|
||||
|
||||
@ -40,7 +50,7 @@ BuildRequires: libX11-devel, libXt-devel, libXext-devel
|
||||
BuildRequires: libICE-devel, libGL-devel
|
||||
%{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel}
|
||||
BuildRequires: tk-devel, tcl-devel
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel
|
||||
%if 0%{with gl2ps}
|
||||
BuildRequires: gl2ps-devel
|
||||
@ -52,7 +62,7 @@ BuildRequires: cmake(Qt5)
|
||||
BuildRequires: cmake(Qt5UiPlugin)
|
||||
BuildRequires: cmake(Qt5X11Extras)
|
||||
BuildRequires: qt5-qtwebkit-devel
|
||||
BuildRequires: python-qt5
|
||||
BuildRequires: python%{python3_pkgversion}-qt5
|
||||
%else
|
||||
BuildRequires: PyQt4-devel
|
||||
BuildRequires: qt4-devel
|
||||
@ -62,35 +72,41 @@ BuildRequires: chrpath
|
||||
BuildRequires: doxygen, graphviz
|
||||
BuildRequires: gnuplot
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: double-conversion-devel
|
||||
BuildRequires: eigen3-devel
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: jsoncpp-devel
|
||||
BuildRequires: libtheora-devel
|
||||
%if 0%{?fedora} >= 28
|
||||
BuildRequires: mariadb-connector-c-devel
|
||||
%else
|
||||
BuildRequires: mysql-devel
|
||||
%endif
|
||||
BuildRequires: mariadb-connector-c-devel
|
||||
BuildRequires: netcdf-cxx-devel
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: libpq-devel
|
||||
BuildRequires: PEGTL-devel
|
||||
BuildRequires: proj-devel
|
||||
BuildRequires: pugixml-devel
|
||||
BuildRequires: R-devel
|
||||
BuildRequires: sip-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: wget
|
||||
BuildRequires: %{_includedir}/Xm
|
||||
BuildRequires: blas-devel
|
||||
BuildRequires: lapack-devel
|
||||
# Requires patched libharu https://github.com/libharu/libharu/pull/157
|
||||
#BuildRequires: libharu-devel
|
||||
BuildRequires: lz4-devel
|
||||
BuildRequires: motif-devel
|
||||
%if %{with mpich}
|
||||
BuildRequires: mpich-devel
|
||||
BuildRequires: mpi4py-mpich
|
||||
BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich
|
||||
BuildRequires: netcdf-mpich-devel
|
||||
%endif
|
||||
%if %{with openmpi}
|
||||
BuildRequires: openmpi-devel
|
||||
BuildRequires: mpi4py-openmpi
|
||||
BuildRequires: python%{?python3_pkgversion}-mpi4py-openmpi
|
||||
BuildRequires: netcdf-openmpi-devel
|
||||
%endif
|
||||
# For %check
|
||||
%if %{with xdummy}
|
||||
BuildRequires: xorg-x11-drv-dummy
|
||||
%endif
|
||||
%{!?with_java:Conflicts: vtk-java}
|
||||
Requires: hdf5 = %{_hdf5_version}
|
||||
|
||||
@ -112,24 +128,23 @@ Provides: bundled(kwsys-system)
|
||||
Provides: bundled(kwsys-systeminformation)
|
||||
Provides: bundled(kwsys-systemtools)
|
||||
# Other bundled libraries
|
||||
Provides: bundled(alglib)
|
||||
Provides: bundled(exodusII) = 2.0.0
|
||||
Provides: bundled(diy2)
|
||||
Provides: bundled(exodusII) = 2.0.0
|
||||
Provides: bundled(ftgl) = 1.32
|
||||
%if !%{with gl2ps}
|
||||
Provides: bundled(gl2ps) = 1.4.0
|
||||
%endif
|
||||
Provides: bundled(glew)
|
||||
Provides: bundled(libharu)
|
||||
Provides: bundled(metaio)
|
||||
Provides: bundled(sqlite) = 3.6.22
|
||||
Provides: bundled(pugixml) = 1.8
|
||||
Provides: bundled(utf8cpp)
|
||||
Provides: bundled(verdict) = 1.2.0
|
||||
Provides: bundled(vpic)
|
||||
Provides: bundled(xdmf2) = 2.1
|
||||
Provides: bundled(xdmf3)
|
||||
|
||||
# Do not check .so files in the python2_sitearch directory
|
||||
%global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$
|
||||
Obsoletes: %{name}-tcl < 8.2.0-1
|
||||
Obsoletes: %{name}-qt-tcl < 8.2.0-1
|
||||
|
||||
%description
|
||||
VTK is an open-source software system for image processing, 3D
|
||||
@ -149,57 +164,66 @@ Install the %{name}-openmpi package to get a version compiled with openmpi.
|
||||
%package devel
|
||||
Summary: VTK header files for building C++ code
|
||||
Requires: vtk%{?_isa} = %{version}-%{release}
|
||||
Requires: vtk-python%{?_isa} = %{version}-%{release}
|
||||
Requires: vtk-qt-python%{?_isa} = %{version}-%{release}
|
||||
Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release}
|
||||
Requires: vtk-tcl%{?_isa} = %{version}-%{release}
|
||||
Requires: python%{python3_pkgversion}-vtk%{?_isa} = %{version}-%{release}
|
||||
Requires: python%{python3_pkgversion}-vtk-qt%{?_isa} = %{version}-%{release}
|
||||
%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}}
|
||||
Requires: cmake
|
||||
Requires: blas-devel%{?_isa}
|
||||
Requires: double-conversion-devel%{?_isa}
|
||||
# eigen3 is noarch
|
||||
Requires: eigen3-devel
|
||||
Requires: expat-devel%{?_isa}
|
||||
Requires: freetype-devel%{?_isa}
|
||||
%if %{with gl2ps}
|
||||
Requires: gl2ps-devel%{?_isa}
|
||||
%endif
|
||||
Requires: expat-devel%{?_isa}
|
||||
Requires: freetype-devel%{?_isa}
|
||||
Requires: glew-devel%{?_isa}
|
||||
Requires: hdf5-devel%{?_isa}
|
||||
Requires: lapack-devel%{?_isa}
|
||||
Requires: libjpeg-devel%{?_isa}
|
||||
Requires: lz4-devel%{?_isa}
|
||||
Requires: libpng-devel%{?_isa}
|
||||
Requires: libogg-devel%{?_isa}
|
||||
Requires: libSM-devel%{?_isa}
|
||||
Requires: libtheora-devel%{?_isa}
|
||||
Requires: libtiff-devel%{?_isa}
|
||||
Requires: libxml2-devel%{?_isa}
|
||||
Requires: postgresql-devel%{?_isa}
|
||||
Requires: libpq-devel%{?_isa}
|
||||
Requires: PEGTL-devel%{?_isa}
|
||||
Requires: proj-devel%{?_isa}
|
||||
Requires: pugixml-devel%{?_isa}
|
||||
Requires: sqlite-devel%{?_isa}
|
||||
Requires: libX11-devel%{?_isa}
|
||||
Requires: libXext-devel%{?_isa}
|
||||
Requires: libXt-devel%{?_isa}
|
||||
Requires: mysql-devel%{?_isa}
|
||||
Requires: netcdf-cxx-devel%{?_isa}
|
||||
%if %{with qt5}
|
||||
Requires: cmake(Qt5)
|
||||
Requires: cmake(Qt5UiPlugin)
|
||||
Requires: cmake(Qt5X11Extras)
|
||||
Requires: qt5-qtwebkit-devel%{?_isa}
|
||||
%else
|
||||
Requires: qt4-devel%{?_isa}
|
||||
Requires: qtwebkit-devel%{?_isa}
|
||||
%endif
|
||||
Requires: jsoncpp-devel%{?_isa}
|
||||
# bz #1183210 + #1183530
|
||||
Requires: python2-devel
|
||||
Requires: python%{python3_pkgversion}-devel
|
||||
|
||||
%description devel
|
||||
This provides the VTK header files required to compile C++ programs that
|
||||
use VTK to do 3D visualization.
|
||||
|
||||
%package tcl
|
||||
Summary: Tcl bindings for VTK
|
||||
%package -n python%{python3_pkgversion}-vtk
|
||||
Summary: Python 3 bindings for VTK
|
||||
Requires: vtk%{?_isa} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-vtk}
|
||||
Provides: %{py3_dist vtk} = %{version}
|
||||
Provides: python%{python3_version}dist(vtk) = %{version}
|
||||
|
||||
%description tcl
|
||||
tcl bindings for VTK.
|
||||
|
||||
%package -n python2-vtk
|
||||
Summary: Python bindings for VTK
|
||||
Requires: vtk%{?_isa} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-vtk}
|
||||
# Remove before F30
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
|
||||
%description -n python2-vtk
|
||||
python bindings for VTK.
|
||||
%description -n python%{python3_pkgversion}-vtk
|
||||
Python 3 bindings for VTK.
|
||||
|
||||
%if %{with java}
|
||||
%package java
|
||||
@ -217,29 +241,21 @@ Requires: vtk%{?_isa} = %{version}-%{release}
|
||||
%description qt
|
||||
Qt bindings for VTK.
|
||||
|
||||
%package -n python2-vtk-qt
|
||||
Summary: Qt Python bindings for VTK
|
||||
%package -n python%{python3_pkgversion}-vtk-qt
|
||||
Summary: Qt Python 3 bindings for VTK
|
||||
Requires: vtk%{?_isa} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-vtk-qt}
|
||||
# Remove before F30
|
||||
Provides: %{name}-qt-python = %{version}-%{release}
|
||||
Provides: %{name}-qt-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-qt-python < %{version}-%{release}
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-vtk-qt}
|
||||
|
||||
%description -n python2-vtk-qt
|
||||
Qt Python bindings for VTK.
|
||||
|
||||
%package qt-tcl
|
||||
Summary: Qt TCL bindings for VTK
|
||||
Requires: vtk%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description qt-tcl
|
||||
Qt TCL bindings for VTK.
|
||||
%description -n python%{python3_pkgversion}-vtk-qt
|
||||
Qt Python 3 bindings for VTK.
|
||||
|
||||
%if %{with mpich}
|
||||
%package mpich
|
||||
Summary: The Visualization Toolkit - mpich version
|
||||
|
||||
Obsoletes: %{name}-mpich-tcl < 8.2.0-1
|
||||
Obsoletes: %{name}-mpich-qt-tcl < 8.2.0-1
|
||||
|
||||
%description mpich
|
||||
VTK is an open-source software system for image processing, 3D
|
||||
graphics, volume rendering and visualization. VTK includes many
|
||||
@ -252,10 +268,8 @@ NOTE: The version in this package has been compiled with mpich support.
|
||||
%package mpich-devel
|
||||
Summary: VTK header files for building C++ code with mpich
|
||||
Requires: vtk-mpich%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-python%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-qt-python%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-tcl%{?_isa} = %{version}-%{release}
|
||||
#Requires: python2-vtk%{?_isa} = %{version}-%{release}
|
||||
#Requires: python2-vtk-qt%{?_isa} = %{version}-%{release}
|
||||
%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}}
|
||||
Requires: cmake
|
||||
Requires: mpich-devel
|
||||
@ -273,15 +287,22 @@ Requires: libogg-devel%{?_isa}
|
||||
Requires: libtheora-devel%{?_isa}
|
||||
Requires: libtiff-devel%{?_isa}
|
||||
Requires: libxml2-devel%{?_isa}
|
||||
Requires: postgresql-devel%{?_isa}
|
||||
Requires: libpq-devel%{?_isa}
|
||||
Requires: mysql-devel%{?_isa}
|
||||
Requires: netcdf-cxx-devel%{?_isa}
|
||||
Requires: netcdf-mpich-devel%{?_isa}
|
||||
%if %{with qt5}
|
||||
Requires: cmake(Qt5)
|
||||
Requires: cmake(Qt5UiPlugin)
|
||||
Requires: cmake(Qt5X11Extras)
|
||||
Requires: qt5-qtwebkit-devel%{?_isa}
|
||||
%else
|
||||
Requires: qt4-devel%{?_isa}
|
||||
Requires: qtwebkit-devel%{?_isa}
|
||||
%endif
|
||||
Requires: jsoncpp-devel%{?_isa}
|
||||
# bz #1183210 + #1183530
|
||||
Requires: python2-devel
|
||||
Requires: python%{python3_pkgversion}-devel
|
||||
|
||||
%description mpich-devel
|
||||
This provides the VTK header files required to compile C++ programs that
|
||||
@ -289,19 +310,12 @@ use VTK to do 3D visualization.
|
||||
|
||||
NOTE: The version in this package has been compiled with mpich support.
|
||||
|
||||
%package mpich-tcl
|
||||
Summary: Tcl bindings for VTK with mpich
|
||||
%package -n python%{python3_pkgversion}-vtk-mpich
|
||||
Summary: Python 3 bindings for VTK with mpich
|
||||
Requires: vtk-mpich%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description mpich-tcl
|
||||
tcl bindings for VTK with mpich.
|
||||
|
||||
%package mpich-python
|
||||
Summary: Python bindings for VTK with mpich
|
||||
Requires: vtk-mpich%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description mpich-python
|
||||
python bindings for VTK with mpich.
|
||||
%description -n python%{python3_pkgversion}-vtk-mpich
|
||||
python 3 bindings for VTK with mpich.
|
||||
|
||||
%if %{with java}
|
||||
%package mpich-java
|
||||
@ -319,25 +333,21 @@ Requires: vtk-mpich%{?_isa} = %{version}-%{release}
|
||||
%description mpich-qt
|
||||
Qt bindings for VTK with mpich.
|
||||
|
||||
%package mpich-qt-python
|
||||
Summary: Qt Python bindings for VTK with mpich
|
||||
%package -n python%{python3_pkgversion}-vtk-mpich-qt
|
||||
Summary: Qt Python 3 bindings for VTK with mpich
|
||||
Requires: vtk-mpich%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description mpich-qt-python
|
||||
Qt Python bindings for VTK with mpich.
|
||||
|
||||
%package mpich-qt-tcl
|
||||
Summary: Qt TCL bindings for VTK with mpich
|
||||
Requires: vtk-mpich%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description mpich-qt-tcl
|
||||
Qt TCL bindings for VTK with mpich.
|
||||
%description -n python%{python3_pkgversion}-vtk-mpich-qt
|
||||
Qt Python 3 bindings for VTK with mpich.
|
||||
%endif
|
||||
|
||||
%if %{with openmpi}
|
||||
%package openmpi
|
||||
Summary: The Visualization Toolkit - openmpi version
|
||||
|
||||
Obsoletes: %{name}-openmpi-tcl < 8.2.0-1
|
||||
Obsoletes: %{name}-openmpi-qt-tcl < 8.2.0-1
|
||||
|
||||
%description openmpi
|
||||
VTK is an open-source software system for image processing, 3D
|
||||
graphics, volume rendering and visualization. VTK includes many
|
||||
@ -350,10 +360,8 @@ NOTE: The version in this package has been compiled with openmpi support.
|
||||
%package openmpi-devel
|
||||
Summary: VTK header files for building C++ code with openmpi
|
||||
Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-python%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-qt-python%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release}
|
||||
#Requires: vtk-tcl%{?_isa} = %{version}-%{release}
|
||||
#Requires: python2-vtk%{?_isa} = %{version}-%{release}
|
||||
#Requires: python2-vtk-qt%{?_isa} = %{version}-%{release}
|
||||
%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}}
|
||||
Requires: cmake
|
||||
Requires: openmpi-devel
|
||||
@ -371,15 +379,22 @@ Requires: libogg-devel%{?_isa}
|
||||
Requires: libtheora-devel%{?_isa}
|
||||
Requires: libtiff-devel%{?_isa}
|
||||
Requires: libxml2-devel%{?_isa}
|
||||
Requires: postgresql-devel%{?_isa}
|
||||
Requires: libpq-devel%{?_isa}
|
||||
Requires: mysql-devel%{?_isa}
|
||||
Requires: netcdf-cxx-devel%{?_isa}
|
||||
Requires: netcdf-openmpi-devel%{?_isa}
|
||||
%if %{with qt5}
|
||||
Requires: cmake(Qt5)
|
||||
Requires: cmake(Qt5UiPlugin)
|
||||
Requires: cmake(Qt5X11Extras)
|
||||
Requires: qt5-qtwebkit-devel%{?_isa}
|
||||
%else
|
||||
Requires: qt4-devel%{?_isa}
|
||||
Requires: qtwebkit-devel%{?_isa}
|
||||
%endif
|
||||
Requires: jsoncpp-devel%{?_isa}
|
||||
# bz #1183210 + #1183530
|
||||
Requires: python2-devel
|
||||
Requires: python%{python3_pkgversion}-devel
|
||||
|
||||
%description openmpi-devel
|
||||
This provides the VTK header files required to compile C++ programs that
|
||||
@ -387,19 +402,12 @@ use VTK to do 3D visualization.
|
||||
|
||||
NOTE: The version in this package has been compiled with openmpi support.
|
||||
|
||||
%package openmpi-tcl
|
||||
Summary: Tcl bindings for VTK with openmpi
|
||||
%package -n python%{python3_pkgversion}-vtk-openmpi
|
||||
Summary: Python 3 bindings for VTK with openmpi
|
||||
Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description openmpi-tcl
|
||||
tcl bindings for VTK with openmpi.
|
||||
|
||||
%package openmpi-python
|
||||
Summary: Python bindings for VTK with openmpi
|
||||
Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description openmpi-python
|
||||
python bindings for VTK with openmpi.
|
||||
%description -n python%{python3_pkgversion}-vtk-openmpi
|
||||
Python 3 bindings for VTK with openmpi.
|
||||
|
||||
%if %{with java}
|
||||
%package openmpi-java
|
||||
@ -417,19 +425,12 @@ Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
|
||||
%description openmpi-qt
|
||||
Qt bindings for VTK with openmpi.
|
||||
|
||||
%package openmpi-qt-python
|
||||
Summary: Qt Python bindings for VTK with openmpi
|
||||
%package -n python%{python3_pkgversion}-vtk-openmpi-qt
|
||||
Summary: Qt Python 3 bindings for VTK with openmpi
|
||||
Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description openmpi-qt-python
|
||||
Qt Python bindings for VTK with openmpi.
|
||||
|
||||
%package openmpi-qt-tcl
|
||||
Summary: Qt TCL bindings for VTK with openmpi
|
||||
Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description openmpi-qt-tcl
|
||||
Qt TCL bindings for VTK with openmpi.
|
||||
%description -n python%{python3_pkgversion}-vtk-openmpi-qt
|
||||
Qt Python 3 bindings for VTK with openmpi.
|
||||
%endif
|
||||
|
||||
%package data
|
||||
@ -459,22 +460,26 @@ programming languages.
|
||||
|
||||
%prep
|
||||
%setup -q -b 1 -n VTK-%{version}
|
||||
%patch0 -p1 -b .format
|
||||
%patch5 -p1 -b .tcllib
|
||||
%patch0 -p1 -b .py38
|
||||
%patch1 -p1 -b .proj6
|
||||
%patch2 -p1 -b .gcc10
|
||||
# Remove included thirdparty sources just to be sure
|
||||
# TODO - alglib - http://www.vtk.org/Bug/view.php?id=15729
|
||||
# TODO - vtkexodusII - not yet packaged
|
||||
# TODO - vtksqlite - http://www.vtk.org/Bug/view.php?id=14154
|
||||
# TODO - diy2 - not yet packaged
|
||||
# TODO - exodusII - not yet packaged
|
||||
# TODO - pugixml - https://gitlab.kitware.com/vtk/vtk/issues/17538
|
||||
# TODO - utf8cpp(source) - http://www.vtk.org/Bug/view.php?id=15730
|
||||
# TODO - vtkverdict - not yet packaged
|
||||
# TODO - verdict - not yet packaged
|
||||
# TODO - VPIC - not yet packaged
|
||||
# TODO - vtkxdmf2 - not yet packaged
|
||||
# TODO - vtkxdmf3 - not yet packaged
|
||||
for x in autobahn %{?_with_gl2ps:vtkgl2ps} vtkexpat vtkfreetype vtkhdf5 vtkjpeg vtkjsoncpp vtklibxml2 vtkmpi4py vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope
|
||||
# TODO - xdmf2 - not yet packaged
|
||||
# TODO - xdmf3 - not yet packaged
|
||||
for x in vtk{doubleconversion,eigen,expat,freetype,%{?_with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,kissfft,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,sqlite,theora,tiff,zfp,zlib}
|
||||
do
|
||||
rm -r ThirdParty/*/${x}
|
||||
done
|
||||
|
||||
# Needed to find PEGTL
|
||||
cp %SOURCE3 CMake/FindPEGTL.cmake
|
||||
|
||||
# Remove unused KWSys items
|
||||
find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm
|
||||
|
||||
@ -488,6 +493,7 @@ find vtk-examples -type f | xargs chmod -R a-x
|
||||
%build
|
||||
export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
|
||||
export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
|
||||
export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
|
||||
%if %{with java}
|
||||
export JAVA_HOME=/usr/lib/jvm/java
|
||||
%ifarch %{arm} s390x
|
||||
@ -498,18 +504,17 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
|
||||
|
||||
%global vtk_cmake_options \\\
|
||||
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\
|
||||
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \\\
|
||||
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \\\
|
||||
-DVTK_INSTALL_DATA_DIR=share/vtk \\\
|
||||
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \\\
|
||||
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \\\
|
||||
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \\\
|
||||
-DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \\\
|
||||
-DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{python2_version}/site-packages \\\
|
||||
-DVTK_PYTHON_VERSION=3 \\\
|
||||
%if %{with qt5} \
|
||||
-DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt5/plugins/designer \\\
|
||||
%else \
|
||||
-DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt4/plugins/designer \\\
|
||||
%endif \
|
||||
-DVTK_INSTALL_TCL_DIR:PATH=share/tcl%{tcl_version}/vtk \\\
|
||||
-DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \\\
|
||||
%if %{with OSMesa} \
|
||||
-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\
|
||||
@ -523,16 +528,12 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
|
||||
-DVTK_WRAP_JAVA:BOOL=OFF \\\
|
||||
%endif \
|
||||
-DVTK_WRAP_PYTHON:BOOL=ON \\\
|
||||
-DVTK_WRAP_PYTHON_SIP:BOOL=ON \\\
|
||||
-DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python2_version} \\\
|
||||
-DVTK_WRAP_TCL:BOOL=ON \\\
|
||||
-DVTK_Group_Imaging:BOOL=ON \\\
|
||||
-DVTK_Group_Qt:BOOL=ON \\\
|
||||
-DVTK_Group_Rendering:BOOL=ON \\\
|
||||
-DVTK_Group_StandAlone:BOOL=ON \\\
|
||||
-DVTK_Group_Tk:BOOL=ON \\\
|
||||
-DVTK_Group_Views:BOOL=ON \\\
|
||||
-DModule_vtkFiltersStatisticsGnuR:BOOL=ON \\\
|
||||
-DModule_vtkIOExportOpenGL2:BOOL=ON \\\
|
||||
-DModule_vtkIOMySQL:BOOL=ON \\\
|
||||
-DModule_vtkIOPostgreSQL:BOOL=ON \\\
|
||||
@ -544,10 +545,9 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
|
||||
%endif \
|
||||
-DVTK_USE_OGGTHEORA_ENCODER=ON \\\
|
||||
-DVTK_USE_SYSTEM_LIBRARIES=ON \\\
|
||||
-DVTK_USE_SYSTEM_DIY2:BOOL=OFF \\\
|
||||
%{?vtk_use_system_gl2ps} \\\
|
||||
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\
|
||||
-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \\\
|
||||
-DVTK_USE_SYSTEM_LIBHARU=OFF \\\
|
||||
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON
|
||||
# Commented old flags in case we'd like to reactive some of them
|
||||
# -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests
|
||||
@ -559,7 +559,8 @@ pushd build
|
||||
-DBUILD_DOCUMENTATION:BOOL=ON \
|
||||
-DBUILD_EXAMPLES:BOOL=ON \
|
||||
-DBUILD_TESTING:BOOL=ON
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
%make_build DoxygenDoc vtkMyDoxygenDoc
|
||||
popd
|
||||
|
||||
%if %{with mpich}
|
||||
@ -575,7 +576,6 @@ export CXX=mpic++
|
||||
-DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \
|
||||
-DVTK_INSTALL_LIBRARY_DIR:PATH=lib \
|
||||
-DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \
|
||||
-DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python2_version}/site-packages \
|
||||
%if %{with qt5}
|
||||
-DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \
|
||||
%else
|
||||
@ -584,8 +584,9 @@ export CXX=mpic++
|
||||
-DVTK_Group_MPI:BOOL=ON \
|
||||
-DModule_vtkRenderingParallel:BOOL=ON \
|
||||
-DVTK_USE_PARALLEL:BOOL=ON \
|
||||
-DVTK_USE_SYSTEM_DIY2:BOOL=OFF \
|
||||
-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
%_mpich_unload
|
||||
popd
|
||||
%endif
|
||||
@ -603,7 +604,6 @@ export CXX=mpic++
|
||||
-DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \
|
||||
-DVTK_INSTALL_LIBRARY_DIR:PATH=lib \
|
||||
-DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \
|
||||
-DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python2_version}/site-packages \
|
||||
%if %{with qt5}
|
||||
-DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \
|
||||
%else
|
||||
@ -612,8 +612,9 @@ export CXX=mpic++
|
||||
-DVTK_Group_MPI:BOOL=ON \
|
||||
-DModule_vtkRenderingParallel:BOOL=ON \
|
||||
-DVTK_USE_PARALLEL:BOOL=ON \
|
||||
-DVTK_USE_SYSTEM_DIY2:BOOL=OFF \
|
||||
-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
%_openmpi_unload
|
||||
popd
|
||||
%endif
|
||||
@ -628,8 +629,8 @@ pushd build
|
||||
%make_install
|
||||
|
||||
# Gather list of non-python/tcl libraries
|
||||
ls %{buildroot}%{_libdir}/vtk/*.so.* \
|
||||
| grep -Ev '(Java|Qt|Python27D|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||
ls %{buildroot}%{_libdir}/*.so.* \
|
||||
| grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||
|
||||
# List of executable examples
|
||||
cat > examples.list << EOF
|
||||
@ -689,7 +690,7 @@ pushd build-mpich
|
||||
|
||||
# Gather list of non-python/tcl libraries
|
||||
ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \
|
||||
| grep -Ev '(Java|Qt|Python27D|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||
| grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||
popd
|
||||
%_mpich_unload
|
||||
%endif
|
||||
@ -701,19 +702,11 @@ pushd build-openmpi
|
||||
|
||||
# Gather list of non-python/tcl libraries
|
||||
ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \
|
||||
| grep -Ev '(Java|Qt|Python27D|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||
| grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list
|
||||
%_openmpi_unload
|
||||
popd
|
||||
%endif
|
||||
|
||||
# ld config
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
|
||||
echo %{_libdir}/vtk > %{buildroot}%{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
|
||||
|
||||
# Make scripts executable
|
||||
#chmod a+x %{buildroot}%{_libdir}/vtk/doxygen/*.pl
|
||||
#chmod a+x %{buildroot}%{_libdir}/vtk/testing/*.{py,tcl}
|
||||
|
||||
# Remove exec bit from non-scripts and %%doc
|
||||
for file in `find %{buildroot} -type f -perm 0755 \
|
||||
| xargs -r file | grep ASCII | awk -F: '{print $1}'`; do
|
||||
@ -733,6 +726,7 @@ cp -al build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/
|
||||
%check
|
||||
cd build
|
||||
cp %SOURCE2 .
|
||||
%if %{with xdummy}
|
||||
if [ -x /usr/libexec/Xorg ]; then
|
||||
Xorg=/usr/libexec/Xorg
|
||||
else
|
||||
@ -740,125 +734,68 @@ else
|
||||
fi
|
||||
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
|
||||
export DISPLAY=:99
|
||||
%endif
|
||||
ctest %{_smp_mflags} -V || :
|
||||
%if %{with xdummy}
|
||||
kill %1 || :
|
||||
cat xorg.log
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%post tcl -p /sbin/ldconfig
|
||||
|
||||
%postun tcl -p /sbin/ldconfig
|
||||
|
||||
%post -n python2-vtk -p /sbin/ldconfig
|
||||
|
||||
%postun -n python2-vtk -p /sbin/ldconfig
|
||||
|
||||
%if %{with java}
|
||||
%post java -p /sbin/ldconfig
|
||||
|
||||
%postun java -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%post qt -p /sbin/ldconfig
|
||||
|
||||
%postun qt -p /sbin/ldconfig
|
||||
|
||||
%post -n python2-vtk-qt -p /sbin/ldconfig
|
||||
|
||||
%postun -n python2-vtk-qt -p /sbin/ldconfig
|
||||
|
||||
%post qt-tcl -p /sbin/ldconfig
|
||||
|
||||
%postun qt-tcl -p /sbin/ldconfig
|
||||
|
||||
%files -f build/libs.list
|
||||
%license Copyright.txt
|
||||
%doc README.md vtkLogo.jpg vtkBanner.gif _docs/Wrapping
|
||||
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
|
||||
%{_bindir}/vtkEncodeString
|
||||
%dir %{_libdir}/vtk
|
||||
%doc README.md _docs/Wrapping
|
||||
|
||||
%files devel
|
||||
%doc Utilities/Upgrading
|
||||
%{_bindir}/vtkHashSource
|
||||
%{_bindir}/vtkWrapHierarchy
|
||||
%{_includedir}/vtk
|
||||
%{_libdir}/vtk/*.so
|
||||
%{_libdir}/vtk/libvtkWrappingTools.a
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/libvtkWrappingTools.a
|
||||
%{_libdir}/cmake/vtk/
|
||||
%{_docdir}/vtk-7.1/
|
||||
%{tcl_sitelib}/vtk/vtktcl.c
|
||||
%{_docdir}/vtk-8.2/
|
||||
|
||||
%files tcl
|
||||
%{_libdir}/vtk/*TCL.so.*
|
||||
%exclude %{_libdir}/vtk/*QtTCL.so.*
|
||||
%{_bindir}/vtk
|
||||
%{_bindir}/vtkWrapTcl
|
||||
%{_bindir}/vtkWrapTclInit
|
||||
%{tcl_sitelib}/vtk/
|
||||
%exclude %{tcl_sitelib}/vtk/vtktcl.c
|
||||
|
||||
%files -n python2-vtk
|
||||
%{python2_sitearch}/*
|
||||
%{_libdir}/vtk/*Python27D.so.*
|
||||
%exclude %{_libdir}/vtk/*QtPython27D.so.*
|
||||
%files -n python%{python3_pkgversion}-vtk
|
||||
%{python3_sitearch}/*
|
||||
%{_libdir}/*Python3?D.so.*
|
||||
%exclude %{_libdir}/*QtPython3?D.so.*
|
||||
%{_bindir}/vtkpython
|
||||
%{_bindir}/vtkWrapPython
|
||||
%{_bindir}/vtkWrapPythonInit
|
||||
|
||||
%if %{with java}
|
||||
%files java
|
||||
%{_libdir}/vtk/*Java.so.*
|
||||
%{_libdir}/vtk/vtk.jar
|
||||
%{_libdir}/*Java.so.*
|
||||
%{_libdir}/vtk.jar
|
||||
%{_bindir}/vtkParseJava
|
||||
%{_bindir}/vtkWrapJava
|
||||
%endif
|
||||
|
||||
%files qt
|
||||
%{_libdir}/vtk/lib*Qt*.so.*
|
||||
%exclude %{_libdir}/vtk/*TCL.so.*
|
||||
%exclude %{_libdir}/vtk/*Python27D.so.*
|
||||
%{_libdir}/lib*Qt*.so.*
|
||||
%exclude %{_libdir}/*Python??D.so.*
|
||||
%{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so
|
||||
|
||||
%files -n python2-vtk-qt
|
||||
%{_libdir}/vtk/*QtPython27D.so.*
|
||||
|
||||
%files qt-tcl
|
||||
%{_libdir}/vtk/*QtTCL.so.*
|
||||
%files -n python%{python3_pkgversion}-vtk-qt
|
||||
%{_libdir}/*QtPython3?D.so.*
|
||||
|
||||
%if %{with mpich}
|
||||
%files mpich -f build-mpich/libs.list
|
||||
%license Copyright.txt
|
||||
%doc README.md vtkLogo.jpg vtkBanner.gif _docs/Wrapping
|
||||
%{_libdir}/mpich/bin/vtkEncodeString
|
||||
%doc README.md _docs/Wrapping
|
||||
|
||||
%files mpich-devel
|
||||
%{_libdir}/mpich/bin/vtkHashSource
|
||||
%{_libdir}/mpich/bin/vtkWrapHierarchy
|
||||
%{_libdir}/mpich/include/
|
||||
%{_libdir}/mpich/lib/*.so
|
||||
%{_libdir}/mpich/lib/libvtkWrappingTools.a
|
||||
%{_libdir}/mpich/lib/cmake/
|
||||
%{_libdir}/mpich/share/doc/vtk-7.1/
|
||||
%{_libdir}/mpich/share/tcl%{tcl_version}/vtk/vtktcl.c
|
||||
%{_libdir}/mpich/share/doc/vtk-8.2/
|
||||
|
||||
%files mpich-tcl
|
||||
%{_libdir}/mpich/lib/*TCL.so.*
|
||||
%exclude %{_libdir}/mpich/lib/*QtTCL.so.*
|
||||
%{_libdir}/mpich/bin/pvtk
|
||||
%{_libdir}/mpich/bin/vtk
|
||||
%{_libdir}/mpich/bin/vtkWrapTcl
|
||||
%{_libdir}/mpich/bin/vtkWrapTclInit
|
||||
%{_libdir}/mpich/share/tcl%{tcl_version}/
|
||||
%exclude %{_libdir}/mpich/share/tcl%{tcl_version}/vtk/vtktcl.c
|
||||
|
||||
%files mpich-python
|
||||
%{_libdir}/mpich/lib/python%{python2_version}/
|
||||
%{_libdir}/mpich/lib/*Python27D.so.*
|
||||
%exclude %{_libdir}/mpich/lib/*QtPython27D.so.*
|
||||
%files -n python%{python3_pkgversion}-vtk-mpich
|
||||
%{_libdir}/mpich/lib/python%{python3_version}/
|
||||
%{_libdir}/mpich/lib/*Python3?D.so.*
|
||||
%exclude %{_libdir}/mpich/lib/*QtPython??D.so.*
|
||||
%{_libdir}/mpich/bin/pvtkpython
|
||||
%{_libdir}/mpich/bin/vtkpython
|
||||
%{_libdir}/mpich/bin/vtkWrapPython
|
||||
@ -874,47 +811,31 @@ cat xorg.log
|
||||
|
||||
%files mpich-qt
|
||||
%{_libdir}/mpich/lib/lib*Qt*.so.*
|
||||
%exclude %{_libdir}/mpich/lib/*TCL.so.*
|
||||
%exclude %{_libdir}/mpich/lib/*Python27D.so.*
|
||||
%exclude %{_libdir}/mpich/lib/*Python??D.so.*
|
||||
%{_libdir}/mpich/lib/qt?/
|
||||
|
||||
%files mpich-qt-python
|
||||
%{_libdir}/mpich/lib/*QtPython27D.so.*
|
||||
|
||||
%files mpich-qt-tcl
|
||||
%{_libdir}/mpich/lib/*QtTCL.so.*
|
||||
%files -n python%{python3_pkgversion}-vtk-mpich-qt
|
||||
%{_libdir}/mpich/lib/*QtPython3?D.so.*
|
||||
%endif
|
||||
|
||||
%if %{with openmpi}
|
||||
%files openmpi -f build-openmpi/libs.list
|
||||
%license Copyright.txt
|
||||
%doc README.md vtkLogo.jpg vtkBanner.gif _docs/Wrapping
|
||||
%{_libdir}/openmpi/bin/vtkEncodeString
|
||||
%doc README.md _docs/Wrapping
|
||||
|
||||
%files openmpi-devel
|
||||
%{_libdir}/openmpi/bin/vtkHashSource
|
||||
%{_libdir}/openmpi/bin/vtkWrapHierarchy
|
||||
%{_libdir}/openmpi/include/
|
||||
%{_libdir}/openmpi/lib/*.so
|
||||
%{_libdir}/openmpi/lib/libvtkWrappingTools.a
|
||||
%{_libdir}/openmpi/lib/cmake/
|
||||
%{_libdir}/openmpi/share/doc/vtk-7.1/
|
||||
%{_libdir}/openmpi/share/tcl%{tcl_version}/vtk/vtktcl.c
|
||||
%{_libdir}/openmpi/share/doc/vtk-8.2/
|
||||
|
||||
%files openmpi-tcl
|
||||
%{_libdir}/openmpi/lib/*TCL.so.*
|
||||
%exclude %{_libdir}/openmpi/lib/*QtTCL.so.*
|
||||
%{_libdir}/openmpi/bin/pvtk
|
||||
%{_libdir}/openmpi/bin/vtk
|
||||
%{_libdir}/openmpi/bin/vtkWrapTcl
|
||||
%{_libdir}/openmpi/bin/vtkWrapTclInit
|
||||
%{_libdir}/openmpi/share/tcl%{tcl_version}/
|
||||
%exclude %{_libdir}/openmpi/share/tcl%{tcl_version}/vtk/vtktcl.c
|
||||
|
||||
%files openmpi-python
|
||||
%{_libdir}/openmpi/lib/python%{python2_version}/
|
||||
%{_libdir}/openmpi/lib/*Python27D.so.*
|
||||
%exclude %{_libdir}/openmpi/lib/*QtPython27D.so.*
|
||||
%files -n python%{python3_pkgversion}-vtk-openmpi
|
||||
%{_libdir}/openmpi/lib/python%{python3_version}/
|
||||
%{_libdir}/openmpi/lib/*Python3?D.so.*
|
||||
%exclude %{_libdir}/openmpi/lib/*QtPython??D.so.*
|
||||
%{_libdir}/openmpi/bin/pvtkpython
|
||||
%{_libdir}/openmpi/bin/vtkpython
|
||||
%{_libdir}/openmpi/bin/vtkWrapPython
|
||||
@ -930,15 +851,11 @@ cat xorg.log
|
||||
|
||||
%files openmpi-qt
|
||||
%{_libdir}/openmpi/lib/lib*Qt*.so.*
|
||||
%exclude %{_libdir}/openmpi/lib/*TCL.so.*
|
||||
%exclude %{_libdir}/openmpi/lib/*Python27D.so.*
|
||||
%{_libdir}/openmpi/lib/qt?/
|
||||
|
||||
%files openmpi-qt-python
|
||||
%{_libdir}/openmpi/lib/*QtPython27D.so.*
|
||||
|
||||
%files openmpi-qt-tcl
|
||||
%{_libdir}/openmpi/lib/*QtTCL.so.*
|
||||
%files -n python%{python3_pkgversion}-vtk-openmpi-qt
|
||||
%{_libdir}/openmpi/lib/*QtPython3?D.so.*
|
||||
%endif
|
||||
|
||||
%files data
|
||||
@ -951,6 +868,77 @@ cat xorg.log
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 25 2020 Orion Poplawski <orion@cora.nwra.com> - 8.2.0-17
|
||||
- Rebuild for hdf5 1.10.6
|
||||
|
||||
* Sat Jun 20 2020 Orion Poplawski <orion@nwra.com> - 8.2.0-16
|
||||
- Drop _python_bytecompile_extra, python2 conditionals
|
||||
|
||||
* Sat May 30 2020 Björn Esser <besser82@fedoraproject.org> - 8.2.0-15
|
||||
- Rebuild (jsoncpp)
|
||||
|
||||
* Wed May 27 2020 Orion Poplawski <orion@nwra.com> - 8.2.0-14
|
||||
- Add patch to fix building with GCC 10 (bz#1800240)
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 8.2.0-14
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Nov 14 2019 Björn Esser <besser82@fedoraproject.org> - 8.2.0-12
|
||||
- Rebuild (jsoncpp)
|
||||
|
||||
* Sat Nov 9 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-11
|
||||
- Drop BR on sip-devel (python2)
|
||||
|
||||
* Sun Sep 22 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-10
|
||||
- Rebuild for double-conversion 3.1.5
|
||||
|
||||
* Mon Sep 09 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-9
|
||||
- Rebuild for proj 6.2.0
|
||||
- Add patch and flags for proj 6 support
|
||||
|
||||
* Tue Aug 20 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-8
|
||||
- Add upstream patch to support Python 3.8
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 8.2.0-7
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Wed Jul 31 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-6
|
||||
- BR motif-devel instead of /usr/include/Xm (bugz#1731728)
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Jul 03 2019 Björn Esser <besser82@fedoraproject.org> - 8.2.0-4
|
||||
- Rebuild (jsoncpp)
|
||||
|
||||
* Thu Apr 18 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-3
|
||||
- Provide starndard python 3.Y dist name (bugz#1700307)
|
||||
|
||||
* Tue Apr 16 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-2
|
||||
- Provide standard python 3 dist name (bugz#1700307)
|
||||
|
||||
* Sat Mar 16 2019 Orion Poplawski <orion@nwra.com> - 8.2.0-1
|
||||
- Update to 8.2.0
|
||||
- TCL wrapping has been dropped upstream
|
||||
- Build with system glew
|
||||
|
||||
* Fri Feb 15 2019 Orion Poplawski <orion@nwra.com> - 8.1.1-3
|
||||
- Rebuild for openmpi 3.1.3
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Oct 26 2018 Orion Poplawski <orion@cora.nwra.com> - 8.1.1-1
|
||||
- Update to 8.1.1 (bug #1460059)
|
||||
- Use Qt 5 (bug #1319504)
|
||||
- Use Python 3 for Fedora 30+ (bug #1549034)
|
||||
|
||||
* Thu Sep 06 2018 Pavel Raiskup <praiskup@redhat.com> - 7.1.1-13
|
||||
- rebuild against libpq (rhbz#1618698, rhbz#1623764)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user