From 6a4408b9bbd9fe61dc0966f587db94081fa5f52b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jan 2024 19:03:44 +0000 Subject: gentoo auto-resync : 10:01:2024 - 19:03:44 --- sci-libs/vtk/Manifest | 15 +- sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch | 136 +++ ...ix-Java-error-with-integer-enum-overloads.patch | 51 ++ sci-libs/vtk/files/vtk-9.3.0-java.patch | 11 + sci-libs/vtk/files/vtk-9.3.0-opencascade.patch | 17 + sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch | 77 ++ .../vtk-9.3.0-too-many-initializer-values.patch | 20 + sci-libs/vtk/metadata.xml | 1 + sci-libs/vtk/vtk-9.3.0.ebuild | 909 +++++++++++++++++++++ 9 files changed, 1236 insertions(+), 1 deletion(-) create mode 100644 sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch create mode 100644 sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch create mode 100644 sci-libs/vtk/files/vtk-9.3.0-java.patch create mode 100644 sci-libs/vtk/files/vtk-9.3.0-opencascade.patch create mode 100644 sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch create mode 100644 sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch create mode 100644 sci-libs/vtk/vtk-9.3.0.ebuild (limited to 'sci-libs/vtk') diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 0eaf2b114cc8..0169f1999e75 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -4,19 +4,32 @@ AUX vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch 625 BLAKE2B AUX vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch 939 BLAKE2B f97780f5cb469f403615817c76862183604dcebbc40cc6024b708b6be692018654397f389d62015b2a8f0b6bf55ebe41e3d3f60f66fc74829e0cccec2d8a00b9 SHA512 6dfb504500ff35ba98e9610b1d8b868990b933c94789df3bacf155ee212cecb81132754d5b8f0bb82181638ae0d3b47478ae42d2b75fcc9cf5c51be3c2f7ff0a AUX vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch 780 BLAKE2B 4ec89cdd78560910c6aef7113282556008bc8e182ddab2800a3facfc568e90e547c85b8da54386347d7d1b73896b206c77f90a1f0363acbfdbfc2fcd09f5c1e4 SHA512 5db82e3224cd7e07850cd1fc41af91577fdaa10b13d151cf8b02c16eb5c6962a58920c4bf643aaf1b8ddf2644c814c23809df29e976542098d4c1d86f52fa2d7 AUX vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch 957 BLAKE2B 75c8a9929a047db44b541e4bf5c8f58163bdfe1fe68183023577405378f59d78ef7722142a92273626785595fef370362939cd48aaf8a5d642421f5c5e09b7d2 SHA512 8179a31cb7dd50a2e0d0b7719354c1294e8a1997894303e75595464040b5c9340e33cc36064b0f300ac238e86bdd1b00570e23f0156a8542a568f65ee97d9fa1 +AUX vtk-9.2.5-pegtl-3.x.patch 5130 BLAKE2B 3e94c9f95c08b361b66342c9b6b3210e57f12609db583d676b506ecb2804fee4ea4b4b7517ae1a2f04404f5ad64952370a485a965da0826a4eab37b6fab8527e SHA512 a9dae6fdbee230f6095b7f0efe0630dc87e55c8870f6971bd0634a407bc66289f7e5ff19811f5f99d9664a4fefdca8630dbc2695964d6d15d6167c49dd8156b7 AUX vtk-9.2.6-Java21.patch 678 BLAKE2B ce4ee7023672d51875e50f9b5bbf96ded80cbbc1a0c89e04afa53cd9ec616ea3cd9619fb05f255d79b68631f80d481935694d1c734a4225b756d998bb2480180 SHA512 e281906cae0a592aa7068118c63a797e0431348fb5fbeb703602fc4aab2149ae445d42d3b2323bbf297a9b0632a1b32646d15820788d64dcc557b446ee56cafe +AUX vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch 2713 BLAKE2B 541eaa4fb8845c44a7d051b01cbbb06c5a6976e00ee18a067d9cf2ab3155a6d9c76d5eb2e3d5fd2fb5f816933637893c0bddd209cd1bdb2e73f182ba86e17d4f SHA512 134cdf91f9a06691c61342fe93122523c62cdcc652814b09aaf0609ab44addf38444cc5ac9d9ccd7e8643ae4d47b7826fcfc44d55afa0ef6046e13dbe1a5619d +AUX vtk-9.3.0-java.patch 372 BLAKE2B ec11a69bf2e7b467b00648b0bc725f838f9931bce2f2cd1cbabe6d4c8fdcd4ef807dd14eedf06d524eecc3c9bc77850cc8de5e55ceaf8a238efa501c8bb36cf9 SHA512 6d326f95b05fd86d87a0566e45efb484d92d482a916895d3aaca1e019ceac65ecbcdab2957a8686545898551a3382aa718a57ad0d9e9cd16937166bf3f0729d8 +AUX vtk-9.3.0-opencascade.patch 723 BLAKE2B 0157fe53c98daf255381e1090105ea6e0d7df92e8af2e3420b58c24b3541cfcc0c41573ef64421d7b1c6650fde0a99158fe3bd5795127af9dbd5becdfa72bf0b SHA512 23c17adc6aa83ad7e1606ace6f14546767588cdae18e6d77b8dad7eca92fea185153c7f13c2b9fba0054d150f2fb79782e95b093d7cdd1b1f53febcbcf8d2f55 +AUX vtk-9.3.0-pdal-2.6.0.patch 2125 BLAKE2B 5268aad6012fdd699f8b02e74135411507eed1d3c978cfb6db9ad0ab3bbc2b57913623556bffd7364371c2a52ab302746751fd55bdd98d90e48d97598bf81755 SHA512 e7289707272e67639f17049d97c379dac69557d05b526ee8a8ecca97e02c1af9a33ffbace13255074a867349425caae89ca545bca0bdcc936b38301c2cb81217 +AUX vtk-9.3.0-too-many-initializer-values.patch 1048 BLAKE2B b189eae7d6fd24c646b05d7fd3aa3d18adb1b515bd8f63f5d3b069f1bc9628205581bf09bd458dc384aa14109bb7c71d55b3a4db99ed4e2af3ba9a494bfc93f4 SHA512 bbf07317f23b41205feca053257038163c4603bef43eb008664b7b273660cd36704e217d90dd370ccdd2c10620b6403e830f1c6f4352d32fc615e53b866b1fcc DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626 SHA512 b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf DIST VTK-9.2.6.tar.gz 53810904 BLAKE2B e3f9736a9b38415e0edd4b4c4bfe83aa154221c3c2c582e527996f88386b1b4d7864ddd2a364c0e83596ff45902cb7cde548ac3a4eebe06c2e43925c2608c4d3 SHA512 f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc +DIST VTK-9.3.0.tar.gz 99932810 BLAKE2B 59c2cdfe1c2525ac0f89df77a668783d928b55d2e72b42df45ea9b789da1bb150d52ce4108f2bc39cb8840cdd1998f57d3aedf96c72e402f6115d9efeebf4486 SHA512 2722dc8186779df1af5c534f26b20186ea33cb3bca2cef8cb333542b12e738382616e26e8d4d0341cb98c30403f8a896d77ddb04adb07e26d0d548c4a34b7d2f DIST VTKData-9.2.5.tar.gz 594016050 BLAKE2B 7f03f5640ee648275a9771f990f98a3b5dfee10c0e291b353e6f067a098d50e2653c577b7c9c4e19c1d554e14469968014d1dfe9e70a91ecbff75397a53c9be9 SHA512 c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3 DIST VTKData-9.2.6.tar.gz 594029678 BLAKE2B b3d6990a8098d9bec02a031b6d804049ce649bcd58fbcd74001e893ba41159e49f4dea74c5957737098a39a399d347b3bc65db4feadf152dd3fb8e705da16eb4 SHA512 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080 +DIST VTKData-9.3.0.tar.gz 612388942 BLAKE2B 66d73ddaf5f2ddf52cf5c6dda5a918a86ae630df207983534478c92a66c39e38b1f4abfb93900b36899a93ad0e26260763573e925bd128c1646a1bc3bef8c54d SHA512 385d609c2adc1746c073690b58a3fc25e496946c03f08e6c9e0a69ee406cee447e66d267986c3e5ba9006dd1cb0015b68134bb3c375ae41aef8f3b1e0d923d51 DIST VTKDataFiles-9.2.5.tar.gz 609038837 BLAKE2B e6a5aa5a865664cf407914c9598497f6304b914748ce9d9145b5b7d53f5897b4056b6f7615bb8221c9a9747caf13ba632e21b060b1c8963bb7d6b257bb1da559 SHA512 c0cf7e0fb79f626e25946f1154d9e4c3e7ec995a823a01fc9638976f89af26ae8978a5b6c8a78d62f42f7f81b5fbe0cddc6afc5836c214f3dcaddb917a1ccc79 DIST VTKDataFiles-9.2.6.tar.gz 609045751 BLAKE2B c8a4a8472dcc05f5b1d35c8f6923b4ed2e7adb593a3037ae7673a5e674583ef9ccc5bc1ec8cf29e87fd5b168c0bba5ed27b89c51fe2e5da432ef5d50e415af94 SHA512 f7c104641d25126956a50671934c10b25589e435d7cce6a5107c8dcf83a81f48ed3ae8a325b635f341a5a47579f9200689aa5eb34fe0d1c37acddfeedd33cd01 +DIST VTKDataFiles-9.3.0.tar.gz 628646039 BLAKE2B c2a4e875536c0b06f1edc8a8df17defbe1038067d7a04fc07e71ea49cad46139ef25f64d4b434a095ced16a7ff39d5346d34c528c099ea2e126c9f29afe92482 SHA512 c6788acfa790ce6b02aa5545fa4e411d00896b7542416c18b5e5955909f26a8fab9267e44db1c2a86f95f7a7f093695453f3fd0ec4e2c9a73449f9caf3fc09d5 DIST VTKLargeData-9.2.5.tar.gz 247523496 BLAKE2B edc785e271ba605c730b9c8d9d62d2d95d818ebf18e4b20468c247187720a27897ecbf701e1eff61ba135545e6ea8f573ef120206813ee5ca11be33d8c5ff728 SHA512 7a994024aa42b48d3633cdcc528d89a2e7e07bcc47d01a0001578720dbc2eb991b90dc2f9caafe8f26a1f10185efb1bc2c0506f799da2b96e63ba08cb564117d DIST VTKLargeData-9.2.6.tar.gz 247521022 BLAKE2B ee6e5f627a5cb96aac6a53b7ff14d4a40f1e243a095c7d145412d899ab9d509af5a62ab889fc48c96ff78359443afbeecfa70cb937affdad7225071374b28bec SHA512 f0b71baa4e346746e186c6a0cc93588d227b91cd4993ee6afe15708006250b0b3aa9447822845e01432728c12af56c68a213831b6dc809807ca341ff6912f55f +DIST VTKLargeData-9.3.0.tar.gz 247520869 BLAKE2B e01f3d0997d0b328d6c5909d6b891443c1246bdbc36aa978004a1d4bb2770f7923afed2c0d78f7844aae95e067425b9dd25a1c47601c8137ba0a8a958b708cab SHA512 d87eb0fb4ce27ae9f4363c54bb711e66c5d2dbcdf508cb5fae9fcc1574407df2816f29d20037297b834440cd8a54fcf8e1d6db14700054f057bff2fe48404d33 DIST VTKLargeDataFiles-9.2.5.tar.gz 247506616 BLAKE2B 45cd462a11dfa65260a5aa178b2004636eb8ec000af9103fd2fc64ca55b0f607cdf39c40f5f0a9ef843b7b2e468e0f84a34dafb8b8655efce5c8d39c80961422 SHA512 da96e4f1d0e21bc597832d8cd0730dcdd8a8f7d6c1f41f74ec41a7a1d0b2a2d61e86bcb5fade7d3210b9d66cae975b537e25280767e37fe08e0965b3e98c1cae DIST VTKLargeDataFiles-9.2.6.tar.gz 247505945 BLAKE2B dafec016a17bc4371972e85fe95e5032f385ef090ca7f3cc4e060976798c18015e34d74aa008a0532a37b3a51df406886a1d70c2eae18f6092a1c16cc861a81a SHA512 5266d7761987d651e1185e7a8fcc556634e129bb2dab892f8bba0e408a950f38c3f96c521a2079bfdc16a6cefb7b4cebc0b63aea945c4f3f0b6a99c55d638197 +DIST VTKLargeDataFiles-9.3.0.tar.gz 247503839 BLAKE2B 68007af36148eaae43fc0fd75b9f8d3b165c977b7bc44efa4ce7077dc4977514f49a4d7d5e4a9e43fc9dec6562d741bdee5df87efa285b3361f865023da14f55 SHA512 f7def947ff492acbfdaa3d360064c42fdd3fedab27fd5d7bed1dbf8054b814cc8843ba0fed7078926648d1e8949235b877de97747be079ea478b79558975e6ea DIST vtkDocHtml-9.2.5.tar.gz 158865725 BLAKE2B ccfb6276955bda567e7f2b6fdc5e3e601766bae0314821c243a3d009e1557c5732bfbab59358670c4bc6cd598ba80c284971763e5279bc53c37d954ec30fcc03 SHA512 7901e9fb987ef3b88e8c507ecc7538b551c81d04a9cc65a84ff43b40dc1aeca2a694dd9842a030979a1370873b9fed0c8746a0634b486566086d7784a19181d6 DIST vtkDocHtml-9.2.6.tar.gz 158833419 BLAKE2B 04686ee0373191fec454738b5e745f3f6d913120dd55727732ab31a021eeaf1395e6a39ee0e2a943c80dc9d32a929dacfc1325afad5a412964dabb4eda32c898 SHA512 e72cfda5cfeb3df0f915f6515bbd34bcb32052af940760cfb1c9845a5c0a81fae38837fb2e192eb95446cd27b65b37b79263f5396631e4665c9d8c57455dcf43 +DIST vtkDocHtml-9.3.0.tar.gz 165538725 BLAKE2B 27874998679090d5442ecb3a394b53db05a0215cfee9f912bd01af1d5567efc51b4f56dacb960401195da4f3d385b335bbefc922a45d0199c99d619df0941f08 SHA512 8bf9cc87c4653a65ccc39d88d70b421a7b4353986d380cbf558cbf6e8a96435695a5d54aa7ce5bb1240cb46ca0fd9225a51183a39d1af1101d3f2876a2afc10b EBUILD vtk-9.2.5.ebuild 22724 BLAKE2B 1fe02d01fd571e3380583065e28836bcb3b0378d9df4a93dfc4dccefbeecd803ae5b673b821b2a913f500316557f6cb6366f9c80927e845e3154963f0a884539 SHA512 4dff1da0cf7ddcea778e11aea77ded3a888689d8dede37d2655ed977f05b556f16da60d9614dfd1feecd6074449863b95a20040afe4e6ef0e838ad0315ae0353 EBUILD vtk-9.2.6-r1.ebuild 22763 BLAKE2B f5ba2e95174b98a0b34903b47e43da6bc6577e0769eb85a7a527704c676113faee6cf8ba3ee40a51d26e1d0bcbc7cee0d1265c7cfe38656a2d5182cbfb97cd7a SHA512 76b99e5c231a889678c4ee1fc2166bf5539c9324a57b555e65f1cfed89106178cdf6ec20aed9b84448a924477d4fad851b84c6551abbf9531ea846834012a5b4 -MISC metadata.xml 1766 BLAKE2B 81e6fa43b86841a654b6cbf2b45e11842a8be5f762b4cd3537a7f3183db31d0ab4104f1fe4d67e5143205eb60bf6d95c58e55e70ac90d84fe5539735291c4a4f SHA512 9eae005af19e6cb1c4024767fd6fe11c79701e0202d6b807d3568b99c1aacd194e9f1e2b629d65f5f3b53b51ab5be6dfa3a98c8caa577d4bdb2dfe110f52372c +EBUILD vtk-9.3.0.ebuild 35873 BLAKE2B ab7057d245f5765937b73294e41e3300f02c5b81e597bc83fc4286c6daa76d30f03501d43e7182df503da15765bca6706eacf5d206c204d073519dedac147e3e SHA512 cf9791fe288e01e92064403adc0526a2f12038f7874aaed10ee69cf4204d827f50cdf28059c08238832c881cc87dda4b25e5f777d94b31eec06355bc314abf51 +MISC metadata.xml 1829 BLAKE2B 4528f55855ba3a09d0ed1f2d4abfce81d9dc7177e46c88fec44d613ce89522fd689e11c0d8ba40d88e9635d8f8011fd02ac562cbbddd189b9b96036a88f5ec83 SHA512 3d5a9946a48ee3134471f416d11ec4cfe15abd189a8db23c12372d347d5416dd47f9fffed2fb815b05b654274cf0460a793dbb02b46c823ee1a3684e5dad4a14 diff --git a/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch b/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch new file mode 100644 index 000000000000..80838b9c45be --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch @@ -0,0 +1,136 @@ +From: 31058da34eeb26165011b07fe41baf825f7df1a3 Mon Sep 17 00:00:00 2001 +From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> +From: https://github.com/microsoft/vcpkg/pull/29730 +Date: Sat, 18 Feb 2023 10:12:04 +0100 +Subject: [PATCH 1/3] [vtk] update pegtl to version 3 + +diff --git a/IO/MotionFX/vtkMotionFXCFGGrammar.h b/IO/MotionFX/vtkMotionFXCFGGrammar.h +index dba137386..4cb03e054 100644 +--- a/IO/MotionFX/vtkMotionFXCFGGrammar.h ++++ b/IO/MotionFX/vtkMotionFXCFGGrammar.h +@@ -23,7 +23,7 @@ + + // for debugging + // clang-format off +-#include VTK_PEGTL(pegtl/contrib/tracer.hpp) ++#include VTK_PEGTL(pegtl/contrib/trace.hpp) + // clang-format on + + namespace MotionFX +diff --git a/IO/MotionFX/vtkMotionFXCFGReader.cxx b/IO/MotionFX/vtkMotionFXCFGReader.cxx +index 338aa736e..374e54b94 100644 +--- a/IO/MotionFX/vtkMotionFXCFGReader.cxx ++++ b/IO/MotionFX/vtkMotionFXCFGReader.cxx +@@ -1213,7 +1213,7 @@ bool PositionFileMotion::read_position_file(const std::string& rootDir) const + } + return true; + } +- catch (const tao::pegtl::input_error& e) ++ catch (const tao::pegtl::parse_error& e) + { + vtkGenericWarningMacro("PositionFileMotion::read_position_file failed: " << e.what()); + } +@@ -1232,7 +1232,7 @@ bool UniversalTransformMotion::read_universaltransform_file(const std::string& r + in, numbers, this->transforms); + return true; + } +- catch (const tao::pegtl::input_error& e) ++ catch (const tao::pegtl::parse_error& e) + { + vtkGenericWarningMacro( + "UniversalTransformMotion::read_universaltransform_file failed: " << e.what()); +@@ -1267,7 +1267,7 @@ public: + if (getenv("MOTIONFX_DEBUG_GRAMMAR") != nullptr) + { + tao::pegtl::read_input<> in2(filename); +- tao::pegtl::parse(in2); ++ tao::pegtl::complete_trace(in2); + } + return false; + } +diff --git a/ThirdParty/pegtl/CMakeLists.txt b/ThirdParty/pegtl/CMakeLists.txt +index 9bbd4c828..0cdb1f53d 100644 +--- a/ThirdParty/pegtl/CMakeLists.txt ++++ b/ThirdParty/pegtl/CMakeLists.txt +@@ -5,7 +5,6 @@ vtk_module_third_party( + VERSION "2.8.3" + EXTERNAL + PACKAGE PEGTL +- VERSION 2.0.0 + TARGETS PEGTL::PEGTL + STANDARD_INCLUDE_DIRS) + +diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake +index 73eee02f7..22d8bc159 100644 +--- a/CMake/FindPEGTL.cmake ++++ b/CMake/FindPEGTL.cmake +@@ -19,31 +19,43 @@ + # Copyright (c) 2009 Benoit Jacob + # Redistribution and use is allowed according to the terms of the 2-clause BSD license. + +-find_path(PEGTL_INCLUDE_DIR +- NAMES pegtl/version.hpp +- PATH_SUFFIXES tao +- DOC "Path to PEGTL headers") +-mark_as_advanced(PEGTL_INCLUDE_DIR) ++message(STATUS "Searching for PEGTL") ++find_package(PEGTL CONFIG REQUIRED) ++if(TARGET taocpp::pegtl) ++ message(STATUS "Searching for PEGTL - found target taocpp::pegtl") ++ set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE) ++ if(NOT TARGET PEGTL::PEGTL) ++ add_library(PEGTL::PEGTL IMPORTED INTERFACE) ++ target_link_libraries(PEGTL::PEGTL INTERFACE taocpp::pegtl) ++ endif() ++else() ++ find_path(PEGTL_INCLUDE_DIR ++ NAMES pegtl/version.hpp ++ PATH_SUFFIXES tao ++ DOC "Path to PEGTL headers") ++ mark_as_advanced(PEGTL_INCLUDE_DIR) + +-if (PEGTL_INCLUDE_DIR) +- file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header +- REGEX "TAO_PEGTL_VERSION") +- string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") +- set(PEGTL_VERSION "${CMAKE_MATCH_1}") +- unset(_pegtl_version_header) +- unset(_pegtl_version_match) +-endif () ++ if (PEGTL_INCLUDE_DIR) ++ file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header ++ REGEX "TAO_PEGTL_VERSION") ++ string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") ++ set(PEGTL_VERSION "${CMAKE_MATCH_1}") ++ unset(_pegtl_version_header) ++ unset(_pegtl_version_match) ++ endif () + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(PEGTL +- REQUIRED_VARS PEGTL_INCLUDE_DIR +- VERSION_VAR PEGTL_VERSION) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(PEGTL ++ REQUIRED_VARS PEGTL_INCLUDE_DIR ++ VERSION_VAR PEGTL_VERSION) + +-if (PEGTL_FOUND) +- set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") +- if (NOT TARGET PEGTL::PEGTL) +- add_library(PEGTL::PEGTL INTERFACE IMPORTED) +- set_target_properties(PEGTL::PEGTL PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") +- endif () +-endif () ++ if (PEGTL_FOUND) ++ set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") ++ if (NOT TARGET PEGTL::PEGTL) ++ add_library(PEGTL::PEGTL INTERFACE IMPORTED) ++ set_target_properties(PEGTL::PEGTL PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") ++ endif () ++ message(STATUS "Searching for PEGTL - found") ++ endif () ++endif () +\ No newline at end of file diff --git a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch new file mode 100644 index 000000000000..1b06b59a996e --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch @@ -0,0 +1,51 @@ +From: dd7acfb4548dc76f1191aa96778f35c0cda80d35 Mon Sep 17 00:00:00 2001 +From: David Gobbi +From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10712 +Date: Sat, 18 Nov 2023 15:57:18 -0700 +Subject: [PATCH] Fix Java error with integer, enum overloads + +The Java wrappers simply cast enum types to 'jint', and do not +distinguish them as individual types that are distinct from 'int' +or 'unsigned int'. So when a method is overloaded with both 'int' +and an enum type, only one of the overloads can be wrapped. The +'int' (or 'unsigned int') is the one that is chosen. +--- + Wrapping/Tools/vtkParseJava.c | 3 ++- + Wrapping/Tools/vtkWrapJava.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Wrapping/Tools/vtkParseJava.c b/Wrapping/Tools/vtkParseJava.c +index 36b58dda425..9f1544561f3 100644 +--- a/Wrapping/Tools/vtkParseJava.c ++++ b/Wrapping/Tools/vtkParseJava.c +@@ -248,9 +248,10 @@ void return_result_native(FILE* fp) + * return 0 if the types do not map to the same type */ + static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2) + { ++ /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */ + static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 }; + static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 }; +- static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; ++ static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; + static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG, + VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 }; + +diff --git a/Wrapping/Tools/vtkWrapJava.c b/Wrapping/Tools/vtkWrapJava.c +index d629cc5c8a8..009853d2a89 100644 +--- a/Wrapping/Tools/vtkWrapJava.c ++++ b/Wrapping/Tools/vtkWrapJava.c +@@ -639,9 +639,10 @@ void OutputFunctionResult(FILE* fp) + * return 0 if the types do not map to the same type */ + static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2) + { ++ /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */ + static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 }; + static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 }; +- static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; ++ static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; + static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG, + VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 }; + +-- +GitLab + diff --git a/sci-libs/vtk/files/vtk-9.3.0-java.patch b/sci-libs/vtk/files/vtk-9.3.0-java.patch new file mode 100644 index 000000000000..4b9125515eac --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-java.patch @@ -0,0 +1,11 @@ +--- a/Wrapping/Java/Testing/Java/CMakeLists.txt ++++ b/Wrapping/Java/Testing/Java/CMakeLists.txt +@@ -22,6 +22,8 @@ if (WIN32) + endif () + set(vtk_test_classpath + "$") ++list(APPEND vtk_test_classpath ++ ${java_classpath}) + string(REPLACE ";" "${classpath_separator}" vtk_test_classpath "${vtk_test_classpath}") + + add_library(vtkjava_tests STATIC diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch new file mode 100644 index 000000000000..e26caecf497c --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch @@ -0,0 +1,17 @@ +From: https://gitlab.archlinux.org/archlinux/packaging/packages/vtk/-/blob/main/vtk-occt.patch +From: Sven-Hendrik Haase +diff --git a/IO/OCCT/vtkOCCTReader.h b/IO/OCCT/vtkOCCTReader.h +index 36a02f5be3..33fa45fccc 100644 +--- a/IO/OCCT/vtkOCCTReader.h ++++ b/IO/OCCT/vtkOCCTReader.h +@@ -48,8 +48,8 @@ public: + * It can be either STEP or IGES. + * Default is FILE_FORMAT::STEP + */ +- VTK_DEPRECATED_IN_9_3_0("Use SetFormat with unsigned int instead.") +- vtkSetEnumMacro(FileFormat, Format); ++ // VTK_DEPRECATED_IN_9_3_0("Use SetFormat with unsigned int instead.") ++ // vtkSetEnumMacro(FileFormat, Format); + vtkSetClampMacro(FileFormat, unsigned int, Format::STEP, Format::IGES); + ///@} + diff --git a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch new file mode 100644 index 000000000000..98ab24334fd4 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch @@ -0,0 +1,77 @@ +From: ccee5db79d6037c4d752b5f29dc30fb0dfd039bf Mon Sep 17 00:00:00 2001 +From: Timothée Couble +From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10692 +Date: Fri, 10 Nov 2023 10:03:07 +0100 +Subject: [PATCH 1/2] IOPDAL: Always links with pdalcpp + +pdal_base and pdal_utils libraries are removed in PDAL 2.6.0 +link with pdalcpp instead starting from this version. +--- + IO/PDAL/CMakeLists.txt | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/IO/PDAL/CMakeLists.txt b/IO/PDAL/CMakeLists.txt +index c31af0410f4..b83a9334109 100644 +--- a/IO/PDAL/CMakeLists.txt ++++ b/IO/PDAL/CMakeLists.txt +@@ -3,14 +3,20 @@ vtk_module_find_package(PACKAGE PDAL VERSION 2.1) + set(classes + vtkPDALReader) + +-set(pdal_libraries pdal_util) +-if (APPLE OR WIN32) ++set(pdal_libraries) ++if (PDAL_VERSION VERSION_LESS "2.6") ++ set(pdal_libraries pdal_util) ++ if (APPLE OR WIN32) ++ list(APPEND pdal_libraries ++ pdalcpp) ++ else() ++ list(APPEND pdal_libraries ++ pdal_base) ++ endif() ++else () + list(APPEND pdal_libraries + pdalcpp) +-else() +- list(APPEND pdal_libraries +- pdal_base) +-endif() ++endif () + + vtk_module_add_module(VTK::IOPDAL + CLASSES ${classes}) +-- +GitLab + + +From 5bf45b44760bac09b0079827346e78af38d981af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= +Date: Fri, 10 Nov 2023 10:12:32 +0100 +Subject: [PATCH 2/2] Add support for PDAL 2.0 version + +--- + IO/PDAL/CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/IO/PDAL/CMakeLists.txt b/IO/PDAL/CMakeLists.txt +index b83a9334109..a7027524e4f 100644 +--- a/IO/PDAL/CMakeLists.txt ++++ b/IO/PDAL/CMakeLists.txt +@@ -23,4 +23,13 @@ vtk_module_add_module(VTK::IOPDAL + vtk_module_link(VTK::IOPDAL + PRIVATE + ${pdal_libraries}) ++ ++# PDAL 2.0 didn't include interfaces to its exported targets. ++# Resolved in https://github.com/PDAL/PDAL/issues/2262. ++if (PDAL_VERSION VERSION_LESS "2.1") ++ vtk_module_include(VTK::IOPDAL ++ PRIVATE ++ ${PDAL_INCLUDE_DIRS}) ++endif () ++ + vtk_add_test_mangling(VTK::IOPDAL) +-- +GitLab + diff --git a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch new file mode 100644 index 000000000000..13b6bf94a4ec --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch @@ -0,0 +1,20 @@ +--- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx 2023-11-14 00:37:21.000000000 +0100 ++++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx 2023-11-19 17:09:22.089595938 +0100 +@@ -334,7 +334,7 @@ + auto TransformForScalarRange(const ArrayHandleType& src, + const vtkm::cont::ArrayHandle& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) + { +- DecoratorForScalarRanage decorator{ ghostValueToSkip, finitesOnly }; ++ DecoratorForScalarRanage decorator{ { ghostValueToSkip, finitesOnly } }; + return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost); + } + +@@ -342,7 +342,7 @@ + auto TransformForVectorRange(const ArrayHandleType& src, + const vtkm::cont::ArrayHandle& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) + { +- DecoratorForVectorRanage decorator{ ghostValueToSkip, finitesOnly }; ++ DecoratorForVectorRanage decorator{ { ghostValueToSkip, finitesOnly } }; + return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost); + } + diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index e9e7bf06f7ed..27b20de02278 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -25,6 +25,7 @@ Building Imaging modules Build support for LiDAR files Build the logging module + Enable OpenCASCADE support Build support to handle VDB data files Build support to handle point cloud data files Use Qt6 packages instead of Qt5 diff --git a/sci-libs/vtk/vtk-9.3.0.ebuild b/sci-libs/vtk/vtk-9.3.0.ebuild new file mode 100644 index 000000000000..f57063d4f5b4 --- /dev/null +++ b/sci-libs/vtk/vtk-9.3.0.ebuild @@ -0,0 +1,909 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: +# - add USE flag for remote modules? Those modules can be downloaded +# properly before building. +# - replace usex by usev where applicable + +PYTHON_COMPAT=( python3_{10..11} ) +WEBAPP_OPTIONAL=yes +WEBAPP_MANUAL_SLOT=yes + +inherit check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp + +# Short package version +MY_PV="$(ver_cut 1-2)" +MY_PV2="${PV/_rc/.rc}" + +DESCRIPTION="The Visualization Toolkit" +HOMEPAGE="https://www.vtk.org/" +SRC_URI=" + https://www.vtk.org/files/release/${MY_PV}/VTK-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKData-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${MY_PV2}.tar.gz + doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${MY_PV2}.tar.gz ) + examples? ( + https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz + ) + test? ( + https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz + https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz + ) +" +S="${WORKDIR}/VTK-${MY_PV2}" + +LICENSE="BSD LGPL-2" +SLOT="0/${MY_PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +# TODO: Like to simplifiy these. Mostly the flags related to Groups. +IUSE="all-modules boost cuda debug doc examples ffmpeg +freetype gdal gles2-only imaging + java las +logging mpi mysql odbc opencascade openmp openvdb pdal postgres python qt5 + qt6 +rendering sdl tbb test +threads tk video_cards_nvidia views vtkm web" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + all-modules? ( + boost ffmpeg freetype gdal imaging las mysql odbc opencascade openvdb pdal + postgres rendering views + ) + cuda? ( video_cards_nvidia vtkm !tbb ) + java? ( rendering ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( rendering ) + qt6? ( rendering ) + sdl? ( rendering ) + tk? ( python rendering ) + web? ( python ) + rendering? ( freetype ) +" + +# eigen, nlohmann_json, pegtl and utfcpp are referenced in the cmake files +# and need to be available when VTK consumers configure the dependencies. +RDEPEND=" + app-arch/lz4:= + app-arch/xz-utils + dev-db/sqlite:3 + dev-libs/double-conversion:= + dev-libs/expat + dev-libs/icu:= + dev-libs/jsoncpp:= + >=dev-libs/libfmt-8.1.1:= + dev-libs/libxml2:2 + dev-libs/libzip:= + dev-libs/pugixml + media-libs/freetype + media-libs/libjpeg-turbo + >=media-libs/libharu-2.4.0:= + media-libs/libogg + media-libs/libpng:= + media-libs/libtheora + media-libs/tiff:= + >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] + sci-libs/hdf5:=[mpi=] + sci-libs/proj:= + sci-libs/netcdf:=[mpi=] + sys-libs/zlib + boost? ( dev-libs/boost:=[mpi?] ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + ffmpeg? ( media-video/ffmpeg:= ) + freetype? ( media-libs/fontconfig ) + gdal? ( sci-libs/gdal:= ) + java? ( >=virtual/jdk-11:= ) + las? ( sci-geosciences/liblas ) + mpi? ( virtual/mpi[cxx,romio] ) + mysql? ( dev-db/mariadb-connector-c ) + odbc? ( dev-db/unixODBC ) + openvdb? ( media-gfx/openvdb:= ) + opencascade? ( sci-libs/opencascade:= ) + pdal? ( sci-libs/pdal:= ) + postgres? ( dev-db/postgresql:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') + $(python_gen_cond_dep 'rendering? ( dev-python/matplotlib[${PYTHON_USEDEP}] )') + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + ) + qt6? ( + !qt5? ( + dev-qt/qtbase:6[gui,opengl,sql,widgets] + dev-qt/qtdeclarative:6[opengl] + dev-qt/qtshadertools:6 + x11-libs/libxkbcommon + ) + ) + sdl? ( media-libs/libsdl2 ) + rendering? ( + media-libs/glew:= + virtual/opengl + x11-libs/gl2ps + x11-libs/libICE + x11-libs/libXcursor + x11-libs/libXext + ) + tbb? ( dev-cpp/tbb:= ) + tk? ( dev-lang/tk:= ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) + views? ( + x11-libs/libICE + x11-libs/libXext + ) + web? ( ${WEBAPP_DEPEND} ) +" + +DEPEND=" + ${RDEPEND} + dev-cpp/cli11 + dev-cpp/eigen + dev-cpp/nlohmann_json + dev-libs/pegtl + dev-libs/utfcpp + test? ( + media-libs/glew + x11-libs/libXcursor + rendering? ( media-libs/freeglut ) + ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-9.2.5-pegtl-3.x.patch" + "${FILESDIR}/${PN}-9.3.0-pdal-2.6.0.patch" + "${FILESDIR}/${PN}-9.3.0-too-many-initializer-values.patch" + "${FILESDIR}/${PN}-9.3.0-java.patch" + "${FILESDIR}/${PN}-9.3.0-opencascade.patch" + "${FILESDIR}/${PN}-9.3.0-fix-Java-error-with-integer-enum-overloads.patch" +) + +DOCS=( CONTRIBUTING.md README.md ) + +vtk_check_reqs() { + local dsk=4096 + + dsk=$(( $(usex doc 3072 0) + dsk )) + dsk=$(( $(usex examples 3072 0) + dsk )) + dsk=$(( $(usex cuda 8192 0) + dsk )) + export CHECKREQS_DISK_BUILD=${dsk}M + + # In case users are not aware of the extra NINJAOPTS, check + # for the more common MAKEOPTS, in case NINJAOPTS is empty + local jobs=1 + if [[ -n "${NINJAOPTS}" ]]; then + jobs=$(makeopts_jobs "${NINJAOPTS}" "$(get_nproc)") + elif [[ -n "${MAKEOPTS}" ]]; then + jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + fi + + if use cuda; then + local mem=$(( $(usex cuda 7168 0) )) + mem=$(( mem * $(( jobs > 4 ? 4 : jobs )) )) + export CHECKREQS_MEMORY=${mem}M + fi + + "check-reqs_pkg_${EBUILD_PHASE}" +} + +vtk_check_compiler() { + [[ -z "$1" ]] && die "no compiler specified" + local compiler="$1" + local package="sys-devel/${compiler}" + local version="${package}" + local CUDAHOSTCXX_test + while + CUDAHOSTCXX="${CUDAHOSTCXX_test}" + version=$(best_version "${version}") + if [[ -z "${version}" ]]; then + if [[ -z "${CUDAHOSTCXX}" ]]; then + die "could not find supported version of ${package}" + fi + break + fi + CUDAHOSTCXX_test="$( + dirname "$( + realpath "$( + which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")" + )" + )" + )" + version="<${version}" + do ! echo "int main(){}" | nvcc "-ccbin=${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp + + if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then + # FIXME: better use eerror? + ewarn "GCC 11 is know to fail building with CUDA support in some cases." + ewarn "See bug #820593" + fi + + use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" + + vtk_check_reqs +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp + + if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then + # FIXME: better use eerror? + ewarn "GCC 11 is know to fail building with CUDA support in some cases." + ewarn "See bug #820593" + fi + + use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" + + vtk_check_reqs + + use java && java-pkg-opt-2_pkg_setup + use python && python-single-r1_pkg_setup + use web && webapp_pkg_setup +} + +# Note: The following libraries are marked as internal by kitware +# and can currently not unbundled: +# diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic, +# vtkm, xdmf{2,3}, zfp +# TODO: exprtk, ioss +# Note: As of v9.2.2 we no longer drop bundled libraries, when using system +# libraries. This just saves a little space. CMake logic of VTK on ThirdParty +# libraries avoids automagic builds, so deletion is not needed to catch these. +src_prepare() { + if use doc; then + einfo "Removing .md5 files from documents." + rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes" + sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \ + -i Utilities/Doxygen/CMakeLists.txt || die + fi + + cmake_src_prepare + + if use test; then + ebegin "Copying data files to ${BUILD_DIR}" + mkdir -p "${BUILD_DIR}/ExternalData" || die + pushd "${BUILD_DIR}/ExternalData" >/dev/null || die + ln -sf "../../VTK-${MY_PV2}/.ExternalData/README.rst" . || die + ln -sf "../../VTK-${MY_PV2}/.ExternalData/SHA512" . || die + popd >/dev/null || die + eend "$?" + fi +} + +# TODO: check these and consider to use them +# VTK_BUILD_SCALED_SOA_ARRAYS +# VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_LICENSEDIR="share/${PN}/licenses" + -DVTK_DEBUG_MODULE=ON + -DVTK_DEBUG_MODULE_ALL=ON + -DVTK_IGNORE_CMAKE_CXX11_CHECKS=yes + + -DVTK_ANDROID_BUILD=OFF + -DVTK_IOS_BUILD=OFF + + -DVTK_BUILD_ALL_MODULES="$(usex all-modules)" + # we use the pre-built documentation and install these with USE=doc + -DVTK_BUILD_DOCUMENTATION=OFF + -DVTK_BUILD_EXAMPLES="$(usex examples)" + + # no package in the tree: https://github.com/LLNL/conduit + -DVTK_ENABLE_CATALYST=OFF + -DVTK_ENABLE_KITS=OFF + -DVTK_ENABLE_LOGGING="$(usex logging)" + # defaults to ON: USE flag for this? + -DVTK_ENABLE_REMOTE_MODULES=OFF + + # disable fetching files during build + -DVTK_FORBID_DOWNLOADS=OFF + + -DVTK_GROUP_ENABLE_Imaging="$(usex imaging "YES" "NO")" + -DVTK_GROUP_ENABLE_Rendering="$(usex rendering "YES" "NO")" + -DVTK_GROUP_ENABLE_StandAlone="YES" + -DVTK_GROUP_ENABLE_Views="$(usex views "YES" "NO")" + -DVTK_GROUP_ENABLE_Web="$(usex web "YES" "NO")" + + -DVTK_INSTALL_SDK=ON + + -DVTK_MODULE_ENABLE_VTK_IOCGNSReader="YES" + -DVTK_MODULE_ENABLE_VTK_IOExportPDF="YES" + -DVTK_MODULE_ENABLE_VTK_IOLAS="$(usex las "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IONetCDF="YES" + -DVTK_MODULE_ENABLE_VTK_IOOggTheora="YES" + -DVTK_MODULE_ENABLE_VTK_IOOpenVDB="$(usex openvdb "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOSQL="YES" # sqlite + -DVTK_MODULE_ENABLE_VTK_IOPDAL="$(usex pdal "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_IOXML="YES" + -DVTK_MODULE_ENABLE_VTK_IOXMLParser="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingFreeType="$(usex freetype "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig="$(usex freetype "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_cgns="YES" + -DVTK_MODULE_ENABLE_VTK_doubleconversion="YES" + -DVTK_MODULE_ENABLE_VTK_eigen="YES" + -DVTK_MODULE_ENABLE_VTK_expat="YES" + -DVTK_MODULE_ENABLE_VTK_fmt="YES" + -DVTK_MODULE_ENABLE_VTK_freetype="YES" + -DVTK_MODULE_ENABLE_VTK_hdf5="YES" + -DVTK_MODULE_ENABLE_VTK_jpeg="YES" + -DVTK_MODULE_ENABLE_VTK_jsoncpp="YES" + -DVTK_MODULE_ENABLE_VTK_libharu="YES" + -DVTK_MODULE_ENABLE_VTK_libproj="YES" + -DVTK_MODULE_ENABLE_VTK_libxml2="YES" + -DVTK_MODULE_ENABLE_VTK_lz4="YES" + -DVTK_MODULE_ENABLE_VTK_lzma="YES" + -DVTK_MODULE_ENABLE_VTK_netcdf="YES" + -DVTK_MODULE_ENABLE_VTK_nlohmannjson="YES" + -DVTK_MODULE_ENABLE_VTK_ogg="YES" + -DVTK_MODULE_ENABLE_VTK_pegtl="YES" + -DVTK_MODULE_ENABLE_VTK_png="YES" + -DVTK_MODULE_ENABLE_VTK_pugixml="YES" + -DVTK_MODULE_ENABLE_VTK_sqlite="YES" + -DVTK_MODULE_ENABLE_VTK_theora="YES" + -DVTK_MODULE_ENABLE_VTK_tiff="YES" + -DVTK_MODULE_ENABLE_VTK_utf8="YES" + -DVTK_MODULE_ENABLE_VTK_vtkvtkm="$(usex vtkm "YES" "NO")" + -DVTK_MODULE_ENABLE_VTK_zlib="YES" + + # not packaged in Gentoo + -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF + + -DVTK_RELOCATABLE_INSTALL=ON + + -DVTK_SMP_ENABLE_OPENMP="$(usex openmp)" + -DVTK_SMP_ENABLE_STDTHREAD="$(usex threads)" + -DVTK_SMP_ENABLE_TBB="$(usex tbb)" + + -DVTK_UNIFIED_INSTALL_TREE=ON + + -DVTK_USE_CUDA="$(usex cuda)" + # use system libraries where possible + -DVTK_USE_EXTERNAL=ON + # avoid finding package from either ::guru or ::sci + -DVTK_USE_MEMKIND=OFF + -DVTK_USE_MPI="$(usex mpi)" + -DVTK_USE_TK="$(usex tk)" + -DVTK_USE_X=ON + + -DVTK_WHEEL_BUILD=OFF + + -DVTK_WRAP_JAVA="$(usex java)" + -DVTK_WRAP_PYTHON="$(usex python)" + ) + + if use all-modules; then + mycmakeargs+=( + # no package in ::gentoo + -DVTK_ENABLE_OSPRAY=OFF + # TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES + # option. Check whether we can download them clean and enable + # them. + -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO" + -DVTK_MODULE_ENABLE_VTK_fides="NO" + -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO" + -DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO" + -DVTK_MODULE_ENABLE_VTK_IOFides="NO" + + -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO" + -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO" + + -DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES" + ) + fi + + if use boost; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_InfovisBoost="YES" + -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="YES" + ) + fi + + if use cuda; then + cuda_add_sandbox -w + tc-is-gcc && vtk_check_compiler "gcc" + tc-is-clang && vtk_check_compiler "clang" + [[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS" + : "${CUDAARCHS:=$(__nvcc_device_query)}" + einfo "building for CUDAARCHS = ${CUDAARCHS}" + + export CUDAARCHS + export CUDAHOSTCXX + unset NVCCFLAGS + fi + + if use debug; then + mycmakeargs+=( + -DVTK_DEBUG_LEAKS=ON + -DVTK_DEBUG_MODULE=ON + -DVTK_DEBUG_MODULE_ALL=ON + -DVTK_ENABLE_SANITIZER=ON + -DVTK_EXTRA_COMPILER_WARNINGS=ON + -DVTK_WARN_ON_DISPATCH_FAILURE=ON + ) + if use rendering; then + mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON ) + fi + fi + + if use examples || use test; then + mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON ) + fi + + if use ffmpeg; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="YES" ) + if use rendering; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="YES" ) + fi + fi + + if use gdal; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="YES" + -DVTK_MODULE_ENABLE_VTK_IOGDAL="YES" + -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="YES" + ) + fi + + if use imaging; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_ImagingColor="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingCore="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingFourier="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingGeneral="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingHybrid="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingMath="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingMorphological="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingSources="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingStatistics="YES" + -DVTK_MODULE_ENABLE_VTK_ImagingStencil="YES" + ) + use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="YES" ) + fi + + if ! use java && ! use python; then + # defaults to ON + mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF ) + fi + + if use java; then + export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" + mycmakeargs+=( + -DCMAKE_INSTALL_JARDIR="share/${PN}" + -DVTK_ENABLE_WRAPPING=ON + -DVTK_MODULE_ENABLE_VTK_Java="YES" + -DVTK_JAVA_SOURCE_VERSION="$(java-config -g PROVIDES_VERSION)" + -DVTK_JAVA_TARGET_VERSION="$(java-config -g PROVIDES_VERSION)" + ) + fi + + if use mpi; then + mycmakeargs+=( + -DVTK_GROUP_ENABLE_MPI="YES" + -DVTK_MODULE_ENABLE_VTK_IOH5part="YES" + -DVTK_MODULE_ENABLE_VTK_IOMPIParallel="YES" + -DVTK_MODULE_ENABLE_VTK_IOParallel="YES" + -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="YES" + -DVTK_MODULE_ENABLE_VTK_IOParallelXML="YES" + -DVTK_MODULE_ENABLE_VTK_ParallelMPI="YES" + -DVTK_MODULE_ENABLE_VTK_h5part="YES" + -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF + ) + use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="YES" ) + use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="YES" ) + if use rendering; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_RenderingParallel="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="YES" + ) + fi + use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) + else + mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" ) + fi + + use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="YES" ) + use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="YES" ) + use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" ) + use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="YES" ) + + if use python; then + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DVTK_ENABLE_WRAPPING=ON + -DVTK_MODULE_ENABLE_VTK_Python="YES" + -DVTK_MODULE_ENABLE_VTK_PythonInterpreter="YES" + -DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="YES" + -DVTK_PYTHON_OPTIONAL_LINK="OFF" + -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages" + ) + use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="YES" ) + fi + + if use qt5; then + # prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies + mycmakeargs+=( + -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" + -DVTK_QT_VERSION="5" + ) + has_version "dev-qt/qtopengl:5[gles2-only]" || use gles2-only && mycmakeargs+=( + # Force using EGL & GLES + -DVTK_OPENGL_HAS_EGL=ON + -DVTK_OPENGL_USE_GLES=ON + ) + elif use qt6; then + mycmakeargs+=( + -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" + -DVTK_QT_VERSION="6" + ) + has_version "dev-qt/qtbase:6[gles2-only]" || use gles2-only && mycmakeargs+=( + # Force using EGL & GLES + -DVTK_OPENGL_HAS_EGL=ON + -DVTK_OPENGL_USE_GLES=ON + ) + else + mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) + fi + + if use qt5 || use qt6; then + mycmakeargs+=( + -DVTK_GROUP_ENABLE_Qt:STRING="YES" + -DVTK_MODULE_ENABLE_VTK_GUISupportQt="YES" + -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="YES" + ) + if use mysql || use postgres; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="YES" ) + fi + if use rendering; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="YES" ) + fi + if use views; then + mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="YES" ) + fi + fi + + if use rendering; then + mycmakeargs+=( + -DVTK_ENABLE_OSPRAY=OFF + + -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingContext2D="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingCore="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingExternal="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingLOD="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingLabel="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingUI="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingVolume="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="YES" + -DVTK_MODULE_ENABLE_VTK_RenderingZSpace="NO" + -DVTK_MODULE_ENABLE_VTK_gl2ps="YES" + -DVTK_MODULE_ENABLE_VTK_glew="YES" + -DVTK_MODULE_ENABLE_VTK_opengl="YES" + + -DVTK_USE_SDL2="$(usex sdl "YES" "NO")" + ) + use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="YES" ) + use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="YES" ) + use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="YES" ) + use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="YES" ) + fi + + # Testing has been changed in 9.2.5: it is now allowed without + # requiring to download, if the data files are available locally! + if use test; then + mycmakeargs+=( + -DVTK_BUILD_TESTING=ON + # disable fetching data files for the default 'all' target + -DVTK_DATA_EXCLUDE_FROM_ALL=OFF + + # requested even if all use flags are off + -DVTK_MODULE_ENABLE_VTK_octree="YES" + -DVTK_MODULE_ENABLE_VTK_ViewsCore="YES" + + -DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES" + ) + else + mycmakeargs+=( -DVTK_BUILD_TESTING=OFF ) + fi + + # FIXME: upstream provides 4 threading models, as of 9.1.0. These are + # sequential, stdthread, openmp and tbb. AFAICS all of them can be + # enabled at the same time. Sequential and STDThread are enabled by + # default. The default selected type for the build is sequential. + # Assuming sequential < STDThread < openmp < tbb wrt speed, although + # this is dependent on the actual scenario where threading is used. + if use tbb; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) + elif use openmp; then # FIXME doesn't work with clang + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" ) + elif use threads; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" ) + else + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) + fi + + use tk && mycmakeargs+=( -DVTK_GROUP_ENABLE_Tk="YES" ) + + if use views; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_ViewsCore="YES" + -DVTK_MODULE_ENABLE_VTK_ViewsInfovis="YES" + ) + fi + + if use vtkm; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="YES" + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="YES" + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="YES" + + -DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221 + -DVTKm_Vectorization=native + ) + fi + + if use web; then + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_WebCore="YES" + -DVTK_MODULE_ENABLE_VTK_WebGLExporter="YES" + ) + use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="YES" ) + fi + + cmake_src_configure +} + +src_compile() { + use test && cmake_build VTKData + cmake_src_compile +} + +src_test() { + if use cuda; then + cuda_add_sandbox -w + fi + + # don't work at all + REALLY_BAD_TESTS=( + "VTK::RenderingRayTracing-HeaderTest$" # (Failed) # 82 + "VTK::RenderingFreeTypeFontConfigCxx-TestSystemFontRendering$" # (Failed) # 309 + "VTK::IOMPIParallelPython-MPI-Plot3DMPIIO$" # (Failed) # 376 + "VTK::IOExportPDFCxx-TestPDFTransformedText-VerifyRasterizedPDFPNG$" # (Failed) # 483 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed) # 494 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed) # 518 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed) # 519 + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItem$" # (Failed) # 732 + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItemWidget$" # (Failed) # 733 + "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderWindow$" # (Failed) # 734 + "VTK::FiltersSelectionCxx-TestLinearSelector3D$" # (Failed) # 1102 + "VTK::FiltersParallelDIY2Cxx-MPI-TestProbeLineFilter$" # (Failed) # 1180 + "VTK::FiltersFlowPathsCxx-TestEvenlySpacedStreamlines2D$" # (Failed) # 1215 + "VTK::ChartsCoreCxx-TestChartDoubleColors$" # (Failed) # 1555 + "VTK::ChartsCoreCxx-TestChartDoubleColorsOpaque$" # (Failed) # 1556 + "VTK::ChartsCoreCxx-TestParallelCoordinatesDouble$" # (Failed) # 1599 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExternalFaces$" # (Failed) # 2142 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMHistogram$" # (Failed) # 2146 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes$" # (Failed) # 2148 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes2$" # (Failed) # 2149 + "VTK::FiltersGeneralCxx-TestContourTriangulatorHoles$" # (Failed) # 2305 + "VTK::FiltersCoreCxx-TestDecimatePolylineFilter$" # (Failed) # 2497 + "VTK::FiltersCorePython-TestSphereTreeFilter$" # (Failed) # 2617 + "VTK::CommonDataModelCxx-TestTriangle$" # (Failed) # 2770 + "VTK::CommonDataModelCxx-UnitTestCells$" # (Failed) # 2793 + "VTK::CommonDataModelCxx-TestHyperTreeGridGeometricLocator$" # (Failed) # 2799 + ) + + # don't work in src_test but when on their own + BAD_TESTS=( + "VTK::IOMotionFXCxx-TestMotionFXCFGReaderPositionFile$" # (Subprocess aborted) # 374 + + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run) # 517 + + "VTK::FiltersParallelDIY2Cxx-MPI-TestGhostCellsGenerator$" # (Timeout) # 1173 + "VTK::FiltersParallelDIY2Cxx-MPI-TestRedistributeDataSetFilterOnIOSS$" # (Timeout) # 1185 + "VTK::FiltersParallelDIY2Cxx-TestOverlappingCellsDetector$" # (Timeout) # 1193 + "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilter$" # (Timeout) # 1196 + "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterOnIOSS$" # (Timeout) # 1197 + "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterWithPolyData$" # (Timeout) # 1198 + "VTK::CommonCoreCxx-TestSMP$" # 2945 + + # "VTK::IOMovieCxx-TestAVIWriter$" # (Skipped) # 470 + # "VTK::IOMovieCxx-TestMP4Writer$" # (Skipped) # 471 + + "VTK::RenderingMatplotlibCxx-TestContextMathTextImage$" # (NUMERICAL) # 243 + "VTK::RenderingMatplotlibCxx-TestMathTextActor$" # (NUMERICAL) # 244 + "VTK::RenderingMatplotlibCxx-TestMathTextActor3D$" # (NUMERICAL) # 245 + "VTK::RenderingMatplotlibCxx-TestRenderString$" # (NUMERICAL) # 246 + "VTK::RenderingMatplotlibCxx-TestStringToPath$" # (NUMERICAL) # 247 + "VTK::RenderingMatplotlibCxx-TestIndexedLookupScalarBar$" # (NUMERICAL) # 248 + "VTK::RenderingMatplotlibCxx-TestScalarBarCombinatorics$" # (NUMERICAL) # 249 + "VTK::RenderingLICOpenGL2Cxx-TestImageDataLIC2D$" # (NUMERICAL) # 266 + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DXSlice$" # (NUMERICAL) # 267 + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DYSlice$" # (NUMERICAL) # 268 + "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DZSlice$" # (NUMERICAL) # 269 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaults$" # (NUMERICAL) # 270 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended$" # (NUMERICAL) # 271 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped$" # (NUMERICAL) # 272 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff$" # (NUMERICAL) # 273 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain$" # (NUMERICAL) # 274 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain$" # (NUMERICAL) # 275 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff$" # (NUMERICAL) # 276 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor$" # (NUMERICAL) # 277 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain$" # (NUMERICAL) # 278 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain$" # (NUMERICAL) # 279 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask$" # (NUMERICAL) # 280 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask$" # (NUMERICAL) # 281 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask$" # (NUMERICAL) # 282 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults$" # (NUMERICAL) # 283 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced$" # (NUMERICAL) # 284 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff$" # (NUMERICAL) # 285 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform$" # (NUMERICAL) # 286 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin$" # (NUMERICAL) # 287 + "VTK::RenderingLICOpenGL2Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin$" # (NUMERICAL) # 288 + "VTK::RenderingExternalCxx-TestGLUTRenderWindow$" # (Failed) # 311 + "VTK::ImagingOpenGL2Cxx-TestOpenGLImageGradient$" # (NUMERICAL) # 722 + # "VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout) # 838 + "VTK::InteractionWidgetsCxx-TestResliceCursorWidget2$" # (Failed) # 847 + "VTK::InteractionWidgetsCxx-TestResliceCursorWidget3$" # (Failed) # 848 + "VTK::InteractionWidgetsPython-TestTensorWidget2$" # (Failed) # 919 + # "VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout) # 1319 + "VTK::RenderingOpenGL2Cxx-TestGlyph3DMapperPickability$" # (Failed) # 1404 + "VTK::RenderingCoreCxx-TestTextureRGBADepthPeeling$" # (Failed) # 2020 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMCleanGrid$" # (NUMERICAL) # 2138 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClip$" # (NUMERICAL) # 2140 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClipWithImplicitFunction$" # (NUMERICAL) # 2141 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExtractVOI$" # (NUMERICAL) # 2143 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMLevelOfDetail$" # (NUMERICAL) # 2147 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointElevation$" # (NUMERICAL) # 2152 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointTransform$" # (NUMERICAL) # 2153 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPolyDataNormals$" # (NUMERICAL) # 2155 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold$" # (NUMERICAL) # 2157 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold2$" # (NUMERICAL) # 2158 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMTriangleMeshPointNormals$" # (NUMERICAL) # 2159 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpScalar$" # (NUMERICAL) # 2160 + "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpVector$" # (NUMERICAL) # 2161 + "VTK::AcceleratorsVTKmCoreCxx-TestVTKMImplicitDataArray$" # (NUMERICAL) # 2897 + ) + + SEQUENTIAL_TESTS=( + # TODO requires die -n + # "VTK::IOExportGL2PSCxx-.*$" + "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D$" + "VTK::IOExportGL2PSCxx-TestGL2PSContext$" + "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper$" + "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper$" + "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster$" + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed) # 494 + "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSContext-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSContext-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextActor-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPDFPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-RasterizePNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPNG$" + "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPDFPNG$" + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run) # 517 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed) # 518 + # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed) # 519 + "VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout) # 838 + "VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout) # 1319 + ) + + CMAKE_SKIP_TESTS=( + "${BAD_TESTS[@]}" + "${REALLY_BAD_TESTS[@]}" + "${SEQUENTIAL_TESTS[@]}" + ) + + virtx cmake_src_test + unset CMAKE_SKIP_TESTS + + myctestargs=( + -R "($( IFS='|'; echo "${SEQUENTIAL_TESTS[*]}"))" + -j1 + ) + # TODO requires die -n + # nonfatal \ + virtx cmake_src_test || einfo "These tests are known to fail" + + # TODO requires die -n + # myctestargs=( + # -R "($( IFS='|'; echo "${REALLY_BAD_TESTS[*]}"))" + # --timeout 600 + # ) + # nonfatal \ + # virtx cmake_src_test || einfo "These tests are known to fail" + + # TODO requires die -n + # myctestargs=( + # -R "($( IFS='|'; echo "${BAD_TESTS[*]}"))" + # --timeout 600 + # ) + # nonfatal \ + # virtx cmake_src_test || einfo "These tests are known to only fail inside src_test" +} + +src_install() { + use web && webapp_src_preinst + + # Stop web page images from being compressed + if use doc; then + HTML_DOCS=( "${WORKDIR}/html/." ) + fi + + cmake_src_install + + use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PN}.jar" + + # install examples + if use examples; then + einfo "Installing examples" + mv -v {E,e}xamples || die + dodoc -r examples + docompress -x "/usr/share/doc/${PF}/examples" + + einfo "Installing datafiles" + insinto "/usr/share/${PN}/data" + doins -r "${S}/.ExternalData" + fi + + use python && python_optimize + + use web && webapp_src_install +} + +# webapp.eclass exports these but we want it optional #534036 +pkg_postinst() { + use web && webapp_pkg_postinst + + if use examples; then + einfo "You can get more and updated examples at" + einfo "https://kitware.github.io/vtk-examples/site/" + fi +} + +pkg_prerm() { + use web && webapp_pkg_prerm +} -- cgit v1.2.3