summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2019-06-30 09:48:09 -0500
committerMatthias Maier <tamiko@gentoo.org>2019-06-30 13:19:07 -0500
commitdc620c1481998584ba8269585d82f04fe980fffa (patch)
treeaab4fb3a882d305a971ed4b5f9d95df008148461 /sci-visualization/paraview/files
parentsci-visualization/paraview: drop old (diff)
downloadgentoo-dc620c1481998584ba8269585d82f04fe980fffa.tar.gz
gentoo-dc620c1481998584ba8269585d82f04fe980fffa.tar.bz2
gentoo-dc620c1481998584ba8269585d82f04fe980fffa.zip
sci-visualization/paraview: version bump to 5.6.1
- Version bump to 5.6.1 - OpenMP 4.0 compatibility - Fix various dependencies Closes: https://bugs.gentoo.org/661860 Closes: https://bugs.gentoo.org/686362 Closes: https://bugs.gentoo.org/686990 Closes: https://bugs.gentoo.org/687534 Closes: https://bugs.gentoo.org/687790 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'sci-visualization/paraview/files')
-rw-r--r--sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
new file mode 100644
index 000000000000..515624150315
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
@@ -0,0 +1,32 @@
+diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h 2018-11-07 05:05:18.000000000 +1000
++++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h 2019-06-28 14:04:02.292922908 +1000
+@@ -290,7 +290,7 @@
+ std::unique_ptr<ReturnType[]> threadData;
+
+ VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
+- shared(data, doParallel, numThreads, threadData))
++ shared(data, doParallel, numThreads, threadData, numVals))
+ {
+
+ int tid = omp_get_thread_num();
+@@ -422,7 +422,7 @@
+ vtkm::Id outIdx = 0;
+
+ VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f)
+- shared(outIdx))
++ shared(outIdx, numValues))
+ {
+ int tid = omp_get_thread_num();
+ int numThreads = omp_get_num_threads();
+diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h 2018-11-07 05:05:18.000000000 +1000
++++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h 2019-06-28 13:54:33.132064191 +1000
+@@ -133,6 +133,7 @@
+ VTKM_OPENMP_DIRECTIVE(parallel for
+ default(none)
+ firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
++ shared(size)
+ schedule(static))
+ for (vtkm::Id i = 0; i < size; ++i)
+ {