| 1 |
commit: ece50308c059c23f4e4d543d07d4b3bd2a263307 |
| 2 |
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au> |
| 3 |
AuthorDate: Tue Aug 18 16:20:15 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 24 13:41:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece50308 |
| 7 |
|
| 8 |
media-gfx/openvdb: Fix const correct patch |
| 9 |
|
| 10 |
The updated patch with comments no longer worked. I have |
| 11 |
recreated it and it now patches successfully. |
| 12 |
|
| 13 |
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au> |
| 14 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
.../files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch | 8 ++++---- |
| 18 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index ceda282a2bb..cb266032994 100644 |
| 22 |
--- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch |
| 23 |
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch |
| 24 |
@@ -17,19 +17,19 @@ Fixes bug https://bugs.gentoo.org/734102 |
| 25 |
Upstream commit https://github.com/AcademySoftwareFoundation/openvdb/commit/d2e8bd87a63d1e9f66a558ecbb6e6cbd54f7de13 |
| 26 |
|
| 27 |
diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc |
| 28 |
---- a/openvdb/unittest/TestFile.cc 2020-08-19 01:32:17.137844464 +1000 |
| 29 |
-+++ b/openvdb/unittest/TestFile.cc 2020-08-19 01:36:03.698539134 +1000 |
| 30 |
+--- a/openvdb/unittest/TestFile.cc 2020-08-19 02:11:48.945711312 +1000 |
| 31 |
++++ b/openvdb/unittest/TestFile.cc 2020-08-19 02:13:31.106074899 +1000 |
| 32 |
@@ -2666,7 +2666,12 @@ |
| 33 |
|
| 34 |
for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) { |
| 35 |
char* compname = nullptr; |
| 36 |
-- if (0 > blosc_compcode_to_compname(compcode, const_cast<const char **>(&compname))) continue; |
| 37 |
+- if (0 > blosc_compcode_to_compname(compcode, &compname)) continue; |
| 38 |
+#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15) |
| 39 |
+ if (0 > blosc_compcode_to_compname(compcode, const_cast<const char**>(&compname))) |
| 40 |
+#else |
| 41 |
+ if (0 > blosc_compcode_to_compname(compcode, &compname)) |
| 42 |
+#endif |
| 43 |
-+ continue; |
| 44 |
++ continue; |
| 45 |
/// @todo This changes the compressor setting globally. |
| 46 |
if (blosc_set_compressor(compname) < 0) continue; |
Archives