<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/42c209b73e7a1e93a934cf04aeed6781d9593d36">https://github.com/macports/macports-ports/commit/42c209b73e7a1e93a934cf04aeed6781d9593d36</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 42c209b73e7 libdevil: Fix build with newer JasPer
</span>42c209b73e7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 42c209b73e7a1e93a934cf04aeed6781d9593d36
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jan 8 23:09:16 2022 -0600

<span style='display:block; white-space:pre;color:#404040;'>    libdevil: Fix build with newer JasPer
</span>---
 devel/libdevil/Portfile           |  1 +
 devel/libdevil/files/jasper.patch | 40 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/Portfile b/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae417cd37cd..efedddadfe7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,7 @@ depends_lib         port:jasper \
</span> 
 patchfiles          case.patch \
                     endian.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    jasper.patch \
</span>                     jpeg-boolean.patch \
                     igetfitshead.patch \
                     ivec_align_buffer.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/jasper.patch b/devel/libdevil/files/jasper.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1921aae5411
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/jasper.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with newer JasPer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/issues/90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/issues/94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/91
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/openil/patches/54/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src-IL/src/il_jp2.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src-IL/src/il_jp2.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,13 +314,32 @@ ILboolean iLoadJp2Internal(jas_stream_t      *Stream, ILimage *Image)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Hack to compile against different versions of Jasper which expect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// slightly different function types for their callbacks.  The defined()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// checks are just looking for sybols that happen to have arrived around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// the same time as the API change, so no reason they won't break in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// future :-(  Hopefully by the time it does nobody will care about pre-2.0.20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// versions of jasper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// see: https://github.com/OSGeo/gdal/commit/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//      https://github.com/DentonW/DevIL/issues/90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(PRIjas_seqent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   obj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   return iread(buf, 1, cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(JAS_INCLUDE_JP2_CODEC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned cnt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(PRIjas_seqent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, unsigned cnt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   obj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   return iwrite(buf, 1, cnt);
</span></pre><pre style='margin:0'>

</pre>