aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAiden Grossman <agrossman154@yahoo.com>2022-10-09 15:44:27 +0000
committeralice <alice@ayaya.dev>2022-10-10 04:55:44 +0000
commitf4a1390eea0f6ea21714b835b79a3e95991ce9e9 (patch)
treeec341886a7af0eb81c8fecb8912725a17c006e2d
parent72ce678f0c8f88ecaef7b60d00e051e27a315648 (diff)
downloadaports-f4a1390eea0f6ea21714b835b79a3e95991ce9e9.tar.gz
aports-f4a1390eea0f6ea21714b835b79a3e95991ce9e9.tar.bz2
aports-f4a1390eea0f6ea21714b835b79a3e95991ce9e9.tar.xz
community/vtk: upgrade to 9.2.2
-rw-r--r--community/vtk/APKBUILD33
-rw-r--r--community/vtk/disable-tests.patch5
-rw-r--r--community/vtk/fix-allvalues.patch136
-rw-r--r--community/vtk/fix-build.patch20
-rw-r--r--community/vtk/thumb1_noisb.patch11
-rw-r--r--community/vtk/unistd.patch18
6 files changed, 38 insertions, 185 deletions
diff --git a/community/vtk/APKBUILD b/community/vtk/APKBUILD
index 9ef6d64db8..a34b541866 100644
--- a/community/vtk/APKBUILD
+++ b/community/vtk/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
pkgname=vtk
-pkgver=9.1.0
-pkgrel=8
+pkgver=9.2.2
+pkgrel=0
pkgdesc="A software system for 3D computer graphics, image processing and visualization"
url="https://vtk.org/"
# s390x blocked by netcdf
@@ -10,13 +10,16 @@ arch="all !s390x"
license="BSD-3-Clause"
depends_dev="
boost-dev
+ curl-dev
doxygen
ffmpeg-dev
gdal-dev
glew-dev
+ hdf5-dev
jpeg-dev
libpng-dev
libxml2-dev
+ netcdf-dev
openmpi-dev
pdal-dev
qt5-qtbase-dev
@@ -26,9 +29,6 @@ depends_dev="
tk-dev
unixodbc-dev
zlib-dev
- netcdf-dev
- hdf5-dev
- curl-dev
"
makedepends="$depends_dev
cmake
@@ -36,7 +36,6 @@ makedepends="$depends_dev
"
checkdepends="
xvfb-run
- mesa
mesa-dri-gallium
"
subpackages="$pkgname-doc $pkgname-dev"
@@ -44,11 +43,9 @@ source="
https://www.vtk.org/files/release/${pkgver%.*}/VTK-$pkgver.tar.gz
https://www.vtk.org/files/release/${pkgver%.*}/VTKData-$pkgver.tar.gz
https://www.vtk.org/files/release/${pkgver%.*}/VTKLargeData-$pkgver.tar.gz
- ffmpeg5.patch
- fix-build.patch
- fix-allvalues.patch
- unistd.patch
disable-tests.patch
+ unistd.patch
+ thumb1_noisb.patch
"
builddir="$srcdir/VTK-$pkgver"
@@ -78,7 +75,7 @@ build() {
}
check() {
- xvfb-run ctest -a -j $JOBS --test-dir ./build
+ xvfb-run -a ctest -a -j $JOBS --test-dir ./build
}
package() {
@@ -86,12 +83,10 @@ package() {
}
sha512sums="
-b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a VTK-9.1.0.tar.gz
-134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a VTKData-9.1.0.tar.gz
-0760dfd4e92bbfec10fec9d783f548a8ca5464b1a1744dfa575d4ed4592756335dbfcf28249d2da964aa6b41933ff1ac98458e4a32484ee4bb91b5e7cfaa78c9 VTKLargeData-9.1.0.tar.gz
-df9e44c97333457d5090dddd0701c7e1222cc8c739d628d5495ae5a312adb73f53f22a6d6ccfbed69a85ea3c350dc98aafc0d2482b0a91faa3cd2a127b2d1dc7 ffmpeg5.patch
-c814628a7ce9e1015cb02d4c9ad7ae7c6ad6d5d83b553f0c484414744488e4d0fa313924b4fd0f579a363352832347035147d1be3aca6f6a4885b6f9a1590b9e fix-build.patch
-87ffb0f1a243a10983e0313b3ca472361c74f0f5054be0eca898232f11a57369dfba80a836679a772eb641e1fdd43fa07ae7f85faecf3243b172c4206325dd9d fix-allvalues.patch
-4054796e7f4cf78be3fbdf4d0befb79ff118e9a54e649da8a39b717e84ccb3d9dc05d8398de046447f789df5a8f3f84253866f3e59f7cbacfe981ffbbe5b7429 unistd.patch
-da077b2097024ed370b3fd4d73ea6e0b75a9e17e7ed914ae55c59109c59f388f250ff9efdf19f55fb54120306b49d6be2e8740147a0558d04fc36fcc3da9d817 disable-tests.patch
+11b8203a4efaac0cda9ea46acf58c0d88c18f55bfd52e284f74ef313646913d194d3885da9d9fa7222d926502522505bfdf9d719f8c09790dab1315e2161610a VTK-9.2.2.tar.gz
+54d33ba24c9adfef2de17f26aa68b53f61f32e50d92bd1b0ddd75b1818d864af9a4d7fa7cb55297839bd2e50c2a7d12a18695151db32f7f59fbbd2ec9169e7b8 VTKData-9.2.2.tar.gz
+4ee1f0b4dac929f7335d2a23ad56ddddaa8ebba34c547c18883418f56fb285fba38ffbfd5124ab428b6e19e87a916ba0858ae227af453519c1cbd5598fe6ccf6 VTKLargeData-9.2.2.tar.gz
+53dc8a9f9680bd124399161f6703aa2a4e1ce3460b237de1858e2abff128628769a08484f927a4d0aa87c26abd279025391c6206751a68d4ba8dc7b0ef96e1d1 disable-tests.patch
+0f9135c421344f789db64ad46f6acd452214de8f1d4696dea3cd1d3517d0057d277a4d01e82804ffb7db086fd7527e511baa1b24a38826aec5c44872610ca0cb unistd.patch
+0b29ce9e4bb6fea928a460cd148f876bc8dc59602b60ac11a711182ed324d5e8a460c1a4d97bbd72351b766333b34d94931113dac0b060dba517b01c31009b6e thumb1_noisb.patch
"
diff --git a/community/vtk/disable-tests.patch b/community/vtk/disable-tests.patch
index cf2de85873..ef85a600e2 100644
--- a/community/vtk/disable-tests.patch
+++ b/community/vtk/disable-tests.patch
@@ -1,6 +1,6 @@
--- ./CMake/CTestCustom.cmake.in
+++ ./CMake/CTestCustom.cmake.in
-@@ -214,3 +214,67 @@
+@@ -214,3 +214,70 @@
# Exclude files from the Utilities directories
".*/Utilities/.*"
".*/ThirdParty/.*")
@@ -67,4 +67,7 @@
+ VTK::FiltersHybridCxx-TestTemporalCacheTemporal
+ VTK::ChartsCoreCxx-TestAdjustLowerBoundForLogPlot
+ VTK::CommonDataModelCxx-TestIncrementalOctreePointLocator
++ VTK::FiltersGeneralCxx-TestContourTriangulatorHoles
++ VTK::IOCesium3DTilesCxx-TestCesium3DTilesWriter
++ VTK::FiltersGeneralCxx-TestContourTriangulatorBadData
+)
diff --git a/community/vtk/fix-allvalues.patch b/community/vtk/fix-allvalues.patch
deleted file mode 100644
index 17698b75e6..0000000000
--- a/community/vtk/fix-allvalues.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-Originally from Fedora package
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkDataArray.cxx
-+++ VTK-9.0.1/Common/Core/vtkDataArray.cxx
-@@ -1627,7 +1627,7 @@ struct ScalarRangeDispatchWrapper
- void operator()(ArrayT* array)
- {
- this->Success = vtkDataArrayPrivate::DoComputeScalarRange(
-- array, this->Range, vtkDataArrayPrivate::AllValues());
-+ array, this->Range, vtkDataArrayPrivate::vtkAllValues());
- }
- };
-
-@@ -1646,7 +1646,7 @@ struct VectorRangeDispatchWrapper
- void operator()(ArrayT* array)
- {
- this->Success = vtkDataArrayPrivate::DoComputeVectorRange(
-- array, this->Range, vtkDataArrayPrivate::AllValues());
-+ array, this->Range, vtkDataArrayPrivate::vtkAllValues());
- }
- };
-
-Index: VTK-9.0.1/Common/Core/vtkDataArray.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkDataArray.h
-+++ VTK-9.0.1/Common/Core/vtkDataArray.h
-@@ -599,7 +599,7 @@ vtkArrayDownCast_FastCastMacro(vtkDataAr
- // vtkGenericDataArray.h as well.
- namespace vtkDataArrayPrivate
- {
--struct AllValues
-+struct vtkAllValues
- {
- };
- struct FiniteValues
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.txx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.txx
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArray.txx
-@@ -1192,7 +1192,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{});
- }
-
- //-----------------------------------------------------------------------------
-@@ -1202,7 +1202,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{});
- }
-
- //-----------------------------------------------------------------------------
-Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkDataArrayPrivate.txx
-+++ VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx
-@@ -301,7 +301,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);
-@@ -435,7 +435,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);
-@@ -518,7 +518,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();
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArray.h
-@@ -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 --git a/community/vtk/fix-build.patch b/community/vtk/fix-build.patch
deleted file mode 100644
index d1bff0496b..0000000000
--- a/community/vtk/fix-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-It is not up for upstream to decide the valid build type.
-
-diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
-index fc5ca90..c9e6a35 100644
---- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
-+++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
-@@ -21,13 +21,6 @@ if (NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
- endif()
-
--string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
--if( NOT cmake_build_type_tolower STREQUAL "debug"
-- AND NOT cmake_build_type_tolower STREQUAL "release"
-- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
-- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
--endif()
--
-
- #############################################################################
- # retrieve version infomation #
diff --git a/community/vtk/thumb1_noisb.patch b/community/vtk/thumb1_noisb.patch
new file mode 100644
index 0000000000..ef64804b55
--- /dev/null
+++ b/community/vtk/thumb1_noisb.patch
@@ -0,0 +1,11 @@
+--- ./Common/Core/vtkAtomicMutex.cxx.orig
++++ ./Common/Core/vtkAtomicMutex.cxx
+@@ -16,7 +16,7 @@
+
+ #if defined(__i386__) || defined(__x86_64__)
+ #include <immintrin.h>
+-#elif defined(__ARM_FEATURE_SIMD32) || defined(__ARM_NEON)
++#elif (defined(__ARM_FEATURE_SIMD32) || defined(__ARM_NEON)) && __ARM_ARCH_ISA_THUMB > 1
+ // https://github.com/DLTcollab/sse2neon
+ static inline __attribute__((always_inline)) void _mm_pause()
+ {
diff --git a/community/vtk/unistd.patch b/community/vtk/unistd.patch
index 332babc301..0c41684e36 100644
--- a/community/vtk/unistd.patch
+++ b/community/vtk/unistd.patch
@@ -1,11 +1,11 @@
---- ./ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ ./ThirdParty/ioss/vtkioss/Ioss_FileInfo.C.new
-@@ -14,7 +14,7 @@
- #include <tokenize.h>
-
- #ifndef _WIN32
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C.orig
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
-#include <sys/unistd.h>
+#include <unistd.h>
- #else
- #include <direct.h>
- #include <io.h>
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI