diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-26 02:00:48 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-26 02:00:48 +0000 |
commit | 403335d7014372971e9e9267493a808d08bab48e (patch) | |
tree | ffd28ddc69e6fe6543b018a00c9fad058bdda027 /sci-libs | |
parent | 7f0b7329b3aa78ea82792fdf68ab48415fe4cc35 (diff) |
gentoo auto-resync : 26:11:2024 - 02:00:48
Diffstat (limited to 'sci-libs')
43 files changed, 96 insertions, 3369 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 7a805f6bf731..10413643476f 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index 7d9f5df20e4a..2cae521a3bb6 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1,12 +1,8 @@ AUX avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch 1644 BLAKE2B 3b25bc2648b323b803b5d0b6e10be2689ef9e4c988d0c55abe172bf4312da8f5f9b527262a2f8e48d0b2391b01a03a976bc36cc22c467ac9a44fb85cc43c7a6d SHA512 515c7029e6f99c5e88a37f43387e656b2873b99e14e8d8e9b1b20bf82604f70be8f669d8b97383e80969b0f80d43439647fdfd17566bbf6fbd32cb75ce2fb4e3 AUX avogadrolibs-1.95.1-tests.patch 263 BLAKE2B 463e2fb995354253e25cd2a0ee53603faefbf5ed5ca92c74154694df02ab488ffae155f08b3d1019e5713cb6c4e6fa340ead9fb93bd2ea91d79af0b646d86bb7 SHA512 00facd6927fe84ca65971a723531df6653ea9379fdaaae17401645508fb6ccce2f4b5efc5e53c6d2851611ffcc2ce382840da4a82366b26d1c7f368dceeb549b -AUX avogadrolibs-1.95.1-usability_backport.patch 3189 BLAKE2B 7668450eaa3daab4474cf87ad0ce97aa1c98f7fbfc13586ae94b84653387d30ff2aaa34ae9cc7a359b1723c4ea92b1620fece5266da0a1ca0bcbd16e50a33a6d SHA512 a8143e940008981f62bd128bc1b2ebcba012c46fcdac4a2e9b1e08537b9c51ce4e21d7423dfd9380c4cc822d0cb8dbc87231142f5d85fac5b472b0d60368ab9b -DIST avogadrolibs-1.95.1.tar.gz 11015910 BLAKE2B 27cb43a22e489c0279e1ed912b1e81f3c850983f367ffb89bef3a63d11204cbf761f2bce6501988ed5ef9b21b44cc5194dad4367da3ae6af65efd0cec5e7d711 SHA512 b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb DIST avogadrolibs-1.97.0.tar.gz 11456702 BLAKE2B 2f9229a0525dc151ef636c4c101ea21d3713efb033f6a007c43689bfd078b07081d695bb3ec32715c3ccf9d67e7bb85a617a08eeb0e6fc8c80e479a3cb3f1553 SHA512 a0ad3ba294db5f0fff35087ff0f616fdcaefc7b4abfa470c9fd26326ad14f73e3584c18a7111b671998d8a23a50091307520f01f79295fc7ea52ae2d78716c7e DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B 0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223 SHA512 c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650 DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B 70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218 SHA512 06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2 -DIST linux64-genXrdPattern-avogadrolibs-1.95.1 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 DIST linux64-genXrdPattern-avogadrolibs-1.97.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8 -EBUILD avogadrolibs-1.95.1-r1.ebuild 2531 BLAKE2B 6e8272a7e775ea4898e5ce0d19597092c0b01777574e523b8ab5cc7318c2995cb2d6d6012cec71db87d9eddea2388cc85c0605aa385c090f3bc9ec0ad1d842a4 SHA512 b3b8c451607550295b6b5918b11c330a96468490a4cfc2f4dbbb63c6afaf38ada6acc29b2d0694152638e82248579e33e868df19e597cad3bd94826d477cc4b0 EBUILD avogadrolibs-1.97.0.ebuild 2483 BLAKE2B 34a3d859318c57095af34849ff412a2f1e4b0783ea198decbae5904c6b33efc84a1de442f84038d2b02de128898c3be035c43ee354aadd914a247f21e393d6ca SHA512 ece7e8d0758de73ac9a753e5223c10ae92faef26a544ee329035af0fcb16072ba97cb1f56285f86b0071800fbb0b3a8fe7bd82991772d8237e59b374bdbe409d MISC metadata.xml 580 BLAKE2B 6947845054474e20335743a41d96511981b4eb0bf9ae1c4ab23cb20fc2ead0dff6055c406ae96604312fe348d636f4b9557e98b051ddcf33ba13e9d68df01045 SHA512 81e34367a52b6d1ce417ce086d11e72e071ca7193862bfac1b6c7e4160716e50aaf40a157f3e05dfd0a18a00388fe39a254332c548e101c478d93aa8b38b8e4c diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild deleted file mode 100644 index 330bb74633f7..000000000000 --- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries" -HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs" -SRC_URI=" - https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/OpenChemistry/molecules/archive/refs/tags/1.0.0.tar.gz -> ${PN}-molecules-1.0.0.tar.gz - https://github.com/OpenChemistry/crystals/archive/refs/tags/1.0.1.tar.gz -> ${PN}-crystals-1.0.1.tar.gz - vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern -> linux64-genXrdPattern-${P} )" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="archive doc hdf5 qt5 test vtk" -RESTRICT="!test? ( test )" -REQUIRED_USE="vtk? ( qt5 )" - -# TODO: Not yet packaged: -# sci-libs/libmsym (https://github.com/mcodev31/libmsym) -RDEPEND=" - >=sci-chemistry/molequeue-0.7 - archive? ( app-arch/libarchive:= ) - hdf5? ( sci-libs/hdf5:= ) - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/glew:0= - virtual/opengl - ) - vtk? ( sci-libs/vtk[qt5,views] )" -DEPEND="${RDEPEND} - dev-cpp/eigen:3 - test? ( dev-cpp/gtest )" -BDEPEND=" - doc? ( app-text/doxygen ) - qt5? ( dev-qt/linguist-tools:5 )" - -PATCHES=( - "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch - "${FILESDIR}/"${PN}-1.95.1-tests.patch - "${FILESDIR}/"${PN}-1.95.1-usability_backport.patch -) - -src_unpack() { - default - - if use vtk; then - cp "${DISTDIR}"/linux64-genXrdPattern-${P} "${WORKDIR}/genXrdPattern" || die - fi - - # hardcoded assumptions in - # avogadro/qtplugins/insertfragment/CMakeLists.txt - mv crystals-1.0.1 crystals || die - mv molecules-1.0.0 molecules || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_LIBARCHIVE=$(usex archive) - -DBUILD_DOCUMENTATION=$(usex doc) - -DUSE_HDF5=$(usex hdf5) - -DENABLE_TRANSLATIONS=$(usex qt5) - -DUSE_OPENGL=$(usex qt5) - -DUSE_QT=$(usex qt5) - -DENABLE_TESTING=$(usex test) - -DUSE_VTK=$(usex vtk) - # disabled libraries - -DUSE_PYTHON=OFF - -DUSE_PROTOCALL=OFF - -DUSE_MMTF=OFF - -DUSE_LIBMSYM=OFF - # find_package(Spglib) completely broken - -DUSE_SPGLIB=OFF - ) - use qt5 && mycmakeargs+=( - -DBUILD_GPL_PLUGINS=ON - -DBUILD_STATIC_PLUGINS=ON - -DOpenGL_GL_PREFERENCE=GLVND - ) - use vtk && mycmakeargs+=( - -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern" - ) - - cmake_src_configure -} diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch deleted file mode 100644 index 07a32023600e..000000000000 --- a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 56c67fff7dd7ec84b2f2b5c2e5beaec13981e408 Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <aerkiaga3@gmail.com> -Date: Sat, 3 Sep 2022 16:54:55 +0200 -Subject: [PATCH 1/3] Fix erratic editing behavior - -Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com> ---- - avogadro/qtgui/rwmolecule_undo.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/avogadro/qtgui/rwmolecule_undo.h b/avogadro/qtgui/rwmolecule_undo.h -index de5bdd33..20768066 100644 ---- a/avogadro/qtgui/rwmolecule_undo.h -+++ b/avogadro/qtgui/rwmolecule_undo.h -@@ -89,7 +89,7 @@ public: - { - assert(m_molecule.atomCount() == m_atomId); - if (m_usingPositions) -- m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomId); -+ m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomUid); - else - m_molecule.addAtom(m_atomicNumber, m_atomUid); - m_molecule.layer().addAtom(m_layer, m_atomId); --- -2.34.1 - - -From 5159ea1a9629ad82130670767cc25c5065f9627c Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <aerkiaga3@gmail.com> -Date: Sat, 3 Sep 2022 16:55:26 +0200 -Subject: [PATCH 2/3] Fix Manipulator Tool not working at all - -Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com> ---- - avogadro/qtplugins/manipulator/manipulator.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/avogadro/qtplugins/manipulator/manipulator.cpp b/avogadro/qtplugins/manipulator/manipulator.cpp -index 19dc51ac..29559dd0 100644 ---- a/avogadro/qtplugins/manipulator/manipulator.cpp -+++ b/avogadro/qtplugins/manipulator/manipulator.cpp -@@ -129,7 +129,7 @@ QUndoCommand* Manipulator::mouseMoveEvent(QMouseEvent* e) - Vector2f windowPos(e->localPos().x(), e->localPos().y()); - - if (mol->isSelectionEmpty() && m_object.type == Rendering::AtomType && -- m_object.molecule == mol) { -+ m_object.molecule == &m_molecule->molecule()) { - // translate single atom position - RWAtom atom = m_molecule->atom(m_object.index); - Vector3f oldPos(atom.position3d().cast<float>()); --- -2.34.1 - - -From f38bfbc88f0722a66ab298ff26073874b5f73634 Mon Sep 17 00:00:00 2001 -From: Aritz Erkiaga <aerkiaga3@gmail.com> -Date: Sat, 3 Sep 2022 16:55:59 +0200 -Subject: [PATCH 3/3] Fix Bond Centric Tool not working at all - -Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com> ---- - avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp -index 79112899..3a853057 100644 ---- a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp -+++ b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp -@@ -342,8 +342,7 @@ QUndoCommand* BondCentricTool::mousePressEvent(QMouseEvent* e) - Rendering::Identifier ident = m_renderer->hit(e->pos().x(), e->pos().y()); - - // If no hits, return. Also ensure that the hit molecule is the one we expect. -- const Core::Molecule* mol = &m_molecule->molecule(); -- if (!ident.isValid() || ident.molecule != mol) -+ if (!ident.isValid() || ident.molecule != &m_molecule->molecule()) - return nullptr; - - // If the hit is a left click on a bond, make it the selected bond and map --- -2.34.1 - diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 54a818bf998e..e9c9039eb6da 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -16,5 +16,5 @@ EBUILD gdal-3.8.0-r1.ebuild 7637 BLAKE2B 880de2388b10f4de0a049ccee96fe53b857afbf EBUILD gdal-3.8.5.ebuild 7592 BLAKE2B b84884742702cf708847a403e8069ed46916cd038a35013fddf94043994904001bfe6577e738e708b341759495ad9fd8e3c5726440498b08e9a3001d6152317a SHA512 86d8586f309023be222c0aa56a6a6dd7aa3851cd0ca8b4b3b7b40ea6cf388e8cb5dd1b70d945c22c06899461b275320a8a5ec1b1f785c849906a2094d1b3c786 EBUILD gdal-3.9.0.ebuild 7570 BLAKE2B 62464361be497f14052f94cfff55ac357d0822b3fd95e461e8ced40516352a7333ec0fd4671238646775e593f2f64454d3416f01dfb0dd13944593983269279a SHA512 bf53744c3266dac39540c5e2a261e1b16ad92ca71877fb16bc7de0d83523151f6c2d02081967182fa3aea75d3981d41d9a0697852351f56362e1e87e9226f0fc EBUILD gdal-3.9.1-r1.ebuild 7630 BLAKE2B 4bc755890e5a4767191b08bde1e657774055d059ce96e99bb7ad139206d2ccb91b9215e8e7c4ba2dfd1d6a2622382e2a654d60e8baf5ebec253c02e06b494d90 SHA512 e15e5008d8c0858b4e5a0df70239456fd8dc6b2565ba3c420d3a002bb70fe90d5a29cabb1f4a034048c66be26f49aaadb53ce55ce37463ca38e58f8207de05bb -EBUILD gdal-3.9.1.ebuild 7575 BLAKE2B 1cf1b46e876a7e91435cda0469ec1c8e87cc4d9ea61f53a7c8e1df3711c2e1e874335a72d71bf7699fd97fbc6d40422f3a63b9d3debab9b6d5dd7030c7c8b3a7 SHA512 5cb7f50c01a972c4720ff9b4e1fc4d1b2876625c087509b759270cc3b33022bac162770ac421daad762b17e434275ce0bd359724f787259b3bc330dbac46d2e4 +EBUILD gdal-3.9.1.ebuild 7574 BLAKE2B 986054296a096755065582c067f0ded9c2161fa83c081624c6859a7e2cb7a995ffb50f622c89a36c36ba91c5542281e4c1dc18c48e3ccfb1e6b5ac6cd407da41 SHA512 1d74a6d9ead2365c65856dbb45f6f2af3df4aa7c02df28e07c1389131c37510ab6e44c7b2a7f1b78e64e49bfa5046fe5ef9131ca7d11be684f9ecc76ede09d4b MISC metadata.xml 1401 BLAKE2B f76e292c72b879bf98dd9e009bdc3aabd5d1ca134d2f867a38faafa755db99b39d217b12105a184ca2ad4943704b8f1df6d129605f59485dc74114e88bfcbbed SHA512 54342a758b5d8c0b7dac325565cb7ace9ac32a6a27b621bea232ade813f9bc6b002049fb0293b7b838dd9f0ec10719ccf8f11197227acfbeddc77b4f87dc4a12 diff --git a/sci-libs/gdal/gdal-3.9.1.ebuild b/sci-libs/gdal/gdal-3.9.1.ebuild index dffb907ec66a..22717aa1fd76 100644 --- a/sci-libs/gdal/gdal-3.9.1.ebuild +++ b/sci-libs/gdal/gdal-3.9.1.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta LICENSE="BSD Info-ZIP MIT" SLOT="0/35" # subslot is libgdal.so.<SONAME> -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle parquet pdf png postgres python spatialite sqlite test webp xls zstd" RESTRICT="!test? ( test )" diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index b27039191530..e11a388ce8f7 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,9 +1,5 @@ -AUX opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch 2207 BLAKE2B f00d3137ff9046019f0e4dbad09d79141a65c0b68da0e5c613aa234fddfd651e2b61fb00129ae7a84f521ca3e00858d76ce46cc2f62521c22402f4b664e94274 SHA512 8a4206854a96fb4c45450ad1081cd28ede0171f32392d9f0876b7e41789a0ba2e07ca82011503bd562541367a6b39b8df15aba843f6bb6eef6c473db6ee788a4 AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 01b0ec99fb9ad032d6a90cceabb50900528abd0528b53e976484bf02f04eac9bc02b063bce5c221ae88782a126103e8077db9e90aa7f64f4f187dad00354d4d2 SHA512 fb3c374fe8aff8d2bac039a0eef754f2e823a97bfd7860bdd7e047c1b357202abfca0e37b46afc32220c7e354b5edb54805fbbbffde015bb4be2d7f4ded4a8da AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7 -AUX opencascade-7.5.3-tbb-2021.patch 1931 BLAKE2B cf4f6895f7418a4af75f164065945aff9b7f592ed221b1802f08c9b912fb970c5f7a868c9302f05865f8bd5f30de1bdda2abcb0dc928d28500ca3956735efa2b SHA512 203d28fe8b61ac7cabac2f6d2dd1e1deea80e9f18123ced4581bf2cfa054d350251cdc9e32f01a95b713ac915859be42f25e770593469ca3f07169e0508ef18c -AUX opencascade-7.6.2-avoid-pre-stripping-binaries.patch 1187 BLAKE2B fbfc9f3aafc4e69259cc37e82c266f7af979716bed7d80fd0f680b4b6d6fdad3b26b0214f06fbbc8ee09db08602572a4543ad0aa8ec7b1af98139312cdba291d SHA512 04c7f37e42eeafe6d8ee99df8c50bb5bf8bbc90c8b958fcf486adbfbf79fcba60c4a3bbbf7495388096f5902b0af7280f0561556eae6e6f030b73850df55ca2c -AUX opencascade-7.7.0-add-missing-include-limits.patch 459 BLAKE2B 507fd80c08c52ea1e9a9e70a0cbc6bee4f7093123de71f2b173e2d43355a1cc8a45f05e4acc7c07dbdfa1035fe13c97d56466a15e386c00c03c283dddd6b71a5 SHA512 048384188731831f7dd47d32d38df115a3e4c6abaf47615233b16c00b0547fee8ec757623d5c7ff0250988c9d47c0821fa06f95a69413fe2c339f0a5a47223d1 AUX opencascade-7.7.0-avoid-pre-stripping-binaries.patch 1357 BLAKE2B 2f26c4a4e4737971b0bf14828acc7c6049ad75920853f565705699ab58bf60d6e4aa5473114c6224938870e19439b569ce2112af2e9b0742c361cc54a68421ae SHA512 202994e6a0b42c2469f8fc11ace7364ce41056192393bd2930fba1468809ce8992169a6ccbe909930ad181d9c633fc9f6169f7ef72ef071c0186ae7f2ecdb456 AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff2aca6662f18d67e72a341e98281b0b04b7b302ad9d0adfa576ad82ce3cfa646e1b9f4107580231bf8613d0cdb72791fda478485c8072827 SHA512 3afb471767b78b4096e00a8eab4c71a90944c70945a16f45ac372ab824c4c6a140c165882e7cb15c95c95d70ae4c9298cc03fc7cd4ebe920bb7ed4eb38aba0a5 AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4 @@ -15,15 +11,8 @@ AUX opencascade-7.8.0-jemalloc-noexcept.patch 529 BLAKE2B 7882379259c483625e8b83 AUX opencascade-7.8.0-tests.patch 539 BLAKE2B 519e97a2881da6d437c4b54beaeb5e77883669ff8d16b491bc6859db6c02e807dc4ceffa1052ece9a8ec56ba9024c5abb61caca1a1efa7847efbe3bce7d5ef95 SHA512 4ba8fcf8277b4dda3ceb84010299b925ccb561e9bb3d1097dc41c437be6be9499160ac1c3f36d63ca6f4fa9f9f9d012f787125c0bd693b44028c50b9c858bd8a AUX opencascade-7.8.1-vtk_components.patch 603 BLAKE2B cfe4b19b53a63df593fb64e86ba2a4b31d9346a06fa7666cf29ca6b17aa18bbacf806828a3402395032cdece8ea36a672b27fdc9433fd56b3282173a0fa92310 SHA512 5f63bf223c29a8f2492484364b1ab097bb7c9f5a1ab064c0cff9a593836b2f4fff20de1d677cf81d51f0e68ddfc8b1466a5c1dcffdcd10bea58e6c2501f2b776 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019 -DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded -DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c -DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052 SHA512 807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81 -DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279 SHA512 71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8 DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c SHA512 9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990 -EBUILD opencascade-7.6.3-r2.ebuild 4690 BLAKE2B 8447a1b6c95c13c14a21bc58fbe82bb113e4d042e1034f66723f19eeddb558f8a243e77514c27ed53b0f220cb077d5bc91a8856f41a74d5fa396c16c3548e658 SHA512 d5821c186e2715fa7cea2b21f043b9c08c99de015789837b5e27a537c4a4017af0366752840d817b92506bea2d9bd2450fa6fca914c2e266001cde0cd483ebf4 -EBUILD opencascade-7.7.0-r2.ebuild 4970 BLAKE2B 5d92de56b2b667ad7817c512f0051b007b7089b864b63d438c35d306cdb2073743c5565946ab64f3d4a06ddfcfcd8051574bd41de299c75c9067cff639950d66 SHA512 52394427ab0e3de8599d79a18aaa9135c8d683451a0f0cd58a49de5e43fa734554010be73f19b4bbe33c84940fe805bb76ebd89d988449f86230683b55ced243 -EBUILD opencascade-7.7.2-r1.ebuild 9284 BLAKE2B 4154f8f5c3892ca163e32559d2fa839d8ecab452043cf4f991fa781cd9bbc0b1a4a41a7bac1e0e76705abefdabb9e01c3f22de8a0383691144f2c6296ce71ea4 SHA512 3323098f4439541acb74603c3ec55fe885f2f6d1ebcc09c889e984724eee6c54484dd40c508aa2132a3c935ecfc359a1330650f4eefd6c8f159df9e776b2b0a8 EBUILD opencascade-7.8.1.ebuild 9790 BLAKE2B b5a409776b201debb6e2668832a9039f44fb2395a780fb750758f3670c21336f89d4f699594c52c87fba502c4686d193bcf92039fb351067813eb4fd0ac4e1b0 SHA512 43ef5730e5d26936215dcea8df5095eddd94bbe925817e645ec7f41ad28928cc99848656aa9dd78926f159521928f616bf9be310910deb35a8ec0f847b0d8e11 EBUILD opencascade-9999.ebuild 9649 BLAKE2B 4dee7cb6a3ff5f6d59e58338f4b6a2309c7bdbfc63d63a8cc3671f8929a29bf79187785f4ba8b7f9d21abd863da517819f3f749f3aac4adf9035b19c42cae5e0 SHA512 befee43a568193cad25fd3d889d6a1e29fc87e7838545f0b6aa9bfb92e0e0c534056f4a24c4b609e1622d313fab5077af4dec4e4cb8861f3bae52f74072aad5d -MISC metadata.xml 1532 BLAKE2B 3dcf1eddd35262f7642a7fdea793ba8d696fa987abf8add8c06982bd0923b86864d89c8ab7f8582f2b8a3fc07ee8c284b7f1ad0402eed9af8b78680eeadd254a SHA512 843150e97f20c48775cecad5f95cb661f6bea721f3cf531d8c8f13a821f3c83b7962b80588ce9009888b93fc6b15c868729a5ab3bed0485b306f338ff399acbc +MISC metadata.xml 1416 BLAKE2B d28651c4dd23df684c014535cab0a2b13ae7441d13fb8433780fc99e271f992345b462d18761819c775ca0838903c6b7cc91033afd25cd1bbb7b7b7d3e8b9cde SHA512 894763fe5d16810624767e36987b845cd00c1999be670210fc01a46a3fb8ead951acb199cc54e2a6978a923f6c27652ac86a5b8ba04c6900c26a1f9436bb101e diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch deleted file mode 100644 index caace23fc2d8..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8469f927963fe4bece05297c514fb2b9f9ad9b1a Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Fri, 5 Feb 2021 13:44:15 +0100 -Subject: [PATCH] fix installation of cmake config files - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - CMakeLists.txt | 2 +- - adm/cmake/occt_macros.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 100d6133..bc8cdb92 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1156,7 +1156,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES}) - endforeach() - # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration - install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") --install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") -+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") - - foreach (OCCT_MODULE ${OCCT_MODULES}) - if (BUILD_MODULE_${OCCT_MODULE}) -diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake -index 0a387945..f10fe5e3 100644 ---- a/adm/cmake/occt_macros.cmake -+++ b/adm/cmake/occt_macros.cmake -@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE) - "cmake_policy(PUSH) - cmake_policy(SET CMP0007 NEW) - string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) -- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") -+ file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") - foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES}) - file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT) - file (REMOVE \"\${TARGET_FILENAME}\") --- -2.30.0 - diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch deleted file mode 100644 index 38770ac9a541..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3 - -From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001 -From: kgv <kgv@opencascade.com> -Date: Mon, 29 Nov 2021 21:26:45 +0300 -Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB - 2021 - -Removed usage of no more existing tbb::task_scheduler_init and tbb::captured_exception. ---- a/src/OSD/OSD_Parallel_TBB.cxx -+++ b/src/OSD/OSD_Parallel_TBB.cxx -@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS - #include <tbb/parallel_for.h> - #include <tbb/parallel_for_each.h> - #include <tbb/blocked_range.h> --#include <tbb/task_scheduler_init.h> -+#if TBB_VERSION_MAJOR < 2021 -+ #include <tbb/task_scheduler_init.h> -+#endif - Standard_ENABLE_DEPRECATION_WARNINGS - - //======================================================================= -@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin, - const FunctorInterface& theFunctor, - Standard_Integer theNbItems) - { -+#if TBB_VERSION_MAJOR >= 2021 -+ // task_scheduler_init is removed, -+ // exceptions are captured without proxy tbb::captured_exception object -+ (void )theNbItems; -+ tbb::parallel_for_each (theBegin, theEnd, theFunctor); -+#else - try - { - const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool(); -- const Standard_Integer aNbThreads = theNbItems > 0 ? -- aThreadPool->NbDefaultThreadsToLaunch() : -1; -- -+ const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1; - tbb::task_scheduler_init aScheduler (aNbThreads); - tbb::parallel_for_each (theBegin, theEnd, theFunctor); - } -@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin, - { - throw Standard_ProgramError (anException.what()); - } -+#endif - } - - #endif /* HAVE_TBB */ - diff --git a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch deleted file mode 100644 index 144047fba163..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/831800 -https://dev.opencascade.org/content/dont-pre-strip-binaries - -From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sun, 5 Jun 2022 09:48:09 +0200 -Subject: [PATCH] avoid pre-stripping binaries - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/adm/cmake/occt_defs_flags.cmake -+++ b/adm/cmake/occt_defs_flags.cmake -@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang") - # does not support option "-std=c++0x" - set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") - endif() -- # Optimize size of binaries -- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}") - elseif(MINGW) - add_definitions(-D_WIN32_WINNT=0x0601) - # _WIN32_WINNT=0x0601 (use Windows 7 SDK) -@@ -150,9 +148,6 @@ elseif(MINGW) - elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX) - # Require C++11 - set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") -- # Optimize size of binaries -- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") -- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") - endif() - - if (BUILD_RELEASE_DISABLE_EXCEPTIONS) --- -2.35.1 - diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch deleted file mode 100644 index 2bc59319864a..000000000000 --- a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 44a30819131496bf41f2e1dcfd362b23173db6fb Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Wed, 5 Oct 2022 21:55:06 +0200 -Subject: [PATCH] add missing #include <limits> - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/src/ViewerTest/ViewerTest_CmdParser.cxx -+++ b/src/ViewerTest/ViewerTest_CmdParser.cxx -@@ -21,6 +21,7 @@ - - #include <algorithm> - #include <iostream> -+#include <limits> - - namespace - { --- -2.38.0 - diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml index 5f2d813e1af6..38b85e513a1f 100644 --- a/sci-libs/opencascade/metadata.xml +++ b/sci-libs/opencascade/metadata.xml @@ -10,7 +10,6 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="eigen">Enable support for eigenvalues through the header-only <pkg>dev-cpp/eigen</pkg> package.</flag> <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag> <flag name="freetype">Enable <pkg>media-libs/freetype</pkg> support</flag> <flag name="inspector">Build Inspector tool</flag> diff --git a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild deleted file mode 100644 index 2e561ce32b79..000000000000 --- a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_SLOT="$(ver_cut 1-2)" -COMMIT="b079fb9877ef64d4a8158a60fa157f59b096debb" -COMMIT_SHORT="${COMMIT:0:7}" - -DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="https://www.opencascade.com" -SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" -S="${WORKDIR}/occt-${COMMIT_SHORT}" - -LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="0/${MY_SLOT}" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" -IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk" - -REQUIRED_USE="?? ( optimize tbb )" - -# There's no easy way to test. Testing needs a rather big environment -# properly set up. -RESTRICT="test" - -# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5 -RDEPEND=" - dev-lang/tcl:= - dev-lang/tk:= - dev-tcltk/itcl - dev-tcltk/itk - dev-tcltk/tix - media-libs/fontconfig - media-libs/freetype:2 - media-libs/ftgl - virtual/glu - virtual/opengl - x11-libs/libX11 - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - ffmpeg? ( <media-video/ffmpeg-5:= ) - freeimage? ( media-libs/freeimage ) - tbb? ( dev-cpp/tbb:= ) - vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) -" -DEPEND=" - ${RDEPEND} - eigen? ( dev-cpp/eigen ) - json? ( dev-libs/rapidjson ) - vtk? ( dev-libs/utfcpp ) -" -BDEPEND=" - doc? ( app-text/doxygen[dot] ) - examples? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch - "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch - "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch - "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch - "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch - "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch - "${FILESDIR}"/${PN}-7.7.0-musl.patch -) - -src_prepare() { - cmake_src_prepare - - sed -e 's|/lib\$|/'$(get_libdir)'\$|' \ - -i adm/templates/OpenCASCADEConfig.cmake.in || die - - # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some - # assumptions it makes about installation paths. Rather than fixing it, just - # get rid of the mechanism altogether - its purpose is to allow a - # side-by-side installation of release and debug libraries. - sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ - -i adm/cmake/occt_toolkit.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOC_Overview=$(usex doc) - -DBUILD_Inspector=$(usex examples) - -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916 - - -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" - -DINSTALL_DIR_DATA="share/${PN}/data" - -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_INCLUDE="include/${PN}" - -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" - -DINSTALL_DIR_RESOURCE="share/${PN}/resources" - -DINSTALL_DIR_SAMPLES="share/${PN}/samples" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_WITH_VERSION=OFF - -DINSTALL_SAMPLES=$(usex examples) - -DINSTALL_TEST_CASES=NO - - -DUSE_D3D=NO - # no package yet in tree - -DUSE_DRACO=OFF - -DUSE_EIGEN=$(usex eigen) - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_FREEIMAGE=$(usex freeimage) - -DUSE_FREETYPE=ON - -DUSE_GLES2=$(usex gles2) - # no package in tree - -DUSE_OPENVR=OFF - -DUSE_RAPIDJSON=$(usex json) - -DUSE_TBB=$(usex tbb) - -DUSE_VTK=$(usex vtk) - -DUSE_XLIB=ON - # suppress CMake dev warnings - -Wno-dev - ) - - use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON ) - - if use examples; then - mycmakeargs+=( - -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr - -DBUILD_SAMPLES_QT=ON - ) - fi - - if use vtk; then - local vtk_ver=$(best_version "sci-libs/vtk") - vtk_ver=${vtk_ver#sci-libs/vtk-} - vtk_ver=$(ver_cut 1-2 ${vtk_ver}) - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver} - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) - fi - - cmake_src_configure - - sed -e "s|lib/|$(get_libdir)/|" \ - -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ - < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die - - # use TBB for memory allocation optimizations - if use tbb; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die - fi - - # use internal optimized memory manager and don't clear memory with this - # memory manager. - if use optimize ; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ - -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ - -i "${T}"/99${PN} || die - fi -} - -src_install() { - cmake_src_install - - doenvd "${T}/99${PN}" - - docompress -x /usr/share/doc/${PF}/overview/html -} diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild deleted file mode 100644 index 9db1978c27a0..000000000000 --- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# USE_{DRACO,FFMPEG,FREEIMAGE,FREETYPE,GLES2,OPENGL,OPENVR,RAPIDJSON,TBB,TK,VTK,XLIB} - -EAPI=8 - -inherit cmake flag-o-matic - -MY_SLOT="$(ver_cut 1-2)" -MY_PV="$(ver_rs 3 '-')" - -DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="https://www.opencascade.com" -SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=185d29b92f6764ffa9fc195b7dbe7bba3c4ac855;sf=tgz -> ${P}.tar.gz" -S="${WORKDIR}/occt-185d29b" - -LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="0/${MY_SLOT}" -KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" -IUSE="doc examples ffmpeg freeimage gles2 json optimize tbb vtk" - -REQUIRED_USE="?? ( optimize tbb )" - -# There's no easy way to test. Testing needs a rather big environment -# properly set up. -RESTRICT="test" - -# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 -RDEPEND=" - dev-lang/tcl:= - dev-lang/tk:= - media-libs/fontconfig - media-libs/freetype:2 - virtual/opengl - x11-libs/libX11 - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - ffmpeg? ( <media-video/ffmpeg-5:= ) - freeimage? ( media-libs/freeimage ) - tbb? ( dev-cpp/tbb:= ) - vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - json? ( dev-libs/rapidjson ) - vtk? ( dev-libs/utfcpp ) -" -BDEPEND=" - doc? ( app-text/doxygen ) - examples? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch - "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch - "${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch - "${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch - "${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch - "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch - "${FILESDIR}"/${PN}-7.7.0-musl.patch -) - -src_prepare() { - cmake_src_prepare - - sed -e 's|/lib\$|/'$(get_libdir)'\$|' \ - -i adm/templates/OpenCASCADEConfig.cmake.in || die - - # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some - # assumptions it makes about installation paths. Rather than fixing it, just - # get rid of the mechanism altogether - its purpose is to allow a - # side-by-side installation of release and debug libraries. - sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ - -i adm/cmake/occt_toolkit.cmake || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862912 - # https://tracker.dev.opencascade.org/view.php?id=33091 - filter-lto - - local mycmakeargs=( - -DBUILD_DOC_Overview=$(usex doc) - -DBUILD_Inspector=$(usex examples) - -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916 - - -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" - -DINSTALL_DIR_DATA="share/${PN}/data" - -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_INCLUDE="include/${PN}" - -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" - -DINSTALL_DIR_RESOURCE="share/${PN}/resources" - -DINSTALL_DIR_SAMPLES="share/${PN}/samples" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_WITH_VERSION=OFF - -DINSTALL_SAMPLES=$(usex examples) - -DINSTALL_TEST_CASES=NO - - -DUSE_D3D=NO - # no package yet in tree - -DUSE_DRACO=OFF - # has no function in 7.7.0_beta - # see https://dev.opencascade.org/content/occt-770-beta-version-available#comment-23733 - -DUSE_EIGEN=OFF - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_FREEIMAGE=$(usex freeimage) - -DUSE_FREETYPE=ON - -DUSE_GLES2=$(usex gles2) - # no package in tree - -DUSE_OPENVR=OFF - -DUSE_RAPIDJSON=$(usex json) - -DUSE_TBB=$(usex tbb) - -DUSE_VTK=$(usex vtk) - -DUSE_XLIB=ON - # suppress CMake dev warnings - -Wno-dev - ) - - use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON ) - - if use examples; then - mycmakeargs+=( - -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr - -DBUILD_SAMPLES_QT=ON - ) - fi - - if use tbb; then - mycmakeargs+=( -D3RDPARTY_TBB_DIR="${ESYSROOT}"/usr ) - fi - - if use vtk; then - local vtk_ver=$(best_version "sci-libs/vtk") - vtk_ver=${vtk_ver#sci-libs/vtk-} - vtk_ver=$(ver_cut 1-2 ${vtk_ver}) - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver} - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) - fi - - cmake_src_configure - - sed -e "s|lib/|$(get_libdir)/|" \ - -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ - < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die - - # use TBB for memory allocation optimizations - if use tbb; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die - fi - - # use internal optimized memory manager and don't clear memory with this - # memory manager. - if use optimize ; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ - -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ - -i "${T}"/99${PN} || die - fi -} - -src_install() { - cmake_src_install - - doenvd "${T}/99${PN}" - - docompress -x /usr/share/doc/${PF}/overview/html -} diff --git a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild deleted file mode 100644 index ebb48f6acc7e..000000000000 --- a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic virtualx - -DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="https://www.opencascade.com" - -MY_PN="OCCT" - -MY_TEST_PV="7.7.0" -MY_TEST_PV2="${MY_TEST_PV//./_}" - -SRC_URI=" - test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz - -> ${PN}-dataset-${MY_TEST_PV}.tar.gz ) -" - -if [[ ${PV} = *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git" -else - MY_PV="${PV//./_}" - SRC_URI+=" - https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz - " - S="${WORKDIR}/${MY_PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="0/$(ver_cut 1-2)" -IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector json +opengl optimize tbb test testprograms tk vtk" - -REQUIRED_USE=" - ?? ( optimize tbb ) - ?? ( opengl gles2-only ) - test? ( freeimage json opengl ) -" - -# There's no easy way to test. Testing needs a rather big environment properly set up. -RESTRICT="!test? ( test )" - -# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 -RDEPEND=" - dev-lang/tcl:= - tk? ( dev-lang/tk:= ) - dev-libs/double-conversion - freetype? ( - media-libs/fontconfig - media-libs/freetype:2 - ) - gles2-only? ( - media-libs/libglvnd - ) - opengl? ( - media-libs/libglvnd[X] - ) - X? ( - x11-libs/libX11 - ) - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - ffmpeg? ( <media-video/ffmpeg-5:= ) - freeimage? ( media-libs/freeimage ) - inspector? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - tbb? ( dev-cpp/tbb:= ) - vtk? ( - dev-lang/tk:= - sci-libs/vtk:=[rendering] - tbb? ( - sci-libs/vtk:=[tbb,-cuda] - ) - ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - json? ( dev-libs/rapidjson ) -" -BDEPEND=" - doc? ( app-text/doxygen[dot] ) - inspector? ( - dev-qt/linguist-tools:5 - ) - test? ( dev-tcltk/thread ) -" - -PATCHES=( - "${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch" - "${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch" - "${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch" - "${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch" - "${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch" - "${FILESDIR}/${PN}-7.7.0-musl.patch" - "${FILESDIR}/${PN}-7.7.0-tbb-detection.patch" - "${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch" - "${FILESDIR}/${PN}-7.8.0-tests.patch" -) - -src_unpack() { - if [[ ${PV} = *9999* ]] ; then - git-r3_src_unpack - else - unpack "${P}.tar.gz" - fi - - if use test; then - mkdir "${WORKDIR}/data" - pushd "${WORKDIR}/data" > /dev/null || die - # should be in paths indicated by CSF_TestDataPath environment variable, - # or in subfolder data in the script directory - unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz" - popd > /dev/null || die - fi -} - -src_prepare() { - cmake_src_prepare - - sed -e 's|/lib\$|/'"$(get_libdir)"'\$|' \ - -i adm/templates/OpenCASCADEConfig.cmake.in || die - - # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some - # assumptions it makes about installation paths. Rather than fixing it, just - # get rid of the mechanism altogether - its purpose is to allow a - # side-by-side installation of release and debug libraries. - sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ - -i adm/cmake/occt_toolkit.cmake || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862912 - # https://tracker.dev.opencascade.org/view.php?id=33091 - filter-lto - - local mycmakeargs=( - -D3RDPARTY_DIR="${ESYSROOT}/usr" - -DBUILD_CPP_STANDARD="C++17" - -DBUILD_SOVERSION_NUMBERS=2 - - -DBUILD_DOC_Overview="$(usex doc)" - -DBUILD_Inspector="$(usex inspector)" - - -DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)" - -DBUILD_USE_PCH="no" - # -DBUILD_OPT_PROFILE="Default" # Production - # -DBUILD_RESOURCES="yes" - # -DBUILD_YACCLEX="yes" - - -DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916 - -DINSTALL_DIR="${EPREFIX}/usr" - -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" - -DINSTALL_DIR_DATA="share/${PN}/data" - -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_INCLUDE="include/${PN}" - -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" - -DINSTALL_DIR_RESOURCE="share/${PN}/resources" - -DINSTALL_DIR_SAMPLES="share/${PN}/samples" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" - -DINSTALL_DIR_TESTS="share/${PN}/tests" - -DINSTALL_DIR_WITH_VERSION="no" - -DINSTALL_SAMPLES="$(usex examples)" - - -DINSTALL_TEST_CASES="$(usex testprograms)" - - # no package yet in tree - -DUSE_DRACO="no" - -DUSE_FFMPEG="$(usex ffmpeg)" - -DUSE_FREEIMAGE="$(usex freeimage)" - -DUSE_FREETYPE="$(usex freetype)" - # Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module - -DUSE_GLES2="$(usex gles2-only)" - # Indicates whether OpenGL desktop should be used in OCCT visualization module - -DUSE_OPENGL="$(usex opengl)" - # no package in tree - -DUSE_OPENVR="no" - -DUSE_RAPIDJSON="$(usex json)" - -DUSE_TBB="$(usex tbb)" - -DUSE_TK="$(usex tk)" - -DUSE_VTK="$(usex vtk)" - -DUSE_XLIB="$(usex X)" - ) - - if use doc; then - mycmakeargs+=( - -DINSTALL_DOC_Overview="yes" - -D3RDPARTY_SKIP_DOT_EXECUTABLE="no" - ) - fi - - if use examples || use inspector; then - mycmakeargs+=( - -D3RDPARTY_QT_DIR="${ESYSROOT}/usr" - -DBUILD_SAMPLES_QT="$(usex examples)" - ) - fi - - if use tbb; then - mycmakeargs+=( - -D3RDPARTY_TBB_DIR="${ESYSROOT}/usr" - ) - fi - - if use vtk; then - local vtk_ver - vtk_ver="$(best_version "sci-libs/vtk")" - vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}") - mycmakeargs+=( - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}" - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)" - ) - fi - - cmake_src_configure - - sed -e "s|lib/|$(get_libdir)/|" \ - -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ - < "${FILESDIR}/${PN}.env.in" > "${T}/99${PN}" || die - - # use TBB for memory allocation optimizations - if use tbb; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/99${PN}" || die - fi - - # use internal optimized memory manager and don't clear memory with this - # memory manager. - if use optimize ; then - sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ - -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ - -i "${T}/99${PN}" || die - fi -} - -src_test() { - echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die - - if has_version media-fonts/dejavu; then - cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal - fi - - local test_file=${T}/testscript.tcl - - local draw_opts=( - i # see ${BUILD_DIR}/custom*.sh - # -b # batch mode (no GUI, no viewers) - -v # no GUI, use virtual (off-screen) windows for viewers - ) - - local test_names=( - "demo draw bug30430" # prone to dying due to cpu limit - ) - local test_opts=( # run single tests - -overwrite - ) - for test_name in "${test_names[@]}"; do - cat >> "${test_file}" <<- _EOF_ || die - test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]} - _EOF_ - done - - local testgrid_opts=() - - local SKIP_TESTS=() - - if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then - SKIP_TESTS+=( - 'blend complex F4' - 'bugs' - 'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11} - 'heal checkshape bug32448_1' - 'hlr exact_hlr bug25813_2' - - 'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate} - 'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703} - 'lowalgos proximity '{A4,A5} - 'opengl background bug27836' - 'opengl drivers opengles' - 'opengles3' - - 'offset wire_closed_inside_0_005 D1' - 'offset wire_unclosed_outside_0_025 A1' - - 'demo draw bug30430' - ) - - local DEL_TESTS=( - 'opengl/data/background/bug27836' - 'perf/mesh/bug26965' - 'v3d/trsf/bug26029' - ) - - for test in "${DEL_TESTS[@]}"; do - rm "${CMAKE_USE_DIR}/tests/${test}" || die - done - fi - - if ! use vtk; then - SKIP_TESTS+=( - 'vtk' - ) - echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules" - fi - - if [[ -n "${SKIP_TESTS[*]}" ]]; then - testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" ) - fi - - testgrid_opts+=( - # -refresh 5 - -overwrite - ) - cat >> "${test_file}" <<- _EOF_ || die - testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]} - _EOF_ - - # # regenerate summary in case we have to - # cat >> "${test_file}" <<- _EOF_ || die - # testsummarize "${BUILD_DIR}/test_results" - # _EOF_ - - # Work around zink warnings - export LIBGL_ALWAYS_SOFTWARE="true" - - export CASROOT="${BUILD_DIR}" - - virtx \ - "${BUILD_DIR}/draw.sh" \ - "${draw_opts[@]}" \ - -f "${test_file}" - - if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then - eerror "tests never ran!" - die - fi - failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")" - if [[ -n ${failed_tests} ]]; then - eerror "Failed tests:" - eerror "${failed_tests}" - die - fi -} - -src_install() { - cmake_src_install - - doenvd "${T}/99${PN}" - - docompress -x "/usr/share/doc/${PF}/overview/html" -} diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index 9f8cdf918137..317f37fcbda4 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,17 +1,7 @@ -AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7 -AUX p4est-2.3.6-override_soname.patch 612 BLAKE2B b34bc5c700446526d5e93e986928202e05c3aec4a96bf1019a59eb12e905d9da3ef6ded754931245e4d8c4ce6c2d02dd8ea1ee0e90c5c69f35fc70b89599804f SHA512 7d7ca69c5211124fb3a6cf1d710b775e4f4141dad43b80900e3591d444ed538ba276878683922a596a521747e0c35598f7cf53b8ccf5999423f51ead9c158259 -AUX p4est-2.8.5-fix_build_system.patch 717 BLAKE2B 87d73e6a40c4d3c4a63f81310f8fed7580c26c42d4f6e104d83ccaa05e9cade306da0b7897ed5dbad1c559b79cbec0c23b950406bc4eebf81c88942e19e2757c SHA512 b425ee30cb1e6754f2139e72984152fe3ed5df71fce1ae5d8ae797b7edd292159f700a13c431ba57177132dbe297606594a0e29aa4df407f6275e517536c3124 -AUX p4est-2.8.5-fix_cmake_path.patch 1293 BLAKE2B 223471b591415a89fb62f503802a25b2e53aa16201a4582908b1e1f65701eef6d425a7c775cd6bd3d45e420cead3d2caf00fefb56591593d6033005596458cfb SHA512 cd0368b729fb6118ab0f5b48e91657e6e4452e77271178700873c9e890a5678dda5059e4679fb2770b711f45a02c12a0edbce9c154ab6ab6f456829557d745fb -AUX p4est-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c AUX p4est-2.8.6-fix_build_system.patch 720 BLAKE2B e367e81b27618320883b7e5a9e85ee7bfa6e9b7920e39ce96698f8bc7f91fd84b52cd3843773654827781c87bfd3e33558a4750b5e491477a202ab47baf8346d SHA512 1fe5dc6fbc1372420c3c4b0209f59e1477e6b7c992bb74d99748dc4856e1b5b3c6763d1c66b253ea93d6562bd56704af670222674414e977f4be17a774e7f7a1 AUX p4est-2.8.6-fix_cmake_path.patch 1623 BLAKE2B 30ce39158adb3869dbfbdcad66114544b9bd1849234dac75f9d57b24fda53506c0d039f82cfec3a970253b37191a34d00488617f73ed598822f30e14fde020fe SHA512 e4ff2da317527525e2e5c7a3f394e6f385ad0ee64caae7248761ca9bc1251d43552da71822f28303af02c463e712c2cab3ac34d524cbe0185eba0f64749a3e4c AUX p4est-2.8.6-set_version.patch 1772 BLAKE2B e489b4c18cb466b420a8ace4c7bfeb347daa3873a2549f200006161a34ab22a1d7e92252d45ae9b5db3710f09619f620e183d46a784b8029b395ec33ddd13c4e SHA512 0011435d6519664aacab05115f3b9bc4d9c4b7393c78ec6199334456d3d991f1966a0f73f50512aa895d7c834d228733b7e404aae6440ad9c7ec2cdaaaffd75b AUX p4est-2.8.6-use_external_sc.patch 357 BLAKE2B 7e0ac11712c3eb0fc947f1483a7b086628006e892e0a11c532d938a8edb62f0de37157a3d8fdf6913f9128fb9b58214bfa7b3af9a669a6d4167f34903b7ae411 SHA512 c26e460cbf515e8a4da7028751d688dd9f8d0d4107c7186280705797157d9e03ce2ba7547adf4888d6a957e53d6f9960544ab20959417553e0938d9a7c418d28 -DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 -DIST p4est-2.3.6.tar.gz 2645384 BLAKE2B f6763e6a5b8b371eeead8a9d6481ea63e01ec5f13ea0dd9748aeaaec5551d39ac5d73f75f92275bfe61370e578ba1b1d0940c569e48fbd83997eaad4ab65b088 SHA512 99df91ee9d351cc889a532764096428e3f575c5f71199fca9f217c3dac5030a263308aa9c698476e7a12774d0751409f27e70ac2e9cd27847b2345b3f909b195 -DIST p4est-2.8.5.tar.gz 2721258 BLAKE2B 07fd70f5b7ce0d2dcdc0d913cd9ae7920272a0e459c7db7f9d180b592570a5232c7d2bd03547eec3333dcdc6fdc83adcce30c71eb9c44ab6e6b9b9a314707471 SHA512 22b5a9bbfb51e972f4b93a90f5fa0f9557770ccbe357044b5bb97b31d02783affef188cde38c86bb4ece31ba23ce47e4eb95a6e7c5f02d11549cf986e85f68a0 DIST p4est-2.8.6.tar.gz 4589078 BLAKE2B 7f868cf38aa4e0abc50b4c1071ca39ada2fa9cc973f31bb0365eb1bf447f9a23fa570ada525b1482cb8120a534582cf978ccae83048d27c439ea07572171e928 SHA512 e5892cf153cb4204c2ae3c1389c6a872113b037abda1d0f95df062ad2651a2231b1e3cabdc8e86f3f61ad021274a069acf7ec801281164740a8018ac46b07c96 -EBUILD p4est-2.3.6.ebuild 2926 BLAKE2B 3c837d7d93f8ec1513a465707552dc1f3e014fc57867f5c12358abf73226147e9422becb42ece3d57fecdb4f858721a68dc3a9bcb6c785f96acfb9131e237733 SHA512 2e3a698a59218906a7490c808224ac8c5902c639fba96ad5d26fe4f828f9d96e037dc605d958fc0934fefbe842e9aa07e06be8c7b50312b731066b449e52c1e7 -EBUILD p4est-2.8.5-r3.ebuild 1733 BLAKE2B d98f17da8af76900a6b8016d021caa26b965befd8f49342a97b567ee1951bbf9588990866eab62d2c38acb3debc7c904b3c50c02c5f07b4e991c818e956a6308 SHA512 bbf7e2e87ef6f4e868d88a50819a052ea91468babe1958b0065b8de23ec2b022564a216ba0ca99d59a15c3b8307bd2f6f6a1d76ca28210f44838a07a486d0099 EBUILD p4est-2.8.6.ebuild 1661 BLAKE2B 94fa83b83742a5c6512dcb96df77ed4e7c8e030bcfc2aa4ae7ecffdcc948476ae178f7ee133691827af06ce4db4dc74ed816c9e50cd3a1e711799b6081dc6e6f SHA512 5b05eb5985aae5fd61d7740baaddc592b17fea910605e5c0d00b3df9ae5d42e8b968c4cade5ac0eda62ed57707da48b3c10f475f408472956ff3a873787ee6f1 -MISC metadata.xml 933 BLAKE2B dbebf4c49f70183487e695e63b78c412260956c197dce7471145c8eb150672fcd7223d1ab4b81c793c0147bc77c49f235fbf31949581d760d077c0ca61e72a0b SHA512 228cade7cf570c4e5f629ae64b8fef9cb3635556f2ad52bc31c34480cc148ace1d2ebcb59563d02f1cc94f21a863c6077e8acc9b58b01d0519962c1580d836c5 +MISC metadata.xml 855 BLAKE2B fb3444a8e900f216fde24b9f0136ec2bda2646b96b696c01fe59d74ac59a0bac14c669518b716e4a9da25b3e72cf85676b679162fc3f3d196d9a6df45d00807b SHA512 930f4584f43a51433be58d96bcebe924a1986db5993e2dbf9e574ff0dc1a711fbebf0f5dfe93d8f26c92a8d930a49b60994dc6061a1799d89c9a2158a874ddab diff --git a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch b/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch deleted file mode 100644 index a3209d5064fb..000000000000 --- a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index e8b7e67..1817e37 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,6 @@ - # This file is part of p4est. - # Makefile.am in toplevel directory - --ACLOCAL_AMFLAGS = -I config @P4EST_SC_AMFLAGS@ - if P4EST_SC_MK_USE - @P4EST_SC_MK_INCLUDE@ - endif diff --git a/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch b/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch deleted file mode 100644 index 40f032c109b7..000000000000 --- a/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index b30f0e3..2c636f9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -82,7 +82,7 @@ src_libp4est_la_SOURCES = \ - src_libp4est_la_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS) - ## This is the official API versioning scheme of libtool. Please see: - ## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning --src_libp4est_la_LDFLAGS = -version-info 1:0:0 -+src_libp4est_la_LDFLAGS = -release $(VERSION) - src_libp4est_la_LIBADD = @P4EST_SC_LDADD@ - LDADD += src/libp4est.la @P4EST_SC_LDADD@ - EXTRA_src_libp4est_la_DEPENDENCIES = @P4EST_SC_LDADD@ diff --git a/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch deleted file mode 100644 index 0063acf9c5c1..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78c02bf..d1b2094 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ - DESCRIPTION "p4est manages a collection---a forest---of octrees in parallel." - VERSION ${PROJECT_VERSION}) - -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - include(CTest) - - list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) -@@ -68,8 +70,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/ - - install(TARGETS p4est - EXPORT ${PROJECT_NAME}-targets --ARCHIVE DESTINATION lib --LIBRARY DESTINATION lib -+ARCHIVE DESTINATION ${library_reldir} -+LIBRARY DESTINATION ${library_reldir} - RUNTIME DESTINATION bin - ) - diff --git a/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch b/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch deleted file mode 100644 index 8202a4007ede..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1b2094..e5fe188 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,9 +104,8 @@ endif(BUILD_TESTING) - # --- packaging - - install(FILES --${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSC.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindP4EST.cmake --DESTINATION cmake) -+DESTINATION ${library_reldir}/cmake/P4est) - - include(cmake/pkgconf.cmake) - include(cmake/install.cmake) -diff --git a/cmake/install.cmake b/cmake/install.cmake -index f4f92c4..0f31976 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -4,7 +4,7 @@ include(CMakePackageConfigHelpers) - - configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake --INSTALL_DESTINATION cmake -+INSTALL_DESTINATION ${library_reldir}/cmake/P4est - ) - - write_basic_package_version_file( -@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion - - install(EXPORT ${PROJECT_NAME}-targets - NAMESPACE ${PROJECT_NAME}:: --DESTINATION cmake -+DESTINATION ${library_reldir}/cmake/P4est - ) - - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}ConfigVersion.cmake --DESTINATION cmake -+DESTINATION ${library_reldir}/cmake/P4est - ) - - # --- CPack diff --git a/sci-libs/p4est/files/p4est-2.8.5-set_version.patch b/sci-libs/p4est/files/p4est-2.8.5-set_version.patch deleted file mode 100644 index 061081a0da9e..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-set_version.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/cmake/git.cmake b/cmake/git.cmake -index f88e984..f04f52b 100644 ---- a/cmake/git.cmake -+++ b/cmake/git.cmake -@@ -1,39 +1,5 @@ --# --- extract version from Git -- --set(PROJECT_MAJOR 0) --set(PROJECT_MINOR 0) --set(PROJECT_PATCH 0) --set(PROJECT_VERSION 0.0.0) --find_program(GIT_VERSION_GEN NAMES git-version-gen -- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) --if(GIT_VERSION_GEN) -- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball-version -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- RESULT_VARIABLE _err -- OUTPUT_VARIABLE git_version -- OUTPUT_STRIP_TRAILING_WHITESPACE) --endif() --if(_err EQUAL 0) -- if(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_MINOR "${CMAKE_MATCH_2}") -- set(PROJECT_PATCH "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_MINOR "${CMAKE_MATCH_2}") -- set(PROJECT_PATCH "${CMAKE_MATCH_3}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_MINOR "${CMAKE_MATCH_2}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}) -- elseif(git_version MATCHES -- "^(0|[1-9][0-9]*)") -- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") -- set(PROJECT_VERSION ${PROJECT_MAJOR}) -- endif() --endif() -+set(git_version 2.8.5) -+set(PROJECT_MAJOR 2) -+set(PROJECT_MINOR 8) -+set(PROJECT_PATCH 5) -+set(PROJECT_VERSION 2.8.5) diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml index c58dd131de04..f29f22e517cb 100644 --- a/sci-libs/p4est/metadata.xml +++ b/sci-libs/p4est/metadata.xml @@ -17,7 +17,6 @@ processor cores. </longdescription> <use> <flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag> - <flag name="romio">Build with support for the ROMIO MPI-IO component</flag> </use> <upstream> <remote-id type="github">cburstedde/libsc</remote-id> diff --git a/sci-libs/p4est/p4est-2.3.6.ebuild b/sci-libs/p4est/p4est-2.3.6.ebuild deleted file mode 100644 index 27b596c41c15..000000000000 --- a/sci-libs/p4est/p4est-2.3.6.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools flag-o-matic lua-single toolchain-funcs - -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" -HOMEPAGE="http://www.p4est.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI=" - https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" - -# TODO petsc -IUSE="debug doc examples mpi openmp romio threads +vtk-binary" -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" - -RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio=] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch - "${FILESDIR}"/${PN}-2.3.6-override_soname.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - lua-single_pkg_setup -} - -src_prepare() { - default - - # Inject libsc to get all parts of the build system... - if ! [[ ${PV} = *9999* ]]; then - rmdir "${S}/sc" || die "rmdir failed" - mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed" - fi - - # Inject a version number into the build system - echo "${PV}" > "${S}"/.tarball-version - - AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config" - eautoreconf - - sed -i \ - "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \ - "${S}"/configure || die "sed failed" - - sed -i \ - "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \ - "${S}"/configure || die "sed failed" -} - -src_configure() { - # avoid underlinkage - append-libs -lsc - - local myeconfargs=( - --disable-static - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp) - $(use_enable romio mpiio) - $(use_enable threads pthread) - $(use_enable vtk-binary) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${ESYSROOT}/usr" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - use doc && dodoc -r doc/* - - if use examples - then - docinto examples - dodoc -r example/* - docompress -x /usr/share/doc/${PF}/examples - else - # Remove compiled example binaries in case of -examples: - rm -r "${ED}"/usr/bin || die "rm failed" - fi - - # Fix wrong installation paths: - dodir /usr/share/p4est - mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" - mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/p4est/p4est-2.8.5-r3.ebuild b/sci-libs/p4est/p4est-2.8.5-r3.ebuild deleted file mode 100644 index 253f6ee31911..000000000000 --- a/sci-libs/p4est/p4est-2.8.5-r3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" -HOMEPAGE="http://www.p4est.org/" - -LIBSC_VERSION="${PV}" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" - -# TODO petsc -IUSE="debug doc examples mpi openmp threads +vtk-binary" - -RDEPEND=" - ~sci-libs/libsc-${LIBSC_VERSION}[mpi=,openmp=,threads=] - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-fix_build_system.patch - "${FILESDIR}"/${P}-set_version.patch - "${FILESDIR}"/${P}-fix_cmake_path.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - # avoid using debug codepaths that are manually enabled with the - # RelWithDebInfo build type - local CMAKE_BUILD_TYPE="Release" - - local mycmakeargs=( - -Dmpi="$(usex mpi)" - -Dopenmp="$(usex openmp)" - -Dlibrary_reldir="$(get_libdir)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - [ ! "$(get_libdir)" = "lib" ] && mv "${ED}"/usr/{lib,$(get_libdir)}/pkgconfig || die "mv failed" - - mkdir -p "${ED}"/usr/share/doc/${PF} - mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${PF}/ || die "mv failed" - rm -r "${ED}"/usr/share/docs || die "rm failed" -} diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 67b8e27b41b2..f85b0e00ebcb 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -3,9 +3,7 @@ AUX pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.pat AUX pcl-1.14.1-boost.patch 1155 BLAKE2B 09f41979ef2878bd062e14fc38e9525cea090729e9d49b3a55d95bfc375c42cee9b9d0af1578407d9bc467babcb11b15f4c600fe2b8e34e30e12fb50c83ab577 SHA512 88431830523552c45625b1931138e79b75eebe4be0432b263519fde24518942a92ef595b77e73fea393db6da8bfaba286f07644e3894fb8eb66ebaa8babe9588 AUX pcl-1.14.1-gcc15.patch 2070 BLAKE2B 9baa1eda8a751c832fe875d9f941214f854bf70e0feba4f2793aadd3421898c6ce580f488f0daa35d102b63bf0aba7015d3552d0f6c97e456b4dfb9c47203433 SHA512 a15b13aee5d1e727072066c549a131e58f81bc804c2d9bc67cbec6da11a881a19a5438051f3eea4ad7c63ca7b4d92bc3105cc8ff8d58621a46f61a364077e7c3 AUX pcl-1.14.1-tests.patch 785 BLAKE2B 3cd99c021f70dbf2239979772c642d60e1d4c0631b2c7dd7d732c0ed51ecfec2fa02e1c796115bd4242e0403524422f8a6a3fa0b1e47474d278770b5ea23a0b4 SHA512 0039aac3850b0fe29fb7ef416fc3f812462001c145406e196d60ab9ec4e4c325b3bd2e342bd423a89f9bc547c51ccd95184d8b548186b338b90f4b3262d5080c -DIST pcl-1.14.0.tar.gz 68662907 BLAKE2B 5e797666b2a6cd5b828b399592daaa78c3bcbc0968c1ec5dafe441717bb4067de4604cdab11d3317370c7f69a1b29db0cca6348e91697d16846ae44c1952ce3e SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f DIST pcl-1.14.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b -EBUILD pcl-1.14.0.ebuild 2783 BLAKE2B 9c7e1362d4078dcd6ce910751788ed3d3647a7d6aad4cb45f9fb632dbb0ce8f5d8947dd7d6890a9866c8ddb0aee9069799505a53f93d9c7bf94b52de0ed31fb4 SHA512 b6272250819871c32e703642f97e26f84c0682029b1d2406eca72e093c5eb8e6bc367a4655d81653dbd2dfefaa05eb1d86af8701ffd8ab0f26587d024ce6088c -EBUILD pcl-1.14.1.ebuild 2948 BLAKE2B f34ae38659bad171e6e7c07162760c62b63d195f9a707b8675bd194f9df170a48f0befb879fdf9819640bad9584689e048528d1cd9f9334d2fff2fecb151f62b SHA512 ece5aa9aef1d65b9e28f16ac13f690f5e7eb2ca0a68cd2bb42781362f8e4ebb3673e8bbdea21cc7580a8cc98983edf28633412e33a204e2d1f87b4cf6421a408 -EBUILD pcl-9999.ebuild 2909 BLAKE2B 313fb46699bb0cb81146f0ee803866770a9021269f73260844ae07ff3ae141633f3ffbd3aba47e98fb20e9439418f5ccf5970d5f9f292504287aabb070d001a9 SHA512 dbf5f62e2191207f96f6ba2a7b30230b66da39e9153a2aee76585beed93e18f295fb8fec02e4e0b295606815c7224ce98a781f6af846c5a3817ebfea8d65380f +EBUILD pcl-1.14.1-r1.ebuild 2761 BLAKE2B f0f960fff2c09adf816f4e0e369028535f320908c855af734c88daa90000836bab96704cbe06d7a5ba998855ce4ecd735b5fcb7ace6f5f5c7c4aa9d73a6f87d5 SHA512 a4e59b4cf6e3f8a9cccdcb3065aa22bb2f2557cf5edb6302d8b29b259af0cd77564494b6e701edf51d5b0a84aa5bd32f81d630e9faf5a9444de7308095e0ef56 +EBUILD pcl-9999.ebuild 2722 BLAKE2B a6b3462cd72c1540e66d9e2a83ceb2d268165fcdfcd33efd5c54c27d38d81eea9d3e666b3a0d5dcb695edd845dbcfd77c38ed3d8a4207b0d281a6d20c1092558 SHA512 b20241abd527a32e14a5f17973f7e2cf394be7b3a20ef8a7443f81a29d4b75cdf2d6dbfc5f834e3313d1311554749b6360714539f68e9c5d460bd5ac728505b7 MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f diff --git a/sci-libs/pcl/pcl-1.14.0.ebuild b/sci-libs/pcl/pcl-1.14.0.ebuild deleted file mode 100644 index 6fc89d2b0d70..000000000000 --- a/sci-libs/pcl/pcl-1.14.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake cuda - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" -else - KEYWORDS="amd64 ~arm" - SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" -fi - -HOMEPAGE="https://pointclouds.org/" -DESCRIPTION="2D/3D image and point cloud processing" -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials" -# tests need the gtest sources to be available at build time -RESTRICT="test" - -RDEPEND=" - >=sci-libs/flann-1.7.1 - dev-libs/boost:= - dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) - openni? ( dev-libs/OpenNI ) - openni2? ( dev-libs/OpenNI2 ) - pcap? ( net-libs/libpcap ) - png? ( media-libs/libpng:0= ) - qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - vtk? ( sci-libs/vtk[qt5] ) - ) - qt6? ( - !qt5? ( - dev-qt/qtbase:6[concurrent,gui,opengl] - vtk? ( sci-libs/vtk[-qt5,qt6] ) - ) - ) - usb? ( virtual/libusb:1 ) - vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) -" -DEPEND="${RDEPEND} - !!dev-cpp/metslib -" -BDEPEND=" - doc? ( - app-text/doxygen[dot] - virtual/latex-base - ) - tutorials? ( - dev-python/sphinx - dev-python/sphinx-rtd-theme - dev-python/sphinxcontrib-doxylink - ) - virtual/pkgconfig" - -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch - "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch -) - -src_prepare() { - if use cuda; then - cuda_src_prepare - cuda_add_sandbox -w - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DDOC_INSTALL_DIR=share/doc/${PF}" - "-DLIB_INSTALL_DIR=$(get_libdir)" - "-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)" - "-DWITH_CUDA=$(usex cuda TRUE FALSE)" - "-DWITH_LIBUSB=$(usex usb TRUE FALSE)" - "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" - "-DWITH_PNG=$(usex png TRUE FALSE)" - "-DWITH_QHULL=$(usex qhull TRUE FALSE)" - "-DWITH_VTK=$(usex vtk TRUE FALSE)" - "-DWITH_PCAP=$(usex pcap TRUE FALSE)" - "-DWITH_OPENNI=$(usex openni TRUE FALSE)" - "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)" - "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)" - "-DWITH_DOCS=$(usex doc TRUE FALSE)" - "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" - "-DBUILD_global_tests=FALSE" - ) - - if use qt5; then - mycmakeargs+=( "-DWITH_QT=QT5" ) - elif use qt6; then - mycmakeargs+=( "-DWITH_QT=QT6" ) - else - mycmakeargs+=( "-DWITH_QT=NO" ) - fi - - cmake_src_configure -} diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1-r1.ebuild index f13905c51f60..774a3e660967 100644 --- a/sci-libs/pcl/pcl-1.14.1.ebuild +++ b/sci-libs/pcl/pcl-1.14.1-r1.ebuild @@ -5,44 +5,45 @@ EAPI=8 inherit cmake cuda -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" else - KEYWORDS="amd64 ~arm" SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" S="${WORKDIR}/${PN}-${P}" + KEYWORDS="amd64 ~arm" fi DESCRIPTION="2D/3D image and point cloud processing" HOMEPAGE="https://pointclouds.org/" + LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials" +IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials" + +REQUIRED_USE=" + openni? ( usb ) + openni2? ( usb ) + tutorials? ( doc ) +" RESTRICT="!test? ( test )" RDEPEND=" - >=sci-libs/flann-1.7.1 dev-libs/boost:= dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) + >=sci-libs/flann-1.7.1 + opengl? ( + media-libs/freeglut + virtual/opengl + ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - vtk? ( sci-libs/vtk[qt5] ) - ) qt6? ( - !qt5? ( - dev-qt/qtbase:6[concurrent,gui,opengl] - vtk? ( sci-libs/vtk[-qt5,qt6] ) - ) + dev-qt/qtbase:6[concurrent,gui,opengl] + vtk? ( sci-libs/vtk[-qt5,qt6] ) ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] ) @@ -65,18 +66,12 @@ BDEPEND=" virtual/pkgconfig " -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - PATCHES=( "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch - "${FILESDIR}/${PN}-1.14.1-gcc15.patch" - "${FILESDIR}/${PN}-1.14.1-tests.patch" - "${FILESDIR}/${PN}-1.14.1-boost.patch" + "${FILESDIR}"/${PN}-1.14.1-gcc15.patch + "${FILESDIR}"/${PN}-1.14.1-tests.patch + "${FILESDIR}"/${PN}-1.14.1-boost.patch ) src_prepare() { @@ -108,9 +103,7 @@ src_configure() { -DBUILD_global_tests="$(usex test)" ) - if use qt5; then - mycmakeargs+=( "-DWITH_QT=QT5" ) - elif use qt6; then + if use qt6; then mycmakeargs+=( "-DWITH_QT=QT6" ) else mycmakeargs+=( "-DWITH_QT=NO" ) diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild index b5d59362af57..01025ec4ffd0 100644 --- a/sci-libs/pcl/pcl-9999.ebuild +++ b/sci-libs/pcl/pcl-9999.ebuild @@ -5,44 +5,45 @@ EAPI=8 inherit cmake cuda -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" else - KEYWORDS="~amd64 ~arm" SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" S="${WORKDIR}/${PN}-${P}" + KEYWORDS="~amd64 ~arm" fi DESCRIPTION="2D/3D image and point cloud processing" HOMEPAGE="https://pointclouds.org/" + LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials" +IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials" + +REQUIRED_USE=" + openni? ( usb ) + openni2? ( usb ) + tutorials? ( doc ) +" RESTRICT="!test? ( test )" RDEPEND=" - >=sci-libs/flann-1.7.1 dev-libs/boost:= dev-cpp/eigen:3 - opengl? ( virtual/opengl media-libs/freeglut ) + >=sci-libs/flann-1.7.1 + opengl? ( + media-libs/freeglut + virtual/opengl + ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtopengl:5 - vtk? ( sci-libs/vtk[qt5] ) - ) qt6? ( - !qt5? ( - dev-qt/qtbase:6[concurrent,gui,opengl] - vtk? ( sci-libs/vtk[-qt5,qt6] ) - ) + dev-qt/qtbase:6[concurrent,gui,opengl] + vtk? ( sci-libs/vtk[-qt5,qt6] ) ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] ) @@ -65,17 +66,11 @@ BDEPEND=" virtual/pkgconfig " -REQUIRED_USE=" - openni? ( usb ) - openni2? ( usb ) - tutorials? ( doc ) -" - PATCHES=( "${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch "${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch - "${FILESDIR}/${PN}-1.14.1-gcc15.patch" - "${FILESDIR}/${PN}-1.14.1-tests.patch" + "${FILESDIR}"/${PN}-1.14.1-gcc15.patch + "${FILESDIR}"/${PN}-1.14.1-tests.patch ) src_prepare() { @@ -107,9 +102,7 @@ src_configure() { -DBUILD_global_tests="$(usex test)" ) - if use qt5; then - mycmakeargs+=( "-DWITH_QT=QT5" ) - elif use qt6; then + if use qt6; then mycmakeargs+=( "-DWITH_QT=QT6" ) else mycmakeargs+=( "-DWITH_QT=NO" ) diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 4a44d29334a4..c1fbe2d40d5e 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1,4 +1,4 @@ -DIST rtabmap-0.21.3.tar.gz 21956462 BLAKE2B 41c3c95715bc165d339a4a63747e40db4357ffd1b5151630689008a6856c4721805ec8def9b47ea487ca428641b5d253dfa5b62b1bbb14027168bbc0e4c350d3 SHA512 0b9b2d2fdcfdef0324fcde54a74ecec75786372f2df0bd8d9383ae71c500098bff016465a68ce2a9328d0a2beee4bf9b0af6b21435589ce1e91503fe2aca5d01 -EBUILD rtabmap-0.21.3.ebuild 1485 BLAKE2B ba7da3b2d4ca1b7c150e6705746c453f26168fa0e4afedcb07b30d34e7d068c351e36818a609ce49e5a12612e6d2c34c29e512ba5b635c769d2d089e1a21e2bf SHA512 ff8420c2730254f31ae40d35bd1e2e1221e82b4e392d0112b4f26a47d080c54db1ce8b0eca1bb047091779ae40a8c3ad3bfdfc881900413b8ff2ad6afe84890b -EBUILD rtabmap-9999.ebuild 1485 BLAKE2B ba7da3b2d4ca1b7c150e6705746c453f26168fa0e4afedcb07b30d34e7d068c351e36818a609ce49e5a12612e6d2c34c29e512ba5b635c769d2d089e1a21e2bf SHA512 ff8420c2730254f31ae40d35bd1e2e1221e82b4e392d0112b4f26a47d080c54db1ce8b0eca1bb047091779ae40a8c3ad3bfdfc881900413b8ff2ad6afe84890b +DIST rtabmap-0.21.4.tar.gz 21963687 BLAKE2B aa1cd455624a5a0ac4529fe6f8cd95500a4e247cc71d40041d813ed551e7f0026ad73b2a7e37869cc600aacaac5d5aea5934ebc8f888bcfa2bb21359451c6f23 SHA512 72a0d2247485008c8656a6806aa0e062759debdf1ce05a6e15e73474f531e4f4d91f77b3f9f21bf01038a6cdee46aecfa2f1728537ac9571f97085b878879172 +EBUILD rtabmap-0.21.4.ebuild 1368 BLAKE2B f8f89213fbd58241b7b8200cde0c5f04581e29c655ab1befa42184db4ee9c30faed6ad1bc51b1dae70a72dc4ba67cddc96748ca81336f109596ed3fcde092a5c SHA512 dc9ecbf45c3b8d9be1de5e140705ed185bdf7087b9e5be34b0443978dc5a02b2e02ffa8dc2270b6fb515fa652b457aafc40a46e5f7529c60095390aaff48bca7 +EBUILD rtabmap-9999.ebuild 1368 BLAKE2B f8f89213fbd58241b7b8200cde0c5f04581e29c655ab1befa42184db4ee9c30faed6ad1bc51b1dae70a72dc4ba67cddc96748ca81336f109596ed3fcde092a5c SHA512 dc9ecbf45c3b8d9be1de5e140705ed185bdf7087b9e5be34b0443978dc5a02b2e02ffa8dc2270b6fb515fa652b457aafc40a46e5f7529c60095390aaff48bca7 MISC metadata.xml 472 BLAKE2B 141f2e2a39f7e3e8543c255995ecc14ee3168985e47a4c0882d32fdd884a81ca0aeade5a41092ce5525a54a0ac2802714e2c6031c09af9671682231378918c64 SHA512 a472fd8de805c23ebf8de91fdecab35cb5af78bb971ad10f8e4b23ab97efaffc3f7fa3ffbec457ab120d3fe75f4d021079a67d426f0df022be389f00bc311651 diff --git a/sci-libs/rtabmap/rtabmap-0.21.3.ebuild b/sci-libs/rtabmap/rtabmap-0.21.4.ebuild index 88c172c29ffb..89d5ba388dbb 100644 --- a/sci-libs/rtabmap/rtabmap-0.21.3.ebuild +++ b/sci-libs/rtabmap/rtabmap-0.21.4.ebuild @@ -3,45 +3,38 @@ EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/introlab/rtabmap" -fi - -inherit ${SCM} cmake multilib - VER_SUFFIX=noetic +inherit cmake -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/introlab/rtabmap" else - KEYWORDS="~amd64" SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P}-${VER_SUFFIX}" + KEYWORDS="~amd64" fi DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" -HOMEPAGE="http://introlab.github.io/rtabmap/" +HOMEPAGE="https://introlab.github.io/rtabmap/" + LICENSE="BSD" SLOT="0" -IUSE="examples ieee1394 openni2 qt5" +IUSE="examples ieee1394 openni2 qt6" RDEPEND=" - media-libs/opencv:=[qt5(-)?] - sci-libs/pcl:=[openni,vtk,qt5(-)?] - sci-libs/vtk:=[qt5(-)?] - sys-libs/zlib - sci-libs/octomap:= - dev-libs/boost:= dev-cpp/yaml-cpp:= + dev-libs/boost:= + media-libs/opencv:=[qt6(-)?] + sci-libs/octomap:= + sci-libs/pcl:=[openni,vtk,qt6(-)?] + sci-libs/vtk:=[qt6(-)?] + sys-libs/zlib ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 + qt6? ( + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 ) " DEPEND="${RDEPEND}" @@ -49,10 +42,11 @@ BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( - "-DWITH_QT=$(usex qt5 ON OFF)" - "-DWITH_DC1394=$(usex ieee1394 ON OFF)" - "-DWITH_OPENNI2=$(usex openni2 ON OFF)" - "-DBUILD_EXAMPLES=$(usex examples ON OFF)" + -DRTABMAP_QT_VERSION=6 + -DWITH_QT=$(usex qt6) + -DWITH_DC1394=$(usex ieee1394) + -DWITH_OPENNI2=$(usex openni2) + -DBUILD_EXAMPLES=$(usex examples) ) cmake_src_configure } diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild index 88c172c29ffb..89d5ba388dbb 100644 --- a/sci-libs/rtabmap/rtabmap-9999.ebuild +++ b/sci-libs/rtabmap/rtabmap-9999.ebuild @@ -3,45 +3,38 @@ EAPI=8 -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/introlab/rtabmap" -fi - -inherit ${SCM} cmake multilib - VER_SUFFIX=noetic +inherit cmake -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/introlab/rtabmap" else - KEYWORDS="~amd64" SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P}-${VER_SUFFIX}" + KEYWORDS="~amd64" fi DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" -HOMEPAGE="http://introlab.github.io/rtabmap/" +HOMEPAGE="https://introlab.github.io/rtabmap/" + LICENSE="BSD" SLOT="0" -IUSE="examples ieee1394 openni2 qt5" +IUSE="examples ieee1394 openni2 qt6" RDEPEND=" - media-libs/opencv:=[qt5(-)?] - sci-libs/pcl:=[openni,vtk,qt5(-)?] - sci-libs/vtk:=[qt5(-)?] - sys-libs/zlib - sci-libs/octomap:= - dev-libs/boost:= dev-cpp/yaml-cpp:= + dev-libs/boost:= + media-libs/opencv:=[qt6(-)?] + sci-libs/octomap:= + sci-libs/pcl:=[openni,vtk,qt6(-)?] + sci-libs/vtk:=[qt6(-)?] + sys-libs/zlib ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 + qt6? ( + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 ) " DEPEND="${RDEPEND}" @@ -49,10 +42,11 @@ BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( - "-DWITH_QT=$(usex qt5 ON OFF)" - "-DWITH_DC1394=$(usex ieee1394 ON OFF)" - "-DWITH_OPENNI2=$(usex openni2 ON OFF)" - "-DBUILD_EXAMPLES=$(usex examples ON OFF)" + -DRTABMAP_QT_VERSION=6 + -DWITH_QT=$(usex qt6) + -DWITH_DC1394=$(usex ieee1394) + -DWITH_OPENNI2=$(usex openni2) + -DBUILD_EXAMPLES=$(usex examples) ) cmake_src_configure } diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest index 7a8050be9475..1c06f810d404 100644 --- a/sci-libs/shapelib/Manifest +++ b/sci-libs/shapelib/Manifest @@ -1,5 +1,5 @@ DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721 DIST shapelib-1.6.0.tar.gz 528882 BLAKE2B 02561b947ede10dcbb04ebe4d007b99ac2421ab56251a981e0bf4033b33bc5ae3a09a919c295a41797e7c295424d027a5f650848196f945918f7d6aeea177f89 SHA512 cc0b5841da5039c0467291994b9cd3aa99bebe70adf8db01719336a0eb2f0d7362395806f99228ba1f7ec68f0c5ecf9f7f5f1018093cf8dad9e06f0ae147c3fc EBUILD shapelib-1.5.0.ebuild 738 BLAKE2B c5bab0aa07847ca34b955df4073c625fae350f7c5beac1aea51ae0ff7a7d1ae6c8c0952442c64775ece4e49982e780e1e4c5efeb7105af320ab81b2d0393c008 SHA512 b33d2a2ceafee3bbf97839c6eb85e7a04452e6ba0d1fc158ed20744c12f5f29a1deaf395b0fba5c7789355bbb6606405a4fc0801a3770c9e4de123fb75a89394 -EBUILD shapelib-1.6.0.ebuild 780 BLAKE2B 72f8bf8068ac743c6af10e0ee6759c01a676523cbf989eb3ae2de02445b6ccdb645f103a98bac4042b48c3350973fea97ff739916c769bad7207cd7b5a5cb490 SHA512 1d5c64b4897dcd1891f09a983ee7140ba24fc45dccded9903d987ba50f8d757c3e656f4faa50382317dc72edec3663fd28379e9ce978056b3270d4b86609e735 +EBUILD shapelib-1.6.0.ebuild 779 BLAKE2B e095afcec16b2061617deeb82b1da9e5f945bf1d6f64a7576691f4d74c34a02003766c988ab795deaae21b0b96d24a7d880c6e28eab1843f79b4d88270861c34 SHA512 957b2b991cf02f42dab01b5aa1d39b55dde1c8548b71a4572d1961c346996050233a71ba9ea01f5bd4a638dad772954a0005335c94f117b17f44717f7a85742f MISC metadata.xml 270 BLAKE2B d671fe6a94e536276e72466a25e98a1e0bc835584f788b10653270c10b976da801bdb6bad177fc69d359c1e588d08101dc4f01792f14f04432ba7b6e234787a7 SHA512 e54914ee9c11010802a2bb5b4c998c82c53e93085d12dd59c6c5ec570de962ec8938e1e1a5ad6640fe8047c3d3eedea8c367881dd07a5648e95863af32e888f9 diff --git a/sci-libs/shapelib/shapelib-1.6.0.ebuild b/sci-libs/shapelib/shapelib-1.6.0.ebuild index 5d21a20581e5..5817f09926a9 100644 --- a/sci-libs/shapelib/shapelib-1.6.0.ebuild +++ b/sci-libs/shapelib/shapelib-1.6.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0/4" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="doc static-libs" src_prepare() { diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 692210e5ebc0..9844f874125e 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,11 +1,4 @@ -AUX vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch 3256 BLAKE2B d769a03237938c58ae86dd9ec8ba13af2da07551ccfe7efed9bb98068233e37b4d0cf164a72ed157cf7ee79442c82f223566c74b6fe799a66e85a940a9f14035 SHA512 9373fa9cff8c998236d6fd16271bd40029355f9fbc7c28714a98de7488784930e0878c8424eac08c9ad56546974cf8d80c515cba4bece7dd582a3a1867082e9d -AUX vtk-9.2.2-link-with-glut-library-for-freeglut.patch 594 BLAKE2B 054c68fa27fae4b331a78a6fd54fed9c95a18d5a54b088be1a78625922dd2638394198c3a61aed4288739bf49ea10090908133f28106d0359e055bfad9d8ed0a SHA512 1b2e84c916fa1a1a28eca981a05c190f105168e8c7adbc3d8842539de90bbca9af3511c584dc500c75e9499e7d175dbcb91125e246f93d1b16bcbf97ce2ce027 -AUX vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch 625 BLAKE2B 46c15c6e2a1fde4974e0bb79bf96d9d695e5ab10f189ce47eb0a17845a75ef58eb0f22125c8f0043463b19b8adcdea837ce10725bbd54f1b78bcdd01b807df30 SHA512 b1a4093a63d67bf0de3f2eb4c738d4cb6da315395b3f2a1d54b449e82a008c6373ce332af7e235e693e9af6cc043ed8d28e2a62a9e05177557d628ce677e1bb5 -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 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 @@ -16,25 +9,11 @@ AUX vtk-9.3.0-opencascade.patch 624 BLAKE2B 8188da64b12213074a4093ee0dd047fcf91a 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 -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-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.2-VTKm-respect-user-CXXFLAGS.patch b/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch deleted file mode 100644 index c47bced20f22..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 225a077898eb714e5ecb80255796aa70625e6cea Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 12 Nov 2022 02:01:35 +0100 -Subject: [PATCH] VTKm respect user CXXFLAGS - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/Accelerators/Vtkm/Core/CMakeLists.txt -+++ b/Accelerators/Vtkm/Core/CMakeLists.txt -@@ -79,6 +79,16 @@ if (TARGET vtkm::cuda) - vtk_module_set_properties(VTK::AcceleratorsVTKmCore - LANGUAGE CUDA - CUDA_SEPARABLE_COMPILATION ON) -+ -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ set(cxx_flags -Wall) -+ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) -+ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) -+ endforeach() -+ vtk_module_compile_options(VTK::AcceleratorsVTKmCore -+ PUBLIC -+ ${cxx_flags}) - endif() - - if (MSVC) ---- a/Accelerators/Vtkm/DataModel/CMakeLists.txt -+++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt -@@ -89,6 +89,16 @@ if (TARGET vtkm::cuda) - - vtk_module_compile_options(VTK::AcceleratorsVTKmDataModel - PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>) -+ -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ set(cxx_flags -Wall) -+ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) -+ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) -+ endforeach() -+ vtk_module_compile_options(VTK::AcceleratorsVTKmDataModel -+ PUBLIC -+ ${cxx_flags}) - endif () - - if (MSVC) ---- a/Accelerators/Vtkm/Filters/CMakeLists.txt -+++ b/Accelerators/Vtkm/Filters/CMakeLists.txt -@@ -138,6 +138,16 @@ if (TARGET vtkm::cuda) - - vtk_module_compile_options(VTK::AcceleratorsVTKmFilters - PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>) -+ -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ set(cxx_flags -Wall) -+ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) -+ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) -+ endforeach() -+ vtk_module_compile_options(VTK::AcceleratorsVTKmFilters -+ PUBLIC -+ ${cxx_flags}) - endif () - - if (MSVC) ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmCompilerFlags.cmake -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmCompilerFlags.cmake -@@ -126,6 +126,12 @@ elseif(VTKM_COMPILER_IS_ICC) - elseif(VTKM_COMPILER_IS_GNU OR VTKM_COMPILER_IS_CLANG) - set(cxx_flags -Wall -Wcast-align -Wextra -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused -fno-common -Wno-unused-function) - set(cuda_flags -Xcompiler=-Wall,-Wcast-align,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-fno-common,-Wunused,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-function) -+ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) -+ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) -+ foreach(elem ${cmake_cxx_flags_list}) -+ list(PREPEND cxx_flags ${elem}) -+ list(PREPEND cuda_flags -Xcompiler=${elem}) -+ endforeach() - - #Clang does not support the -Wchar-subscripts flag for warning if an array - #subscript has a char type. --- -2.38.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.2-link-with-glut-library-for-freeglut.patch b/sci-libs/vtk/files/vtk-9.2.2-link-with-glut-library-for-freeglut.patch deleted file mode 100644 index 39b7e7ab0f15..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.2-link-with-glut-library-for-freeglut.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 801654a5f1c3991ff9bb3ea5798afdd252d214b6 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Mon, 21 Nov 2022 15:35:58 +0100 -Subject: [PATCH] link with glut library for freeglut - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/Rendering/External/Testing/Cxx/CMakeLists.txt -+++ b/Rendering/External/Testing/Cxx/CMakeLists.txt -@@ -12,5 +12,5 @@ if(NOT APPLE) - - vtk_test_cxx_executable(vtkRenderingExternalCxxTests tests) - target_link_libraries(vtkRenderingExternalCxxTests PRIVATE -- ${GLUT_LIBRARY}) -+ ${GLUT_LIBRARIES}) - endif() --- -2.38.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch b/sci-libs/vtk/files/vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch deleted file mode 100644 index 287d804847bb..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch +++ /dev/null @@ -1,20 +0,0 @@ -From https://gitlab.kitware.com/vtk/vtk/-/commit/57767732c4d54db89004c685022ac828bb51eccd - -From 57767732c4d54db89004c685022ac828bb51eccd Mon Sep 17 00:00:00 2001 -From: Andrew Bauer <bauer.andrew.c@gmail.com> -Date: Wed, 27 Jul 2022 09:31:13 -0400 -Subject: [PATCH 033/614] vtkGeometryFilter: add missing mutex header file - ---- a/Filters/Geometry/vtkGeometryFilter.cxx -+++ b/Filters/Geometry/vtkGeometryFilter.cxx -@@ -52,6 +52,7 @@ - #include "vtkWedge.h" - - #include <memory> -+#include <mutex> - - vtkStandardNewMacro(vtkGeometryFilter); - vtkCxxSetObjectMacro(vtkGeometryFilter, Locator, vtkIncrementalPointLocator); --- -2.38.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch deleted file mode 100644 index 82bf19b6b07f..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://gitlab.kitware.com/vtk/vtk/-/merge-requests/9857 - -From ef95422b62296e4c136917095eace14f48cefb82 Mon Sep 17 00:00:00 2001 -From: Laurent Rineau <laurent.rineau@cgal.org> -Date: Tue, 17 Jan 2023 16:18:53 +0100 -Subject: [PATCH] Add #include <cstdint> to compile with gcc13 - -The `vtkSEPReader` was introduced by MRs !4909 (from my former -collaborator Maxime) and !4938. Then it was highly modified by -!7516. The later MR is the one that introduced the uses of -`std::uint8_t` and `std::uint32_t`. - -Those types needs the inclusion of `<cstdint>`. ---- a/IO/Image/vtkSEPReader.h -+++ b/IO/Image/vtkSEPReader.h -@@ -25,8 +25,9 @@ - #include "vtkImageAlgorithm.h" - #include "vtkNew.h" // for ivars - --#include <array> // for std::array --#include <string> // for std::string -+#include <array> // for std::array -+#include <cstdint> // for std::uint8_t and std::uint32_t -+#include <string> // for std::string - - namespace details - { --- -GitLab - 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 deleted file mode 100644 index 9b8583fa61e2..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch +++ /dev/null @@ -1,21 +0,0 @@ -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" <laguest@archeia.com> -Date: Thu, 16 Feb 2023 16:57:32 +0000 -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/exec/cuda/internal/ThrustPatches.h> - VTKM_THIRDPARTY_PRE_INCLUDE - #include <thrust/execution_policy.h> -+#include <thrust/sort.h> - #include <thrust/system/cuda/execution_policy.h> - #include <thrust/system/cuda/memory.h> - VTKM_THIRDPARTY_POST_INCLUDE --- -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 deleted file mode 100644 index 356efbb4da9a..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/905387 -https://github.com/Kitware/VTK/commit/4d8283bcb460ff60d8df1b7b67b5db19876a5ca3 - -From 890f7574f01cf58cb1522772a62ca07deb438479 Mon Sep 17 00:00:00 2001 -From: Mathieu Westphal <mathieu.westphal@kitware.com> -Date: Thu, 23 Feb 2023 18:06:07 +0100 -Subject: [PATCH 1580/2105] More #include <cstdint> 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 <cstdint> - #include <fstream> - #include <iostream> - #include <list> ---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -49,7 +49,8 @@ - #include "vtkMathTextUtilities.h" - #include "vtkRenderingMatplotlibModule.h" // For export macro - --#include <vector> // for std::vector -+#include <cstdint> // for std::uint64_t -+#include <vector> // for std::vector - - struct _object; - typedef struct _object PyObject; --- -2.40.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch deleted file mode 100644 index b7b2e233cdb4..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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") - mark_as_advanced(VTK_JAVA_TARGET_VERSION) - - if (VTK_JAVA_SOURCE_VERSION STREQUAL "<DEFAULT>") -- set(VTK_JAVA_SOURCE_VERSION "1.7") -+ set(VTK_JAVA_SOURCE_VERSION "1.8") - endif () - if (VTK_JAVA_TARGET_VERSION STREQUAL "<DEFAULT>") -- set(VTK_JAVA_TARGET_VERSION "1.7") -+ set(VTK_JAVA_TARGET_VERSION "1.8") - endif () - - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_JARDIR}") diff --git a/sci-libs/vtk/vtk-9.2.5-r2.ebuild b/sci-libs/vtk/vtk-9.2.5-r2.ebuild deleted file mode 100644 index 4af7d8df0261..000000000000 --- a/sci-libs/vtk/vtk-9.2.5-r2.ebuild +++ /dev/null @@ -1,746 +0,0 @@ -# Copyright 1999-2024 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_{9..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)" - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="https://www.vtk.org/" -SRC_URI=" - https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz - doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz ) - examples? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) - test? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) -" -S="${WORKDIR}/VTK-${PV}" - -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 imaging - java las +logging mpi mysql odbc 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 openvdb pdal - postgres rendering views - ) - cuda? ( video_cards_nvidia vtkm ) - java? ( rendering ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( rendering ) - qt6? ( rendering ) - sdl? ( rendering ) - tk? ( python rendering ) - web? ( python ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -# 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-cpp/eigen - dev-cpp/nlohmann_json - 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/pegtl-3 - dev-libs/pugixml - dev-libs/utfcpp - media-libs/freetype - media-libs/libjpeg-turbo - >=media-libs/libharu-2.4.2:= - 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-1.8:* ) - las? ( sci-geosciences/liblas ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( dev-db/mariadb-connector-c ) - odbc? ( dev-db/unixODBC ) - openvdb? ( media-gfx/openvdb:= ) - pdal? ( <sci-libs/pdal-2.6.0:= ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - 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} ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -DEPEND=" - ${RDEPEND} - dev-cpp/eigen - dev-cpp/nlohmann_json - <dev-libs/pegtl-3 - dev-libs/utfcpp - test? ( - media-libs/glew - x11-libs/libXcursor - rendering? ( media-libs/freeglut ) - ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch - "${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-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 ) - -vtk_check_reqs() { - local dsk=4096 - local mem=$(( $(usex cuda 7168 0) )) - - dsk=$(( $(usex doc 3072 0) + ${dsk} )) - dsk=$(( $(usex examples 3072 0) + ${dsk} )) - dsk=$(( $(usex cuda 8192 0) + ${dsk} )) - - # 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)") - else - if [[ -n "${MAKEOPTS}" ]]; then - jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - fi - fi - mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) )) - - use cuda && export CHECKREQS_MEMORY=${mem}M - export CHECKREQS_DISK_BUILD=${dsk}M - - check-reqs_pkg_${EBUILD_PHASE} -} - -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 - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - 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 - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - 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: cli11 (::guru), 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 cuda; then - cuda_add_sandbox -w - cuda_src_prepare - fi - - 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-${PV}/.ExternalData/README.rst . || die - ln -sf ../../VTK-${PV}/.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_ANDROID_BUILD=OFF - -DVTK_IOS_BUILD=OFF - - -DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF) - # we use the pre-built documentation and install these with USE=doc - -DVTK_BUILD_DOCUMENTATION=OFF - -DVTK_BUILD_EXAMPLES=$(usex examples ON OFF) - - # no package in the tree: https://github.com/LLNL/conduit - -DVTK_ENABLE_CATALYST=OFF - -DVTK_ENABLE_KITS=OFF - -DVTK_ENABLE_LOGGING=$(usex logging ON OFF) - # defaults to ON: USE flag for this? - -DVTK_ENABLE_REMOTE_MODULES=OFF - - # disable fetching files during build - -DVTK_FORBID_DOWNLOADS=ON - - -DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_StandAlone="YES" - -DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT") - - -DVTK_INSTALL_SDK=ON - - -DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT" - -DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite - -DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOXML="WANT" - -DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_cgns="WANT" - -DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT" - -DVTK_MODULE_ENABLE_VTK_eigen="WANT" - -DVTK_MODULE_ENABLE_VTK_expat="WANT" - -DVTK_MODULE_ENABLE_VTK_fmt="WANT" - -DVTK_MODULE_ENABLE_VTK_freetype="WANT" - -DVTK_MODULE_ENABLE_VTK_hdf5="WANT" - -DVTK_MODULE_ENABLE_VTK_jpeg="WANT" - -DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT" - -DVTK_MODULE_ENABLE_VTK_libharu="WANT" - -DVTK_MODULE_ENABLE_VTK_libproj="WANT" - -DVTK_MODULE_ENABLE_VTK_libxml2="WANT" - -DVTK_MODULE_ENABLE_VTK_lz4="WANT" - -DVTK_MODULE_ENABLE_VTK_lzma="WANT" - -DVTK_MODULE_ENABLE_VTK_netcdf="WANT" - -DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT" - -DVTK_MODULE_ENABLE_VTK_ogg="WANT" - -DVTK_MODULE_ENABLE_VTK_pegtl="WANT" - -DVTK_MODULE_ENABLE_VTK_png="WANT" - -DVTK_MODULE_ENABLE_VTK_pugixml="WANT" - -DVTK_MODULE_ENABLE_VTK_sqlite="WANT" - -DVTK_MODULE_ENABLE_VTK_theora="WANT" - -DVTK_MODULE_ENABLE_VTK_tiff="WANT" - -DVTK_MODULE_ENABLE_VTK_utf8="WANT" - -DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_zlib="WANT" - - # not packaged in Gentoo - -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 ON OFF) - -DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF) - -DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF) - - -DVTK_UNIFIED_INSTALL_TREE=ON - - -DVTK_USE_CUDA=$(usex cuda ON OFF) - # 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 ON OFF) - -DVTK_USE_TK=$(usex tk ON OFF) - -DVTK_USE_X=ON - - -DVTK_WHEEL_BUILD=OFF - - -DVTK_WRAP_JAVA=$(usex java ON OFF) - -DVTK_WRAP_PYTHON=$(usex python ON OFF) - ) - - 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" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - fi - - if use boost; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT" - -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT" - ) - fi - - # TODO: checks this on updates of nvidia-cuda-toolkit and update - # the list of available arches if necessary, i.e. add new arches - # once they are released at the end of the list before all. - # See https://en.wikipedia.org/wiki/CUDA#GPUs_supported - # CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake, - # as of 3.25.1 doesn't recognize these keywords. - # FIXME: better use numbers than names? - if use cuda; then - local cuda_arch= - case ${VTK_CUDA_ARCH:-native} in - # we ignore fermi arch, because current nvidia-cuda-toolkit-11* - # no longer supports it - kepler|maxwell|pascal|volta|turing|ampere|all) - cuda_arch=${VTK_CUDA_ARCH} - ;; -# native) -# ewarn "If auto detection fails for you, please try and export the" -# ewarn "VTK_CUDA_ARCH environment variable to one of the common arch" -# ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all." -# cuda_arch=native -# ;; - *) - eerror "Please properly set the VTK_CUDA_ARCH environment variable to" - eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all" - die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!" - ;; - esac - ewarn "Using CUDA architecture '${cuda_arch}'" - - mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} ) - 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="WANT" ) - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" ) - fi - fi - - if use gdal; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT" - ) - fi - - if use imaging; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" ) - fi - - if ! use java && ! use python; then - # defaults to ON - mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF ) - fi - - if use java; then - mycmakeargs+=( - -DCMAKE_INSTALL_JARDIR="share/${PN}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Java="WANT" - ) - fi - - if use mpi; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_MPI="YES" - -DVTK_MODULE_ENABLE_VTK_IOH5part="WANT" - -DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT" - -DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT" - -DVTK_MODULE_ENABLE_VTK_h5part="WANT" - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - ) - use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" ) - if use rendering; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT" - ) - fi - use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" ) - fi - - use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" ) - use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" ) - use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" ) - use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" ) - - if use python; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Python="WANT" - -DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT" - -DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT" - -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" ) - fi - - if use qt5 && use qt6; 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" - ) - else - if use qt5; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - elif use qt6; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" - -DVTK_QT_VERSION="6" - ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) - fi - fi - - if use qt5 || use qt6; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_Qt:STRING="YES" - -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" - -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT" - ) - if use mysql || use postgres; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" ) - fi - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" ) - fi - if use views; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" ) - fi - fi - - if use rendering; then - mycmakeargs+=( - -DVTK_ENABLE_OSPRAY=OFF - - -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_gl2ps="WANT" - -DVTK_MODULE_ENABLE_VTK_glew="WANT" - -DVTK_MODULE_ENABLE_VTK_opengl="WANT" - - -DVTK_USE_SDL2=$(usex sdl "YES" "NO") - ) - use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" ) - use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" ) - use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" ) - 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=ON - - # requested even if all use flags are off - -DVTK_MODULE_ENABLE_VTK_octree="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - 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 < stdpthread < 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 - 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="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT" - ) - fi - - if use vtkm; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT" - - -DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221 - -DVTKm_Vectorization=native - ) - fi - - if use web; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_WebCore="WANT" - -DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT" - ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" ) - fi - - use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" - - cmake_src_configure -} - -src_compile() { - use test && cmake_build VTKData - cmake_src_compile -} - -# FIXME: avoid nonfatal? -# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043 -src_test() { -# nonfatal virtx cmake_src_test - virtx cmake_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 -} diff --git a/sci-libs/vtk/vtk-9.2.6-r3.ebuild b/sci-libs/vtk/vtk-9.2.6-r3.ebuild deleted file mode 100644 index 9520c47ec4fd..000000000000 --- a/sci-libs/vtk/vtk-9.2.6-r3.ebuild +++ /dev/null @@ -1,747 +0,0 @@ -# Copyright 1999-2024 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_{9..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)" - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="https://www.vtk.org/" -SRC_URI=" - https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz - doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz ) - examples? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) - test? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz - ) -" -S="${WORKDIR}/VTK-${PV}" - -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 imaging - java las +logging mpi mysql odbc 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 openvdb pdal - postgres rendering views - ) - cuda? ( video_cards_nvidia vtkm ) - java? ( rendering ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( rendering ) - qt6? ( rendering ) - sdl? ( rendering ) - tk? ( python rendering ) - web? ( python ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -# 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-cpp/eigen - dev-cpp/nlohmann_json - 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/pegtl-3 - dev-libs/pugixml - dev-libs/utfcpp - media-libs/freetype - media-libs/libjpeg-turbo - >=media-libs/libharu-2.4.2:= - 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-1.8:* ) - las? ( sci-geosciences/liblas ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( dev-db/mariadb-connector-c ) - odbc? ( dev-db/unixODBC ) - openvdb? ( media-gfx/openvdb:= ) - pdal? ( <sci-libs/pdal-2.6.0:= ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - 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} ) -" - -# for <pegtl-3 dependency see -# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929 -DEPEND=" - ${RDEPEND} - dev-cpp/eigen - dev-cpp/nlohmann_json - <dev-libs/pegtl-3 - dev-libs/utfcpp - test? ( - media-libs/glew - x11-libs/libXcursor - rendering? ( media-libs/freeglut ) - ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch - "${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-Fix-compilation-error-with-CUDA-12.patch - "${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch - "${FILESDIR}"/vtk-9.2.6-Java21.patch -) - -DOCS=( CONTRIBUTING.md README.md ) - -vtk_check_reqs() { - local dsk=4096 - local mem=$(( $(usex cuda 7168 0) )) - - dsk=$(( $(usex doc 3072 0) + ${dsk} )) - dsk=$(( $(usex examples 3072 0) + ${dsk} )) - dsk=$(( $(usex cuda 8192 0) + ${dsk} )) - - # 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)") - else - if [[ -n "${MAKEOPTS}" ]]; then - jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - fi - fi - mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) )) - - use cuda && export CHECKREQS_MEMORY=${mem}M - export CHECKREQS_DISK_BUILD=${dsk}M - - check-reqs_pkg_${EBUILD_PHASE} -} - -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 - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - 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 - - if use qt6 && use qt5; then - ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - fi - - # bug #835659 - if use cuda; then - if [[ ${VTK_CUDA_ARCH} = native ]]; then - eerror "Using native CUDA arches is currently broken." - eerror "Please set it to one of the common arch names:" - eerror "kepler, maxwell, pascal, turing or ampere." - die "Please set VTK_CUDA_ARCH environment variable!" - fi - fi - - 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: cli11 (::guru), 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 cuda; then - cuda_add_sandbox -w - cuda_src_prepare - fi - - 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-${PV}/.ExternalData/README.rst . || die - ln -sf ../../VTK-${PV}/.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_ANDROID_BUILD=OFF - -DVTK_IOS_BUILD=OFF - - -DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF) - # we use the pre-built documentation and install these with USE=doc - -DVTK_BUILD_DOCUMENTATION=OFF - -DVTK_BUILD_EXAMPLES=$(usex examples ON OFF) - - # no package in the tree: https://github.com/LLNL/conduit - -DVTK_ENABLE_CATALYST=OFF - -DVTK_ENABLE_KITS=OFF - -DVTK_ENABLE_LOGGING=$(usex logging ON OFF) - # defaults to ON: USE flag for this? - -DVTK_ENABLE_REMOTE_MODULES=OFF - - # disable fetching files during build - -DVTK_FORBID_DOWNLOADS=ON - - -DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_StandAlone="YES" - -DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT") - -DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT") - - -DVTK_INSTALL_SDK=ON - - -DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT" - -DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT" - -DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite - -DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_IOXML="WANT" - -DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_cgns="WANT" - -DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT" - -DVTK_MODULE_ENABLE_VTK_eigen="WANT" - -DVTK_MODULE_ENABLE_VTK_expat="WANT" - -DVTK_MODULE_ENABLE_VTK_fmt="WANT" - -DVTK_MODULE_ENABLE_VTK_freetype="WANT" - -DVTK_MODULE_ENABLE_VTK_hdf5="WANT" - -DVTK_MODULE_ENABLE_VTK_jpeg="WANT" - -DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT" - -DVTK_MODULE_ENABLE_VTK_libharu="WANT" - -DVTK_MODULE_ENABLE_VTK_libproj="WANT" - -DVTK_MODULE_ENABLE_VTK_libxml2="WANT" - -DVTK_MODULE_ENABLE_VTK_lz4="WANT" - -DVTK_MODULE_ENABLE_VTK_lzma="WANT" - -DVTK_MODULE_ENABLE_VTK_netcdf="WANT" - -DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT" - -DVTK_MODULE_ENABLE_VTK_ogg="WANT" - -DVTK_MODULE_ENABLE_VTK_pegtl="WANT" - -DVTK_MODULE_ENABLE_VTK_png="WANT" - -DVTK_MODULE_ENABLE_VTK_pugixml="WANT" - -DVTK_MODULE_ENABLE_VTK_sqlite="WANT" - -DVTK_MODULE_ENABLE_VTK_theora="WANT" - -DVTK_MODULE_ENABLE_VTK_tiff="WANT" - -DVTK_MODULE_ENABLE_VTK_utf8="WANT" - -DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT") - -DVTK_MODULE_ENABLE_VTK_zlib="WANT" - - # not packaged in Gentoo - -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 ON OFF) - -DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF) - -DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF) - - -DVTK_UNIFIED_INSTALL_TREE=ON - - -DVTK_USE_CUDA=$(usex cuda ON OFF) - # 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 ON OFF) - -DVTK_USE_TK=$(usex tk ON OFF) - -DVTK_USE_X=ON - - -DVTK_WHEEL_BUILD=OFF - - -DVTK_WRAP_JAVA=$(usex java ON OFF) - -DVTK_WRAP_PYTHON=$(usex python ON OFF) - ) - - 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" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - fi - - if use boost; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT" - -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT" - ) - fi - - # TODO: checks this on updates of nvidia-cuda-toolkit and update - # the list of available arches if necessary, i.e. add new arches - # once they are released at the end of the list before all. - # See https://en.wikipedia.org/wiki/CUDA#GPUs_supported - # CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake, - # as of 3.25.1 doesn't recognize these keywords. - # FIXME: better use numbers than names? - if use cuda; then - local cuda_arch= - case ${VTK_CUDA_ARCH:-native} in - # we ignore fermi arch, because current nvidia-cuda-toolkit-11* - # no longer supports it - kepler|maxwell|pascal|volta|turing|ampere|all) - cuda_arch=${VTK_CUDA_ARCH} - ;; -# native) -# ewarn "If auto detection fails for you, please try and export the" -# ewarn "VTK_CUDA_ARCH environment variable to one of the common arch" -# ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all." -# cuda_arch=native -# ;; - *) - eerror "Please properly set the VTK_CUDA_ARCH environment variable to" - eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all" - die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!" - ;; - esac - ewarn "Using CUDA architecture '${cuda_arch}'" - - mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} ) - 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="WANT" ) - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" ) - fi - fi - - if use gdal; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT" - -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT" - ) - fi - - if use imaging; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT" - -DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" ) - fi - - if ! use java && ! use python; then - # defaults to ON - mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF ) - fi - - if use java; then - mycmakeargs+=( - -DCMAKE_INSTALL_JARDIR="share/${PN}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Java="WANT" - ) - fi - - if use mpi; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_MPI="YES" - -DVTK_MODULE_ENABLE_VTK_IOH5part="WANT" - -DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT" - -DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT" - -DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT" - -DVTK_MODULE_ENABLE_VTK_h5part="WANT" - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - ) - use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" ) - if use rendering; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT" - ) - fi - use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" ) - fi - - use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" ) - use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" ) - use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" ) - use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" ) - - if use python; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Python="WANT" - -DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT" - -DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT" - -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" ) - fi - - if use qt5 && use qt6; 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" - ) - else - if use qt5; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - elif use qt6; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" - -DVTK_QT_VERSION="6" - ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) - fi - fi - - if use qt5 || use qt6; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_Qt:STRING="YES" - -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" - -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT" - ) - if use mysql || use postgres; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" ) - fi - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" ) - fi - if use views; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" ) - fi - fi - - if use rendering; then - mycmakeargs+=( - -DVTK_ENABLE_OSPRAY=OFF - - -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT" - -DVTK_MODULE_ENABLE_VTK_gl2ps="WANT" - -DVTK_MODULE_ENABLE_VTK_glew="WANT" - -DVTK_MODULE_ENABLE_VTK_opengl="WANT" - - -DVTK_USE_SDL2=$(usex sdl "YES" "NO") - ) - use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" ) - use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" ) - use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" ) - 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=ON - - # requested even if all use flags are off - -DVTK_MODULE_ENABLE_VTK_octree="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT" - - # available in ::guru, so avoid detection if installed - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF - ) - 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 < stdpthread < 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 - 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="WANT" - -DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT" - ) - fi - - if use vtkm; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT" - - -DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221 - -DVTKm_Vectorization=native - ) - fi - - if use web; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_WebCore="WANT" - -DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT" - ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" ) - fi - - use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" - - cmake_src_configure -} - -src_compile() { - use test && cmake_build VTKData - cmake_src_compile -} - -# FIXME: avoid nonfatal? -# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043 -src_test() { -# nonfatal virtx cmake_src_test - virtx cmake_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 -} |