diff options
Diffstat (limited to 'sci-libs/vtk')
15 files changed, 211 insertions, 51 deletions
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 933370b6bef0..692210e5ebc0 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -4,14 +4,18 @@ 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.2.5-pegtl-3.x.patch 4679 BLAKE2B 0c0be426ac07c2dcab275fb84ef68f6fe3e914d83a9434ef07b2d184bd313ed2ce62d471531c330a32cc734f7b3fcb8859a0c49c8bc5ac461191c86ea9755778 SHA512 75e8a740a784ba811eff27f0ba60d8889b24f97b1fcdf7feda4a73f0324d36060d7b35dba74bf6de2a16136201dc772ee5825e93ec0e5337e74299baea3444a0 +AUX vtk-9.2.6-Java21.patch 573 BLAKE2B ec4fac0a029cc3ef7285f1526aedd19232c67479f754c2e55d29b2316ea7322f07513f85bc4311c7acc4b4d4fcdbc3231cccb93d963293cd05a78f3dc88e0654 SHA512 a7f36c27a147a9f93aa20c807244f9b79aac45452eb4bca7ecdaf9cf9778f0575d5af742f4209b67c455e556bba354354a728407937c348c6d923775fd30c80a +AUX vtk-9.3.0-ThirdParty-gcc15.patch 2443 BLAKE2B 67bd35f3a21ddd0897394afc5f7037f3346078ebf988f4cd358122a121197cd0bebbb748cb5972802dd4d615bf57929e41e47e2d81bb4f02f2cfe608e35497fd SHA512 636ed29f528403755c7f620826bbf384f61bec3b64b151804b6976f4aadaf786c15b9f8a38961bc059a93c671f27fb979bd34e3f42db8f6344b255490945e09b +AUX vtk-9.3.0-ThrustPatches.patch 2026 BLAKE2B e51c72b9d2bfb0e7e968f1c9f0896a70d6215f60d21dd234c26feb7a47653c46c8d75b24b1ab0286e51d228b6c4ff7fefd34c01f5b8e885dc1cab6190fc9c6f7 SHA512 b326839c82682e7c1fc1e19d836fb55837417bbf0c23ccb28edc84dd519f085cce0a07221bf6c9e794d1b8a73ecd77c154f82cb602feef9e8d8962b2e8fabd92 +AUX vtk-9.3.0-core-octree_node.txx.patch 670 BLAKE2B 6f53735716d6c75bfcf41dbc27331a4ac495f474c540b06c7a1b62e71b84af88304c2364e88060aae9cd015866138240f40ba28e0db8470e7a841cfb06ef827e SHA512 36d9b12f29e60bb773745263996eaf9fed2f6dee4e3be7f593f5a72e25909d30cde90828c54e1981290640b9f4cae85b20292ae054b6b5f2ee4420f27d23c07f +AUX vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch 2356 BLAKE2B 45e2569239b5dcd4e26a007746179cb1743cc4269f82d2fff2cdb2d5188f47cf84315ddb850f2dcc602595d928569c41f986ed6677fabf52e91a0b15b8ed3225 SHA512 dff1bb8d4480ef7d8f6672015c11c29bc7ac2ee396f473c388b236b30326978b80b0a557cc8910fce34f9c54db9ef31b7a1440c930faf83c5b4acca9ecbee99c AUX vtk-9.3.0-java.patch 372 BLAKE2B ec11a69bf2e7b467b00648b0bc725f838f9931bce2f2cd1cbabe6d4c8fdcd4ef807dd14eedf06d524eecc3c9bc77850cc8de5e55ceaf8a238efa501c8bb36cf9 SHA512 6d326f95b05fd86d87a0566e45efb484d92d482a916895d3aaca1e019ceac65ecbcdab2957a8686545898551a3382aa718a57ad0d9e9cd16937166bf3f0729d8 -AUX vtk-9.3.0-opencascade-7.8.0.patch 916 BLAKE2B edd240aa7f0c30224b688b03e8594a661c3e669b395cfdf203450c5f2715b40731ef6885e1c946067444c01989d92c9d1d2034a58b56a47b73148e37f5c46da0 SHA512 64478fff2bd05aecc2079cf867a44b6d4b49d377b29752376053329df614b798ab6e80db4c055a1fac943c0b9877c443a618e755494dd0badea2852692f82703 -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 +AUX vtk-9.3.0-opencascade-7.8.0.patch 819 BLAKE2B 51f4af785af5f44b21b641a631fe63c5e308558d573c03d02646691fd3762dce89670be80da2284769fe30129861982a062aea8574c90ea7472d7875ba8b2fbb SHA512 6d3bec28921d7e3b61fa10cbe68a529190248519f67d52365b0d73f2ce265aae028b7db4601b60c13fdd309db8b4164f2134961acf27e8f0778ec649674442a0 +AUX vtk-9.3.0-opencascade.patch 624 BLAKE2B 8188da64b12213074a4093ee0dd047fcf91a777742492dfe0cb1e93b597c23e78406e4783b3cdff23ffcac81655efa370bb3746a69d166edd138ec45beeb5c09 SHA512 1a0da4ffb822a038a13201d83f1cf6b42d4438073ea35fe3654d9e907e20c12306b47a511b72cb843097327a186b36560e2590ded47ce73aa8eb5a7655664236 +AUX vtk-9.3.0-pdal-2.6.0.patch 1748 BLAKE2B 9210b5ceceb95a5d74bd7ed4815faf809206bf3f66bc1606cf17124abfab6252a87285561fd9a3e0b1e542d981e714b3e5d1ae2137672beb9bc3c25d3f5afced SHA512 59cd68181857ffb3e428f6ae46b807fda6b3e1c1d4985e31f13b7d7ff177368e1ea65fa7e4bb5ce0d004ba7a9d1aef54e4e231111f05f638ddce8b360213f2f0 +AUX vtk-9.3.0-r1-expat-2.6.0.patch 2527 BLAKE2B 30006963525dcd4c06414c03e5504376853c2114c1b6f9a8eee862d15a21188ff0432fc32174bd9b4bc62bc9d3624c9107bff8772fb3610dfe54fca47f025a0e SHA512 16196fac6bee600ccc0da04d496cf56ffaf6a1a8d1146e3f7dbd87f12bd77eae7bd3716d6d7373a1e97b91c60c8e33591029b4cac9e7c2f2e5b875dc4d90c690 +AUX vtk-9.3.0-too-many-initializer-values.patch 976 BLAKE2B ae9863f867988e1202c2fba8ded3a9c610e8dd3b731eb32f1a687faa36b011e027f5b2cea435b38f9f0eb6d6d8114cb64b60a03b9c379d2c77745fe3840fdb28 SHA512 9a935eb4b7c3eea6d9e13ba4616de1717d29732f3cfc8cd08d52cc5c4c76af336574d9e10c2546c55f5d2afae7e89f571cf91f78945abae47f15388a158bd9e5 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 @@ -30,7 +34,7 @@ DIST VTKLargeDataFiles-9.3.0.tar.gz 247503839 BLAKE2B 68007af36148eaae43fc0fd75b 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 -EBUILD vtk-9.3.0.ebuild 36083 BLAKE2B 086f1467d0f7a6d857a3f05d96aba5f6687e1728522687e6ad8af462f7fe36511e48e42611dd4735a8af3d4c678e7bc6f59d43574da38a8cb71032d2f22fe13c SHA512 789e6ddb3fc806c6286b2137a7b5f3cb7648ebe4a25217c5d9d61cd8d369c3f17ee689e1d172a8bf8e7e82f0f5836c970237617073e3c2e6d22ab2ed873bd7a2 +EBUILD vtk-9.2.5-r2.ebuild 22724 BLAKE2B 712cafbf33a9f7f20949a9864630d114a37b60e4f64894a232648d873bd2b078688946fdbc7a94bea6dccbfa06bc465f90cfcbf8223c5886780fa8af22908de1 SHA512 4a58dbae0f477d66e900df78b78ea5f1cc5fe57200b89ef7dc481a422d81051a9a352f48bef0e9f7ec9eafbb91b175f26095e560ef44159c628ee6c365aefa33 +EBUILD vtk-9.2.6-r3.ebuild 22763 BLAKE2B 818d81d2059389e53473324803b852b0df1eec11029f99d3301d032ac30a8e798da9756bcdc4ef7bc122b5faad0357faef70894d5e13e8c44cfc08886f22e419 SHA512 4d658fdf49e3c52969d1e048827caeb71d7de38c7e2b708a6254a5d0f938fd10695589368f5a4614f176a438d53b0ec2efa16f71b7b7ba3071f4e7c42092fa9c +EBUILD vtk-9.3.0-r3.ebuild 36282 BLAKE2B bdc9308f7477a56f6b5e391942d829bb72e7446a058f8b61b2d931a6300ecf289486903a24a3c997057e135760d06a042bf1189147bb561fb3b91aa2969b34e4 SHA512 b6262a241a493c12d74e0c919f34d6d7d3a8544bbf4a0dc9b28fb1a2019f0ca6a046b476ad3064b870f5ab154adac3e717dc81e5dde4971d9feb52223d7af6d7 MISC metadata.xml 1696 BLAKE2B facd22a703e2ffda9e2a4ac8ad61855eadc47a9d0397117d7bf5516f31561c4eda178c607055c964dfbde4d1c3feb0f125085775e3c147389bee17151b21b744 SHA512 4289a0b9a96a012e94b2f33cd18481884ee04f3c21ead3d024b29c8d45dfe1247ea450e17e72488ea0f547946c55b0e8872015197f0785efd7ffcfe7bf203cbe 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 index 80838b9c45be..e330e1837c90 100644 --- 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 @@ -4,8 +4,6 @@ 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 @@ @@ -17,8 +15,6 @@ index dba137386..4cb03e054 100644 // 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 @@ -48,8 +44,6 @@ index 338aa736e..374e54b94 100644 } 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( @@ -60,9 +54,7 @@ index 9bbd4c828..0cdb1f53d 100644 TARGETS PEGTL::PEGTL STANDARD_INCLUDE_DIRS) -diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake -index 73eee02f7..22d8bc159 100644 ---- a/CMake/FindPEGTL.cmake +--- a/CMake/FindPEGTL.cmake +++ b/CMake/FindPEGTL.cmake @@ -19,31 +19,43 @@ # Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com> diff --git a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch index 08d4c0bf633f..b7b2e233cdb4 100644 --- a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch +++ b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch @@ -1,5 +1,3 @@ -diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt -index 01f3f93d..3afd78cf 100644 --- a/Wrapping/Java/CMakeLists.txt +++ b/Wrapping/Java/CMakeLists.txt @@ -201,10 +201,10 @@ set(VTK_JAVA_TARGET_VERSION "<DEFAULT>" CACHE STRING "javac target version") diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch new file mode 100644 index 000000000000..df2d6fc61167 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch @@ -0,0 +1,46 @@ +From d00b98bd8ef02f854f1068e8ab8fd2fb28244c3b Mon Sep 17 00:00:00 2001 +From: Ted Rodgers <ted.d.rodgers@gmail.com> +Date: Sat, 10 Aug 2024 16:13:09 -0400 +Subject: [PATCH] include cstdint + correct case/words + +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h +@@ -11402,7 +11402,7 @@ public: + + VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const + { +- return this->CellFacePortal.Get(pointIndex); ++ return this->CellEdgesPortal.Get(pointIndex); + } + + private: +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h +@@ -663,7 +663,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha + auto hyperarcsPortal = this->Hyperarcs.ReadPortal(); + auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal(); + auto whichIterationPortal = this->WhichIteration.ReadPortal(); +- auto whichRoundPortal = this->whichRound.ReadPortal(); ++ auto whichRoundPortal = this->WhichRound.ReadPortal(); + auto superarcsPortal = this->Superarcs.ReadPortal(); + auto superparentsPortal = this->Superparents.ReadPortal(); + for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++) +@@ -708,7 +708,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha + if (contourtree_augmented::NoSuchElement(superarcTo)) + { // no superarc + // if it occurred on the final round, it's the global root and is shown as the NULL node +- if (whichRoundPortal.Get(superarcFrom) == this->NRounds) ++ if (whichRoundPortal.Get(superarcFrom) == this->NumRounds) + { // root node + outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc + << " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n"; +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp +@@ -136,6 +136,7 @@ + // + #pragma once + ++#include <cstdint> + #include <type_traits> + #include <cstddef> + #include <memory> diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch b/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch new file mode 100644 index 000000000000..82525e75d914 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch @@ -0,0 +1,51 @@ +From 4a4466e7c8cd44d2be2bd3fe6f359faa8e9547aa Mon Sep 17 00:00:00 2001 +From: Kenneth Moreland <morelandkd@ornl.gov> +Date: Tue, 4 Jun 2024 10:04:42 -0400 +Subject: [PATCH] Disable Thrust patch that is no longer needed in modern + Thrust + +There is a Thrust patch that works around an issue in Thrust 1.9.4 +(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue +should be fixed in recent versions. In recent versions of CUDA, the patch +breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). + +This change fixes the problem by disabling the patch where it is not +needed. +--- /dev/null ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/docs/changelog/obsolete-thrust-patch.md +@@ -0,0 +1,9 @@ ++# Disable Thrust patch that is no longer needed in modern Thrust ++ ++There is a Thrust patch that works around an issue in Thrust 1.9.4 ++(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue ++should be fixed in recent versions. In recent versions of CUDA, the patch ++breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). ++ ++This change fixes the problem by disabling the patch where it is not ++needed. +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h +@@ -170,9 +170,9 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64); + #undef ALIGN_RE_PAIR + } + } +-#endif //THRUST_VERSION >= 100900 ++#endif //THRUST_VERSION >= 100900 && THRUST_VERSION < 100906 + +-#if THRUST_VERSION >= 100904 ++#if (THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) + //So for thrust 1.9.4+ (CUDA 10.1+) the stateless_resource_allocator has a bug + //where it is not marked as __host__ __device__ && __thrust_exec_check_disable__. + //To fix this we add a new partial specialization on cuda::memory_resource +@@ -236,7 +236,7 @@ public: + }; + } + } +-#endif //THRUST_VERSION >= 100903 ++#endif //(THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) + + + #if THRUST_VERSION < 100900 +-- +GitLab + diff --git a/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch b/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch new file mode 100644 index 000000000000..7c4d4544a490 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch @@ -0,0 +1,18 @@ +From b5f466a66771621a3aaa15434910f413ab7168f7 Mon Sep 17 00:00:00 2001 +From: Ted Rodgers <ted.d.rodgers@gmail.com> +Date: Sat, 10 Aug 2024 16:10:13 -0400 +Subject: [PATCH] octree_node.txx fix chilren typo + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +--- a/Utilities/octree/octree/octree_node.txx ++++ b/Utilities/octree/octree/octree_node.txx +@@ -210,7 +210,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_>::operator[](int child) co + { + throw std::domain_error("Attempt to access children of an octree leaf node."); + } +- return this->_M_chilren[child]; ++ return this->m_children[child]; + } + + /**\brief Return a reference to a child node. 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 index 1b06b59a996e..7dd005ff4191 100644 --- 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 @@ -9,13 +9,6 @@ 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) @@ -30,8 +23,6 @@ index 36b58dda425..9f1544561f3 100644 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) diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch index 4adec4944492..0e6410c18ea0 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch @@ -16,8 +16,6 @@ set(opencascade_missing_targets) foreach (opencascade_req_target IN LISTS opencascade_req_targets) if (NOT TARGET "${opencascade_req_target}") -diff --git a/IO/OCCT/vtkOCCTReader.cxx b/IO/OCCT/vtkOCCTReader.cxx -index 52e76be..7235309 100644 --- a/IO/OCCT/vtkOCCTReader.cxx +++ b/IO/OCCT/vtkOCCTReader.cxx @@ -348,7 +348,7 @@ public: diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch index e26caecf497c..d7e0e3f9556c 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch @@ -1,7 +1,5 @@ From: https://gitlab.archlinux.org/archlinux/packaging/packages/vtk/-/blob/main/vtk-occt.patch From: Sven-Hendrik Haase <svenstaro@archlinux.org> -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: 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 index 98ab24334fd4..261f3736eb3d 100644 --- 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 @@ -6,12 +6,6 @@ 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) @@ -50,12 +44,6 @@ From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com> 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 diff --git a/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch new file mode 100644 index 000000000000..ac519f98aa63 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch @@ -0,0 +1,72 @@ +From 3efa07ad277efe5c1d11a2ef2b907c095f68bbef Mon Sep 17 00:00:00 2001 +From: Ben Boeckel <ben.boeckel@kitware.com> +Date: Mon, 15 Apr 2024 22:22:22 -0400 +Subject: [PATCH] vtkXMLDataParser: track `AppendedData` state explicitly + +Newer `libexpat` doesn't like being given the appended data after the +artificially ended document anymore. Avoid pushing it through to its +parser. + +(cherry picked from commit db8f9efca220c9d16a30958e179abae3379d0011) + +Fixes: #19258 +--- + IO/XMLParser/vtkXMLDataParser.cxx | 6 +++++- + IO/XMLParser/vtkXMLDataParser.h | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/IO/XMLParser/vtkXMLDataParser.cxx b/IO/XMLParser/vtkXMLDataParser.cxx +index 1f6006d37c2..7d38092fdd7 100644 +--- a/IO/XMLParser/vtkXMLDataParser.cxx ++++ b/IO/XMLParser/vtkXMLDataParser.cxx +@@ -36,6 +36,7 @@ vtkXMLDataParser::vtkXMLDataParser() + this->RootElement = nullptr; + this->AppendedDataPosition = 0; + this->AppendedDataMatched = 0; ++ this->AppendedDataFound = false; + this->DataStream = nullptr; + this->InlineDataStream = vtkBase64InputStream::New(); + this->AppendedDataStream = vtkBase64InputStream::New(); +@@ -88,6 +89,7 @@ void vtkXMLDataParser::PrintSelf(ostream& os, vtkIndent indent) + { + this->Superclass::PrintSelf(os, indent); + os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n"; ++ os << indent << "AppendedDataFound: " << this->AppendedDataFound << "\n"; + if (this->RootElement) + { + this->RootElement->PrintXML(os, indent); +@@ -214,7 +216,7 @@ int vtkXMLDataParser::ParsingComplete() + // If we have reached the appended data section, we stop parsing. + // This prevents the XML parser from having to walk over the entire + // appended data section. +- if (this->AppendedDataPosition) ++ if (this->AppendedDataPosition || this->AppendedDataFound) + { + return 1; + } +@@ -433,6 +435,8 @@ int vtkXMLDataParser::ParseBuffer(const char* buffer, unsigned int count) + { + return 0; + } ++ ++ this->AppendedDataFound = true; + } + + return 1; +diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h +index 1504a4d400b..142bf28327d 100644 +--- a/IO/XMLParser/vtkXMLDataParser.h ++++ b/IO/XMLParser/vtkXMLDataParser.h +@@ -204,6 +204,9 @@ protected: + // How much of the string "<AppendedData" has been matched in input. + int AppendedDataMatched; + ++ // Whether AppendedData has been dealt with or not. ++ bool AppendedDataFound; ++ + // The byte order of the binary input. + int ByteOrder; + +-- +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 index 13b6bf94a4ec..52c37250c7e7 100644 --- 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 @@ -1,5 +1,5 @@ ---- 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 +--- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx ++++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx @@ -334,7 +334,7 @@ auto TransformForScalarRange(const ArrayHandleType& src, const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5-r2.ebuild index 7460dc7f2461..4af7d8df0261 100644 --- a/sci-libs/vtk/vtk-9.2.5.ebuild +++ b/sci-libs/vtk/vtk-9.2.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/vtk/vtk-9.2.6-r1.ebuild b/sci-libs/vtk/vtk-9.2.6-r3.ebuild index bb87bdb1068e..9520c47ec4fd 100644 --- a/sci-libs/vtk/vtk-9.2.6-r1.ebuild +++ b/sci-libs/vtk/vtk-9.2.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/vtk/vtk-9.3.0.ebuild b/sci-libs/vtk/vtk-9.3.0-r3.ebuild index 745cb1354799..3a522724f066 100644 --- a/sci-libs/vtk/vtk-9.3.0.ebuild +++ b/sci-libs/vtk/vtk-9.3.0-r3.ebuild @@ -8,7 +8,7 @@ EAPI=8 # properly before building. # - replace usex by usev where applicable -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_OPTIONAL=yes WEBAPP_MANUAL_SLOT=yes @@ -164,6 +164,10 @@ PATCHES=( "${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" + "${FILESDIR}/${PN}-9.3.0-ThrustPatches.patch" + "${FILESDIR}/${PN}-9.3.0-core-octree_node.txx.patch" + "${FILESDIR}/${PN}-9.3.0-ThirdParty-gcc15.patch" + "${FILESDIR}/${PN}-9.3.0-r1-expat-2.6.0.patch" ) DOCS=( CONTRIBUTING.md README.md ) |