<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/17b43cfe19da2a68eaec9b563fee07f10fe36a83">https://github.com/macports/macports-ports/commit/17b43cfe19da2a68eaec9b563fee07f10fe36a83</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 17b43cfe19d libjxl: fix build with gcc
</span>17b43cfe19d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 17b43cfe19da2a68eaec9b563fee07f10fe36a83
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Apr 17 20:38:19 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> libjxl: fix build with gcc
</span>---
graphics/libjxl/Portfile | 3 +-
.../unbreak-build-on-macOS-with-GCC-add.patch | 84 ++++++++++++++++++++++
2 files changed, 86 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/Portfile b/graphics/libjxl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a5c2b241c5..f1fc3b7844d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjxl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,8 @@ patchfiles giflib_include_order.patch \
</span> include_order.patch \
find_asciidoc.patch \
apple-clang-version.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _mm512_cvtsi512_si32.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _mm512_cvtsi512_si32.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unbreak-build-on-macOS-with-GCC-add.patch
</span> if {${os.platform} eq "darwin" && ${os.major} <= 15} {
# No support for sized operator delete
patchfiles-append sized-deallocation.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/files/unbreak-build-on-macOS-with-GCC-add.patch b/graphics/libjxl/files/unbreak-build-on-macOS-with-GCC-add.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ff934fa419
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjxl/files/unbreak-build-on-macOS-with-GCC-add.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/libjxl/libjxl/commit/97ec970d06ad04254f2cdcbe0bf8bba3166372b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/decode_oneshot.cc.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/decode_oneshot.cc 2023-04-28 00:07:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // available at once). The example outputs the pixels and color information to a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // floating point image and an ICC profile on disk.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __STDC_FORMAT_MACROS
</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;'>+ #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <limits.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/decode_progressive.cc.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/decode_progressive.cc 2023-04-28 00:07:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This C++ example decodes a JPEG XL image progressively (input bytes are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // passed in chunks). The example outputs the intermediate steps to PAM files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __STDC_FORMAT_MACROS
</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;'>+ #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <limits.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl/base/status.h.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl/base/status.h 2023-04-28 00:06:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,12 +94,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // #ifndef JXL_DEBUG_MYMODULE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // #define JXL_DEBUG_MYMODULE 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // #endif JXL_DEBUG_MYMODULE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define JXL_DEBUG(enabled, format, ...) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- do { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (enabled) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ##__VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define JXL_DEBUG_TMP(format, ...) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define JXL_DEBUG(enabled, format, ...) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (enabled) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ JXL_DEBUG_TMP(format, ##__VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // JXL_DEBUG version that prints the debug message if the global verbose level
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl/image_test_utils.h.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl/image_test_utils.h 2023-04-28 00:05:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef LIB_JXL_IMAGE_TEST_UTILS_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LIB_JXL_IMAGE_TEST_UTILS_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __STDC_FORMAT_MACROS
</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;'>++#include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <limits>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/speed_stats.cc.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/speed_stats.cc 2023-04-28 00:02:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tools/speed_stats.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __STDC_FORMAT_MACROS
</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;'>+ #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stddef.h>
</span></pre><pre style='margin:0'>
</pre>