Compare commits
No commits in common. "factory" and "factory" have entirely different histories.
@ -1,72 +0,0 @@
|
||||
From 4409560bfae26035cebf474b28097464b9ba4634 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
|
||||
Date: Wed, 4 Sep 2024 18:22:50 -0400
|
||||
Subject: [PATCH] ioss: update fmt includes
|
||||
|
||||
---
|
||||
ThirdParty/ioss/vtkioss/Ioss_IOFactory.C | 2 ++
|
||||
ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C | 2 ++
|
||||
ThirdParty/ioss/vtkioss/Ioss_Utils.C | 2 ++
|
||||
ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C | 2 ++
|
||||
4 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
|
||||
index 440f352e0e..c9f0d422a3 100644
|
||||
--- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
|
||||
+++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
|
||||
@@ -11,7 +11,9 @@
|
||||
#include <Ioss_Version.h>
|
||||
#include <cstddef> // for nullptr
|
||||
#include "vtk_fmt.h"
|
||||
+#include VTK_FMT(fmt/format.h)
|
||||
#include VTK_FMT(fmt/ostream.h)
|
||||
+#include VTK_FMT(fmt/ranges.h)
|
||||
#include <map> // for _Rb_tree_iterator, etc
|
||||
#include <ostream> // for basic_ostream, etc
|
||||
#include <set>
|
||||
diff --git a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
|
||||
index 1609c31fae..9afc17edbb 100644
|
||||
--- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
|
||||
+++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
|
||||
@@ -14,7 +14,9 @@
|
||||
#include <Ioss_SmartAssert.h>
|
||||
#include <Ioss_StructuredBlock.h>
|
||||
#include "vtk_fmt.h"
|
||||
+#include VTK_FMT(fmt/format.h)
|
||||
#include VTK_FMT(fmt/ostream.h)
|
||||
+#include VTK_FMT(fmt/ranges.h)
|
||||
|
||||
#include <cstddef> // for size_t
|
||||
#include <numeric>
|
||||
diff --git a/ThirdParty/ioss/vtkioss/Ioss_Utils.C b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
||||
index 57021abdcb..6a1e2ae243 100644
|
||||
--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
||||
+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
||||
@@ -19,8 +19,10 @@
|
||||
#include <cstring>
|
||||
#include "vtk_fmt.h"
|
||||
#include VTK_FMT(fmt/chrono.h)
|
||||
+#include VTK_FMT(fmt/core.h)
|
||||
#include VTK_FMT(fmt/format.h)
|
||||
#include VTK_FMT(fmt/ostream.h)
|
||||
+#include VTK_FMT(fmt/ranges.h)
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
diff --git a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
|
||||
index 5d324817f2..a1e047f967 100644
|
||||
--- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
|
||||
+++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
|
||||
@@ -8,7 +8,9 @@
|
||||
#include <Ioss_ZoneConnectivity.h>
|
||||
#include <cstddef> // for size_t
|
||||
#include "vtk_fmt.h"
|
||||
+#include VTK_FMT(fmt/format.h)
|
||||
#include VTK_FMT(fmt/ostream.h)
|
||||
+#include VTK_FMT(fmt/ranges.h)
|
||||
#include <string> // for string
|
||||
#include <vector> // for vector
|
||||
|
||||
--
|
||||
2.35.3
|
||||
|
||||
3
VTK-9.3.0.tar.gz
Normal file
3
VTK-9.3.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
|
||||
size 99932810
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
|
||||
size 99964158
|
||||
18
fix_rendering_core_linkage.patch
Normal file
18
fix_rendering_core_linkage.patch
Normal file
@ -0,0 +1,18 @@
|
||||
--- a/Rendering/LICOpenGL2/vtk.module_orig 2023-12-27 17:36:03.966016939 +0100
|
||||
+++ b/Rendering/LICOpenGL2/vtk.module 2023-12-27 17:36:40.199591808 +0100
|
||||
@@ -14,6 +14,7 @@
|
||||
VTK::CommonDataModel
|
||||
VTK::CommonExecutionModel
|
||||
VTK::RenderingOpenGL2
|
||||
+ VTK::RenderingCore
|
||||
PRIVATE_DEPENDS
|
||||
VTK::CommonMath
|
||||
VTK::CommonSystem
|
||||
@@ -22,7 +23,6 @@
|
||||
VTK::IOXML
|
||||
VTK::ImagingCore
|
||||
VTK::ImagingSources
|
||||
- VTK::RenderingCore
|
||||
VTK::glew
|
||||
VTK::opengl
|
||||
VTK::vtksys
|
||||
22
vtk.changes
22
vtk.changes
@ -1,25 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 29 00:00:00 UTC 2024 - Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
|
||||
|
||||
- Update to version 9.3.1, see:
|
||||
https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.3.md
|
||||
- Add patches:
|
||||
* 0001-ioss-update-fmt-includes.patch
|
||||
- Drop upstream patches:
|
||||
* fix_rendering_core_linkage.patch
|
||||
- New features and bugfixes:
|
||||
* The vendored `fmt` library has been updated to 10.1.1.
|
||||
* Fix SIGSEGV on `vtkCompositeDataProbeFilter`.
|
||||
* Add `ComponentName` in `vtkImageAlgorithm` and subclasses.
|
||||
* Fix UT record support in `vtkDICOMParser`
|
||||
* Fix for reading binary XML files > 2Gb on Windows.
|
||||
* Fix `ResampleWithDataSet` with an HTG source using MPI.
|
||||
* Fix `HyperTree` iterator in `ExtractElements` method.
|
||||
* Fix `vtkOpenGLRenderWindow::GetZBufferData` in OpenGL ES 3.
|
||||
* Fix GPU Ray Cast Volume Rendering with `ModelTransformMatrix`.
|
||||
* Fix Off-axis stereo image separation issue.
|
||||
* Fix Display Attribute Inheritance `vtkOpenGLGlyph3DMapper`.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 20 13:26:32 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
10
vtk.spec
10
vtk.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -92,7 +92,7 @@
|
||||
%define shlib %{vtklib}
|
||||
|
||||
Name: vtk%{?my_suffix}
|
||||
Version: 9.3.1
|
||||
Version: 9.3.0
|
||||
Release: 0
|
||||
%define series 9.3
|
||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||
@ -108,6 +108,8 @@ Source: https://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.g
|
||||
Source99: vtk-rpmlintrc
|
||||
# PATCH-FIX-OPENSUSE bundled_libharu_add_missing_libm.patch stefan.bruens@rwth-aachen.de -- Add missing libm for linking (gh#libharu/libharu#213)
|
||||
Patch1: bundled_libharu_add_missing_libm.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch2: fix_rendering_core_linkage.patch
|
||||
# PATCH-FIX-OPENSUSE -- Fix building with Qt GLES builds
|
||||
Patch7: 0001-Add-missing-guard-required-for-GLES-to-disable-stere.patch
|
||||
# PATCH-FIX-UPSTREAM -- Fix building with Qt GLES builds
|
||||
@ -120,8 +122,6 @@ Patch10: Do-not-request-CUBE_MAP_SEAMLESS-on-GLES.patch
|
||||
Patch17: 0001-Always-generate-Python-Metadata-when-WRAP_PYTHON-is-.patch
|
||||
# PATCH-FIX-UPSTREAM -- Copy generated metadata to the right directory
|
||||
Patch18: 0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch
|
||||
# PATCH-FIX-UPSTREAM -- Update fmt includes in ioss thirdparty package
|
||||
Patch19: 0001-ioss-update-fmt-includes.patch
|
||||
BuildRequires: cgns-devel
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: cmake >= 3.12
|
||||
@ -398,6 +398,7 @@ languages.
|
||||
%prep
|
||||
%setup -n VTK-%{version}
|
||||
%patch -P 1 -p1
|
||||
%patch -P 2 -p1
|
||||
%if %{with gles}
|
||||
%patch -P 7 -p1
|
||||
%patch -P 8 -p1
|
||||
@ -406,7 +407,6 @@ languages.
|
||||
%endif
|
||||
%patch -P 17 -p1
|
||||
%patch -P 18 -p1
|
||||
%patch -P 19 -p1
|
||||
|
||||
# Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata
|
||||
# otherwise it will break on symlinks.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user