Orion Poplawski
parent
a6301b86a6
commit
5cef47821a
|
|
@ -27,3 +27,5 @@ vtk-5.6.0.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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,79 @@
|
|||
From a2ca9a079ecc8926f6ddf7a72803340a4944e7cf Mon Sep 17 00:00:00 2001
|
||||
From: Eric Larson <larson.eric.d@gmail.com>
|
||||
Date: Tue, 11 Oct 2022 12:12:38 -0400
|
||||
Subject: [PATCH] BUG: Fix bug with vtkPlotBar.GetLookupTable()
|
||||
|
||||
Also remove old nullptr assignments as they are unnecessary
|
||||
when using vtkSmartPointer.
|
||||
---
|
||||
.../Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx | 2 ++
|
||||
Charts/Core/vtkPlotBar.cxx | 10 +++++++---
|
||||
.../release/dev/fix-vtkPlotBar-GetLookupTable.md | 4 ++++
|
||||
3 files changed, 13 insertions(+), 3 deletions(-)
|
||||
create mode 100644 Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md
|
||||
|
||||
diff --git a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx
|
||||
index 2d0ed46b128..919319a6b4d 100644
|
||||
--- a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx
|
||||
+++ b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx
|
||||
@@ -88,6 +88,8 @@ int TestPlotBarRangeHandlesItem(int, char*[])
|
||||
|
||||
// Add bar plot and handles
|
||||
vtkPlotBar* barPlot = vtkPlotBar::SafeDownCast(chart->AddPlot(vtkChart::BAR));
|
||||
+ // smoke test for https://gitlab.kitware.com/vtk/vtk/-/issues/18682#note_1258974
|
||||
+ barPlot->GetLookupTable();
|
||||
barPlot->SetInputData(table, "Months", "Books");
|
||||
chart->SetBarWidthFraction(1.0);
|
||||
|
||||
diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx
|
||||
index a68a26c0ecd..220e8199d02 100644
|
||||
--- a/Charts/Core/vtkPlotBar.cxx
|
||||
+++ b/Charts/Core/vtkPlotBar.cxx
|
||||
@@ -535,12 +535,11 @@ vtkStandardNewMacro(vtkPlotBar);
|
||||
vtkPlotBar::vtkPlotBar()
|
||||
{
|
||||
this->Private = new vtkPlotBarPrivate(this);
|
||||
+ // Points is not a vtkSmartPointer, so set it explicitly to nullptr
|
||||
this->Points = nullptr;
|
||||
- this->AutoLabels = nullptr;
|
||||
this->Width = 1.0;
|
||||
this->Pen->SetWidth(1.0);
|
||||
this->Offset = 1.0;
|
||||
- this->ColorSeries = nullptr;
|
||||
this->Orientation = vtkPlotBar::VERTICAL;
|
||||
this->ScalarVisibility = false;
|
||||
this->EnableOpacityMapping = true;
|
||||
@@ -612,6 +611,10 @@ void vtkPlotBar::GetBounds(double bounds[4], bool unscaled)
|
||||
|
||||
// Get the x and y arrays (index 0 and 1 respectively)
|
||||
vtkTable* table = this->Data->GetInput();
|
||||
+ if (!table)
|
||||
+ {
|
||||
+ return;
|
||||
+ }
|
||||
vtkDataArray* x =
|
||||
this->UseIndexForXSeries ? nullptr : this->Data->GetInputArrayToProcess(0, table);
|
||||
vtkDataArray* y = this->Data->GetInputArrayToProcess(1, table);
|
||||
@@ -945,7 +948,8 @@ void vtkPlotBar::CreateDefaultLookupTable()
|
||||
// rainbow - blue to red
|
||||
lut->SetHueRange(0.6667, 0.0);
|
||||
lut->Build();
|
||||
- double bounds[4];
|
||||
+ // set reasonable defaults in case no data has been set
|
||||
+ double bounds[4] = { 0.0, 1.0, 0.0, 1.0 };
|
||||
this->GetBounds(bounds);
|
||||
lut->SetRange(bounds[0], bounds[1]);
|
||||
this->LookupTable = lut;
|
||||
diff --git a/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md
|
||||
new file mode 100644
|
||||
index 00000000000..ba6a96753ac
|
||||
--- /dev/null
|
||||
+++ b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md
|
||||
@@ -0,0 +1,4 @@
|
||||
+## Fixes for vtkPlotBar.GetLookupTable
|
||||
+
|
||||
+Fixes a bug where calling vtkPlotBar.GetLookupTable caused a segmentation
|
||||
+fault in the case where no data had been plotted yet.
|
||||
--
|
||||
GitLab
|
||||
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (VTK-9.1.0.tar.gz) = b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a
|
||||
SHA512 (VTKData-9.1.0.tar.gz) = 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a
|
||||
SHA512 (VTK-9.2.5.tar.gz) = b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf
|
||||
SHA512 (VTKData-9.2.5.tar.gz) = c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3
|
||||
|
|
|
|||
|
|
@ -1,132 +0,0 @@
|
|||
diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx
|
||||
--- VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues 2021-10-01 12:23:49.000000000 -0600
|
||||
+++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx 2021-10-04 19:27:42.557502417 -0600
|
||||
@@ -1674,7 +1674,7 @@ struct ScalarRangeDispatchWrapper
|
||||
void operator()(ArrayT* array)
|
||||
{
|
||||
this->Success = vtkDataArrayPrivate::DoComputeScalarRange(
|
||||
- array, this->Range, vtkDataArrayPrivate::AllValues());
|
||||
+ array, this->Range, vtkDataArrayPrivate::vtkAllValues());
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1693,7 +1693,7 @@ struct VectorRangeDispatchWrapper
|
||||
void operator()(ArrayT* array)
|
||||
{
|
||||
this->Success = vtkDataArrayPrivate::DoComputeVectorRange(
|
||||
- array, this->Range, vtkDataArrayPrivate::AllValues());
|
||||
+ array, this->Range, vtkDataArrayPrivate::vtkAllValues());
|
||||
}
|
||||
};
|
||||
|
||||
diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.h
|
||||
--- VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600
|
||||
+++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.h 2021-10-04 19:27:42.557502417 -0600
|
||||
@@ -599,7 +599,7 @@ vtkArrayDownCast_FastCastMacro(vtkDataAr
|
||||
// vtkGenericDataArray.h as well.
|
||||
namespace vtkDataArrayPrivate
|
||||
{
|
||||
-struct AllValues
|
||||
+struct vtkAllValues
|
||||
{
|
||||
};
|
||||
struct FiniteValues
|
||||
diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx
|
||||
--- VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues 2021-10-01 12:23:49.000000000 -0600
|
||||
+++ VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx 2021-10-04 19:27:42.559502435 -0600
|
||||
@@ -310,7 +310,7 @@ template <int NumComps>
|
||||
struct ComputeScalarRange
|
||||
{
|
||||
template <class ArrayT, typename RangeValueType>
|
||||
- bool operator()(ArrayT* array, RangeValueType* ranges, AllValues)
|
||||
+ bool operator()(ArrayT* array, RangeValueType* ranges, vtkAllValues)
|
||||
{
|
||||
AllValuesMinAndMax<NumComps, ArrayT> minmax(array);
|
||||
vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax);
|
||||
@@ -447,7 +447,7 @@ public:
|
||||
};
|
||||
|
||||
template <class ArrayT, typename RangeValueType>
|
||||
-bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, AllValues)
|
||||
+bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, vtkAllValues)
|
||||
{
|
||||
AllValuesGenericMinAndMax<ArrayT> minmax(array);
|
||||
vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax);
|
||||
@@ -530,7 +530,7 @@ bool DoComputeScalarRange(ArrayT* array,
|
||||
//----------------------------------------------------------------------------
|
||||
// generic implementation that operates on ValueType.
|
||||
template <typename ArrayT, typename RangeValueType>
|
||||
-bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], AllValues)
|
||||
+bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], vtkAllValues)
|
||||
{
|
||||
range[0] = vtkTypeTraits<RangeValueType>::Max();
|
||||
range[1] = vtkTypeTraits<RangeValueType>::Min();
|
||||
diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h
|
||||
--- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600
|
||||
+++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h 2021-10-04 19:27:42.559502435 -0600
|
||||
@@ -414,7 +414,7 @@ namespace vtkDataArrayPrivate
|
||||
template <typename A, typename R, typename T>
|
||||
bool DoComputeScalarRange(A*, R*, T);
|
||||
template <typename A, typename R>
|
||||
-bool DoComputeVectorRange(A*, R[2], AllValues);
|
||||
+bool DoComputeVectorRange(A*, R[2], vtkAllValues);
|
||||
template <typename A, typename R>
|
||||
bool DoComputeVectorRange(A*, R[2], FiniteValues);
|
||||
} // namespace vtkDataArrayPrivate
|
||||
@@ -466,11 +466,11 @@ class vtkScaledSOADataArrayTemplate;
|
||||
|
||||
#define VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \
|
||||
template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \
|
||||
- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \
|
||||
+ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \
|
||||
template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \
|
||||
ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \
|
||||
template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \
|
||||
- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \
|
||||
+ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \
|
||||
template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \
|
||||
ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues);
|
||||
|
||||
@@ -516,18 +516,18 @@ namespace vtkDataArrayPrivate
|
||||
template <typename A, typename R, typename T>
|
||||
bool DoComputeScalarRange(A*, R*, T);
|
||||
template <typename A, typename R>
|
||||
-bool DoComputeVectorRange(A*, R[2], AllValues);
|
||||
+bool DoComputeVectorRange(A*, R[2], vtkAllValues);
|
||||
template <typename A, typename R>
|
||||
bool DoComputeVectorRange(A*, R[2], FiniteValues);
|
||||
} // namespace vtkDataArrayPrivate
|
||||
|
||||
#define VTK_DECLARE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \
|
||||
extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \
|
||||
- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \
|
||||
+ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \
|
||||
extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \
|
||||
ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \
|
||||
extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \
|
||||
- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \
|
||||
+ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \
|
||||
extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \
|
||||
ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues);
|
||||
|
||||
diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx
|
||||
--- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues 2021-10-01 12:23:49.000000000 -0600
|
||||
+++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx 2021-10-04 19:27:42.558502426 -0600
|
||||
@@ -1190,7 +1190,7 @@ bool vtkGenericDataArray<DerivedT, Value
|
||||
using namespace vtk_GDA_detail;
|
||||
using Supported = IsSupported<DerivedT, ValueTypeT>;
|
||||
return ComputeScalarValueRangeImpl(
|
||||
- static_cast<DerivedT*>(this), ranges, vtkDataArrayPrivate::AllValues{}, Supported{});
|
||||
+ static_cast<DerivedT*>(this), ranges, vtkDataArrayPrivate::vtkAllValues{}, Supported{});
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -1200,7 +1200,7 @@ bool vtkGenericDataArray<DerivedT, Value
|
||||
using namespace vtk_GDA_detail;
|
||||
using Supported = IsSupported<DerivedT, ValueTypeT>;
|
||||
return ComputeVectorValueRangeImpl(
|
||||
- static_cast<DerivedT*>(this), range, vtkDataArrayPrivate::AllValues{}, Supported{});
|
||||
+ static_cast<DerivedT*>(this), range, vtkDataArrayPrivate::vtkAllValues{}, Supported{});
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -ru VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt
|
||||
--- VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2021-11-04 13:48:20.000000000 -0600
|
||||
+++ VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2022-06-20 10:08:06.000000000 -0600
|
||||
@@ -40,3 +40,7 @@
|
||||
target_include_directories(kissfft
|
||||
PRIVATE
|
||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
|
||||
+
|
||||
+if (UNIX)
|
||||
+ vtk_module_link(VTK::kissfft PRIVATE m)
|
||||
+endif ()
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
diff -up VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt
|
||||
--- VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu 2020-05-01 13:29:00.000000000 -0600
|
||||
+++ VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt 2020-05-12 16:47:18.298133406 -0600
|
||||
@@ -8,7 +8,7 @@ vtk_module_third_party(
|
||||
# Unreleased. Requires these PRs:
|
||||
# https://github.com/libharu/libharu/pull/157
|
||||
# https://github.com/libharu/libharu/pull/187
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff -up VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
|
||||
--- VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf 2021-11-04 13:48:20.000000000 -0600
|
||||
+++ VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-28 07:04:11.574398570 -0600
|
||||
@@ -1770,7 +1770,9 @@ void ex__compress_variable(int exoid, in
|
||||
*/
|
||||
|
||||
/* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
|
||||
+#if !defined(NC_SZIP_NN)
|
||||
const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
|
||||
+#endif
|
||||
/* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
|
||||
const int SZIP_PIXELS_PER_BLOCK =
|
||||
file->compression_level == 0 ? 32 : file->compression_level;
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff -up VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
|
||||
--- VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 2019-01-30 10:15:13.000000000 -0700
|
||||
+++ VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx 2020-09-17 21:44:08.125697274 -0600
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <QImage>
|
||||
#include <QMap>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QPair>
|
||||
#include <QPixmap>
|
||||
#include <QTextDocument>
|
||||
diff -up VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx
|
||||
--- VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 2020-09-17 21:44:08.125697274 -0600
|
||||
+++ VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx 2020-09-17 21:45:46.126513263 -0600
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <QFontMetrics>
|
||||
#include <QImage>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QPixmap>
|
||||
#include <QTextDocument>
|
||||
#include <QTextStream>
|
||||
43
vtk.spec
43
vtk.spec
|
|
@ -39,25 +39,16 @@
|
|||
|
||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||
Name: vtk
|
||||
Version: 9.1.0
|
||||
Release: 18%{?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: https://www.vtk.org/files/release/9.1/VTK-%{version}.tar.gz
|
||||
Source1: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz
|
||||
Version: 9.2.5
|
||||
Release: 1%{?dist}
|
||||
License: BSD-3-Clause
|
||||
Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz
|
||||
Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz
|
||||
Source2: xorg.conf
|
||||
# Patch required libharu version (Fedora 33+ contains the needed VTK patches)
|
||||
Patch0: vtk-libharu.patch
|
||||
# Upstream patch to link kissfft with libm
|
||||
Patch1: vtk-kissfft-libm.patch
|
||||
# Upstream patch to support netcdf 4.9.0
|
||||
# https://gitlab.kitware.com/vtk/vtk/-/issues/18576
|
||||
Patch2: vtk-netcdf.patch
|
||||
# Duplicate define conflict with Xutil, see:
|
||||
# https://gitlab.kitware.com/vtk/vtk/-/issues/18048
|
||||
Patch3: vtk-AllValues.patch
|
||||
# Fix issue with Mayavi
|
||||
Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch
|
||||
|
||||
URL: https://vtk.org/
|
||||
|
||||
|
|
@ -94,11 +85,11 @@ BuildRequires: gl2ps-devel
|
|||
%endif
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: json-devel
|
||||
BuildRequires: jsoncpp-devel
|
||||
BuildRequires: libarchive-devel
|
||||
BuildRequires: libGL-devel
|
||||
# Requires special patched version of libharu
|
||||
BuildRequires: libharu-devel >= 2.3.0-9
|
||||
BuildRequires: libharu-devel >= 2.4.0
|
||||
BuildRequires: libICE-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
|
|
@ -107,6 +98,7 @@ BuildRequires: libtheora-devel
|
|||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: lz4-devel
|
||||
|
|
@ -179,6 +171,7 @@ Requires: gdal-devel%{?_isa} \
|
|||
Requires: gl2ps-devel%{?_isa} \
|
||||
%endif \
|
||||
Requires: glew-devel%{?_isa} \
|
||||
Requires: json-devel%{?_isa} \
|
||||
Requires: jsoncpp-devel%{?_isa} \
|
||||
Requires: lapack-devel%{?_isa} \
|
||||
Requires: libarchive-devel%{?_isa} \
|
||||
|
|
@ -192,6 +185,7 @@ Requires: libtheora-devel%{?_isa} \
|
|||
Requires: libtiff-devel%{?_isa} \
|
||||
Requires: libxml2-devel%{?_isa} \
|
||||
Requires: libX11-devel%{?_isa} \
|
||||
Requires: libXcursor-devel%{?_isa} \
|
||||
Requires: libXext-devel%{?_isa} \
|
||||
Requires: libXt-devel%{?_isa} \
|
||||
Requires: lz4-devel%{?_isa} \
|
||||
|
|
@ -246,7 +240,7 @@ Provides: bundled(gl2ps) = 1.4.0
|
|||
Provides: bundled(ioss) = 20210512
|
||||
Provides: bundled(kissfft)
|
||||
Provides: bundled(metaio)
|
||||
Provides: bundled(verdict) = 1.2.0
|
||||
Provides: bundled(verdict) = 1.4.0
|
||||
Provides: bundled(vpic)
|
||||
Provides: bundled(xdmf2) = 2.1
|
||||
Provides: bundled(xdmf3)
|
||||
|
|
@ -566,6 +560,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
|
|||
%endif \
|
||||
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\
|
||||
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\
|
||||
-DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \\\
|
||||
-DVTK_USE_TK=ON \\\
|
||||
%{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS}
|
||||
# https://gitlab.kitware.com/cmake/cmake/issues/17223
|
||||
|
|
@ -577,7 +572,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
|
|||
-DVTK_BUILD_DOCUMENTATION:BOOL=ON \
|
||||
-DVTK_BUILD_EXAMPLES:BOOL=ON \
|
||||
-DVTK_BUILD_TESTING:BOOL=ON
|
||||
%cmake_build
|
||||
%cmake_build -- --output-sync
|
||||
%cmake_build --target DoxygenDoc
|
||||
|
||||
%if %{with mpich}
|
||||
|
|
@ -593,7 +588,7 @@ export CXX=mpic++
|
|||
-DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \
|
||||
-DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \
|
||||
-DVTK_USE_MPI:BOOL=ON
|
||||
%cmake_build
|
||||
%cmake_build -- --output-sync
|
||||
%_mpich_unload
|
||||
%endif
|
||||
|
||||
|
|
@ -610,7 +605,7 @@ export CXX=mpic++
|
|||
-DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \
|
||||
-DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \
|
||||
-DVTK_USE_MPI:BOOL=ON
|
||||
%cmake_build
|
||||
%cmake_build -- --output-sync
|
||||
%_openmpi_unload
|
||||
%endif
|
||||
|
||||
|
|
@ -844,6 +839,10 @@ cat xorg.log
|
|||
|
||||
|
||||
%changelog
|
||||
* 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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue