[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/

[Sam James]

commit:     ece50308c059c23f4e4d543d07d4b3bd2a263307
Author:     Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Tue Aug 18 16:20:15 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:41:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece50308

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 <AT> yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch  | 8 ++++----
 1 file 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 ceda282a2bb..cb266032994 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;
  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/files/

[Sam James]

commit:     d1fbb06685e53f236a1ab5bce3a2571045a0e83c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  4 01:06:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  4 01:06:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1fbb066

media-gfx/openvdb: fix minor typo in patch comment

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
index 972db42b3556..5fa90a7b6524 100644
--- a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch
@@ -1,5 +1,5 @@
 Grabbed relevant parts from upstream PR for 9.x; it's a variant
-of https://github.com/gentoo/gentoo/pull/22738 which wa sfor earlier versions.
+of https://github.com/gentoo/gentoo/pull/22738 which was for earlier versions.
 
 https://github.com/AcademySoftwareFoundation/openvdb/pull/1237