diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-01 00:07:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-01 00:07:06 +0100 |
| commit | 1551fe56fd6ba43a94509cffc61b6bf854b7ac9f (patch) | |
| tree | be99b6ceb874878a108d68c641b476a2df076517 /sci-physics/vgm | |
| parent | 0e2a727aba684f1a44cc0402a3f77d242140681b (diff) | |
gentoo auto-resync : 01:06:2024 - 00:07:06
Diffstat (limited to 'sci-physics/vgm')
| -rw-r--r-- | sci-physics/vgm/Manifest | 3 | ||||
| -rw-r--r-- | sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch | 31 | ||||
| -rw-r--r-- | sci-physics/vgm/vgm-5.2-r1.ebuild | 4 |
3 files changed, 37 insertions, 1 deletions
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index f334e9194a73..f1a16721a377 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,4 +1,5 @@ +AUX vgm-5.2-r1-root-6.32-TesselatedSolid.patch 1252 BLAKE2B 113a2b9cb046e0beb2114ac620b74251b87b71312fd8ee170464a2ea08056b35d291365bc3a91f575222d5e597aeb2b88f04276c1729fe554ed757044b663ba1 SHA512 6f402cb30e4aba97e87b9c246bc2cc7856feafabf3c3e8bb5cae8231d60d113d8b42f30a73f015ac5330e34fd40c01dc3da1632a821957d88c3c8945f5313c7f DIST vgm-5.2.tar.gz 3963607 BLAKE2B 6b82f0ac8fa345e4a736d38c2e961f04836c943445fa2dbe52e48dcc378826a4aa7e1ea1af74ae097288121e52549d599e434da30bfd2b46c35b177ef42dae14 SHA512 f141215bf67684d41acb3ae3551e0c8b643033fca841d924030eedc18136e94d75efd8940b43eaca2640470c78331fff36957173e98c7f8a1cccc6325abbf870 -EBUILD vgm-5.2-r1.ebuild 1654 BLAKE2B 8e684ba6216c8912d62d6ac8050513d9681b4b7fea5ecf6854fb0570e29b66995fead8a72e78958769963c42671cd907a5d1c13c7dcde76e9bab25a2214667eb SHA512 f8f56c9b0c40bbbc7c0417a47edb813528f46d8ad393489d34e08c38f32dd2527a2a75004252190b35ead74bacb9bdecb552cb16b0009f5dad074b6d259d5c4d +EBUILD vgm-5.2-r1.ebuild 1727 BLAKE2B cdea698c15713a7fb0e5b26a78f54150343eda84942598ae9d99fedc6e85f4f97b71338859464dc9ab97469b3917eb73f3231ec5c9c3d3e27bf126ec435aa072 SHA512 e3ecd096d27950a665ebe39f8784c85c4e70dcca245c1a83312af31a3995311e96eadf85d2f93ea70b67770d49847f6dc13a125b00afb5fc1aeb197fc38e2769 EBUILD vgm-9999.ebuild 1640 BLAKE2B 67a697401c54c6525a69f3b501f70829ffe1d9c50cf37a9e831911fe5d45c1fb1ce0e34e10b28958942e24c44bb443a4c4969c04aec9b5ecf7f0a9bfd2134803 SHA512 728c256c28853805602f04b3137d2853d43a7eef06bfb1a54df6feae54f7da85d9a3b6ae1bbbc38f234c14944f3d424a81e28e50c1df1feccb032115cf2a66d4 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc diff --git a/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch new file mode 100644 index 000000000000..2c1bfc92a349 --- /dev/null +++ b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch @@ -0,0 +1,31 @@ +adapt RootGM::TessellatedSolid for ROOT 6.32.00 + +Bug: https://github.com/vmc-project/vgm/pull/16 +--- + packages/RootGM/source/solids/TessellatedSolid.cxx | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/packages/RootGM/source/solids/TessellatedSolid.cxx ++++ b/packages/RootGM/source/solids/TessellatedSolid.cxx +@@ -178,13 +178,16 @@ VGM::ThreeVector RootGM::TessellatedSolid::Vertex(int ifacet, int index) const + { + CheckVertexIndex(ifacet, index); + +- const TGeoFacet& facet = fTessellated->GetFacet(ifacet); ++#if ROOT_VERSION_CODE > ROOT_VERSION(6, 30, 4) ++ const auto& rvertex = fTessellated->GetVertex((fTessellated->GetFacet(ifacet))[index]); ++#else ++ const auto& rvertex = fTessellated->GetFacet(ifacet).GetVertex(index); ++#endif + + VGM::ThreeVector vertex; +- vertex.push_back(facet.GetVertex(index).fVec[0] * RootGM::Units::Length()); +- vertex.push_back(facet.GetVertex(index).fVec[1] * RootGM::Units::Length()); +- vertex.push_back(facet.GetVertex(index).fVec[2] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[0] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[1] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[2] * RootGM::Units::Length()); + + return vertex; + } +- diff --git a/sci-physics/vgm/vgm-5.2-r1.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild index 6e5f9a755e9c..ff3c18921bb1 100644 --- a/sci-physics/vgm/vgm-5.2-r1.ebuild +++ b/sci-physics/vgm/vgm-5.2-r1.ebuild @@ -45,6 +45,10 @@ DOCS=( doc/VGMhistory.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-5.2-r1-root-6.32-TesselatedSolid.patch +) + src_configure() { local mycmakeargs=( -DCLHEP_DIR="${EPREFIX}/usr" |