[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 86a9526ce8490c8689d8dad8c5c82a2f903e8ffa
Author: Bernd Waibel posteo net>
AuthorDate: Wed May 3 16:14:18 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed May 3 22:23:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a9526c
sci-libs/vtk: fix build with gcc-13
add upstream patch with gcc-13 related fixes
Closes: https://bugs.gentoo.org/905387
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30859
Signed-off-by: Sam James gentoo.org>
.../vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch | 20 -
...ore-include-cstdint-to-compile-with-gcc13.patch | 33 ++
sci-libs/vtk/vtk-9.2.5.ebuild | 2 +-
3 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch
b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch
deleted file mode 100644
index 3ab71521b6b5..
--- a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 69351f357a82c0bb7f97f4f707962de3400760a8 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel
-Date: Sun, 29 Jan 2023 12:17:36 +0100
-Subject: [PATCH] Add #include for gcc-13
-
-Bug: https://gitlab.kitware.com/vtk/vtk/-/issues/18782
-Signed-off-by: Bernd Waibel
a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -50,6 +50,7 @@
- #include "vtkRenderingMatplotlibModule.h" // For export macro
-
- #include // for std::vector
-+#include // for std::uint64_t
-
- struct _object;
- typedef struct _object PyObject;
---
-2.39.1
-
diff --git
a/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
new file mode 100644
index ..356efbb4da9a
--- /dev/null
+++
b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/905387
+https://github.com/Kitware/VTK/commit/4d8283bcb460ff60d8df1b7b67b5db19876a5ca3
+
+From 890f7574f01cf58cb1522772a62ca07deb438479 Mon Sep 17 00:00:00 2001
+From: Mathieu Westphal
+Date: Thu, 23 Feb 2023 18:06:07 +0100
+Subject: [PATCH 1580/2105] More #include to compile with gcc13
+
+--- a/IO/PIO/PIOData.h
b/IO/PIO/PIOData.h
+@@ -1,6 +1,7 @@
+ #if !defined(_PIODATA_H)
+ #define _PIODATA_H
+
++#include
+ #include
+ #include
+ #include
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -49,7 +49,8 @@
+ #include "vtkMathTextUtilities.h"
+ #include "vtkRenderingMatplotlibModule.h" // For export macro
+
+-#include // for std::vector
++#include // for std::uint64_t
++#include // for std::vector
+
+ struct _object;
+ typedef struct _object PyObject;
+--
+2.40.1
+
diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
index e4fc6333d5f8..23a48458dd3a 100644
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild
@@ -162,8 +162,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch
"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
- "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-for-gcc-13.patch
"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
+
"${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
)
DOCS=( CONTRIBUTING.md README.md )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 2ad7471df4b05d94ce984de1b54f6f2f8304ff34
Author: Bernd Waibel posteo net>
AuthorDate: Sun Feb 19 15:21:20 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Feb 27 16:46:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad7471d
sci-libs/vtk: build against CUDA 12
Closes: https://bugs.gentoo.org/894646
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29664
Signed-off-by: Joonas Niilola gentoo.org>
...k-9.2.5-Fix-compilation-error-with-CUDA-12.patch | 21 +
sci-libs/vtk/vtk-9.2.5.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git
a/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch
b/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch
new file mode 100644
index ..9b8583fa61e2
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch
@@ -0,0 +1,21 @@
+https://894646.bugs.gentoo.org/attachment.cgi?id=851914
+https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2972/diffs
+
+From be96ea7d85fefcad876729377c1b73a295d1c732 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest"
+Date: Thu, 16 Feb 2023 16:57:32 +
+Subject: [PATCH] Fix compilation error with CUDA 12.
+
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h
b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h
+@@ -17,6 +17,7 @@
+ #include
+ VTKM_THIRDPARTY_PRE_INCLUDE
+ #include
++#include
+ #include
+ #include
+ VTKM_THIRDPARTY_POST_INCLUDE
+--
+2.39.1
+
diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
index 88721c38e704..eb117e951095 100644
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild
@@ -163,6 +163,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-for-gcc-13.patch
+ "${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
)
DOCS=( CONTRIBUTING.md README.md )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 588025882a58b613f5ef08e02b96efbb7d4c7445 Author: Bernd Waibel posteo net> AuthorDate: Thu Sep 29 05:18:39 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Dec 12 06:08:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58802588 sci-libs/vtk: add 9.2.2 - add a new function to check memory and disk space requirements - don't drop bundled external libraries, it's only a few MB which are freed through this and upstream does a good job to avoid automagic deps - request more modules to build explicitly depending on USE flag settings - don't export CC and friends with USE=mpi, package builds fine with gcc and still links to MPI libraries - add USE flag to build vtk-m optional Bug: https://bugs.gentoo.org/793221 Bug: https://bugs.gentoo.org/835659 Bug: https://bugs.gentoo.org/880759 Closes: https://bugs.gentoo.org/820593 Closes: https://bugs.gentoo.org/827310 Closes: https://bugs.gentoo.org/846374 Closes: https://bugs.gentoo.org/874798 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28250 Signed-off-by: Joonas Niilola gentoo.org> sci-libs/vtk/Manifest | 6 + .../vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch | 81 +++ ...9.2.2-link-with-glut-library-for-freeglut.patch | 18 + ...metryFilter-add-missing-mutex-header-file.patch | 20 + sci-libs/vtk/metadata.xml | 11 +- sci-libs/vtk/vtk-9.2.2.ebuild | 728 + 6 files changed, 863 insertions(+), 1 deletion(-) diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 52b37377441f..2ee625c9b35b 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,10 +1,16 @@ DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a +DIST VTK-9.2.2.tar.gz 53801737 BLAKE2B 345538004a1b147f8a6812e30b6e31bdfba27d13c47e3c659ef6eb51224aa6015a44e6aaabbc6d1b127691592b4727a51c952dc565d1a12f2eddedd1536af58b SHA512 11b8203a4efaac0cda9ea46acf58c0d88c18f55bfd52e284f74ef313646913d194d3885da9d9fa7222d926502522505bfdf9d719f8c09790dab1315e2161610a DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 DIST VTKData-9.1.0.tar.gz 590185633 BLAKE2B 7451d57bc507571afa8a8f9ba541010e1924849759f228318b6390aabb07a68341b84b38b82cd504844194544c569b040c9fad1858e6e35e172e4e18000d338e SHA512 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a +DIST VTKData-9.2.2.tar.gz 593767482 BLAKE2B 65df8f96eaca9ada44f807bd4ff5efe569dde726105c7aa260c4f0ed3b8c19303b7781e0628a759cdf68b314155ac0d125403f27ee38eefd47336a8eed235851 SHA512 54d33ba24c9adfef2de17f26aa68b53f61f32e50d92bd1b0ddd75b1818d864af9a4d7fa7cb55297839bd2e50c2a7d12a18695151db32f7f59fbbd2ec9169e7b8 DIST VTKDataFiles-9.1.0.tar.gz 605163184 BLAKE2B 968e2fed1e17bb57da4f8dd38e17e128779e50dfce81fc31c6ef75a2f3fe46675dd77ab7343b609998b8ddd3927e256d1ea4117c2719ad76f61db435b5f1c34f SHA512 f56ebd087753e2d2805e2f5954197de4e9933ec90648956780525d83149277a7bca42ce376c4355a53fca71ec78510fed155955af71b70e1b26de27851252e36 +DIST VTKDataFiles-9.2.2.tar.gz 608752734 BLAKE2B b33bcec704e0db3ad0de958fbeca1adc1b904279b46a43a5abcd45a7df96138d4d3b76cb21af3aa48c0dd18d05987bdf58476fa945b59ed5b90ad6f2e386926f SHA512 75430127212fdf210fb98d278b0163b4ed09f567fd1b80fcf80ea1cf2709e41f785912b20591712f71ad7ede9e12e23e358b4889963bccfe66cf8c48a7f70e11 DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1 DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa431e53ca33fec99e8aa78ee156a82e4b3351e32ee36674d9d345f346efad085ae1e2d3186a144911d2210a31a259e69f1f SHA512 0760dfd4e92bbfec10fec9d783f548a8ca5464b1a1744dfa575d4ed4592756335dbfcf28249d2da964aa6b41933ff1ac98458e4a32484ee4bb91b5e7cfaa78c9 +DIST VTKLargeData-9.2.2.tar.gz 247523477 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: d699c8995b81d8cd0be7d051485af755d25cdf11
Author: Bernd Waibel posteo net>
AuthorDate: Sat Jun 18 10:29:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 26 07:09:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d699c899
sci-libs/vtk: fix build against netcdf-4.9.0
Closes: https://bugs.gentoo.org/851594
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25954
Signed-off-by: Sam James gentoo.org>
...-avoid-naming-collision-with-netcdf-4.9.0.patch | 26 ++
sci-libs/vtk/vtk-9.1.0-r2.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git
a/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch
b/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch
new file mode 100644
index ..7549c240ee51
--- /dev/null
+++
b/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/851594
+
+From b155e9716a1cf4a03948c01f49c4097e466da4f0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Mon, 20 Jun 2022 07:07:19 +0200
+Subject: [PATCH] avoid naming collision with netcdf-4.9.0
+
+The identifier has already been #defined with netcdf-4.9.0. To avoid
+conflicts guard the declaration.
+
+Signed-off-by: Bernd Waibel
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
b/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
+@@ -1770,7 +1770,9 @@ void ex__compress_variable(int exoid, int varid, int
type)
+ */
+
+ /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for
szip. */
++#ifndef 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;
+--
+2.35.1
+
diff --git a/sci-libs/vtk/vtk-9.1.0-r2.ebuild b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
index 13d7663c5bbf..1e80b96b80b4 100644
--- a/sci-libs/vtk/vtk-9.1.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
"${FILESDIR}"/${P}-adjust-to-find-binaries.patch
+ "${FILESDIR}"/${P}-avoid-naming-collision-with-netcdf-4.9.0.patch
)
DOCS=( CONTRIBUTING.md README.md )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 587997a8ddffe39ddb1ce4c3874d6b0d4082f4d9
Author: Bernd Waibel posteo net>
AuthorDate: Thu Mar 31 15:36:00 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 2 13:05:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587997a8
sci-libs/vtk: find qt binaries with qt-5.15.3
Use the path for qmake as a reference for finding the path to Qt binaries
with Qt 5.15.3 and no qtchooser installed.
Committer-comment: undo unnecessary revbump for build fix.
Closes: https://bugs.gentoo.org/836343
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24831
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/vtk-9.1.0-adjust-to-find-binaries.patch | 25 ++
sci-libs/vtk/vtk-9.1.0.ebuild | 1 +
2 files changed, 26 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
new file mode 100644
index ..10d6d251ebf3
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
@@ -0,0 +1,25 @@
+From e59b8ff7b83cd6a58c226cb4f5d9661bcb29002b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Thu, 31 Mar 2022 08:05:17 +0200
+Subject: [PATCH] adjust to find binaries
+
+Add compatibility for qt-5.15.3 with no qtchooser installed. QtCore exports
+Qt5::{qmake,moc,rcc} which we use to get the path for binaries.
+
+Signed-off-by: Bernd Waibel
+--- a/GUISupport/QtQuick/qml/CMakeLists.txt
b/GUISupport/QtQuick/qml/CMakeLists.txt
+@@ -60,8 +60,8 @@ file(GENERATE
+ # Generate the qmltypes file for the VTK QML plugin
+
+ # First, find the qmlplugindump executable
+-get_target_property(qt_core_location "Qt${vtk_qt_major_version}::Core"
LOCATION)
+-get_filename_component(qt_bin_dir "${qt_core_location}" PATH)
++get_target_property(qt_qmake_location "Qt${vtk_qt_major_version}::qmake"
LOCATION)
++get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH)
+ if (APPLE)
+ get_filename_component(qt_bin_dir "${qt_bin_dir}" PATH)
+ endif ()
+--
+2.35.1
+
diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0.ebuild
index 7be370c13c6a..9a6ebbdaac51 100644
--- a/sci-libs/vtk/vtk-9.1.0.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0.ebuild
@@ -143,6 +143,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
+ "${FILESDIR}"/${P}-adjust-to-find-binaries.patch
)
DOCS=( CONTRIBUTING.md README.md )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 1a1324aa105beed8878503f55dd6783255127de0 Author: Bernd Waibel posteo net> AuthorDate: Thu Jan 20 16:55:55 2022 + Commit: Sam James gentoo org> CommitDate: Mon Feb 21 23:23:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1324aa sci-libs/vtk: drop 8.2.0 Only one package, sci-libs/oce, which is masked for last-riting, depends on this version. Won't build with ffmpeg-5. Bug: https://bugs.gentoo.org/831595 Bug: https://bugs.gentoo.org/832625 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/23886 Signed-off-by: Sam James gentoo.org> sci-libs/vtk/Manifest | 4 - .../files/vtk-8.1.0-openmpi-4-compatibility.patch | 14 - ...01-fix-library-installation-dir-for-xdmf3.patch | 57 sci-libs/vtk/files/vtk-8.2.0-fno-common.patch | 40 --- sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch | 16 - sci-libs/vtk/files/vtk-8.2.0-pugixml.patch | 12 - sci-libs/vtk/files/vtk-8.2.0-py38.patch| 175 -- sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch | 37 -- sci-libs/vtk/metadata.xml | 1 - sci-libs/vtk/vtk-8.2.0-r6.ebuild | 375 - 10 files changed, 731 deletions(-) diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index d345d4831ee0..52b37377441f 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,14 +1,10 @@ -DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a -DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 DIST VTKData-9.1.0.tar.gz 590185633 BLAKE2B 7451d57bc507571afa8a8f9ba541010e1924849759f228318b6390aabb07a68341b84b38b82cd504844194544c569b040c9fad1858e6e35e172e4e18000d338e SHA512 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a DIST VTKDataFiles-9.1.0.tar.gz 605163184 BLAKE2B 968e2fed1e17bb57da4f8dd38e17e128779e50dfce81fc31c6ef75a2f3fe46675dd77ab7343b609998b8ddd3927e256d1ea4117c2719ad76f61db435b5f1c34f SHA512 f56ebd087753e2d2805e2f5954197de4e9933ec90648956780525d83149277a7bca42ce376c4355a53fca71ec78510fed155955af71b70e1b26de27851252e36 -DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588 DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1 DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa431e53ca33fec99e8aa78ee156a82e4b3351e32ee36674d9d345f346efad085ae1e2d3186a144911d2210a31a259e69f1f SHA512 0760dfd4e92bbfec10fec9d783f548a8ca5464b1a1744dfa575d4ed4592756335dbfcf28249d2da964aa6b41933ff1ac98458e4a32484ee4bb91b5e7cfaa78c9 DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc -DIST
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 4893345530421b0d6168b5278d57d69fc08f7fdf
Author: Vadim Misbakh-Soloviov gentoo org>
AuthorDate: Fri Dec 3 22:34:45 2021 +
Commit: Vadim Misbakh-Soloviov gentoo org>
CommitDate: Fri Dec 3 22:37:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48933455
sci-libs/vtk: fix build with new deps versions
Mostly backported upstream patches (from 9.1.0 and post-9.1).
Also, some patches (like CUDA-11.5) was provided by
Vyacheclav Perestoronin gmail.com>
and slightly adapted by me.
Actually, there is already PR for 9.1.0, which have most of this
compatibility issues fixed, but I bump 9.0.3 to work with them in case
if there is some revdeps still not compatible with 9.1 API/ABI.
Bug: https://bugs.gentoo.org/827310
Package-Manager: Portage-3.0.28, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov gentoo.org>
sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch | 229 ++
sci-libs/vtk/files/vtk-9.0.3-cuda-11.5.0.patch | 25 +
...addr-in-wrappers-upstream-commit-55c74ed3.patch | 88 +++
sci-libs/vtk/files/vtk-9.0.3-pegtl-3.patch | 75 ++
...0.3-proj-api-fix-upstream-commit-03256388.patch | 163
.../files/vtk-9.0.3-tbb-fix-for-bundled-vtkm.patch | 504
.../vtk/files/vtk-9.0.3-use-std-atomic-part1.patch | 811
.../vtk/files/vtk-9.0.3-use-std-atomic-part2.patch | 851 +
sci-libs/vtk/vtk-9.0.3-r4.ebuild | 557 ++
9 files changed, 3303 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch
b/sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch
new file mode 100644
index ..2927368a7fdc
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.0.3-TBB-2021.04-fix.patch
@@ -0,0 +1,229 @@
+Patch is based on following upstream commits:
+
+56cf03534c58a21f3cea608e4f53b7e7e00670fc by Mickael PHILIT
+ded89c1e3a025874bfd69feb6c67fa21d6af36d4 by Mickael PHILIT
+3e5313e71c35aaeabfd4e65e090031716460d35e by Timothée Couble
+
+Backported by Vyacheslav Perestoronin
+
+Adapted by Vadim Misbakh-Soloviov
+
+--- a/CMake/FindTBB.cmake
b/CMake/FindTBB.cmake
+@@ -424,12 +424,18 @@ findpkg_finish(TBB_MALLOC_PROXY tbbmalloc_proxy)
+ #=
+ #parse all the version numbers from tbb
+ if(NOT TBB_VERSION)
+-
+- #only read the start of the file
+- file(STRINGS
++ if (EXISTS "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h")
++file(STRINGS
++ "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h"
++ TBB_VERSION_CONTENTS
++ REGEX "VERSION")
++ else()
++#only read the start of the file
++file(STRINGS
+ "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h"
+ TBB_VERSION_CONTENTS
+ REGEX "VERSION")
++ endif()
+
+ string(REGEX REPLACE
+ ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
+--- a/Common/Core/SMP/TBB/vtkSMPTools.cxx
b/Common/Core/SMP/TBB/vtkSMPTools.cxx
+@@ -22,47 +22,50 @@
+ #define __TBB_NO_IMPLICIT_LINKAGE 1
+ #endif
+
+-#include
++#include
+
+ #ifdef _MSC_VER
+ #pragma pop_macro("__TBB_NO_IMPLICIT_LINKAGE")
+ #endif
+
+-struct vtkSMPToolsInit
+-{
+- tbb::task_scheduler_init Init;
+-
+- vtkSMPToolsInit(int numThreads)
+-: Init(numThreads)
+- {
+- }
+-};
+-
+-static bool vtkSMPToolsInitialized = 0;
+-static int vtkTBBNumSpecifiedThreads = 0;
++static tbb::task_arena taskArena;
+ static vtkSimpleCriticalSection vtkSMPToolsCS;
+
+
//
+ void vtkSMPTools::Initialize(int numThreads)
+ {
+ vtkSMPToolsCS.Lock();
+- if (!vtkSMPToolsInitialized)
++
++ // If numThreads <= 0, don't create a task_arena
++ // and let TBB do the default thing.
++ if (numThreads > 0 && numThreads != taskArena.max_concurrency())
+ {
+-// If numThreads <= 0, don't create a task_scheduler_init
+-// and let TBB do the default thing.
+-if (numThreads > 0)
++if (taskArena.is_active())
+ {
+- static vtkSMPToolsInit aInit(numThreads);
+- vtkTBBNumSpecifiedThreads = numThreads;
++ taskArena.terminate();
+ }
+-vtkSMPToolsInitialized = true;
++taskArena.initialize(numThreads);
+ }
++
+ vtkSMPToolsCS.Unlock();
+ }
+
+
//
+ int vtkSMPTools::GetEstimatedNumberOfThreads()
+ {
+- return vtkTBBNumSpecifiedThreads ? vtkTBBNumSpecifiedThreads
+- :
tbb::task_scheduler_init::default_num_threads();
++ return taskArena.max_concurrency();
++}
++
++//--
++void vtk::detail::smp::vtkSMPTools_Impl_For_TBB(vtkIdType first, vtkIdType
last, vtkIdType grain,
++ ExecuteFunctorPtrType functorExecuter, void* functor)
++{
++ if (taskArena.is_active())
++ {
++taskArena.execute([&] { functorExecuter(functor, first, last, grain); });
++ }
++ else
++ {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 0e3674e78cc315bd0f9adf266dc2b9259b149ac6 Author: Bernd Waibel gmail com> AuthorDate: Tue Feb 2 07:12:25 2021 + Commit: Sam James gentoo org> CommitDate: Mon May 31 11:37:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e3674e7 sci-libs/vtk: bump to 9.0.1 Closes: https://bugs.gentoo.org/723744 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Signed-off-by: Sam James gentoo.org> sci-libs/vtk/Manifest | 4 + ...r-compute_arch-if-CUDA-toolkit-11-is-used.patch | 32 ++ sci-libs/vtk/metadata.xml | 13 +- sci-libs/vtk/vtk-9.0.1.ebuild | 531 + 4 files changed, 579 insertions(+), 1 deletion(-) diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 2ea60d8ea77..38838374c4f 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,4 +1,8 @@ DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 +DIST VTK-9.0.1.tar.gz 34687900 BLAKE2B 2c1cc2a35eb6f05d23ec49d8c3c8d787134ce840f940d948da1e03d6875c15e2660c52776218fc3dbccf77959d9affaef051cba14991e6dd150ef5d50b5ae2eb SHA512 eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b +DIST VTKData-9.0.1.tar.gz 413680549 BLAKE2B 2804f8261763553408c1de8b0d47091875a262cf670604289879253922932f260d4ce8d1586e9b2a8ef3a1286c90e8a61c6472fafcddbd9b40090818eb310d49 SHA512 2fc418a6e15bd4e30ce181bb209c39666982645dbdbe2d6491683497662b72712689e58cf54b7af91865d0e3d0cb3f9ab66606b02964d57bf88d769d292dd938 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588 +DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b638f2559259f09a6cbbe80da8c2937b1c50cfa2c3b2c6adf99b5bbf537678f817e44bc72962f36364913ae6cc524ae8a8 SHA512 b3303d633f063a6f3bfcc61b441f445611ff7cff6f006c77d8452eb5a3af89a18b2a1201a2dbd230af085b9e45b9abb70319d2f41db0f1e19c632286e7b02ec2 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317 +DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4 diff --git a/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch b/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch new file mode 100644 index 000..2514dac6356 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch @@ -0,0 +1,32 @@ +From 33d9b7ded14ce36e3f63810f3403623ee5c2059c Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Sun, 10 Jan 2021 20:29:56 +0100 +Subject: [PATCH] fix kepler compute_arch if CUDA toolkit >=11 is used. + +Signed-off-by: Bernd Waibel +--- + .../vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake | 8 ++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake +index ff0b2581..e565e783 100644 +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake +@@ -229,8 +229,12 @@ if(VTKm_ENABLE_CUDA) + if(VTKm_CUDA_Architecture STREQUAL "fermi") + set(arch_flags --generate-code=arch=compute_20,code=sm_20) + elseif(VTKm_CUDA_Architecture STREQUAL "kepler") +- set(arch_flags --generate-code=arch=compute_30,code=sm_30 +- --generate-code=arch=compute_35,code=sm_35) ++ if(CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0) ++set(arch_flags
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 0980511b01c8aeba0da6936228433088c33c7298
Author: Sam James gentoo org>
AuthorDate: Mon May 31 11:37:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon May 31 11:38:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0980511b
sci-libs/vtk: add various GCC 11 fixes
Signed-off-by: Sam James gentoo.org>
.../vtk/files/vtk-9.0.1-limits-include-gcc11.patch | 84 ++
sci-libs/vtk/vtk-9.0.1.ebuild | 1 +
2 files changed, 85 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-9.0.1-limits-include-gcc11.patch
b/sci-libs/vtk/files/vtk-9.0.1-limits-include-gcc11.patch
new file mode 100644
index 000..5473378512f
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.0.1-limits-include-gcc11.patch
@@ -0,0 +1,84 @@
+From c7d6a8d81367a4ed92163c059aa3181386eabc24 Mon Sep 17 00:00:00 2001
+From: Ben Boeckel
+Date: Mon, 3 May 2021 11:55:27 -0400
+Subject: [PATCH] vtkDataArrayPrivate: include for std::numeric_limits
+
+See: #18194
+---
+ Common/Core/vtkDataArrayPrivate.txx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Common/Core/vtkDataArrayPrivate.txx
b/Common/Core/vtkDataArrayPrivate.txx
+index eb366f1c6d0..6709f7f3ac1 100644
+--- a/Common/Core/vtkDataArrayPrivate.txx
b/Common/Core/vtkDataArrayPrivate.txx
+@@ -24,6 +24,7 @@
+ #include
+ #include
+ #include // for assert()
++#include
+ #include
+
+ namespace vtkDataArrayPrivate
+--
+GitLab
+diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h
b/Common/Core/vtkGenericDataArrayLookupHelper.h
+index f278e27..de6d842 100644
+--- a/Common/Core/vtkGenericDataArrayLookupHelper.h
b/Common/Core/vtkGenericDataArrayLookupHelper.h
+@@ -25,6 +25,7 @@
+ #include "vtkIdList.h"
+ #include
+ #include
++#include
+ #include
+ #include
+
+diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx
b/Common/DataModel/vtkPiecewiseFunction.cxx
+index c75935fd..9459ce90 100644
+--- a/Common/DataModel/vtkPiecewiseFunction.cxx
b/Common/DataModel/vtkPiecewiseFunction.cxx
+@@ -22,6 +22,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+diff --git a/Rendering/Core/vtkColorTransferFunction.cxx
b/Rendering/Core/vtkColorTransferFunction.cxx
+index 40504e5..125597b 100644
+--- a/Rendering/Core/vtkColorTransferFunction.cxx
b/Rendering/Core/vtkColorTransferFunction.cxx
+@@ -21,6 +21,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
+index 9944db6..01a1517 100644
+--- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
+@@ -28,6 +28,7 @@
+ #include "vtkHyperTreeGridNonOrientedCursor.h"
+
+ #include
++#include
+
+ vtkStandardNewMacro(vtkHyperTreeGridThreshold);
+
+diff --git a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
+index 7823d61..02f627d 100644
+--- a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
+@@ -14,6 +14,7 @@
+ =*/
+
+ #include
++#include
+
+ #include "vtkLine.h"
+ #include "vtkMath.h"
diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
index bf7a3ba0a1b..848e2fce63d 100644
--- a/sci-libs/vtk/vtk-9.0.1.ebuild
+++ b/sci-libs/vtk/vtk-9.0.1.ebuild
@@ -132,6 +132,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+ "${FILESDIR}"/${PN}-9.0.1-limits-include-gcc11.patch
)
DOCS=( CONTRIBUTING.md README.md )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 767ff1a606565950d73c713ef498daaff12d6509
Author: Aisha Tammy aisha cc>
AuthorDate: Sun Dec 13 16:59:35 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 15 02:13:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767ff1a6
sci-libs/vtk: fix finding pugixml
Closes: https://bugs.gentoo.org/758611
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Aisha Tammy aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/18640
Signed-off-by: Sam James gentoo.org>
sci-libs/vtk/files/vtk-8.2.0-pugixml.patch | 13 ++
sci-libs/vtk/vtk-8.2.0-r1.ebuild | 347 +
2 files changed, 360 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
new file mode 100644
index 000..3c72bcf0003
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
@@ -0,0 +1,13 @@
+diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
+index ce979ba..555f205 100644
+--- a/IO/CityGML/CMakeLists.txt
b/IO/CityGML/CMakeLists.txt
+@@ -5,7 +5,7 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
+ if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
+ find_package(pugixml REQUIRED)
+ get_target_property(pugixml_INCLUDE_DIRS pugixml
INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(pugixml_LIBRARIES pugixml LOCATION)
++ get_target_property(pugixml_LIBRARIES pugixml INTERFACE_LINK_LIBRARIES)
+ include_directories(${pugixml_INCLUDE_DIRS})
+ vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
+ endif()
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
new file mode 100644
index 000..c5fa5e5ead4
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+# Short package version
+SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
toolchain-funcs cmake virtualx webapp
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/;
+SRC_URI="
+ https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+ doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz
)
+ examples? (
+ https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+
https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+ )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
+ odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
+ video_cards_nvidia views web +X xdmf2"
+
+REQUIRED_USE="
+ all-modules? ( python xdmf2 boost )
+ java? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tcl? ( rendering )
+ examples? ( python )
+ tk? ( tcl )
+ web? ( python )
+ ^^ ( X aqua offscreen )"
+
+RDEPEND="
+ app-arch/lz4
+ dev-cpp/eigen
+ dev-db/sqlite
+ dev-libs/double-conversion:0=
+ dev-libs/expat
+ dev-libs/jsoncpp:=
+ dev-libs/libxml2:2
+ >=dev-libs/pugixml-1.11
+ >=media-libs/freetype-2.5.4
+ media-libs/glew:0=
+ >=media-libs/libharu-2.3.0-r2
+ media-libs/libpng:0=
+ media-libs/libtheora
+ media-libs/mesa
+ media-libs/tiff:0
+ sci-libs/exodusii
+ sci-libs/hdf5:=
+ sci-libs/netcdf:0=
+ sci-libs/netcdf-cxx:3
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXt
+ boost? ( dev-libs/boost:=[mpi?] )
+ examples? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ )
+ ffmpeg? ( media-video/ffmpeg )
+ gdal? ( sci-libs/gdal )
+ java? ( >=virtual/jdk-1.7:* )
+ mpi? (
+ virtual/mpi[cxx,romio]
+ $(python_gen_cond_dep '
+ python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
+ odbc? ( dev-db/unixODBC )
+ offscreen? ( media-libs/mesa[osmesa] )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ qt5? (
+ dev-qt/designer:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtsql:5
+ dev-qt/qtx11extras:5
+ $(python_gen_cond_dep '
+ python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
+ R? ( dev-lang/R )
+ tbb? ( dev-cpp/tbb )
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 2b2feec8938382ff81a1c44c571d072c3ec52167
Author: Sam James gentoo org>
AuthorDate: Sun Nov 8 13:59:29 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 8 13:59:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2feec8
sci-libs/vtk: fix build with >=media-libs/freetype-2.10.3
Closes: https://bugs.gentoo.org/751088
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
...8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch | 18 ++
sci-libs/vtk/vtk-8.2.0.ebuild | 1 +
2 files changed, 19 insertions(+)
diff --git
a/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 000..b4674873508
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,18 @@
+--- VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in.orig 2019-01-30
18:15:13.0 +0100
VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in2020-10-17
00:03:32.730820908 +0200
+@@ -20,6 +20,15 @@
+
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to */
++# ifndef FT_CALLBACK_DEF
++# ifdef __cplusplus
++# define FT_CALLBACK_DEF( x ) extern "C" x
++# else
++# define FT_CALLBACK_DEF( x ) static x
++# endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include
+ #endif
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index b0aa1a26e40..5f74a4c99e4 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -129,6 +129,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
"${FILESDIR}"/${P}-fno-common.patch # bug 721048
"${FILESDIR}"/${P}-py38.patch
+ "${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug
#751088
)
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 64839f71f4892ca57ce5e36648b9a2b1c8a60822
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 6 09:19:08 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 6 09:41:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64839f71
sci-libs/vtk: Fix CMake detection of GCC 10
Thanks-to: Tiernan Hubble gmail.com>
Closes: https://bugs.gentoo.org/723374
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch | 16
sci-libs/vtk/vtk-8.2.0.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
new file mode 100644
index 000..a903b037530
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
@@ -0,0 +1,16 @@
+--- a/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:12.154603698 -0600
b/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:34.864603776 -0600
+@@ -174,8 +174,12 @@
+ execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+-string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++string(REGEX MATCH "[1-9][0-9]\\.[0-9]\\.[0-9]*"
+ _gcc_version "${_gcc_version_info}")
++if(NOT _gcc_version)
++ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++_gcc_version "${_gcc_version_info}")
++endif()
+ # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+ # patch level, handle this here:
+ if(NOT _gcc_version)
\ No newline at end of file
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index 1097c4df324..0538637cc2a 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -126,6 +126,7 @@ S="${WORKDIR}"/VTK-${PV}
PATCHES=(
"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
"${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
+ "${FILESDIR}"/${P}-gcc-10.patch # bug 723374
)
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 5c9d6ce7a1706c381df35c68f28f56132b57c344
Author: Matthias Maier gentoo org>
AuthorDate: Fri May 1 14:45:17 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Fri May 1 16:47:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9d6ce7
sci-libs/vtk: fix compilation with openmpi-4
Closes: https://bugs.gentoo.org/683382
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch | 14 ++
sci-libs/vtk/vtk-8.1.0-r6.ebuild | 6 ++
2 files changed, 20 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
new file mode 100644
index 000..267c1d91b0c
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
@@ -0,0 +1,14 @@
+diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
+index 3173831..e8ee74b 100644
+--- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
+@@ -141,4 +141,9 @@
+
+ #endif
+
++ #if OMPI_NUMVERSION >= 4
++ #undef PyMPI_HAVE_MPI_LB
++ #undef PyMPI_HAVE_MPI_UB
++ #endif /* OMPI >= 4.0.0 */
++
+ #endif /* !PyMPI_CONFIG_OPENMPI_H */
diff --git a/sci-libs/vtk/vtk-8.1.0-r6.ebuild b/sci-libs/vtk/vtk-8.1.0-r6.ebuild
index 06e69225f0f..9e5bc9d717c 100644
--- a/sci-libs/vtk/vtk-8.1.0-r6.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r6.ebuild
@@ -116,6 +116,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/VTK-${PV}
+PATCHES=(
+ "${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
+)
+
RESTRICT="test"
pkg_setup() {
@@ -125,6 +129,8 @@ pkg_setup() {
}
src_prepare() {
+ default
+
local x
# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
for x in constantly expat freetype hdf5 hyperlink incremental jpeg
jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib
ZopeInterface; do
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 491a9cab41c19581749635d563ca2cbe1c138726 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jul 6 13:36:54 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jul 6 13:37:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491a9cab Revert "sci-libs/vtk: remove old" This broke the tree. This reverts commit b7f85bc606ce1067c6cd9d607c4e07ea55c2f9bf. sci-libs/vtk/Manifest | 8 + sci-libs/vtk/files/vtk-6.1.0-freetype.patch | 22 ++ sci-libs/vtk/files/vtk-6.1.0-gcc67.patch| 26 ++ sci-libs/vtk/files/vtk-6.1.0-gdal2.patch| 33 +++ sci-libs/vtk/files/vtk-6.1.0-glext.patch| 13 + sci-libs/vtk/files/vtk-6.1.0-install.patch | 19 ++ sci-libs/vtk/files/vtk-6.1.0-netcdf.patch | 29 +++ sci-libs/vtk/files/vtk-6.1.0-system.patch | 27 ++ sci-libs/vtk/files/vtk-6.1.0-web.patch | 25 ++ sci-libs/vtk/metadata.xml | 1 + sci-libs/vtk/vtk-6.1.0-r3.ebuild| 390 sci-libs/vtk/vtk-6.1.0-r4.ebuild| 390 sci-libs/vtk/vtk-7.0.0.ebuild | 348 + 13 files changed, 1331 insertions(+) diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 7882a427ce0..e25d4468ada 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,4 +1,12 @@ +DIST VTK-6.1.0.tar.gz 27608882 SHA256 bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc WHIRLPOOL e387390efdc8cd2e413524794786369ba8a2bfe788913dfb161b82d9bc041e15ed5585286bebe38f955d1def3043481303d3bc74c648bbf5bf856e212ac9950c +DIST VTK-7.0.0.tar.gz 30659751 SHA256 78a990a15ead79cdc752e86b83cfab7dbf5b7ef51ba409db02570dbdd9ec32c3 SHA512 4ce51ff6ddf56f1fb45c1b09a09389bc43dffd892f80c833ea861537e02a61079e9cfd3931308f7d72f37d1977806ed2ce010a7b5c2c1a0c5bb1435e09e1f049 WHIRLPOOL 5b6aaf42440b27b6d46ceb5484266df84c7dd205eb87353faec034a080b0d2bc61dafaee05ff3d16e381fae8ec00ef093a93f422d531d7061250f4c15dd6be37 DIST VTK-7.1.0.tar.gz 31171521 SHA256 5f3ea001204d4f714be972a810a62c0f2277fbb9d8d2f8df39562988ca37497a SHA512 83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534 WHIRLPOOL 7e52342bae6487f3cdede70a6b77da4c74b27d8e9eb45aef3065f12d4ff940093b4051b1d3bfb523ddbd2b9b4f18da5b78c32570c2d76dcc8ea1aebaa8987047 +DIST VTKData-6.1.0.tar.gz 94452190 SHA256 aba27ac05d721e36b9424131f1d0f673448f2b31aac34e9e74590fdf208ad0c7 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65 WHIRLPOOL 1ee803055e3bbf0c8150807a77efce81406c8a512c40644c5ccc35279cb1098bb8f0382b5f2bb01f483c8a38a4e81ee70ed39145c52b4375a0545919faee2a28 +DIST VTKData-7.0.0.tar.gz 183031503 SHA256 68260172ed85134a135a2a7ab2173f6e44640dc20de43fa0f286b545a53fae15 SHA512 a97fd3a3df96b09ee356f60bae190bbd5ca803d774fcfae5d788a897662ba1344990ca0981e41d2b3caa0750b08ed9e60905df2a1dfe29e4b9fba68e6e13c3de WHIRLPOOL dd1bf3faf428cfecb7f85b0b5239a11b48d4d3240c4b44bcb7bbeac91692d976a53a63d7705814d86450af93d5df8a570f612e67c3503d485d6f5522e33375c9 DIST VTKData-7.1.0.tar.gz 249106922 SHA256 4e476a982b08de1ea8d6655ba6dde6ec3fdfa4720d093a184fba6978f8406795 SHA512 8f78fdce36fc683c8b8b7137a02fd727f322ceecce66f20a4b1b3f8d260e8e894c1ec1ed46eb2427e501239f12b02b1476ca3a302fa1f9287584110598972f9e WHIRLPOOL 1998bb07ab7c689033dd061b4d4fae96515521c80e81f7b3984b0990fcb692417fd2ffd27329c7024dd363595bc5ac9a4e03ce36efb8b088e8b10f093080f4b0 +DIST VTKLargeData-6.1.0.tar.gz 166019220 SHA256 d8985508ff2b7fbfbae0aadedfbe2b293640cf6441d3cce41da5c3f591c96d4c SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f WHIRLPOOL db62af365a5c1d71b209d21578184ff1ee7a5913aefd7e5729b7dc555bdd20a8f070ed83051387634bf6a9fc1141ab68a291ec0d557602fa5802e3e6020b7ae1 +DIST VTKLargeData-7.0.0.tar.gz 166680081 SHA256 27db751b93480c0ea9362927a25d8ab5b2cb47532b1e898cdf77c1e41db29ecc SHA512 a17d7b883262c12a0cf0689eec02d92415746d3eea64d308e22d4945e0eaa2bef8eadafef995690c1e02d357c8887a62702c5eaf0f46fe19a66cb9993ce18624 WHIRLPOOL 1e19a68d3a4e7e00d417ddf7f460331179b26f9ef434beedfc52e31a4733892fbd11209c45763a69c775fcbd510971f6463f00e9dbc794945db5110fe646bf84 DIST VTKLargeData-7.1.0.tar.gz 166680011 SHA256 dbf9e9a427e1183886ee7686272c571447491eb7179036f2401622ac7987c6b2 SHA512 79d058732932837f2873a14850e18375d6a43f07de7cf4b71570ae32cf7abb7651052378ff9cbd1e221c95f78e46c13c9852425a509ae02c826f5345e836e455 WHIRLPOOL 3dfb71273a3de14d046f42e8f19b96c04fa08ae5f91309b595143e8c3be7206115c71a87816ae6415bf17b4b739b41a618d79f6e5acbd06193e5114eb88c975d +DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: b7f85bc606ce1067c6cd9d607c4e07ea55c2f9bf Author: Michael Palimaka gentoo org> AuthorDate: Thu Jul 6 12:41:59 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jul 6 12:48:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f85bc6 sci-libs/vtk: remove old Package-Manager: Portage-2.3.6, Repoman-2.3.2 sci-libs/vtk/Manifest | 8 - sci-libs/vtk/files/vtk-6.1.0-freetype.patch | 22 -- sci-libs/vtk/files/vtk-6.1.0-gcc67.patch| 26 -- sci-libs/vtk/files/vtk-6.1.0-gdal2.patch| 33 --- sci-libs/vtk/files/vtk-6.1.0-glext.patch| 13 - sci-libs/vtk/files/vtk-6.1.0-install.patch | 19 -- sci-libs/vtk/files/vtk-6.1.0-netcdf.patch | 29 --- sci-libs/vtk/files/vtk-6.1.0-system.patch | 27 -- sci-libs/vtk/files/vtk-6.1.0-web.patch | 25 -- sci-libs/vtk/metadata.xml | 1 - sci-libs/vtk/vtk-6.1.0-r3.ebuild| 390 sci-libs/vtk/vtk-6.1.0-r4.ebuild| 390 sci-libs/vtk/vtk-7.0.0.ebuild | 348 - 13 files changed, 1331 deletions(-) diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index e25d4468ada..7882a427ce0 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,12 +1,4 @@ -DIST VTK-6.1.0.tar.gz 27608882 SHA256 bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc WHIRLPOOL e387390efdc8cd2e413524794786369ba8a2bfe788913dfb161b82d9bc041e15ed5585286bebe38f955d1def3043481303d3bc74c648bbf5bf856e212ac9950c -DIST VTK-7.0.0.tar.gz 30659751 SHA256 78a990a15ead79cdc752e86b83cfab7dbf5b7ef51ba409db02570dbdd9ec32c3 SHA512 4ce51ff6ddf56f1fb45c1b09a09389bc43dffd892f80c833ea861537e02a61079e9cfd3931308f7d72f37d1977806ed2ce010a7b5c2c1a0c5bb1435e09e1f049 WHIRLPOOL 5b6aaf42440b27b6d46ceb5484266df84c7dd205eb87353faec034a080b0d2bc61dafaee05ff3d16e381fae8ec00ef093a93f422d531d7061250f4c15dd6be37 DIST VTK-7.1.0.tar.gz 31171521 SHA256 5f3ea001204d4f714be972a810a62c0f2277fbb9d8d2f8df39562988ca37497a SHA512 83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534 WHIRLPOOL 7e52342bae6487f3cdede70a6b77da4c74b27d8e9eb45aef3065f12d4ff940093b4051b1d3bfb523ddbd2b9b4f18da5b78c32570c2d76dcc8ea1aebaa8987047 -DIST VTKData-6.1.0.tar.gz 94452190 SHA256 aba27ac05d721e36b9424131f1d0f673448f2b31aac34e9e74590fdf208ad0c7 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65 WHIRLPOOL 1ee803055e3bbf0c8150807a77efce81406c8a512c40644c5ccc35279cb1098bb8f0382b5f2bb01f483c8a38a4e81ee70ed39145c52b4375a0545919faee2a28 -DIST VTKData-7.0.0.tar.gz 183031503 SHA256 68260172ed85134a135a2a7ab2173f6e44640dc20de43fa0f286b545a53fae15 SHA512 a97fd3a3df96b09ee356f60bae190bbd5ca803d774fcfae5d788a897662ba1344990ca0981e41d2b3caa0750b08ed9e60905df2a1dfe29e4b9fba68e6e13c3de WHIRLPOOL dd1bf3faf428cfecb7f85b0b5239a11b48d4d3240c4b44bcb7bbeac91692d976a53a63d7705814d86450af93d5df8a570f612e67c3503d485d6f5522e33375c9 DIST VTKData-7.1.0.tar.gz 249106922 SHA256 4e476a982b08de1ea8d6655ba6dde6ec3fdfa4720d093a184fba6978f8406795 SHA512 8f78fdce36fc683c8b8b7137a02fd727f322ceecce66f20a4b1b3f8d260e8e894c1ec1ed46eb2427e501239f12b02b1476ca3a302fa1f9287584110598972f9e WHIRLPOOL 1998bb07ab7c689033dd061b4d4fae96515521c80e81f7b3984b0990fcb692417fd2ffd27329c7024dd363595bc5ac9a4e03ce36efb8b088e8b10f093080f4b0 -DIST VTKLargeData-6.1.0.tar.gz 166019220 SHA256 d8985508ff2b7fbfbae0aadedfbe2b293640cf6441d3cce41da5c3f591c96d4c SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f WHIRLPOOL db62af365a5c1d71b209d21578184ff1ee7a5913aefd7e5729b7dc555bdd20a8f070ed83051387634bf6a9fc1141ab68a291ec0d557602fa5802e3e6020b7ae1 -DIST VTKLargeData-7.0.0.tar.gz 166680081 SHA256 27db751b93480c0ea9362927a25d8ab5b2cb47532b1e898cdf77c1e41db29ecc SHA512 a17d7b883262c12a0cf0689eec02d92415746d3eea64d308e22d4945e0eaa2bef8eadafef995690c1e02d357c8887a62702c5eaf0f46fe19a66cb9993ce18624 WHIRLPOOL 1e19a68d3a4e7e00d417ddf7f460331179b26f9ef434beedfc52e31a4733892fbd11209c45763a69c775fcbd510971f6463f00e9dbc794945db5110fe646bf84 DIST VTKLargeData-7.1.0.tar.gz 166680011 SHA256 dbf9e9a427e1183886ee7686272c571447491eb7179036f2401622ac7987c6b2 SHA512 79d058732932837f2873a14850e18375d6a43f07de7cf4b71570ae32cf7abb7651052378ff9cbd1e221c95f78e46c13c9852425a509ae02c826f5345e836e455 WHIRLPOOL 3dfb71273a3de14d046f42e8f19b96c04fa08ae5f91309b595143e8c3be7206115c71a87816ae6415bf17b4b739b41a618d79f6e5acbd06193e5114eb88c975d -DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: f56f5ec0f8a43546c9590397c822365c07754628
Author: Matthias Maier gentoo org>
AuthorDate: Fri Jun 2 14:58:21 2017 +
Commit: Matthias Maier gentoo org>
CommitDate: Fri Jun 2 14:59:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56f5ec0
sci-libs/vtk: fix configure error with gcc 6/7, bug #596084
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-libs/vtk/files/vtk-6.1.0-gcc67.patch | 26 ++
sci-libs/vtk/vtk-6.1.0-r3.ebuild | 1 +
sci-libs/vtk/vtk-6.1.0-r4.ebuild | 1 +
3 files changed, 28 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch
b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch
new file mode 100644
index 000..83d1ae18f21
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch
@@ -0,0 +1,26 @@
+diff --git a/old/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake
+index 05b2db9..92c2c4c 100644
+--- a/old/vtkCompilerExtras.cmake
b/CMake/vtkCompilerExtras.cmake
+@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+
+- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
++ string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]"
+ _gcc_version "${_gcc_version_info}")
+ if(NOT _gcc_version)
+ string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0"
+diff --git a/old/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake
+index 3cc12dd..b7a47df 100644
+--- a/old/GenerateExportHeader.cmake
b/CMake/GenerateExportHeader.cmake
+@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility)
+ execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+-string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
++string(REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]"
+ _gcc_version "${_gcc_version_info}")
+ # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+ # patch level, handle this here:
diff --git a/sci-libs/vtk/vtk-6.1.0-r3.ebuild b/sci-libs/vtk/vtk-6.1.0-r3.ebuild
index 7367f5ccbe6..1345bde683e 100644
--- a/sci-libs/vtk/vtk-6.1.0-r3.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0-r3.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
"${FILESDIR}"/${P}-glext.patch
"${FILESDIR}"/${P}-memset.patch
"${FILESDIR}"/${P}-gdal2.patch
+ "${FILESDIR}"/${P}-gcc67.patch
)
RESTRICT=test
diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
index 9f22a8e6793..409b62823c8 100644
--- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
"${FILESDIR}"/${P}-glext.patch
"${FILESDIR}"/${P}-memset.patch
"${FILESDIR}"/${P}-gdal2.patch
+ "${FILESDIR}"/${P}-gcc67.patch
)
RESTRICT=test
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
commit: 996251840da71035c44744e6bce83444bb866975
Author: David Seifert gentoo org>
AuthorDate: Fri Mar 25 17:07:07 2016 +
Commit: David Seifert gentoo org>
CommitDate: Fri Mar 25 17:07:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99625184
sci-libs/vtk: Add explicit cast to fix gdal-2.0 breakage
Gentoo-Bug: 554316
Package-Manager: portage-2.2.28
sci-libs/vtk/files/vtk-6.1.0-gdal2.patch | 33 +++
sci-libs/vtk/vtk-6.1.0-r2.ebuild | 390 +++
2 files changed, 423 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch
b/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch
new file mode 100644
index 000..c218641
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch
@@ -0,0 +1,33 @@
+diff --git a/IO/GDAL/vtkGDALVectorReader.cxx b/IO/GDAL/vtkGDALVectorReader.cxx
+index 86854a0..a0e234a 100644
+--- a/IO/GDAL/vtkGDALVectorReader.cxx
b/IO/GDAL/vtkGDALVectorReader.cxx
+# Patch to build against newer GDAL per upstream commit
+#
https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk=43307598a98872fd4ce7739e47f5bb4cfcb5372d
+@@ -44,7 +44,7 @@ class vtkGDALVectorReader::Internal
+ public:
+ Internal( const char* srcName, int srcMode, int appendFeatures, int
addFeatIds )
+ {
+-this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode,
>Driver );
++this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL );
+ if ( ! this->Source )
+ {
+ this->LastError = CPLGetLastErrorMsg();
+@@ -61,7 +61,7 @@ public:
+ {
+ if ( this->Source )
+ {
+- OGRDataSource::DestroyDataSource( this->Source );
++ GDALClose( (GDALDatasetH) this->Source );
+ }
+ }
+
+@@ -304,7 +304,7 @@ public:
+ return nCells;
+ }
+
+- OGRDataSource* Source;
++ GDALDataset* Source;
+ OGRSFDriver* Driver;
+ const char* LastError;
+ int LayerIdx;
diff --git a/sci-libs/vtk/vtk-6.1.0-r2.ebuild b/sci-libs/vtk/vtk-6.1.0-r2.ebuild
new file mode 100644
index 000..c653faa
--- /dev/null
+++ b/sci-libs/vtk/vtk-6.1.0-r2.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_MAKEFILE_GENERATOR=ninja
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
versionator toolchain-funcs cmake-utils virtualx webapp
+
+# Short package version
+SPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="http://www.vtk.org/;
+SRC_URI="
+ http://www.${PN}.org/files/release/${SPV}/VTK-${PV}.tar.gz
+ doc? (
http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
+ test? (
+ http://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+
http://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+ )
+ "
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+ all-modules aqua boost cg doc examples imaging ffmpeg gdal java json
kaapi mpi
+ mysql odbc offscreen postgres python qt4 rendering smp tbb test theora
tk tcl
+ video_cards_nvidia views web xdmf2 R +X"
+
+REQUIRED_USE="
+ all-modules? ( python xdmf2 )
+ java? ( qt4 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tcl? ( rendering )
+ smp? ( ^^ ( kaapi tbb ) )
+ test? ( python )
+ tk? ( tcl )
+ web? ( python )
+ ^^ ( X aqua offscreen )
+ "
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/jsoncpp
+ dev-libs/libxml2:2
+ >=media-libs/freetype-2.5.4
+ media-libs/libpng:0
+ media-libs/mesa
+ media-libs/libtheora
+ media-libs/tiff:0
+ sci-libs/exodusii
+ sci-libs/hdf5:=
+ sci-libs/netcdf-cxx:3
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ >=x11-libs/gl2ps-1.3.8
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXt
+ boost? ( >=dev-libs/boost-1.40.0[mpi?] )
+ cg? ( media-gfx/nvidia-cg-toolkit )
+ examples? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ sci-libs/vtkdata
+ )
+ ffmpeg? ( virtual/ffmpeg )
+ gdal? ( sci-libs/gdal )
+ java? ( >=virtual/jre-1.5:* )
+ kaapi? ( > "${T}"/40${PN} <<- EOF
+ VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+ VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+ VTKHOME=${EPREFIX}/usr
+ EOF
+ doenvd "${T}"/40${PN}
+
+ use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+ use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+ use web && webapp_pkg_prerm
+}
