<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5db4eef566f99ff7acbc5eeb535085a947a27e46">https://github.com/macports/macports-ports/commit/5db4eef566f99ff7acbc5eeb535085a947a27e46</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 5db4eef566f libdevil: Use jasper 4
</span>5db4eef566f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5db4eef566f99ff7acbc5eeb535085a947a27e46
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun May 5 20:37:53 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> libdevil: Use jasper 4
</span>---
devel/libdevil/Portfile | 14 +++++++-------
devel/libdevil/files/ivec_align_buffer.patch | 6 +++---
devel/libdevil/files/jasper.patch | 21 +++++++++++++++------
3 files changed, 25 insertions(+), 16 deletions(-)
<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 5ded41770c3..be7806d4d4c 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;'>@@ -7,7 +7,7 @@ PortGroup muniversal 1.0
</span> name libdevil
conflicts ResIL
version 1.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> checksums rmd160 411efa9982a1dfd9075536a80c1eb3d8c2ed15e8 \
sha256 0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709 \
size 3084833
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +30,12 @@ long_description Developer's Image Library (DevIL) is a programmer's \
</span> Formerly known as OpenIL, but the name was changed due \
to SGI's request.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://openil.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://openil.sourceforge.net
</span> master_sites sourceforge:project/openil/DevIL/${version}
distname DevIL-${version}
worksrcdir DevIL/DevIL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:jasper2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:jasper \
</span> path:include/turbojpeg.h:libjpeg-turbo \
port:lcms2 \
port:libmng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +59,10 @@ configure.cxxflags-append -std=gnu++11
</span>
# I don't know what the deal is with plural vs. singular cmake flags.
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIRS=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARIES=${prefix}/libexec/jasper2/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY=${prefix}/libexec/jasper2/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARIES=${prefix}/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARY=${prefix}/lib/libjasper.dylib \
</span> -DJPEG_INCLUDE_DIR=${prefix}/include \
-DJPEG_INCLUDE_DIRS=${prefix}/include \
-DJPEG_LIBRARIES=${prefix}/lib/libjpeg.dylib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/ivec_align_buffer.patch b/devel/libdevil/files/ivec_align_buffer.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c01c3fa478..25e85f80d1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/ivec_align_buffer.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/files/ivec_align_buffer.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Fix conflicting types error.
https://github.com/DentonW/DevIL/pull/87
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/IL/devil_internal_exports.h.orig 2009-11-17 11:32:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/IL/devil_internal_exports.h 2009-11-17 11:32:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/IL/devil_internal_exports.h.orig 2017-01-01 18:03:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/IL/devil_internal_exports.h 2024-05-05 20:42:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,7 +95,7 @@
</span> ILAPI void ILAPIENTRY ifree(const void *Ptr);
ILAPI void* ILAPIENTRY icalloc(const ILsizei Size, const ILsizei Num);
#ifdef ALTIVEC_GCC
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/files/jasper.patch b/devel/libdevil/files/jasper.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 01970a3f494..f6e5d8acedb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/files/jasper.patch
</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;'>@@ -1,11 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with newer JasPer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with JasPer 2.0.17+.
</span> https://github.com/DentonW/DevIL/issues/90
https://github.com/DentonW/DevIL/issues/94
https://github.com/DentonW/DevIL/pull/91
https://sourceforge.net/p/openil/patches/54/
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src-IL/src/il_jp2.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src-IL/src/il_jp2.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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;'>+Fix build with JasPer 3+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/issues/99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/issues/101
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DentonW/DevIL/pull/102
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src-IL/src/il_jp2.cpp.orig 2017-01-01 18:03:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src-IL/src/il_jp2.cpp 2024-05-05 20:50:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,13 +314,36 @@
</span>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +23,10 @@ https://sourceforge.net/p/openil/patches/54/
</span> +//
+// see: https://github.com/OSGeo/gdal/commit/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334
+// https://github.com/DentonW/DevIL/issues/90
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(PRIjas_seqent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if JAS_VERSION_MAJOR >= 3
</span> +static ssize_t iJp2_file_read(jas_stream_obj_t *obj, char *buf, size_t cnt)
<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_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
</span> +#else
static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
+#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +35,10 @@ https://sourceforge.net/p/openil/patches/54/
</span> return iread(buf, 1, cnt);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(JAS_INCLUDE_JP2_CODEC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if JAS_VERSION_MAJOR >= 3
</span> +static ssize_t iJp2_file_write(jas_stream_obj_t *obj, const char *buf, size_t cnt)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif 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> +#elif defined(PRIjas_seqent)
+static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+#else
</pre><pre style='margin:0'>
</pre>