From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/
Date: Thu, 1 Sep 2022 02:24:47 +0000 (UTC) [thread overview]
Message-ID: <1661999033.2e02cfbf0edd45b41747e2707fc56b7512c6aef6.sam@gentoo> (raw)
commit: 2e02cfbf0edd45b41747e2707fc56b7512c6aef6
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Aug 23 16:54:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 1 02:23:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e02cfbf
sci-libs/vtk: build with LTO enabled
Closes: https://bugs.gentoo.org/863038
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27010
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-or-scope-struct-names-to-avoid-conflicts.patch | 126 +++++++++++++++++++++
sci-libs/vtk/vtk-9.1.0-r2.ebuild | 1 +
2 files changed, 127 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
new file mode 100644
index 000000000000..e06c786db9ab
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.1.0-Change-or-scope-struct-names-to-avoid-conflicts.patch
@@ -0,0 +1,126 @@
+From https://gitlab.kitware.com/vtk/vtk/-/commit/0322b938968eebee585ad7efb93bbdade7106355
+From: Aron Helser <aron.helser@kitware.com>
+Date: Mon, 15 Aug 2022 10:06:13 -0400
+Subject: [PATCH 16/30] Change or scope struct names to avoid conflicts.
+
+(cherry picked from commit b79eb46bf5a4277cafc1ed2bd47fd3ffc28a5b3f)
+--- a/IO/AMR/vtkAMRFlashReader.cxx
++++ b/IO/AMR/vtkAMRFlashReader.cxx
+@@ -153,7 +153,7 @@ void vtkAMRFlashReader::ComputeStats(
+
+ for (int i = 0; i < internal->NumberOfBlocks; ++i)
+ {
+- Block& theBlock = internal->Blocks[i];
++ FlashReaderBlock& theBlock = internal->Blocks[i];
+ double* gridMin = theBlock.MinBounds;
+ if (gridMin[0] < min[0])
+ {
+@@ -193,7 +193,7 @@ int vtkAMRFlashReader::FillMetaData()
+
+ for (int i = 0; i < this->Internal->NumberOfBlocks; ++i)
+ {
+- Block& theBlock = this->Internal->Blocks[i];
++ FlashReaderBlock& theBlock = this->Internal->Blocks[i];
+
+ // Start numbering levels from 0!
+ int level = this->Internal->Blocks[i].Level - 1;
+--- a/IO/AMR/vtkAMRFlashReaderInternal.cxx
++++ b/IO/AMR/vtkAMRFlashReaderInternal.cxx
+@@ -692,7 +692,7 @@ void vtkFlashReaderInternal::GetBlockMinMaxGlobalDivisionIds()
+
+ for (int b = 0; b < this->NumberOfBlocks; b++)
+ {
+- Block& B = this->Blocks[b];
++ FlashReaderBlock& B = this->Blocks[b];
+
+ for (int d = 0; d < 3; d++)
+ {
+--- a/IO/AMR/vtkAMRFlashReaderInternal.h
++++ b/IO/AMR/vtkAMRFlashReaderInternal.h
+@@ -74,7 +74,7 @@ typedef struct tagFlashReaderSimulationParameters
+ double RedShift;
+ } FlashReaderSimulationParameters;
+
+-typedef struct tagBlock
++typedef struct tagFlashReaderBlock
+ {
+ int Index; // Id of the block
+ int Level; // LOD level
+@@ -88,7 +88,7 @@ typedef struct tagBlock
+ double Center[3]; // center of the block
+ double MinBounds[3]; // lower left of the bounding box
+ double MaxBounds[3]; // upper right of the bounding box
+-} Block;
++} FlashReaderBlock;
+
+ typedef struct tagFlashReaderSimulationInformation
+ {
+@@ -152,7 +152,7 @@ public:
+ FlashReaderSimulationInformation SimulationInformation; // CFD simulation
+
+ // blocks
+- std::vector<Block> Blocks;
++ std::vector<FlashReaderBlock> Blocks;
+ std::vector<int> LeafBlocks;
+ std::vector<std::string> AttributeNames;
+
+--- a/IO/AMR/vtkAMRVelodyneReader.cxx
++++ b/IO/AMR/vtkAMRVelodyneReader.cxx
+@@ -219,7 +219,7 @@ int vtkAMRVelodyneReader::FillMetaData()
+ double spacing[3];
+ for (int i = 0; i < this->Internal->nBlocks; i++)
+ {
+- Block& theBlock = this->Internal->Blocks[i];
++ vtkAMRVelodyneReaderInternal::Block& theBlock = this->Internal->Blocks[i];
+ int level = theBlock.Level;
+ int id = theBlock.Index;
+ CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, dims);
+@@ -243,7 +243,7 @@ vtkUniformGrid* vtkAMRVelodyneReader::GetAMRGrid(const int blockIdx)
+ {
+ return nullptr;
+ }
+- Block& theBlock = this->Internal->Blocks[blockIdx];
++ vtkAMRVelodyneReaderInternal::Block& theBlock = this->Internal->Blocks[blockIdx];
+ int dims[3];
+ CalculateBlockDims(this->Internal->blockDims.data(), theBlock.isFull, dims);
+ vtkUniformGrid* ug = vtkUniformGrid::New();
+--- a/IO/AMR/vtkAMRVelodyneReaderInternal.h
++++ b/IO/AMR/vtkAMRVelodyneReaderInternal.h
+@@ -48,24 +48,20 @@
+ //================================================================================
+ // INTERNAL VELODYNE READER
+ //================================================================================
+-typedef struct tagVelodyneSimParameters
+-{
+- double Time;
+- int CycleTime;
+-} VelodneSimParameters;
+
+-typedef struct tagBlock
+-{
+- int Index;
+- int dSetLoc;
+- int Level;
+- double Origin[3];
+- bool isFull;
+- bool isLeaf;
+-} Block;
+ class vtkAMRVelodyneReaderInternal
+ {
+ public:
++ typedef struct tagVelodyneBlock
++ {
++ int Index;
++ int dSetLoc;
++ int Level;
++ double Origin[3];
++ bool isFull;
++ bool isLeaf;
++ } Block;
++
+ vtkAMRVelodyneReaderInternal();
+ ~vtkAMRVelodyneReaderInternal();
+ void SetFileName(VTK_FILEPATH VTK_FUTURE_CONST char* fileName);
+--
+2.37.2
+
diff --git a/sci-libs/vtk/vtk-9.1.0-r2.ebuild b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
index 1e80b96b80b4..e9034c50bbb0 100644
--- a/sci-libs/vtk/vtk-9.1.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
"${FILESDIR}"/${P}-adjust-to-find-binaries.patch
"${FILESDIR}"/${P}-avoid-naming-collision-with-netcdf-4.9.0.patch
+ "${FILESDIR}"/${P}-Change-or-scope-struct-names-to-avoid-conflicts.patch
)
DOCS=( CONTRIBUTING.md README.md )
next reply other threads:[~2022-09-01 2:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 2:24 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-08 6:29 [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/ Sam James
2025-01-14 16:20 Andreas Sturmlechner
2024-12-05 18:01 Sam James
2024-11-25 15:32 Andreas Sturmlechner
2024-09-08 13:51 Sam James
2024-09-07 14:50 Sam James
2024-07-04 11:12 Miroslav Šulc
2024-04-11 9:44 Andrew Ammerlaan
2024-01-10 12:41 Sam James
2023-11-21 12:47 Guilherme Amadio
2023-03-07 7:57 Sam James
2023-01-30 13:26 Sam James
2022-02-21 23:24 Sam James
2021-12-03 22:51 Sam James
2021-06-10 3:38 Sam James
2020-12-15 2:13 Sam James
2020-06-06 13:17 Andreas Sturmlechner
2020-06-06 10:04 Andreas Sturmlechner
2020-06-06 9:42 Andreas Sturmlechner
2019-11-28 19:04 Andreas Sturmlechner
2019-08-30 8:57 Andreas Sturmlechner
2017-01-26 20:12 David Seifert
2017-01-02 22:09 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1661999033.2e02cfbf0edd45b41747e2707fc56b7512c6aef6.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox