<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b045951dbb5d26f240decb0fe89b7b1deefafeb5">https://github.com/macports/macports-ports/commit/b045951dbb5d26f240decb0fe89b7b1deefafeb5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b045951dbb5d26f240decb0fe89b7b1deefafeb5
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Jun 21 22:18:57 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> charls: update to 2.4.2, support tests
</span>---
graphics/charls/Portfile | 21 ++++++++++++++-------
graphics/charls/files/string.patch | 14 --------------
2 files changed, 14 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/charls/Portfile b/graphics/charls/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8865f47e2d8..8b808b81290 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/charls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/charls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,24 +5,31 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup team-charls charls 2.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup team-charls charls 2.4.2
</span> revision 0
categories graphics
maintainers {vince @Veence}
description CharLS is an implementation of JPEG-LS
long_description CharLS implements JPEG-LS, a lossless JPEG codec.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6a42c6f2caba01e2c01679315b52971bc44740c2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ac58c26fe4121000658b5c8de25540ac93c7bc6a8b0c891a6d01d385478222dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6356904
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append string.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a0bba10cb3125795cf77fa95d8fd023fd336b713 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 17dd4d441c44d1d42e6785f2cfa7016de15a2d35f5cc1a2dcac85a121f927cbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9492542
</span>
compiler.cxx_standard 2014
configure.args-append -DBUILD_SHARED_LIBS=ON
# https://trac.macports.org/ticket/60767
compiler.blacklist-append {clang <= 700.1.81}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description "Enable testing" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://github.com/team-charls/charls/issues/281
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.out_of_source no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCHARLS_BUILD_TESTS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd test/charlstest -unittest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/charls/files/string.patch b/graphics/charls/files/string.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d888c071c94..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/charls/files/string.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with old clang by including the right header.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/team-charls/charls/issues/62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/team-charls/charls/commit/5a58c40f0fd38a75cbd3b1ac2d9dc6171a832f47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/jpegls_error.cpp.orig 2019-12-29 13:10:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/jpegls_error.cpp 2020-06-13 01:06:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <charls/jpegls_error.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using std::string;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using std::error_category;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>