Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
34d4a23f10 | ||
|
|
32e99e33a2 |
11 changed files with 1458 additions and 1906 deletions
28
.gitignore
vendored
28
.gitignore
vendored
|
|
@ -17,31 +17,3 @@ vtk-5.6.0.tar.gz
|
|||
/VTKData-8.1.1.tar.gz
|
||||
/VTK-8.2.0.tar.gz
|
||||
/VTKData-8.2.0.tar.gz
|
||||
/VTK-9.0.0.tar.gz
|
||||
/VTKData-9.0.0.tar.gz
|
||||
/VTK-9.0.1.tar.gz
|
||||
/VTKData-9.0.1.tar.gz
|
||||
/VTK-9.0.2.tar.gz
|
||||
/VTKData-9.0.2.tar.gz
|
||||
/VTK-9.0.3.tar.gz
|
||||
/VTKData-9.0.3.tar.gz
|
||||
/VTK-9.1.0.tar.gz
|
||||
/VTKData-9.1.0.tar.gz
|
||||
/VTK-9.2.5.tar.gz
|
||||
/VTKData-9.2.5.tar.gz
|
||||
/VTK-9.2.6.tar.gz
|
||||
/VTKData-9.2.6.tar.gz
|
||||
/VTK-9.3.0.tar.gz
|
||||
/VTKData-9.3.0.tar.gz
|
||||
/VTK-9.3.1.tar.gz
|
||||
/VTKData-9.3.1.tar.gz
|
||||
/VTK-9.4.1.tar.gz
|
||||
/VTKData-9.4.1.tar.gz
|
||||
/VTK-9.4.2.tar.gz
|
||||
/VTKData-9.4.2.tar.gz
|
||||
/VTK-9.5.0.tar.gz
|
||||
/VTKData-9.5.0.tar.gz
|
||||
/VTK-9.5.1.tar.gz
|
||||
/VTKData-9.5.1.tar.gz
|
||||
/VTK-9.5.2.tar.gz
|
||||
/VTKData-9.5.2.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
|
||||
|
||||
757
changelog
757
changelog
|
|
@ -1,757 +0,0 @@
|
|||
* Thu Feb 13 2025 Orion Poplawski <orion@nwra.com> - 9.2.6-26
|
||||
- Rebuild with hdf5 1.14.6
|
||||
|
||||
* Tue Jan 28 2025 Sandro Mani <manisandro@gmail.com> - 9.2.6-25
|
||||
- Rebuild for cgnslib built with scoped enums
|
||||
|
||||
* Mon Jan 27 2025 Sandro Mani <manisandro@gmail.com> - 9.2.6-24
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Fri Jan 24 2025 Sandro Mani <manisandro@gmail.com> - 9.2.6-23
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.2.6-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Nov 08 2024 Sandro Mani <manisandro@gmail.com> - 9.2.6-21
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Thu Oct 31 2024 Christoph Junghans <junghans@votca.org> - 9.2.6-20
|
||||
- Add missing dep to mpi-devel packages
|
||||
|
||||
* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 9.2.6-19
|
||||
- Rebuild for hdf5 1.14.5
|
||||
|
||||
* Tue Oct 08 2024 Orion Poplawski <orion@nwra.com> - 9.2.6-18
|
||||
- Add upstream patch to fix segmentation fault on import with Python 3.13
|
||||
(rhbz#2310520)
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.2.6-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 9.2.6-16
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Mon May 13 2024 Sandro Mani <manisandro@gmail.com> - 9.2.6-15
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Wed Apr 10 2024 Orion Poplawski <orion@nwra.com> - 9.2.6-14
|
||||
- Set Java source/target version to 8 (FTBFS bz#2272954)
|
||||
|
||||
* Sat Feb 24 2024 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-13
|
||||
- Reduce memory and ncpu usage during riscv64 builds
|
||||
|
||||
* Wed Jan 24 2024 Orion Poplawski <orion@nwra.com> - 9.2.6-12
|
||||
- Drop mpi4py-mpich BR on i686 (bz#2259594)
|
||||
|
||||
* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 9.2.6-12
|
||||
- Rebuilt for Boost 1.83
|
||||
|
||||
* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 9.2.6-11
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Thu Nov 02 2023 Philip Matura <pfed@tura-home.de> - 9.2.6-10
|
||||
- Move API docs to separate doc sub-package (bz#2247327)
|
||||
|
||||
* Wed Oct 11 2023 Orion Poplawski <orion@nwra.com> - 9.2.6-9
|
||||
- Rebuild for openslide 4.0.0
|
||||
|
||||
* Sun Sep 17 2023 Orion Poplawski <orion@nwra.com> - 9.2.6-8
|
||||
- Use loops for mpi builds/intalls
|
||||
|
||||
* Sun Sep 10 2023 Orion Poplawski <orion@nwra.com> - 9.2.6-7
|
||||
- Fix -devel deps on netcdf-*-devel
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.2.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jul 06 2023 Sandro Mani <manisandro@gmail.com> - 9.2.6-5
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 9.2.6-4
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 9.2.6-3
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 9.2.6-2
|
||||
- Rebuilt for Boost 1.81
|
||||
|
||||
* Sun Feb 19 2023 Orion Poplawski <orion@nwra.com> - 9.2.6-1
|
||||
- Update to 9.2.6
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.2.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Jan 09 2023 Orion Poplawski <orion@nwra.com> - 9.2.5-1
|
||||
- Update to 9.2.5
|
||||
- Use SPDX License tag
|
||||
|
||||
* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 9.1.0-18
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Thu Jul 28 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-17
|
||||
- Remove all of vtkdata/Wrapping to keep vtk-data noarch
|
||||
|
||||
* Thu Jul 28 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 9.1.0-16
|
||||
- Make -data subpackage arch-dependent for now due to
|
||||
java removal (bz#2104109)
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sun Jul 10 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-14
|
||||
- Drop java for i686 (bz#2104109)
|
||||
|
||||
* Tue Jun 28 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-13
|
||||
- Add patch to support netcdf 4.9.0
|
||||
|
||||
* Fri Jun 24 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-12
|
||||
- Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611)
|
||||
- Link libvtkkissfft.so.1 against libm (bz#2100573)
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 9.1.0-11
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 9.1.0-10
|
||||
- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
|
||||
|
||||
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 9.1.0-9
|
||||
- Rebuilt for Boost 1.78
|
||||
|
||||
* Tue Mar 22 2022 Sandro Mani <manisandro@gmail.com> - 9.1.0-8
|
||||
- Rebuild for cgnslib-4.3.0
|
||||
|
||||
* Thu Mar 03 2022 Sandro Mani <manisandro@gmail.com> - 9.1.0-7
|
||||
- Rebuild for proj-9.0.0
|
||||
|
||||
* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-6
|
||||
- Rebuild for glew 2.2
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 9.1.0-5
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Sat Jan 29 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-4
|
||||
- Use export CC/CXX to set MPI compiler
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-3
|
||||
- Use %%global to define __cc/__cxx
|
||||
|
||||
* Fri Jan 07 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-2
|
||||
- Make java-devel only be brought in by vtk-java-devel
|
||||
|
||||
* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 9.1.0-1
|
||||
- Update to 9.1.0
|
||||
|
||||
* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 9.0.3-4
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Wed Nov 03 2021 Björn Esser <besser82@fedoraproject.org> - 9.0.3-3
|
||||
- Rebuild (jsoncpp)
|
||||
|
||||
* Sun Sep 26 2021 Orion Poplawski <orion@nwra.com> - 9.0.3-2
|
||||
- Cleanup rpath handling (bz#1902729)
|
||||
|
||||
* Wed Sep 15 2021 Orion Poplawski <orion@nwra.com> - 9.0.3-1
|
||||
- Update to 9.0.3
|
||||
- Add upstream patch to fix Mayavi crash (bz#1966135)
|
||||
|
||||
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 9.0.2-6
|
||||
- Rebuild for hdf5 1.10.7/netcdf 4.8.0
|
||||
|
||||
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 9.0.2-5
|
||||
- More rpath cleanup
|
||||
|
||||
* Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 9.0.2-4
|
||||
- Rebuilt for Boost 1.76
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jul 13 2021 Björn Esser <besser82@fedoraproject.org> - 9.0.2-2
|
||||
- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19
|
||||
|
||||
* Thu Jul 01 2021 Orion Poplawski <orion@nwra.com> - 9.0.2-1
|
||||
- Update to 9.0.2
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 9.0.1-9
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Fri May 21 2021 Sandro Mani <manisandro@gmail.com> - 9.0.1-8
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Thu May 20 2021 Richard Shaw <hobbes1069@gmail.com> - 9.0.1-7
|
||||
- Rebuild for gdal 3.3.0.
|
||||
|
||||
* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 9.0.1-6
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Fri Apr 02 2021 Orion Poplawski <orion@nwra.com> - 9.0.1-5
|
||||
- Make vtk-devel package require vtk-java
|
||||
|
||||
* Sat Mar 13 2021 Orion Poplawski <orion@nwra.com> - 9.0.1-4
|
||||
- Add upstream patch for proj 5 support
|
||||
|
||||
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 9.0.1-4
|
||||
- Rebuild (proj)
|
||||
|
||||
* Mon Feb 15 2021 Orion Poplawski <orion@nwra.com> - 9.0.1-3
|
||||
- Bump python3-vtk-qt obsoletes
|
||||
|
||||
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 9.0.1-2
|
||||
- rebuild for libpq ABI fix rhbz#1908268
|
||||
|
||||
* Sat Jan 30 2021 Orion Poplawski <orion@nwra.com> - 9.0.1-1
|
||||
- Update to 9.0.1
|
||||
- Disable OSMesa - conflicts with X support
|
||||
- Build against Fedora gl2ps, libharu, utf8cpp
|
||||
- Drop python3-vtk-qt packages
|
||||
- No longer ship compiled examples
|
||||
- Install jar file into /usr/share/java
|
||||
- Fix JNI install location
|
||||
- Drop Qt4 build option
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Nov 5 20:45:48 CET 2020 Sandro Mani <manisandro@gmail.com> - 8.2.0-25
|
||||
- Rebuild (proj)
|
||||
|
||||
* Thu Sep 17 2020 Orion Poplawski <orion@nwra.com> - 8.2.0-24
|
||||
- Add patch to fix build with Qt 5.15
|
||||
|
||||
* Thu Aug 27 2020 Iñaki Úcar <iucar@fedoraproject.org> - 8.2.0-23
|
||||
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||
|
||||
* Sun Aug 9 2020 Orion Poplawski <orion@nwra.com> - 8.2.0-22
|
||||
- Fix ExternalData in vtk-data (bz#1783622)
|
||||
|
||||
* Tue Aug 4 2020 Orion Poplawski <orion@nwra.com> - 8.2.0-21
|
||||
- Use new cmake macros
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 24 2020 Jeff Law <law@redhat.com> - 8.2.0-19
|
||||
- Use __cmake_in_source_build
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 8.2.0-18
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* 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
|
||||
|
||||
* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 7.1.1-11
|
||||
- Rebuild to fix GCC 8 mis-compilation
|
||||
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Tue Dec 26 2017 Björn Esser <besser82@fedoraproject.org> - 7.1.1-9
|
||||
- Rebuilt for jsoncpp.so.20
|
||||
|
||||
* Mon Dec 18 2017 Orion Poplawski <orion@nwra.com> - 7.1.1-8
|
||||
- Enable mysql and postgresql support
|
||||
- Use mariadb BR for F28+ (Bug #1494054)
|
||||
|
||||
* Fri Sep 01 2017 Björn Esser <besser82@fedoraproject.org> - 7.1.1-7
|
||||
- Rebuilt for jsoncpp-1.8.3
|
||||
|
||||
* Sat Aug 12 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 7.1.1-6
|
||||
- Python 2 binary packages renamed to python2-vtk and python2-vtk-qt
|
||||
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.1.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||
|
||||
* Tue May 9 2017 Orion Poplawski <orion@cora.nwra.com> - 7.1.1-2
|
||||
- Enable tests on s390x
|
||||
|
||||
* Mon May 8 2017 Orion Poplawski <orion@cora.nwra.com> - 7.1.1-1
|
||||
- Update to 7.1.1
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 3 2017 Dan Horák <dan[at]danny.cz> - 7.1.0-5
|
||||
- s390x needs increased Java heap size
|
||||
|
||||
* Thu Dec 29 2016 Orion Poplawski <orion@cora.nwra.com> - 7.1.0-4
|
||||
- Drop setting java heap size
|
||||
|
||||
* Thu Dec 8 2016 Dan Horák <dan[at]danny.cz> - 7.1.0-3
|
||||
- Enable openmpi on s390(x)
|
||||
- Add missing conditions for mpich/openmpi subpackages
|
||||
|
||||
* Thu Dec 8 2016 Orion Poplawski <orion@cora.nwra.com> - 7.1.0-2
|
||||
- Fix MPI library install location
|
||||
|
||||
* Mon Dec 5 2016 Orion Poplawski <orion@cora.nwra.com> - 7.1.0-1
|
||||
- Update to 7.1.0
|
||||
- Enable OSMesa
|
||||
- Build MPI versions
|
||||
- Use bundled glew
|
||||
|
||||
* Wed Nov 2 2016 Orion Poplawski <orion@cora.nwra.com> - 6.3.0-12
|
||||
- Rebuild for R openblas changes
|
||||
|
||||
* Mon Oct 03 2016 Björn Esser <fedora@besser82.io> - 6.3.0-11
|
||||
- Rebuilt for libjsoncpp.so.11
|
||||
|
||||
* Thu Jul 28 2016 Than Ngo <than@redhat.com> - 6.3.0-10
|
||||
- %%check: make non-fatal as temporary workaround for build on s390x
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.3.0-9
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Wed Jun 29 2016 Orion Poplawski <orion@cora.nwra.com> - 6.3.0-8
|
||||
- Rebuild for hdf5 1.8.17
|
||||
|
||||
* Fri Mar 25 2016 Björn Esser <fedora@besser82.io> - 6.3.0-7
|
||||
- Rebuilt for libjsoncpp.so.1
|
||||
|
||||
* Mon Feb 8 2016 Orion Poplawski <orion@cora.nwra.com> - 6.3.0-6
|
||||
- Add patch for gcc 6 support
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.3.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2016 Orion Poplawski <orion@cora.nwra.com> - 6.3.0-4
|
||||
- Rebuild for netcdf 4.4.0
|
||||
|
||||
* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 6.3.0-3
|
||||
- Rebuilt for Boost 1.60
|
||||
|
||||
* Wed Oct 21 2015 Orion Poplawski <orion@cora.nwra.com> - 6.3.0-2
|
||||
- Note bundled libraries
|
||||
|
||||
* Tue Sep 15 2015 Orion Poplawski <orion@cora.nwra.com> - 6.3.0-1
|
||||
- Update to 6.3.0
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 6.2.0-10
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
* Fri Aug 21 2015 Orion Poplawski <orion@cora.nwra.com> - 6.2.0-9
|
||||
- Note bundled kwsys, remove unused kwsys files
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 6.2.0-7
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Tue Jul 7 2015 Orion Poplawski <orion@cora.nwra.com> - 6.2.0-6
|
||||
- Drop glext patch, no longer needed
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 23 2015 Orion Poplawski <orion@cora.nwra.com> - 6.2.0-4
|
||||
- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512)
|
||||
|
||||
* Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 6.2.0-3
|
||||
- Rebuild for hdf5 1.8.15
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 6.2.0-2
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Wed Mar 18 2015 Orion Poplawski <orion@cora.nwra.com> - 6.2.0-1
|
||||
- Update to 6.2.0
|
||||
- Remove type, system, install, and netcdf patches applied upstream
|
||||
- Integrate and replace vtkdata
|
||||
- Build and run tests again
|
||||
- Generate testing.list based on executable name
|
||||
|
||||
* Thu Mar 05 2015 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-26
|
||||
- Add needed vtk-*-devel requires to vtk-devel (bug #1199310)
|
||||
|
||||
* Wed Mar 04 2015 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-25
|
||||
- Rebuild for jsoncpp
|
||||
|
||||
* Wed Feb 04 2015 Petr Machata <pmachata@redhat.com> - 6.1.0-24
|
||||
- Bump for rebuild.
|
||||
|
||||
* Tue Feb 3 2015 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-23
|
||||
- Add patch to fix tcl library loading
|
||||
|
||||
* Mon Jan 26 2015 Petr Machata <pmachata@redhat.com> - 6.1.0-22
|
||||
- Rebuild for boost 1.57.0
|
||||
|
||||
* Mon Jan 19 2015 François Cami <fcami@fedoraproject.org> - 6.1.0-21
|
||||
- Switch to non-explicit arch requires for now (bugs #1183210 #1183530)
|
||||
|
||||
* Sat Jan 17 2015 François Cami <fcami@fedoraproject.org> - 6.1.0-20
|
||||
- Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210)
|
||||
|
||||
* Thu Jan 08 2015 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-19
|
||||
- Rebuild for hdf5 1.8.14
|
||||
- Add patch to fix compilation error
|
||||
|
||||
* Thu Nov 20 2014 Dan Horák <dan[at]danny.cz> - 6.1.0-18
|
||||
- Don't override Java memory settings on s390 (related to bug #1115920)
|
||||
|
||||
* Wed Nov 19 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-17
|
||||
- Add patch to fix compilation with mesa 10.4 (bug #1138466)
|
||||
|
||||
* Fri Oct 31 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-16
|
||||
- No longer need cmake28 on RHEL6
|
||||
|
||||
* Thu Sep 4 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-15
|
||||
- Increase java heap space for builds (bug #1115920)
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.1.0-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Tue Jun 10 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-13
|
||||
- Rebuild for hdf 1.8.13
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.1.0-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Thu Jun 5 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-11
|
||||
- Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004)
|
||||
|
||||
* Tue May 27 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-10
|
||||
- Rebuild for Tcl 8.6
|
||||
|
||||
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 6.1.0-9
|
||||
- Rebuild for boost 1.55.0
|
||||
|
||||
* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 6.1.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
|
||||
|
||||
* Tue May 6 2014 Tom Callaway <spot@fedoraproject.org> - 6.1.0-7
|
||||
- rebuild against R 3.1.0 (without bundled blas/lapack)
|
||||
|
||||
* Wed Mar 26 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-5
|
||||
- Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781)
|
||||
|
||||
* Tue Jan 28 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-4
|
||||
- Really fix requires freetype-devel
|
||||
|
||||
* Mon Jan 27 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-3
|
||||
- Fix requires freetype-devel
|
||||
|
||||
* Sun Jan 26 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-2
|
||||
- Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924)
|
||||
|
||||
* Thu Jan 23 2014 Orion Poplawski <orion@cora.nwra.com> - 6.1.0-1
|
||||
- Update to 6.1.0
|
||||
- Rebase patches, drop vtkpython patch
|
||||
- Disable BUILD_TESTING for now until we can provide test data
|
||||
|
||||
* Fri Dec 27 2013 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-10
|
||||
- Add patch to use system netcdf
|
||||
|
||||
* Sun Dec 22 2013 Kevin Fenzi <kevin@scrye.com> 6.0.0-9
|
||||
- Add BuildRequires on blas-devel and lapack-devel
|
||||
|
||||
* Sun Dec 22 2013 François Cami <fcami@fedoraproject.org> - 6.0.0-8
|
||||
* Rebuild for rawhide.
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 6.0.0-6
|
||||
- Rebuild for boost 1.54.0
|
||||
|
||||
* Mon Jul 29 2013 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-5
|
||||
- Enable VTK_WRAP_PYTHON_SIP
|
||||
|
||||
* Fri Jul 26 2013 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-4
|
||||
- Add patch to install vtkpython
|
||||
|
||||
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 6.0.0-3
|
||||
- Perl 5.18 rebuild
|
||||
|
||||
* Mon Jul 15 2013 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-2
|
||||
- Install vtkMakeInstantiator files for gdcm build
|
||||
|
||||
* Fri Jul 12 2013 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-1
|
||||
- Add BR on R-devel
|
||||
|
||||
* Thu Jun 27 2013 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-1
|
||||
- Update to 6.0.0
|
||||
|
||||
* Thu May 16 2013 Orion Poplawski <orion@cora.nwra.com> - 5.10.1-5
|
||||
- Rebuild for hdf5 1.8.11
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.10.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 5.10.1-3
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Mon Dec 03 2012 Orion Poplawski <orion@cora.nwra.com> - 5.10.1-2
|
||||
- Rebuild for hdf5 1.8.10
|
||||
- Change doc handling
|
||||
|
||||
* Thu Nov 1 2012 Orion Poplawski <orion@cora.nwra.com> - 5.10.1-1
|
||||
- Update to 5.10.1
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.10.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu May 24 2012 Orion Poplawski <orion@cora.nwra.com> - 5.10.0-2
|
||||
- Add patch to add soname to libvtkNetCDF_cxx
|
||||
|
||||
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> - 5.10.0-1
|
||||
- Update to 5.10.0
|
||||
|
||||
* Tue May 15 2012 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 5.8.0-6
|
||||
- Add cmake28 usage when building for EL6
|
||||
- Disable -java build on PPC64 as it fails to build
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.8.0-5
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Sun Jan 8 2012 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-4
|
||||
- Rebuild with gcc 4.7
|
||||
|
||||
* Fri Nov 18 2011 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-3
|
||||
- Rebuild for hdf5 1.8.8, add explicit requires
|
||||
|
||||
* Tue Nov 1 2011 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-2
|
||||
- Keep libraries in %%{_libdir}/vtk, use ld.so.conf.d
|
||||
|
||||
* Fri Oct 7 2011 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-1
|
||||
- Update to 5.8.0
|
||||
- Drop version from directory names
|
||||
- Use VTK_PYTHON_SETUP_ARGS instead of patch to set python install dir
|
||||
- Drop several patches fixed upstream
|
||||
- Remove rpaths from all hand installed binaries (Bug 744437)
|
||||
- Don't link against OSMesa (Bug 744434)
|
||||
|
||||
* Thu Jun 23 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-10
|
||||
- Add BR qtwebkit-devel, fixes FTBS bug 715770
|
||||
|
||||
* Thu May 19 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-9
|
||||
- Update soversion patch to add soversion to libvtkNetCDF.so
|
||||
|
||||
* Mon Mar 28 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-8
|
||||
- Rebuild for new mysql
|
||||
|
||||
* Thu Mar 17 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-7
|
||||
- Add needed requires to vtk-devel
|
||||
|
||||
* Wed Mar 16 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-6
|
||||
- Turn on boost, mysql, postgres, ogg theora, and text analysis support,
|
||||
bug 688275.
|
||||
|
||||
* Wed Mar 16 2011 Marek Kasik <mkasik@redhat.com> - 5.6.1-5
|
||||
- Add backslashes to VTK_INSTALL_LIB_DIR and
|
||||
- VTK_INSTALL_INCLUDE_DIR (#687895)
|
||||
|
||||
* Tue Mar 15 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-4
|
||||
- Set VTK_INSTALL_LIB_DIR, fix bug 687895
|
||||
|
||||
* Fri Feb 18 2011 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-3
|
||||
- Add patch to support gcc 4.6
|
||||
- Add patch to make using system libraries easier
|
||||
- Update pythondestdir patch to use --prefix and --root
|
||||
- Use system gl2ps and libxml2
|
||||
- Use standard cmake build macro, out of tree builds
|
||||
- Add patch from upstream to add sonames to libCosmo and libVPIC (bug #622840)
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Tue Dec 7 2010 Orion Poplawski <orion@cora.nwra.com> - 5.6.1-1
|
||||
- Update to 5.6.1
|
||||
- Enable qt4 support, drop qt3 support
|
||||
|
||||
* Wed Oct 20 2010 Adam Jackson <ajax@redhat.com> 5.6.0-37
|
||||
- Rebuild for new libOSMesa soname
|
||||
|
||||
* Sat Jul 31 2010 David Malcolm <dmalcolm@redhat.com> - 5.6.0-36
|
||||
- add python 2.7 compat patch
|
||||
|
||||
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 5.6.0-35
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Mon Jul 5 2010 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.6.0-34
|
||||
- Update to 5.6.0.
|
||||
|
||||
* Sat Jun 6 2009 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.4.2-30
|
||||
- Update to 5.4.2.
|
||||
|
||||
* Thu Mar 12 2009 Orion Poplawski <orion@cora.nwra.com> - 5.2.1-29
|
||||
- Update to 5.2.1
|
||||
|
||||
* Fri Mar 06 2009 Jesse Keating <jkeating@redhat.com> - 5.2.0-28
|
||||
- Remove chmod on examples .so files, none are built. This needs
|
||||
more attention.
|
||||
|
||||
* Sun Oct 5 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.2.0-26
|
||||
- Update to 5.2.0.
|
||||
|
||||
* Wed Oct 1 2008 Orion Poplawski <orion@cora.nwra.com> - 5.0.2-25
|
||||
- Fix patch fuzz
|
||||
|
||||
* Mon Aug 25 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-24
|
||||
- Change java build dependencies from java-devel to gcj.
|
||||
|
||||
* Sun Aug 24 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-23
|
||||
- %%check || : does not work anymore.
|
||||
- enable java by default.
|
||||
|
||||
* Wed May 21 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 5.0.4-22
|
||||
- fix license tag
|
||||
|
||||
* Sat Apr 12 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-21
|
||||
- Fixes for gcc 4.3 by Orion Poplawski.
|
||||
|
||||
* Sat Apr 5 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-20
|
||||
- Change BR to qt-devel to qt3-devel.
|
||||
|
||||
* Sat Feb 23 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-19
|
||||
- Update to 5.0.4.
|
||||
|
||||
* Mon May 28 2007 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.3-18
|
||||
- Move headers to %%{_includedir}/vtk.
|
||||
- Remove executable bit from sources.
|
||||
|
||||
* Mon Apr 16 2007 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.3-17
|
||||
- Make java build conditional.
|
||||
- Add ldconfig %%post/%%postun for java/qt subpackages.
|
||||
|
||||
* Sun Apr 15 2007 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.3-16
|
||||
- Remove %%ghosting pyc/pyo.
|
||||
|
||||
* Wed Apr 04 2007 Paulo Roma <roma@lcg.ufrj.br> - 5.0.3-15
|
||||
- Update to 5.0.4.
|
||||
- Added support for qt4 plugin.
|
||||
|
||||
* Wed Feb 7 2007 Orion Poplawski <orion@cora.nwra.com> - 5.0.2-14
|
||||
- Enable Java, Qt, GL2PS, OSMESA
|
||||
|
||||
* Mon Sep 11 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.2-13
|
||||
- Update to 5.0.2.
|
||||
|
||||
* Sun Aug 6 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.1-12
|
||||
- cmake needs to be >= 2.0.4.
|
||||
|
||||
* Fri Aug 4 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.1-11
|
||||
- Fix some python issues including pyo management.
|
||||
|
||||
* Sun Jul 23 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.1-10
|
||||
- Embed feedback from bug 199405 comment 5.
|
||||
- Fix some Group entries.
|
||||
- Remove redundant dependencies.
|
||||
- Use system libs.
|
||||
- Comment specfile more.
|
||||
- Change buildroot handling with CMAKE_INSTALL_PREFIX.
|
||||
- Enable qt designer plugin.
|
||||
|
||||
* Wed Jul 19 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.1-7
|
||||
- Fix some permissions for rpmlint and debuginfo.
|
||||
|
||||
* Sun Jul 16 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.1-7
|
||||
- Remove rpath and some further rpmlint warnings.
|
||||
|
||||
* Thu Jul 13 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.1-6
|
||||
- Update to 5.0.1.
|
||||
|
||||
* Wed May 31 2006 Axel Thimm <Axel.Thimm@ATrpms.net>
|
||||
- Update to 5.0.
|
||||
|
||||
* Mon Apr 05 2004 Intrinsic Spin <spin@freakbait.com> 2.mr
|
||||
- built on a machine with a stock libGL.so
|
||||
|
||||
* Sun Apr 04 2004 Intrinsic Spin <spin@freakbait.com>
|
||||
- little cleanups
|
||||
- Built for FC1
|
||||
|
||||
* Sun Jan 11 2004 Intrinsic Spin <spin@freakbait.com>
|
||||
- Built against a reasonably good (according to dashboard) CVS version so-as
|
||||
to get GL2PS support.
|
||||
- Rearranged. Cleaned up. Added some comments.
|
||||
|
||||
* Sat Jan 10 2004 Intrinsic Spin <spin@freakbait.com>
|
||||
- Blatently stole this spec file for my own nefarious purposes.
|
||||
- Removed Java (for now). Merged the Python and Tcl stuff into
|
||||
the main rpm.
|
||||
|
||||
* Fri Dec 05 2003 Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>
|
||||
- (See Fabrice's RPMs for any more comments --Spin)
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (VTK-9.5.2.tar.gz) = fc8157a89fa603a7f7fce356e2f638ae69e0ea629a507458bdbb173daf511c61e39a1f0d7201b196a5b3a7ffa7e3e821398b62521faadf85edb1119a1e8b8e8e
|
||||
SHA512 (VTKData-9.5.2.tar.gz) = 1be895bed613ed0f0ace0ba5e138afacc3d61b57e437299b3aecf6beff702ad1a2d02036fd147853bbbcb6a1f9d20a51831c0263fdc5b8e62ece9a6f8f7d410e
|
||||
SHA512 (VTK-8.2.0.tar.gz) = 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
|
||||
SHA512 (VTKData-8.2.0.tar.gz) = 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
diff -up VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp.cstdint VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp
|
||||
--- VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp.cstdint 2024-06-28 10:00:10.000000000 -0600
|
||||
+++ VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp 2025-02-17 17:08:44.231541639 -0700
|
||||
@@ -138,6 +138,7 @@
|
||||
|
||||
#include <type_traits>
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#define CHOBO_SMALL_VECTOR_ERROR_HANDLING_NONE 0
|
||||
diff -up VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp.cstdint VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp
|
||||
--- VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp.cstdint 2024-06-28 10:00:10.000000000 -0600
|
||||
+++ VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp 2025-02-17 17:08:27.992495226 -0700
|
||||
@@ -138,6 +138,7 @@
|
||||
|
||||
#include <type_traits>
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#define CHOBO_SMALL_VECTOR_ERROR_HANDLING_NONE 0
|
||||
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:
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt
|
||||
index b18b7a1..3793f4b 100644
|
||||
--- a/ThirdParty/libharu/CMakeLists.txt
|
||||
+++ b/ThirdParty/libharu/CMakeLists.txt
|
||||
@@ -5,7 +5,7 @@ vtk_module_third_party(
|
||||
STANDARD_INCLUDE_DIRS
|
||||
EXTERNAL
|
||||
PACKAGE LibHaru
|
||||
- VERSION 2.4.0
|
||||
+ VERSION 2.3.0
|
||||
TARGETS LibHaru::LibHaru
|
||||
STANDARD_INCLUDE_DIRS)
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/Common/Core/vtkDataArrayMeta.h b/Common/Core/vtkDataArrayMeta.h
|
||||
index 602305d3ed..8c37a96891 100644
|
||||
--- a/Common/Core/vtkDataArrayMeta.h
|
||||
+++ b/Common/Core/vtkDataArrayMeta.h
|
||||
@@ -32,7 +32,7 @@
|
||||
#endif
|
||||
|
||||
#if (defined(VTK_ALWAYS_OPTIMIZE_ARRAY_ITERATORS) || !defined(VTK_DEBUG_RANGE_ITERATORS)) && \
|
||||
- !defined(VTK_COMPILER_MSVC)
|
||||
+ !defined(VTK_COMPILER_MSVC) && !defined(__PPC64__)
|
||||
#define VTK_ITER_INLINE VTK_ALWAYS_INLINE
|
||||
#define VTK_ITER_ASSUME VTK_ASSUME_NO_ASSERT
|
||||
#define VTK_ITER_OPTIMIZE_START VTK_ALWAYS_OPTIMIZE_START
|
||||
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 ()
|
||||
489
vtk-tk9.patch
489
vtk-tk9.patch
|
|
@ -1,489 +0,0 @@
|
|||
commit b7c22497712be6751fbefe155533ae34d5e381f5
|
||||
Author: Spiros Tsalikis <spiros.tsalikis@kitware.com>
|
||||
Date: Thu May 22 12:30:19 2025 -0400
|
||||
|
||||
Tcl/Tk: Support version 9.0.0
|
||||
|
||||
diff --git a/Rendering/Tk/vtkTkImageViewerWidget.cxx b/Rendering/Tk/vtkTkImageViewerWidget.cxx
|
||||
index 43c7a48a13..9d2c4210de 100644
|
||||
--- a/Rendering/Tk/vtkTkImageViewerWidget.cxx
|
||||
+++ b/Rendering/Tk/vtkTkImageViewerWidget.cxx
|
||||
@@ -23,6 +23,17 @@
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+#define VTK_TCL_CONST const
|
||||
+#elif ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
|
||||
+#define VTK_TCL_CONST CONST84
|
||||
+#else
|
||||
+#define VTK_TCL_CONST
|
||||
+#endif
|
||||
+#ifndef offsetof
|
||||
+#define offsetof(type, field) ((size_t)((char*)&((type*)0)->field))
|
||||
+#endif
|
||||
+
|
||||
#define VTK_ALL_EVENTS_MASK \
|
||||
KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | \
|
||||
LeaveWindowMask | PointerMotionMask | ExposureMask | VisibilityChangeMask | FocusChangeMask | \
|
||||
@@ -32,14 +43,14 @@
|
||||
// or with the command configure. The only new one is "-rw" which allows
|
||||
// the uses to set their own ImageViewer window.
|
||||
static Tk_ConfigSpec vtkTkImageViewerWidgetConfigSpecs[] = {
|
||||
- { TK_CONFIG_PIXELS, (char*)"-height", (char*)"height", (char*)"Height", (char*)"400",
|
||||
- Tk_Offset(struct vtkTkImageViewerWidget, Height), 0, nullptr },
|
||||
+ { TK_CONFIG_PIXELS, "-height", "height", "Height", "400",
|
||||
+ offsetof(struct vtkTkImageViewerWidget, Height), 0, nullptr },
|
||||
|
||||
- { TK_CONFIG_PIXELS, (char*)"-width", (char*)"width", (char*)"Width", (char*)"400",
|
||||
- Tk_Offset(struct vtkTkImageViewerWidget, Width), 0, nullptr },
|
||||
+ { TK_CONFIG_PIXELS, "-width", "width", "Width", "400",
|
||||
+ offsetof(struct vtkTkImageViewerWidget, Width), 0, nullptr },
|
||||
|
||||
- { TK_CONFIG_STRING, (char*)"-iv", (char*)"iv", (char*)"IV", (char*)"",
|
||||
- Tk_Offset(struct vtkTkImageViewerWidget, IV), 0, nullptr },
|
||||
+ { TK_CONFIG_STRING, "-iv", "iv", "IV", "", offsetof(struct vtkTkImageViewerWidget, IV), 0,
|
||||
+ nullptr },
|
||||
|
||||
{ TK_CONFIG_END, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr }
|
||||
};
|
||||
@@ -56,17 +67,22 @@ extern int vtkImageViewerCommand(ClientData cd, Tcl_Interp* interp, int argc, ch
|
||||
//------------------------------------------------------------------------------
|
||||
// It's possible to change with this function or in a script some
|
||||
// options like width, height or the ImageViewer widget.
|
||||
-int vtkTkImageViewerWidget_Configure(
|
||||
- Tcl_Interp* interp, struct vtkTkImageViewerWidget* self, int argc, char* argv[], int flags)
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+int vtkTkImageViewerWidget_Configure(Tcl_Interp* interp, struct vtkTkImageViewerWidget* self,
|
||||
+ Tcl_Size objc, Tcl_Obj* const* objv, int flags)
|
||||
+#else
|
||||
+int vtkTkImageViewerWidget_Configure(Tcl_Interp* interp, struct vtkTkImageViewerWidget* self,
|
||||
+ int argc, VTK_TCL_CONST char* argv[], int flags)
|
||||
+#endif
|
||||
{
|
||||
// Let Tk handle generic configure options.
|
||||
- if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, argc,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- const_cast<CONST84 char**>(argv),
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, objc, objv,
|
||||
+ (void*)self, flags) == TCL_ERROR)
|
||||
#else
|
||||
- argv,
|
||||
-#endif
|
||||
+ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, argc, argv,
|
||||
(char*)self, flags) == TCL_ERROR)
|
||||
+#endif
|
||||
{
|
||||
return (TCL_ERROR);
|
||||
}
|
||||
@@ -89,11 +105,8 @@ int vtkTkImageViewerWidget_Configure(
|
||||
// to choose the appropriate method to invoke.
|
||||
extern "C"
|
||||
{
|
||||
- int vtkTkImageViewerWidget_Widget(ClientData clientData, Tcl_Interp* interp, int argc,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- CONST84
|
||||
-#endif
|
||||
- char* argv[])
|
||||
+ int vtkTkImageViewerWidget_Widget(
|
||||
+ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char* argv[])
|
||||
{
|
||||
struct vtkTkImageViewerWidget* self = (struct vtkTkImageViewerWidget*)clientData;
|
||||
int result = TCL_OK;
|
||||
@@ -106,7 +119,11 @@ extern "C"
|
||||
}
|
||||
|
||||
// Make sure the widget is not deleted during this function
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ Tcl_Preserve((ClientData)self);
|
||||
+#else
|
||||
Tk_Preserve((ClientData)self);
|
||||
+#endif
|
||||
|
||||
// Handle render call to the widget
|
||||
if (strncmp(argv[1], "render", std::max<size_t>(1, strlen(argv[1]))) == 0 ||
|
||||
@@ -137,13 +154,27 @@ extern "C"
|
||||
else
|
||||
{
|
||||
/* Execute a configuration change */
|
||||
- result = vtkTkImageViewerWidget_Configure(interp, self, argc - 2,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- const_cast<char**>(argv + 2),
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ // Convert string arguments to Tcl_Obj for TCL 9.0
|
||||
+ Tcl_Obj** objv_config = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*));
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ objv_config[i] = Tcl_NewStringObj(argv[i + 2], -1);
|
||||
+ Tcl_IncrRefCount(objv_config[i]);
|
||||
+ }
|
||||
+ result = vtkTkImageViewerWidget_Configure(
|
||||
+ interp, self, argc - 2, objv_config, TK_CONFIG_ARGV_ONLY);
|
||||
+
|
||||
+ // Clean up the Tcl_Obj array
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ Tcl_DecrRefCount(objv_config[i]);
|
||||
+ }
|
||||
+ ckfree((char*)objv_config);
|
||||
#else
|
||||
- argv + 2,
|
||||
+ result =
|
||||
+ vtkTkImageViewerWidget_Configure(interp, self, argc - 2, argv + 2, TK_CONFIG_ARGV_ONLY);
|
||||
#endif
|
||||
- TK_CONFIG_ARGV_ONLY);
|
||||
}
|
||||
}
|
||||
else if (!strcmp(argv[1], "GetImageViewer"))
|
||||
@@ -165,7 +196,11 @@ extern "C"
|
||||
}
|
||||
|
||||
// Unlock the object so it can be deleted.
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ Tcl_Release((ClientData)self);
|
||||
+#else
|
||||
Tk_Release((ClientData)self);
|
||||
+#endif
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -181,16 +216,10 @@ extern "C"
|
||||
// * Configures this vtkTkImageViewerWidget for the given arguments
|
||||
extern "C"
|
||||
{
|
||||
- int vtkTkImageViewerWidget_Cmd(ClientData clientData, Tcl_Interp* interp, int argc,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- CONST84
|
||||
-#endif
|
||||
- char** argv)
|
||||
+ int vtkTkImageViewerWidget_Cmd(
|
||||
+ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv)
|
||||
{
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- CONST84
|
||||
-#endif
|
||||
- char* name;
|
||||
+ VTK_TCL_CONST char* name;
|
||||
Tk_Window main = (Tk_Window)clientData;
|
||||
Tk_Window tkwin;
|
||||
struct vtkTkImageViewerWidget* self;
|
||||
@@ -233,13 +262,37 @@ extern "C"
|
||||
vtkTkImageViewerWidget_EventProc, (ClientData)self);
|
||||
|
||||
// Configure vtkTkImageViewerWidget widget
|
||||
- if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- const_cast<char**>(argv + 2),
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ // Convert string arguments to Tcl_Obj for TCL 9.0
|
||||
+ Tcl_Obj** objv_init = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*));
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ objv_init[i] = Tcl_NewStringObj(argv[i + 2], -1);
|
||||
+ Tcl_IncrRefCount(objv_init[i]);
|
||||
+ }
|
||||
+
|
||||
+ if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, objv_init, 0) == TCL_ERROR)
|
||||
+ {
|
||||
+ // Clean up before error return
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ Tcl_DecrRefCount(objv_init[i]);
|
||||
+ }
|
||||
+ ckfree((char*)objv_init);
|
||||
+
|
||||
+ Tk_DestroyWindow(tkwin);
|
||||
+ Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget");
|
||||
+ return TCL_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ // Clean up the Tcl_Obj array
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ Tcl_DecrRefCount(objv_init[i]);
|
||||
+ }
|
||||
+ ckfree((char*)objv_init);
|
||||
#else
|
||||
- argv + 2,
|
||||
-#endif
|
||||
- 0) == TCL_ERROR)
|
||||
+ if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, argv + 2, 0) == TCL_ERROR)
|
||||
{
|
||||
Tk_DestroyWindow(tkwin);
|
||||
Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget");
|
||||
@@ -247,6 +300,7 @@ extern "C"
|
||||
// free(self);
|
||||
return TCL_ERROR;
|
||||
}
|
||||
+#endif
|
||||
|
||||
Tcl_AppendResult(interp, Tk_PathName(tkwin), nullptr);
|
||||
return TCL_OK;
|
||||
@@ -255,7 +309,11 @@ extern "C"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ void vtkTkImageViewerWidget_Destroy(void* memPtr)
|
||||
+#else
|
||||
void vtkTkImageViewerWidget_Destroy(char* memPtr)
|
||||
+#endif
|
||||
{
|
||||
struct vtkTkImageViewerWidget* self = (struct vtkTkImageViewerWidget*)memPtr;
|
||||
|
||||
diff --git a/Rendering/Tk/vtkTkRenderWidget.cxx b/Rendering/Tk/vtkTkRenderWidget.cxx
|
||||
index 6ddaa5816a..84c940b484 100644
|
||||
--- a/Rendering/Tk/vtkTkRenderWidget.cxx
|
||||
+++ b/Rendering/Tk/vtkTkRenderWidget.cxx
|
||||
@@ -29,6 +29,17 @@
|
||||
#include <cstdlib>
|
||||
#include <vector>
|
||||
|
||||
+#if (TCL_MAJOR_VERSION >= 9) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 6))
|
||||
+#define VTK_TCL_CONST const
|
||||
+#elif ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
|
||||
+#define VTK_TCL_CONST CONST84
|
||||
+#else
|
||||
+#define VTK_TCL_CONST
|
||||
+#endif
|
||||
+#ifndef offsetof
|
||||
+#define offsetof(type, field) ((size_t)((char*)&((type*)0)->field))
|
||||
+#endif
|
||||
+
|
||||
// Silence warning like
|
||||
// "dereferencing type-punned pointer will break strict-aliasing rules"
|
||||
// it happens because this kind of expression: (long *)&ptr
|
||||
@@ -45,14 +56,13 @@
|
||||
// or with the command configure. The only new one is "-rw" which allows
|
||||
// the uses to set their own render window.
|
||||
static Tk_ConfigSpec vtkTkRenderWidgetConfigSpecs[] = {
|
||||
- { TK_CONFIG_PIXELS, (char*)"-height", (char*)"height", (char*)"Height", (char*)"400",
|
||||
- Tk_Offset(struct vtkTkRenderWidget, Height), 0, nullptr },
|
||||
+ { TK_CONFIG_PIXELS, "-height", "height", "Height", "400",
|
||||
+ offsetof(struct vtkTkRenderWidget, Height), 0, nullptr },
|
||||
|
||||
- { TK_CONFIG_PIXELS, (char*)"-width", (char*)"width", (char*)"Width", (char*)"400",
|
||||
- Tk_Offset(struct vtkTkRenderWidget, Width), 0, nullptr },
|
||||
+ { TK_CONFIG_PIXELS, "-width", "width", "Width", "400", offsetof(struct vtkTkRenderWidget, Width),
|
||||
+ 0, nullptr },
|
||||
|
||||
- { TK_CONFIG_STRING, (char*)"-rw", (char*)"rw", (char*)"RW", (char*)"",
|
||||
- Tk_Offset(struct vtkTkRenderWidget, RW), 0, nullptr },
|
||||
+ { TK_CONFIG_STRING, "-rw", "rw", "RW", "", offsetof(struct vtkTkRenderWidget, RW), 0, nullptr },
|
||||
|
||||
{ TK_CONFIG_END, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr }
|
||||
};
|
||||
@@ -113,11 +123,8 @@ extern "C"
|
||||
#define VTKIMAGEDATATOTKPHOTO_CORONAL 0
|
||||
#define VTKIMAGEDATATOTKPHOTO_SAGITTAL 1
|
||||
#define VTKIMAGEDATATOTKPHOTO_TRANSVERSE 2
|
||||
- int vtkImageDataToTkPhoto_Cmd(ClientData vtkNotUsed(clientData), Tcl_Interp* interp, int argc,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- CONST84
|
||||
-#endif
|
||||
- char** argv)
|
||||
+ int vtkImageDataToTkPhoto_Cmd(
|
||||
+ ClientData vtkNotUsed(clientData), Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv)
|
||||
{
|
||||
int status = 0;
|
||||
vtkImageData* image;
|
||||
@@ -330,8 +337,14 @@ extern "C"
|
||||
block.offset[3] = 3;
|
||||
break;
|
||||
}
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ Tk_PhotoSetSize(interp, photo, block.width, block.height);
|
||||
+ Tk_PhotoPutBlock(
|
||||
+ interp, photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET);
|
||||
+#else
|
||||
Tk_PhotoSetSize(photo, block.width, block.height);
|
||||
Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height);
|
||||
+#endif
|
||||
return TCL_OK;
|
||||
}
|
||||
}
|
||||
@@ -339,17 +352,22 @@ extern "C"
|
||||
//------------------------------------------------------------------------------
|
||||
// It's possible to change with this function or in a script some
|
||||
// options like width, height or the render widget.
|
||||
-int vtkTkRenderWidget_Configure(
|
||||
- Tcl_Interp* interp, struct vtkTkRenderWidget* self, int argc, char* argv[], int flags)
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+int vtkTkRenderWidget_Configure(Tcl_Interp* interp, struct vtkTkRenderWidget* self, Tcl_Size objc,
|
||||
+ Tcl_Obj* const* objv, int flags)
|
||||
+#else
|
||||
+int vtkTkRenderWidget_Configure(Tcl_Interp* interp, struct vtkTkRenderWidget* self, int argc,
|
||||
+ VTK_TCL_CONST char* argv[], int flags)
|
||||
+#endif
|
||||
{
|
||||
// Let Tk handle generic configure options.
|
||||
- if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, argc,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- const_cast<CONST84 char**>(argv),
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, objc, objv, (void*)self,
|
||||
+ flags) == TCL_ERROR)
|
||||
#else
|
||||
- argv,
|
||||
+ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, argc, argv, (char*)self,
|
||||
+ flags) == TCL_ERROR)
|
||||
#endif
|
||||
- (char*)self, flags) == TCL_ERROR)
|
||||
{
|
||||
return (TCL_ERROR);
|
||||
}
|
||||
@@ -372,11 +390,8 @@ int vtkTkRenderWidget_Configure(
|
||||
// to choose the appropriate method to invoke.
|
||||
extern "C"
|
||||
{
|
||||
- int vtkTkRenderWidget_Widget(ClientData clientData, Tcl_Interp* interp, int argc,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- CONST84
|
||||
-#endif
|
||||
- char* argv[])
|
||||
+ int vtkTkRenderWidget_Widget(
|
||||
+ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char* argv[])
|
||||
{
|
||||
struct vtkTkRenderWidget* self = (struct vtkTkRenderWidget*)clientData;
|
||||
int result = TCL_OK;
|
||||
@@ -389,7 +404,11 @@ extern "C"
|
||||
}
|
||||
|
||||
// Make sure the widget is not deleted during this function
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ Tcl_Preserve((ClientData)self);
|
||||
+#else
|
||||
Tk_Preserve((ClientData)self);
|
||||
+#endif
|
||||
|
||||
// Handle render call to the widget
|
||||
if (strncmp(argv[1], "render", std::max<size_t>(1, strlen(argv[1]))) == 0 ||
|
||||
@@ -420,13 +439,26 @@ extern "C"
|
||||
else
|
||||
{
|
||||
/* Execute a configuration change */
|
||||
- result = vtkTkRenderWidget_Configure(interp, self, argc - 2,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- const_cast<char**>(argv + 2),
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ // Convert string arguments to Tcl_Obj for TCL 9.0
|
||||
+ Tcl_Obj** objv_config = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*));
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ objv_config[i] = Tcl_NewStringObj(argv[i + 2], -1);
|
||||
+ Tcl_IncrRefCount(objv_config[i]);
|
||||
+ }
|
||||
+ result =
|
||||
+ vtkTkRenderWidget_Configure(interp, self, argc - 2, objv_config, TK_CONFIG_ARGV_ONLY);
|
||||
+
|
||||
+ // Clean up the Tcl_Obj array
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ Tcl_DecrRefCount(objv_config[i]);
|
||||
+ }
|
||||
+ ckfree((char*)objv_config);
|
||||
#else
|
||||
- argv + 2,
|
||||
+ result = vtkTkRenderWidget_Configure(interp, self, argc - 2, argv + 2, TK_CONFIG_ARGV_ONLY);
|
||||
#endif
|
||||
- TK_CONFIG_ARGV_ONLY);
|
||||
}
|
||||
}
|
||||
else if (!strcmp(argv[1], "GetRenderWindow"))
|
||||
@@ -448,7 +480,11 @@ extern "C"
|
||||
}
|
||||
|
||||
// Unlock the object so it can be deleted.
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ Tcl_Release((ClientData)self);
|
||||
+#else
|
||||
Tk_Release((ClientData)self);
|
||||
+#endif
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -464,16 +500,10 @@ extern "C"
|
||||
// * Configures this vtkTkRenderWidget for the given arguments
|
||||
extern "C"
|
||||
{
|
||||
- int vtkTkRenderWidget_Cmd(ClientData clientData, Tcl_Interp* interp, int argc,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- CONST84
|
||||
-#endif
|
||||
- char** argv)
|
||||
+ int vtkTkRenderWidget_Cmd(
|
||||
+ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv)
|
||||
{
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- CONST84
|
||||
-#endif
|
||||
- char* name;
|
||||
+ VTK_TCL_CONST char* name;
|
||||
Tk_Window main = (Tk_Window)clientData;
|
||||
Tk_Window tkwin;
|
||||
struct vtkTkRenderWidget* self;
|
||||
@@ -515,13 +545,37 @@ extern "C"
|
||||
tkwin, ExposureMask | StructureNotifyMask, vtkTkRenderWidget_EventProc, (ClientData)self);
|
||||
|
||||
// Configure vtkTkRenderWidget widget
|
||||
- if (vtkTkRenderWidget_Configure(interp, self, argc - 2,
|
||||
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
|
||||
- const_cast<char**>(argv + 2),
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ // Convert string arguments to Tcl_Obj for TCL 9.0
|
||||
+ Tcl_Obj** objv_init = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*));
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ objv_init[i] = Tcl_NewStringObj(argv[i + 2], -1);
|
||||
+ Tcl_IncrRefCount(objv_init[i]);
|
||||
+ }
|
||||
+
|
||||
+ if (vtkTkRenderWidget_Configure(interp, self, argc - 2, objv_init, 0) == TCL_ERROR)
|
||||
+ {
|
||||
+ // Clean up before error return
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ Tcl_DecrRefCount(objv_init[i]);
|
||||
+ }
|
||||
+ ckfree((char*)objv_init);
|
||||
+
|
||||
+ Tk_DestroyWindow(tkwin);
|
||||
+ Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget");
|
||||
+ return TCL_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ // Clean up the Tcl_Obj array
|
||||
+ for (int i = 0; i < argc - 2; i++)
|
||||
+ {
|
||||
+ Tcl_DecrRefCount(objv_init[i]);
|
||||
+ }
|
||||
+ ckfree((char*)objv_init);
|
||||
#else
|
||||
- argv + 2,
|
||||
-#endif
|
||||
- 0) == TCL_ERROR)
|
||||
+ if (vtkTkRenderWidget_Configure(interp, self, argc - 2, argv + 2, 0) == TCL_ERROR)
|
||||
{
|
||||
Tk_DestroyWindow(tkwin);
|
||||
Tcl_DeleteCommand(interp, "vtkTkRenderWidget");
|
||||
@@ -529,6 +583,7 @@ extern "C"
|
||||
// free(self);
|
||||
return TCL_ERROR;
|
||||
}
|
||||
+#endif
|
||||
|
||||
Tcl_AppendResult(interp, Tk_PathName(tkwin), nullptr);
|
||||
return TCL_OK;
|
||||
@@ -555,7 +610,11 @@ extern "C"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
+#if (TCL_MAJOR_VERSION >= 9)
|
||||
+ void vtkTkRenderWidget_Destroy(void* memPtr)
|
||||
+#else
|
||||
void vtkTkRenderWidget_Destroy(char* memPtr)
|
||||
+#endif
|
||||
{
|
||||
struct vtkTkRenderWidget* self = (struct vtkTkRenderWidget*)memPtr;
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue