diff options
| author |   Adrian Grigo <agrigo2001@yahoo.com.au> | 2020-08-19 02:20:15 +1000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2020-08-24 14:41:53 +0100 |
| commit | ece50308c059c23f4e4d543d07d4b3bd2a263307 (patch) | |
| tree | 5aac3cba15d6bcccfd5c5484c1301ce33ab5660e /media-gfx/openvdb/files | |
| parent | media-gfx/openvdb: Add back python 3.6 support (diff) | |
| download | gentoo-ece50308c059c23f4e4d543d07d4b3bd2a263307.tar.gz gentoo-ece50308c059c23f4e4d543d07d4b3bd2a263307.tar.bz2 gentoo-ece50308c059c23f4e4d543d07d4b3bd2a263307.zip | |
media-gfx/openvdb: Fix const correct patch
The updated patch with comments no longer worked. I have
recreated it and it now patches successfully.
Signed-off-by: Adrian Grigo <agrigo2001@yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/openvdb/files')
| -rw-r--r-- | media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch index ceda282a2bbd..cb2660329948 100644 --- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch +++ b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch @@ -17,19 +17,19 @@ Fixes bug https://bugs.gentoo.org/734102 Upstream commit https://github.com/AcademySoftwareFoundation/openvdb/commit/d2e8bd87a63d1e9f66a558ecbb6e6cbd54f7de13 diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc ---- a/openvdb/unittest/TestFile.cc 2020-08-19 01:32:17.137844464 +1000 -+++ b/openvdb/unittest/TestFile.cc 2020-08-19 01:36:03.698539134 +1000 +--- a/openvdb/unittest/TestFile.cc 2020-08-19 02:11:48.945711312 +1000 ++++ b/openvdb/unittest/TestFile.cc 2020-08-19 02:13:31.106074899 +1000 @@ -2666,7 +2666,12 @@ for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) { char* compname = nullptr; -- if (0 > blosc_compcode_to_compname(compcode, const_cast<const char **>(&compname))) continue; +- if (0 > blosc_compcode_to_compname(compcode, &compname)) continue; +#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15) + if (0 > blosc_compcode_to_compname(compcode, const_cast<const char**>(&compname))) +#else + if (0 > blosc_compcode_to_compname(compcode, &compname)) +#endif -+ continue; ++ continue; /// @todo This changes the compressor setting globally. if (blosc_set_compressor(compname) < 0) continue; |