archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-17 23:34:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/vtk to 9.2.6-8

Browse source
This commit is contained in:
Kevin Mihelich 2023-07-28 12:40:18 +00:00
parent 257add128e
commit 60b8e07449
2 changed files with 118 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extra/vtk/PKGBUILD
View file

@ -15,7 +15,7 @@
pkgname=vtk
pkgver=9.2.6
pkgrel=7
pkgrel=8
pkgdesc="Software system for 3D computer graphics, image processing, and visualization"
arch=(x86_64)
url="https://www.vtk.org/"
@ -122,10 +122,12 @@ optdepends=(
options=(staticlibs)
source=(${url}/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz
https://github.com/Kitware/VTK/commit/1233ceec.patch
https://github.com/Kitware/VTK/commit/4d8283bc.patch)
https://github.com/Kitware/VTK/commit/4d8283bc.patch
fmt-10.patch)
sha256sums=('06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12'
'5f662d5052dc07ee43d690c5ffdc1880c5c6c4236945c03a40177ae3a6dc5917'
'82eae5864704b1d955c905d75e565380829b05bb6300c4614da2d19834e15014')
'82eae5864704b1d955c905d75e565380829b05bb6300c4614da2d19834e15014'
'c60aa3276a3d7c0e6ae4db5f18a8023ab319ac7d2ff66616936012097e6cebbe')
prepare() {
cd ${pkgname^^}-${pkgver}
@ -134,6 +136,7 @@ prepare() {
patch -p1 -i ../1233ceec.patch # Fix build with GCC 13
patch -p1 -i ../4d8283bc.patch
patch -p1 -i ../fmt-10.patch # Fix build with fmt 10
}
build() {

112
extra/vtk/fmt-10.patch Normal file
View file

@ -0,0 +1,112 @@
diff --git a/ThirdParty/ioss/vtkioss/Ioss_Field.C b/ThirdParty/ioss/vtkioss/Ioss_Field.C
index 62e1bdc93e..f0cafabca6 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_Field.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_Field.C
@@ -249,14 +249,14 @@ bool Ioss::Field::equal_(const Ioss::Field &rhs, bool quiet) const
if (this->type_ != rhs.type_) {
if (!quiet) {
- fmt::print(Ioss::OUTPUT(), "\n\tFIELD type mismatch ({} v. {})", this->type_, rhs.type_);
+ fmt::print(Ioss::OUTPUT(), "\n\tFIELD type mismatch ({} v. {})", static_cast<int>(this->type_), static_cast<int>(rhs.type_));
}
return false;
}
if (this->role_ != rhs.role_) {
if (!quiet) {
- fmt::print(Ioss::OUTPUT(), "\n\tFIELD role mismatch ({} v. {})", this->role_, rhs.role_);
+ fmt::print(Ioss::OUTPUT(), "\n\tFIELD role mismatch ({} v. {})", static_cast<int>(this->role_), static_cast<int>(rhs.role_));
}
return false;
}
diff --git a/ThirdParty/ioss/vtkioss/Ioss_GroupingEntity.C b/ThirdParty/ioss/vtkioss/Ioss_GroupingEntity.C
index 89158bec9d..db60449d73 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_GroupingEntity.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_GroupingEntity.C
@@ -356,7 +356,7 @@ bool Ioss::GroupingEntity::equal_(const Ioss::GroupingEntity &rhs, const bool qu
if (this->entityState != rhs.entityState) {
if (!quiet) {
fmt::print(Ioss::OUTPUT(), "GroupingEntity: entityState mismatch ([] vs. [])\n",
- this->entityState, rhs.entityState);
+ static_cast<int>(this->entityState), static_cast<int>(rhs.entityState));
}
return false;
}
diff --git a/ThirdParty/ioss/vtkioss/Ioss_Region.C b/ThirdParty/ioss/vtkioss/Ioss_Region.C
index dcf53bea99..79816c16f9 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_Region.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_Region.C
@@ -1622,7 +1622,7 @@ namespace Ioss {
"\n\nERROR: The entity named '{}' of type {} which is being aliased to '{}' does "
"not exist in "
"region '{}'.\n",
- db_name, type, alias, name());
+ db_name, static_cast<int>(type), alias, name());
IOSS_ERROR(errmsg);
}
diff --git a/ThirdParty/ioss/vtkioss/cgns/Iocgns_DatabaseIO.C b/ThirdParty/ioss/vtkioss/cgns/Iocgns_DatabaseIO.C
index e4bc3c8ff1..6207990255 100644
--- a/ThirdParty/ioss/vtkioss/cgns/Iocgns_DatabaseIO.C
+++ b/ThirdParty/ioss/vtkioss/cgns/Iocgns_DatabaseIO.C
@@ -1332,7 +1332,7 @@ namespace Iocgns {
"ERROR: CGNS: Zone {} adjacency data is not correct type. Require "
"Abutting1to1 and PointList."
" {}\t{}\t{}",
- zone, connect_type, ptset_type, donor_ptset_type);
+ zone, static_cast<int>(connect_type), static_cast<int>(ptset_type), static_cast<int>(donor_ptset_type));
IOSS_ERROR(errmsg);
}
diff --git a/ThirdParty/ioss/vtkioss/cgns/Iocgns_Utils.C b/ThirdParty/ioss/vtkioss/cgns/Iocgns_Utils.C
index 3768535aa7..bf115394a6 100644
--- a/ThirdParty/ioss/vtkioss/cgns/Iocgns_Utils.C
+++ b/ThirdParty/ioss/vtkioss/cgns/Iocgns_Utils.C
@@ -269,7 +269,7 @@ namespace {
fmt::print(Ioss::WARNING(),
"On sideset '{}', the boundary condition type was previously set to {}"
" which does not match the current value of {}. It will keep the old value.\n",
- sset->name(), old_bocotype, bocotype);
+ sset->name(), static_cast<int>(old_bocotype), static_cast<int>(bocotype));
}
}
else {
diff --git a/ThirdParty/ioss/vtkioss/exodus/Ioex_BaseDatabaseIO.C b/ThirdParty/ioss/vtkioss/exodus/Ioex_BaseDatabaseIO.C
index d488007982..aef98f430a 100644
--- a/ThirdParty/ioss/vtkioss/exodus/Ioex_BaseDatabaseIO.C
+++ b/ThirdParty/ioss/vtkioss/exodus/Ioex_BaseDatabaseIO.C
@@ -762,7 +762,7 @@ namespace Ioex {
std::ostringstream errmsg;
fmt::print(errmsg,
"Error: Failed to find entity of type {} with id {} for assembly {}.\n",
- type, assembly.entity_list[j], assem->name());
+ static_cast<int>(type), assembly.entity_list[j], assem->name());
IOSS_ERROR(errmsg);
}
diff --git a/ThirdParty/ioss/vtkioss/exodus/Ioex_DatabaseIO.C b/ThirdParty/ioss/vtkioss/exodus/Ioex_DatabaseIO.C
index 98de3a2acf..71a2c9f724 100644
--- a/ThirdParty/ioss/vtkioss/exodus/Ioex_DatabaseIO.C
+++ b/ThirdParty/ioss/vtkioss/exodus/Ioex_DatabaseIO.C
@@ -1760,7 +1760,7 @@ namespace Ioex {
fmt::print(errmsg,
"INTERNAL ERROR: Invalid setting for `split_type` {}. Something is wrong "
"in the Ioex::DatabaseIO class. Please report.\n",
- split_type);
+ static_cast<int>(split_type));
IOSS_ERROR(errmsg);
}
assert(elem_topo != nullptr);
diff --git a/ThirdParty/ioss/vtkioss/exodus/Ioex_SuperElement.C b/ThirdParty/ioss/vtkioss/exodus/Ioex_SuperElement.C
index bf3261fd6c..ec7ee7544e 100644
--- a/ThirdParty/ioss/vtkioss/exodus/Ioex_SuperElement.C
+++ b/ThirdParty/ioss/vtkioss/exodus/Ioex_SuperElement.C
@@ -242,7 +242,7 @@ int64_t Ioex::SuperElement::internal_get_field_data(const Ioss::Field &field, vo
}
}
else {
- fmt::print(Ioss::WARNING(), "{} '{}'. Unknown input field '{}'", type(), name(),
+ fmt::print(Ioss::WARNING(), "{} '{}'. Unknown input field '{}'", static_cast<int>(type()), name(),
field.get_name());
return -4;
}