From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- sci-libs/vtk/Manifest | 16 +- sci-libs/vtk/files/vtk-6.1.0-freetype.patch | 22 -- sci-libs/vtk/files/vtk-6.1.0-gcc67.patch | 26 -- sci-libs/vtk/files/vtk-6.1.0-gdal2.patch | 33 --- sci-libs/vtk/files/vtk-6.1.0-glext.patch | 13 - sci-libs/vtk/files/vtk-6.1.0-install.patch | 19 -- sci-libs/vtk/files/vtk-6.1.0-memset.patch | 147 ----------- sci-libs/vtk/files/vtk-6.1.0-netcdf.patch | 29 -- sci-libs/vtk/files/vtk-6.1.0-system.patch | 27 -- sci-libs/vtk/files/vtk-6.1.0-web.patch | 25 -- sci-libs/vtk/metadata.xml | 2 - sci-libs/vtk/vtk-6.1.0-r4.ebuild | 392 ---------------------------- 12 files changed, 1 insertion(+), 750 deletions(-) delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-freetype.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-gcc67.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-gdal2.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-glext.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-install.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-memset.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-netcdf.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-system.patch delete mode 100644 sci-libs/vtk/files/vtk-6.1.0-web.patch delete mode 100644 sci-libs/vtk/vtk-6.1.0-r4.ebuild (limited to 'sci-libs/vtk') diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 6da8f8e189de..99549764a64c 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -1,20 +1,6 @@ -AUX vtk-6.1.0-freetype.patch 1159 BLAKE2B 4dca5ddc3a6d7b9cb14a5a2c1d59ce41e8922467ceb07665358aed809481de7d7dd01b1a08b3c302dca53e7fba63ab0b5c10ff4e12420df656ef6c678e386f8f SHA512 c4e0328d1c7c1a1842de0f70ec93fe28e5537d9add29d4e76243f91138b97e993d5ef02a80fece8cc3476086772bb2f3e97ff6c8ce18a4ffedced90ad98199e0 -AUX vtk-6.1.0-gcc67.patch 1166 BLAKE2B 54a83d81ce2683ebce9616c924aa29cdc8e6614b0e654b2b6d95f6dcdb6d03e9c07c7ad6ea902d2c0155bda5b5dde50853a3d46fa6a3a0cd7ca89862c942a618 SHA512 c8190a0d121564b192a6e2075a31ac494ba735d6092827bcc5370319213c9780c3044179b0389d0056b0513c9ec919ba5da76954e7cd0e4d6617335ac8602609 -AUX vtk-6.1.0-gdal2.patch 1132 BLAKE2B 79a3386a0cff34c38a31b0685a0660f44b7d7e91443fa89ab2337dacb3f40893372687cadb312a7189e11e70ac048ecbac1a2144d6324c98a4ed579dd0b3b44e SHA512 5bd4414ca8892f0b290dddce2b7a98d64ab4bc68818ac168d1170ca4ef7212f908ec8b3d1f84ec0aa131e18c20cfd8584f5b44cd5fbb4019b9bb9e0b4a4f2a47 -AUX vtk-6.1.0-glext.patch 609 BLAKE2B 6433fb3d6766a9b4801779d3e435fbd933c8ef8d79bc6db0f0bc735d8c2449b95237e147c0062f832aafafee7194f07b3c18dbde3fbab6dfd7480c7bed447d91 SHA512 a2cfb0801742fded8984dfe849d3c2da9796c6c87a2bbe2eac622f4b91abe1c142fd97d94bbe248ff222fae85a80db8d6ee100de1022049ef6c9a82aaebbb9d5 -AUX vtk-6.1.0-install.patch 968 BLAKE2B e7618cf685f60a2733869549c4aa001044303215bc6a95fa408e6c7e6640377558c166458ff1baf478023209f859f4835a48acde40b21aaece69f66149dbdb64 SHA512 e6f7e5436c6efca920bd7f9b724c219b7a34a357f01fb813bf168aefc1727b9c2d4af6cb380b4b6b70e4b091557f866761499a53e7e1c07a665d06aacd2acdb6 -AUX vtk-6.1.0-memset.patch 5216 BLAKE2B 301ac84c0e439c14228665c8230d3f843c919b0a2cbc0b83007574e8c22bcd986718be81795f114ceca2a6a627570678a21fb057e8bcaf6e5dc2a762486dc534 SHA512 8789198bcb9c23af290c6b2b90d7277e546fe34e8aed03d1644d1edbec1c523801f3cc325dbb3bc8606ed6e3c84ea2a45fe1f05208366a0a3260e9b73cd96691 -AUX vtk-6.1.0-netcdf.patch 994 BLAKE2B 9b24685987b2a76f32cbe7c107f5c5ac580ca7d6616d959caeedc2b3ac0699b9f1b5b79a26fc1cc61818c3712fb40d9246dea2c3bb221e0fbc5db5a61707406d SHA512 0f0b3493270efbf33a13abb7f38637473d48d15efe793f7148c13f5aeb77ac5534340d42f87451cd81ed2d7cce4ca6da9a71e065a7780e84f30a710d7368b488 -AUX vtk-6.1.0-system.patch 1307 BLAKE2B f89f7e4946c94a907ef7b74c1ca1e35106ece486c944f932b6d19febe2ecb08aee6cd11719a121b3a47a978969724aff2d16c2212151bf6fd50cb7c19ab22957 SHA512 1fae8aecaf2344b5517e9b29ea2cb8b834af8a22be88535ec8bf9ec624625ea3f2ca820945a3d3f7c896ca080a7ded59ca7a601c50f970e59c3a8db691f060b3 -AUX vtk-6.1.0-web.patch 776 BLAKE2B e92d3abb96161f0d955c3c653ce67a2427538fcabcb3b492449d086ec35b545c693231fa9bbb02f27ca96395bcd4c73e6741318625ad23c5105fa3fc8cfbf671 SHA512 5489096a0a4e5854cd426a75a0713f53a5c0daab7a9069c249b65d4a34cc8ff18737267f16ee8fbb2a07b7e987525b93e1eec5a23f78ac1b3f893c5847761bc5 -DIST VTK-6.1.0.tar.gz 27608882 BLAKE2B 10cef62e2fc3bf7109f7b3e9858721850243a7798fe885c6a584dba9a6f74c526c58b009f2cba6c56512a6ec159dbf29ac965f9ae6533128f3a20e7224bdddc0 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3 -DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047 -DIST VTKLargeData-6.1.0.tar.gz 166019220 BLAKE2B 94180c9fd73655cbc08914a2309925d40ac2c99ce8652a7db37bb3ddc3b9dd654e8286be97a764c9029a6de21ae847f1f2c46c07ec974e5da802f23a7d277836 SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31 -DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c -EBUILD vtk-6.1.0-r4.ebuild 10480 BLAKE2B 72dc967f163fed46bcbe7dc0a2b4de89840c95134a5b89522ed2d8962873a4ee54d7e2a0a9dc9814f003e3aa5d206e39ec77b799690b7ba8af1fec5d874cef48 SHA512 b299bee838d2fac4b44d56039856a326388186bac7d7c154bc4b144db66df1c04b9c74db3039f6e2ff8d3b25714a3e37d097e47a573b4a1851be09acbe161794 EBUILD vtk-8.1.0-r3.ebuild 8941 BLAKE2B 46621f53b88cd7577f70f8921a583921791b730200e496f2dd846e2b18cf42d19b25826c244141d736e632a0bc7653e7a2e4076faf087276b2cf2e1ae295d766 SHA512 403715ad2de469165775e506968061965216f90bf36ee51e01f7165073882f14e0799324d7d0823f741567f182c78447634bb3a2bb653e341254cb900aa27769 -MISC metadata.xml 1122 BLAKE2B 8dbb591a7a7058bb373268f588fab8e1d4a16840dd92cb2c288222e091a84bbd7c30bac38ed289f7aa4fcd7fb002438f13ce4046e27822271a34d0bb5410fb39 SHA512 1415d25d21fb73f3eebe0401a1a1d022ace5f4a95e1e522209a2010d98b70a721abb6c5214a5bbe8d68df889b439229c618f7d5fa0671fd98eefb572a4b1bae0 +MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4 diff --git a/sci-libs/vtk/files/vtk-6.1.0-freetype.patch b/sci-libs/vtk/files/vtk-6.1.0-freetype.patch deleted file mode 100644 index b7d3e409cde1..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-freetype.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 -+++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 -@@ -1185,7 +1185,7 @@ - if (bitmap) - { - metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); -- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), -+ metaData.descent = std::min(-(static_cast(bitmap->rows) - (bitmapGlyph->top - 1)), - metaData.descent); - } - ++heightString; -@@ -1952,8 +1952,8 @@ - if (bitmap) - { - bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); -- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); -- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); -+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast(bitmap->width)); -+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast(bitmap->rows)); - bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); - } - else diff --git a/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch deleted file mode 100644 index 83d1ae18f213..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/old/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake -index 05b2db9..92c2c4c 100644 ---- a/old/vtkCompilerExtras.cmake -+++ b/CMake/vtkCompilerExtras.cmake -@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) - OUTPUT_VARIABLE _gcc_version_info - ERROR_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" -+ string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" - _gcc_version "${_gcc_version_info}") - if(NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" -diff --git a/old/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake -index 3cc12dd..b7a47df 100644 ---- a/old/GenerateExportHeader.cmake -+++ b/CMake/GenerateExportHeader.cmake -@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility) - execute_process(COMMAND ${CMAKE_C_COMPILER} --version - OUTPUT_VARIABLE _gcc_version_info - ERROR_VARIABLE _gcc_version_info) -- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" -+ string(REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" - _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: diff --git a/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch b/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch deleted file mode 100644 index c21864102278..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/IO/GDAL/vtkGDALVectorReader.cxx b/IO/GDAL/vtkGDALVectorReader.cxx -index 86854a0..a0e234a 100644 ---- a/IO/GDAL/vtkGDALVectorReader.cxx -+++ b/IO/GDAL/vtkGDALVectorReader.cxx -# Patch to build against newer GDAL per upstream commit -# https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk&id=43307598a98872fd4ce7739e47f5bb4cfcb5372d -@@ -44,7 +44,7 @@ class vtkGDALVectorReader::Internal - public: - Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds ) - { -- this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode, &this->Driver ); -+ this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL ); - if ( ! this->Source ) - { - this->LastError = CPLGetLastErrorMsg(); -@@ -61,7 +61,7 @@ public: - { - if ( this->Source ) - { -- OGRDataSource::DestroyDataSource( this->Source ); -+ GDALClose( (GDALDatasetH) this->Source ); - } - } - -@@ -304,7 +304,7 @@ public: - return nCells; - } - -- OGRDataSource* Source; -+ GDALDataset* Source; - OGRSFDriver* Driver; - const char* LastError; - int LayerIdx; diff --git a/sci-libs/vtk/files/vtk-6.1.0-glext.patch b/sci-libs/vtk/files/vtk-6.1.0-glext.patch deleted file mode 100644 index b5529a5fc3d5..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-glext.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h ---- VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext 2014-01-22 08:55:41.000000000 -0700 -+++ VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h 2014-11-19 10:27:12.349345199 -0700 -@@ -19,7 +19,8 @@ - #include "vtkConfigure.h" - - // To prevent gl.h to include glext.h provided by the system --#define GL_GLEXT_LEGACY -+// https://bugzilla.redhat.com/show_bug.cgi?id=1138466 -+// #define GL_GLEXT_LEGACY - #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA)) - # include // Include OpenGL API. - #else diff --git a/sci-libs/vtk/files/vtk-6.1.0-install.patch b/sci-libs/vtk/files/vtk-6.1.0-install.patch deleted file mode 100644 index 27c6c3adfee9..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-install.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up VTK-6.1.0/CMake/vtkModuleTop.cmake.install VTK-6.1.0/CMake/vtkModuleTop.cmake ---- VTK-6.1.0/CMake/vtkModuleTop.cmake.install 2014-01-23 19:12:04.922871103 -0700 -+++ VTK-6.1.0/CMake/vtkModuleTop.cmake 2014-01-23 19:14:33.002645155 -0700 -@@ -330,11 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) - CMake/pythonmodules.h.in - CMake/UseVTK.cmake - CMake/FindTCL.cmake -+ CMake/TopologicalSort.cmake - CMake/vtkTclTkMacros.cmake - CMake/vtk-forward.c.in -+ CMake/vtkGroups.cmake - CMake/vtkForwardingExecutable.cmake - CMake/vtkJavaWrapping.cmake - CMake/vtkMakeInstantiator.cmake -+ CMake/vtkMakeInstantiator.cxx.in -+ CMake/vtkMakeInstantiator.h.in - CMake/vtkModuleAPI.cmake - CMake/vtkModuleHeaders.cmake.in - CMake/vtkModuleInfo.cmake.in diff --git a/sci-libs/vtk/files/vtk-6.1.0-memset.patch b/sci-libs/vtk/files/vtk-6.1.0-memset.patch deleted file mode 100644 index 362022edf16d..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-memset.patch +++ /dev/null @@ -1,147 +0,0 @@ -From ef22d3d69421581b33bc0cd94b647da73b61ba96 Mon Sep 17 00:00:00 2001 -From: Anton Gladky -Date: Fri, 30 May 2014 23:16:26 +0200 -Subject: [PATCH] Fix compilation by gcc-4.9 - -VTK fails to build during compilation by gcc-4.9 with the -following message: - -CMakeFiles/vtkFiltersParallelMPI.dir/vtkDistributedDataFilter.cxx.o: In -function `memset': -/usr/include/x86_64-linux-gnu/bits/string3.h:81: warning: memset used -with constant zero length parameter; this could be due to transposed -parameters -collect2: error: ld returned 1 exit status - -This patch sets if-condition before all "memsets" in -vtkDistributedDataFilter and checkes, whether the number -of bytes to be set by memset is more than 0 to escape this -error. ---- - Filters/ParallelMPI/vtkDistributedDataFilter.cxx | 48 ++++++++++++++++++------ - 1 file changed, 37 insertions(+), 11 deletions(-) - -diff --git a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -index 3c1ff30..df4b5d3 100644 ---- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -@@ -1091,7 +1091,10 @@ vtkDataSet *vtkDistributedDataFilter::TestFixTooFewInputFiles(vtkDataSet *input) - vtkIdType cellsPerNode = numTotalCells / nprocs; - - vtkIdList **sendCells = new vtkIdList * [ nprocs ]; -- memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); -+ -+ if (sizeof(vtkIdList *) * nprocs > 0) { -+ memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); -+ } - - if (numConsumers == nprocs - 1) - { -@@ -1582,7 +1585,9 @@ vtkFloatArray ** - // Exchange int arrays - - float **recvArrays = new float * [nprocs]; -- memset(recvArrays, 0, sizeof(float *) * nprocs); -+ if (sizeof(float *) * nprocs > 0) { -+ memset(recvArrays, 0, sizeof(float *) * nprocs); -+ } - - if (sendSize[me] > 0) // sent myself an array - { -@@ -1703,7 +1708,9 @@ vtkIdTypeArray ** - // Exchange int arrays - - vtkIdType **recvArrays = new vtkIdType * [nprocs]; -- memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); -+ if (sizeof(vtkIdType *) * nprocs > 0) { -+ memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); -+ } - - if (sendSize[me] > 0) // sent myself an array - { -@@ -2807,7 +2814,9 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharPointArray( - - unsigned char *vals = new unsigned char [npoints]; - -- memset(vals, val, npoints); -+ if (npoints > 0) { -+ memset(vals, val, npoints); -+ } - - vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New(); - Array->SetName(arrayName); -@@ -2827,7 +2836,9 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharCellArray( - - unsigned char *vals = new unsigned char [ncells]; - -- memset(vals, val, ncells); -+ if (ncells > 0) { -+ memset(vals, val, ncells); -+ } - - vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New(); - Array->SetName(arrayName); -@@ -3026,7 +3037,9 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid) - vtkIdType nGridPoints = grid->GetNumberOfPoints(); - - vtkIdType *numPointsOutside = new vtkIdType [nprocs]; -- memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); -+ if (sizeof(vtkIdType) * nprocs > 0) { -+ memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); -+ } - - vtkIdTypeArray *globalIds = vtkIdTypeArray::New(); - globalIds->SetNumberOfValues(nGridPoints); -@@ -3108,10 +3121,16 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid) - // global ID back? - - vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs]; -- memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); -+ -+ if (sizeof(vtkFloatArray *) * nprocs > 0) { -+ memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); -+ } - - vtkIdTypeArray **localIds = new vtkIdTypeArray * [nprocs]; -- memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ -+ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { -+ memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - vtkIdType *next = new vtkIdType [nprocs]; - vtkIdType *next3 = new vtkIdType [nprocs]; -@@ -3286,7 +3305,9 @@ vtkIdTypeArray **vtkDistributedDataFilter::FindGlobalPointIds( - { - // There are no cells in my assigned region - -- memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { -+ memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - return gids; - } -@@ -3491,7 +3512,10 @@ vtkIdTypeArray **vtkDistributedDataFilter::MakeProcessLists( - std::multimap::iterator mapIt; - - vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs]; -- memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); -+ -+ if (sizeof (vtkIdTypeArray *) * nprocs > 0) { -+ memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); -+ } - - for (int i=0; iGetNumberOfPoints(); - - vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs]; -- memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ if (sizeof(vtkIdTypeArray *) * nprocs) { -+ memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - if (numPoints < 1) - { diff --git a/sci-libs/vtk/files/vtk-6.1.0-netcdf.patch b/sci-libs/vtk/files/vtk-6.1.0-netcdf.patch deleted file mode 100644 index e6f8b6431720..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-netcdf.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt ---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-12-27 20:29:11.644289659 -0700 -+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-12-27 20:33:48.071895769 -0700 -@@ -1,10 +1,18 @@ --vtk_module_third_party(NetCDF -- LIBRARIES vtkNetCDF vtkNetCDF_cxx -- INCLUDE_DIRS -- ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include -- ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf -- COMPONENTS C CXX -- ) -+if(NOT VTK_USE_SYSTEM_NETCDF) -+ vtk_module_third_party(NetCDF -+ LIBRARIES vtkNetCDF vtkNetCDF_cxx -+ INCLUDE_DIRS -+ ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include -+ ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf -+ COMPONENTS C CXX -+ ) -+else(NOT VTK_USE_SYSTEM_NETCDF) -+ vtk_module_third_party(NetCDF -+ LIBRARIES vtkNetCDF netcdf -+ COMPONENTS C CXX -+ ) -+endif() -+ - - #Configure the top cpp header to switch between system and internal - #netcdf just like vtk_module_third_party does for the c header. diff --git a/sci-libs/vtk/files/vtk-6.1.0-system.patch b/sci-libs/vtk/files/vtk-6.1.0-system.patch deleted file mode 100644 index c75d544447ea..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-system.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake ---- VTK/CMake/vtkModuleMacros.cmake.system 2013-12-24 19:17:43.000000000 -0700 -+++ VTK/CMake/vtkModuleMacros.cmake 2013-12-27 20:28:22.375573277 -0700 -@@ -682,7 +682,7 @@ macro(vtk_module_third_party _pkg) - message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") - endif() - -- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) -+ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) - mark_as_advanced(VTK_USE_SYSTEM_${_upper}) - - if(VTK_USE_SYSTEM_${_upper}) -diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt ---- VTK/CMakeLists.txt.system 2013-12-27 20:28:22.374573241 -0700 -+++ VTK/CMakeLists.txt 2013-12-27 20:28:48.118669708 -0700 -@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE - endif() - - #----------------------------------------------------------------------------- -+# Do we try to use system libraries by default? -+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) -+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) -+ -+#----------------------------------------------------------------------------- - # The third party macros are still used in one or two third party builds. - include(vtkThirdParty) - diff --git a/sci-libs/vtk/files/vtk-6.1.0-web.patch b/sci-libs/vtk/files/vtk-6.1.0-web.patch deleted file mode 100644 index a85f2cd99640..000000000000 --- a/sci-libs/vtk/files/vtk-6.1.0-web.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 58373b120db6d51c6d5eace38447cdb45ff858d1 Mon Sep 17 00:00:00 2001 -From: Patric Schmitz -Date: Tue, 28 Oct 2014 16:24:22 +0100 -Subject: [PATCH] Include vtkPythonPackages in Web/JavaScript/CMakeLists.txt - -Change-Id: Ie7bffa19bdaa78c5b090c886e50c1af76e2aadee ---- - Web/Applications/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Web/Applications/CMakeLists.txt b/Web/Applications/CMakeLists.txt -index c9e7ad3..b4c9a60 100644 ---- a/Web/Applications/CMakeLists.txt -+++ b/Web/Applications/CMakeLists.txt -@@ -12,6 +12,7 @@ set(WEB_APPLICATIONS - - set(WEB_APPS_DEPENDS) - -+include(vtkPythonPackages) # for copy_files_recursive - foreach(_app ${WEB_APPLICATIONS}) - file(MAKE_DIRECTORY "${VTK_WWW_DIR}/apps/${_app}") - --- -2.2.1 - diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index 9faa532b1c8a..6c1a962488c6 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -8,11 +8,9 @@ Build all modules Add support for boost - Use nvidia's cg shaders Support for gdal formated data Building Imaging modules Support for json formatted data - Use sci-libs/xkaapi to handle smp support Offscreen rendering through OSMesa Building Redering modules Use dev-cpp/tbb to handle smp support diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild deleted file mode 100644 index a24386e16e6b..000000000000 --- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild +++ /dev/null @@ -1,392 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -CMAKE_MAKEFILE_GENERATOR=ninja -WEBAPP_OPTIONAL=yes -WEBAPP_MANUAL_SLOT=yes - -inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp - -# Short package version -SPV="$(get_version_component_range 1-2)" - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="https://www.vtk.org/" -SRC_URI=" - https://www.${PN}.org/files/release/${SPV}/VTK-${PV}.tar.gz - doc? ( https://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz ) - test? ( - https://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz - https://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz - ) - " - -LICENSE="BSD LGPL-2" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE=" - all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi - mysql odbc offscreen postgres python qt5 rendering smp tbb test theora tk tcl - video_cards_nvidia views web xdmf2 R +X" - -REQUIRED_USE=" - all-modules? ( python xdmf2 ) - java? ( qt5 ) - python? ( ${PYTHON_REQUIRED_USE} ) - tcl? ( rendering ) - smp? ( ^^ ( kaapi tbb ) ) - test? ( python ) - tk? ( tcl ) - web? ( python ) - ^^ ( X aqua offscreen ) - " - -RDEPEND=" - dev-libs/expat - dev-libs/jsoncpp - dev-libs/libxml2:2 - >=media-libs/freetype-2.5.4 - media-libs/libpng:0 - media-libs/mesa - media-libs/libtheora - media-libs/tiff:0 - sci-libs/exodusii - sci-libs/hdf5:= - sci-libs/netcdf-cxx:3 - sys-libs/zlib - virtual/jpeg:0 - virtual/opengl - >=x11-libs/gl2ps-1.3.8 - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - boost? ( >=dev-libs/boost-1.40.0[mpi?] ) - cg? ( media-gfx/nvidia-cg-toolkit ) - examples? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - sci-libs/vtkdata - ) - ffmpeg? ( virtual/ffmpeg ) - gdal? ( sci-libs/gdal ) - java? ( >=virtual/jre-1.5:* ) - kaapi? ( > "${T}"/40${PN} <<- EOF - VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data - VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} - VTKHOME=${EPREFIX}/usr - EOF - doenvd "${T}"/40${PN} - - use web && webapp_src_install -} - -# webapp.eclass exports these but we want it optional #534036 -pkg_postinst() { - use web && webapp_pkg_postinst -} - -pkg_prerm() { - use web && webapp_pkg_prerm -} -- cgit v1.2.3