<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9d2ccd38b73305f824df2f8f699a0a0b5af88afc">https://github.com/macports/macports-ports/commit/9d2ccd38b73305f824df2f8f699a0a0b5af88afc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9d2ccd38b73 vigra: add patch for hdf5 compat; fix livecheck
</span>9d2ccd38b73 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9d2ccd38b73305f824df2f8f699a0a0b5af88afc
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Apr 26 13:07:58 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> vigra: add patch for hdf5 compat; fix livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/69007
</span>---
graphics/vigra/Portfile | 9 ++++-----
graphics/vigra/files/patch-hdf5-1.12.diff | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vigra/Portfile b/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f16b95c8de..7316a65b0f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,10 @@ patchfiles-append patch-boost_python.diff
</span> # see https://trac.macports.org/ticket/59970
patchfiles-append patch-sifImport.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# upstream patch for hdf5 1.12+ compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/69007
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-hdf5-1.12.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@DOCDIR@|${prefix}/share/doc/${name}|g" ${worksrcpath}/config/vigra-config.in
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,8 +147,3 @@ if { ${active_py} eq "" } {
</span> set active_py_nodot [string map {. {}} ${active_py}]
default_variants +python${active_py_nodot}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version ${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {>version ([0-9.]+)<}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vigra/files/patch-hdf5-1.12.diff b/graphics/vigra/files/patch-hdf5-1.12.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d59810fe87f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vigra/files/patch-hdf5-1.12.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From 4c70103d215bb70d4820cd4569321361d0baade7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Mark Harfouche <mark.harfouche@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Tue, 28 Sep 2021 09:45:08 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] Add compatibility for HDF5 1.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/impex/hdf5impex.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/impex/hdf5impex.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,7 +190,11 @@ H5O_type_t HDF5_get_type(hid_t loc_id, const char* name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // get information about object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ H5O_info_t infobuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if H5Oget_info_by_name_vers >= 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ H5Oget_info_by_name(loc_id, name, &infobuf, H5O_INFO_BASIC, H5P_DEFAULT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ H5Oget_info_by_name(loc_id, name, &infobuf, H5P_DEFAULT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return infobuf.type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>