<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/a21de4ddec83e307987b2acba8c20d2b5eeae61d">https://github.com/macports/macports-ports/commit/a21de4ddec83e307987b2acba8c20d2b5eeae61d</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 a21de4ddec8 libjxl: update to 0.9.0
</span>a21de4ddec8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a21de4ddec83e307987b2acba8c20d2b5eeae61d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 3 05:29:11 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> libjxl: update to 0.9.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69021
</span>---
graphics/libjxl/Portfile | 22 +--
graphics/libjxl/files/_mm512_cvtsi512_si32.patch | 23 ---
graphics/libjxl/files/apple-clang-version.patch | 26 ---
graphics/libjxl/files/find_asciidoc.patch | 134 ++++++-------
graphics/libjxl/files/giflib_include_order.patch | 11 --
graphics/libjxl/files/include_order.patch | 211 ++++++++-------------
.../unbreak-build-on-macOS-with-GCC-add.patch | 84 --------
7 files changed, 158 insertions(+), 353 deletions(-)
<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 53f413b056f..0bc5438335f 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;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libjxl libjxl 0.8.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libjxl libjxl 0.9.0 v
</span> categories graphics
maintainers {jmr @jmroot}
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,17 +16,17 @@ long_description A reference implementation of JPEG XL.
</span>
github.tarball_from archive
# No option to use external skcms
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set skcms_commit b25b07b4b07990811de121c0356155b2ba0f4318
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set skcms_commit 42030a771244ba67f86b1c1c76a6493f873c5f91
</span> master_sites-append sourceforge:project/macports/distfiles/${name}:skcms
# googlesource doesn't provide stable tarballs
# https://skia.googlesource.com/skcms/+archive/${skcms_commit}.tar.gz?dummy=
distfiles-append skcms-${skcms_commit}${extract.suffix}:skcms
checksums ${name}-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 589217b326f0d47f3bd2151f0e1d5a542a878908 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b12c3a766971834f28c9fb18531fd112babc3070 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f \
</span> skcms-${skcms_commit}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 07667e498bdec4e2297ad845d99516ed3a55337a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c247bed9e063e104cc6c99ce0c29a9e3b01216a3e52fe9aa7782c0f0904233c0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 441c5313197732e0756df440be91bd813a994c20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ee4607d6fbcad26759fcbc95a6dcdccf3dfc1e55a5ca748e7853f9fb97b28ee
</span>
depends_build-append \
port:asciidoc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,12 +44,9 @@ post-extract {
</span> "tar -xzf ${distpath}/skcms-${skcms_commit}${extract.suffix}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles giflib_include_order.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_order.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_asciidoc.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apple-clang-version.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _mm512_cvtsi512_si32.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unbreak-build-on-macOS-with-GCC-add.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles include_order.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_asciidoc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;background:#e0e0e0;'>@@ -61,6 +58,7 @@ configure.args-append \
</span> -DAVIF_FOUND=NO \
-DWebP_FOUND=NO \
-DJPEGXL_ENABLE_DOXYGEN=NO \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJPEGXL_ENABLE_JPEGLI=NO \
</span> -DJPEGXL_ENABLE_JNI=NO \
-DJPEGXL_ENABLE_OPENEXR=YES \
-DJPEGXL_ENABLE_SJPEG=NO \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/files/_mm512_cvtsi512_si32.patch b/graphics/libjxl/files/_mm512_cvtsi512_si32.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90a3280f260..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/files/_mm512_cvtsi512_si32.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl/enc_fast_lossless.cc.orig 2023-04-16 20:10:36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl/enc_fast_lossless.cc 2023-04-16 20:11:00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined(__x86_64__) || defined(_M_X64)) && !defined(_MSC_VER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <immintrin.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// manually add _mm512_cvtsi512_si32 definition if missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// (e.g. with Xcode on macOS Mojave)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// copied from gcc 11.1.0 include/avx512fintrin.h line 14367-14373
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__clang__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && ((!defined(__apple_build_version__) && __clang_major__ < 10) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || (defined(__apple_build_version__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && __apple_build_version__ < 12000032))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline int __attribute__((__gnu_inline__, __always_inline__, __artificial__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_mm512_cvtsi512_si32(__m512i __A) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __v16si __B = (__v16si)__A;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return __B[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // TODO(veluca): MSVC support for dynamic dispatch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__clang__) || defined(__GNUC__)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/files/apple-clang-version.patch b/graphics/libjxl/files/apple-clang-version.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eafc896c872..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/files/apple-clang-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl/enc_fast_lossless.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl/enc_fast_lossless.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,8 +49,9 @@ _mm512_cvtsi512_si32(__m512i __A) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef FJXL_ENABLE_AVX512
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // On clang-7 or earlier, and gcc-10 or earlier, AVX512 seems broken.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (defined(__clang__) && __clang_major__ > 7) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (defined(__GNUC__) && __GNUC__ > 10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (defined(__clang__) && (!defined(__apple_build_version__) && __clang_major__ > 7) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || (defined(__apple_build_version__) && __apple_build_version__ > 10010046)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || (defined(__GNUC__) && __GNUC__ > 10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FJXL_ENABLE_AVX512 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl/image.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl/image.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,7 +111,8 @@ void PlaneBase::InitializePadding(const size_t sizeof_t, Padding padding) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (size_t y = 0; y < ysize_; ++y) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8_t* JXL_RESTRICT row = static_cast<uint8_t*>(VoidRow(y));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__clang__) && (__clang_major__ <= 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__clang__) && ((!defined(__apple_build_version__) && __clang_major__ <= 6) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || (defined(__apple_build_version__) && __apple_build_version__ <= 10001145))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // There's a bug in msan in clang-6 when handling AVX2 operations. This
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // workaround allows tests to pass on msan, although it is slower and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // prevents msan warnings from uninitialized images.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/files/find_asciidoc.patch b/graphics/libjxl/files/find_asciidoc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index dfe20f6cee4..1b192338c5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/files/find_asciidoc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjxl/files/find_asciidoc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,78 +1,80 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-01-21 23:21:52.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,33 +412,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-12-23 01:33:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-12-29 23:44:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,34 +373,41 @@
</span> endif() # JPEGXL_ENABLE_DOXYGEN
if(JPEGXL_ENABLE_MANPAGES)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--find_program(ASCIIDOC a2x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ASCIIDOC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--file(STRINGS "${ASCIIDOC}" ASCIIDOC_SHEBANG LIMIT_COUNT 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(ASCIIDOC_SHEBANG MATCHES "/sh|/bash" OR MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY_FOUND ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Run the program directly and set ASCIIDOC as empty.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY "${ASCIIDOC}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif(ASCIIDOC_SHEBANG MATCHES "python2")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python2 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY_FOUND "${Python2_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY Python2::Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif(ASCIIDOC_SHEBANG MATCHES "python3")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python3 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY_FOUND "${Python3_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY Python3::Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_program(ASCIIDOC a2x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ASCIIDOC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(STRINGS "${ASCIIDOC}" ASCIIDOC_SHEBANG LIMIT_COUNT 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(ASCIIDOC_SHEBANG MATCHES "/sh|/bash" OR MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY_FOUND ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Run the program directly and set ASCIIDOC as empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY "${ASCIIDOC}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(ASCIIDOC_SHEBANG MATCHES "python2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python2 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY_FOUND "${Python2_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY Python2::Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(ASCIIDOC_SHEBANG MATCHES "python3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python3 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY_FOUND "${Python3_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY Python3::Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python COMPONENTS Interpreter QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(NOT Python_Interpreter_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_program(ASCIIDOC_PY python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(ASCIIDOC_PY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY_FOUND ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span> + set(ASCIIDOC_PY_FOUND ON)
+ set(ASCIIDOC_PY "${ASCIIDOC}")
+ set(ASCIIDOC "")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python COMPONENTS Interpreter QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT Python_Interpreter_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_program(ASCIIDOC_PY python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(ASCIIDOC_PY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span> + find_program(ASCIIDOC a2x)
+ if(ASCIIDOC)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file(STRINGS "${ASCIIDOC}" ASCIIDOC_SHEBANG LIMIT_COUNT 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(ASCIIDOC_SHEBANG MATCHES "/sh|/bash" OR MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ASCIIDOC_PY_FOUND ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Run the program directly and set ASCIIDOC as empty.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY "${ASCIIDOC}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(ASCIIDOC_SHEBANG MATCHES "python2")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python2 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY_FOUND "${Python2_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY Python2::Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(ASCIIDOC_SHEBANG MATCHES "python3")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python3 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY_FOUND "${Python3_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY Python3::Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python COMPONENTS Interpreter QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT Python_Interpreter_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_program(ASCIIDOC_PY python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(ASCIIDOC_PY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY_FOUND ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY_FOUND "${Python_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ASCIIDOC_PY Python::Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY_FOUND "${Python_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ASCIIDOC_PY Python::Interpreter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(WARNING "asciidoc was not found, the man pages will not be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif() # ASCIIDOC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ file(STRINGS "${ASCIIDOC}" ASCIIDOC_SHEBANG LIMIT_COUNT 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(ASCIIDOC_SHEBANG MATCHES "/sh|/bash" OR MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY_FOUND ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Run the program directly and set ASCIIDOC as empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY "${ASCIIDOC}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif(ASCIIDOC_SHEBANG MATCHES "python2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python2 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY_FOUND "${Python2_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY Python2::Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif(ASCIIDOC_SHEBANG MATCHES "python3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python3 COMPONENTS Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY_FOUND "${Python3_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY Python3::Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY_FOUND "${Python_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ASCIIDOC_PY Python::Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python COMPONENTS Interpreter QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT Python_Interpreter_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_program(ASCIIDOC_PY python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(ASCIIDOC_PY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY_FOUND ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY_FOUND "${Python_Interpreter_FOUND}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(ASCIIDOC_PY Python::Interpreter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif() # ASCIIDOC_SHEBANG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif() # ASCIIDOC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif() # ASCIIDOC
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ASCIIDOC_PY_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -461,9 +469,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_target(manpages ALL DEPENDS ${MANPAGES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES ${MANPAGE_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif() # ASCIIDOC_PY_FOUND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(WARNING "asciidoc was not found, the man pages will not be installed.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif() # ASCIIDOC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ASCIIDOC_PY_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(MANPAGE_FILES "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,9 +429,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_target(manpages ALL DEPENDS ${MANPAGES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${MANPAGE_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif() # ASCIIDOC_PY_FOUND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(WARNING "asciidoc was not found, the man pages will not be installed.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif() # ASCIIDOC
</span> endif() # JPEGXL_ENABLE_MANPAGES
# Example usage code.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/files/giflib_include_order.patch b/graphics/libjxl/files/giflib_include_order.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 33f61c7a0a2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/files/giflib_include_order.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl_extras.cmake.orig 2022-09-21 22:29:50.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl_extras.cmake 2022-09-24 10:19:40.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,7 +101,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extras/dec/gif.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extras/dec/gif.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_include_directories(jxl_extras_codec-obj PRIVATE "${GIF_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_include_directories(jxl_extras_codec-obj BEFORE PRIVATE "${GIF_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES ${GIF_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND JXL_EXTRAS_CODEC_PUBLIC_DEFINITIONS -DJPEGXL_ENABLE_GIF=1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(JPEGXL_DEP_LICENSE_DIR)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/files/include_order.patch b/graphics/libjxl/files/include_order.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ff6257cad5d..79d2b7ea97a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/files/include_order.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjxl/files/include_order.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,155 +1,104 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl_threads.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl_threads.cmake 2023-01-21 21:08:39.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl_threads.cmake.orig 2023-12-23 01:33:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl_threads.cmake 2024-01-03 05:10:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jxl_threads PROPERTY POSITION_INDEPENDENT_CODE ON)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(${_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(jxl_threads
</span> + BEFORE
PRIVATE
"${PROJECT_SOURCE_DIR}"
PUBLIC
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl_extras.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl_extras.cmake 2023-01-21 21:24:22.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(jxl_extras_codec-obj PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_definitions(jxl_extras_codec-obj PRIVATE -DJXL_EXPORT=)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(TARGET jxl_extras_codec-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl_extras_codec-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl_extras_codec-obj BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PROJECT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${JPEGXL_EXTRAS_SOURCES}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(jxl_extras-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(TARGET jxl_extras-static PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl_extras-static PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl_extras-static BEFORE PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl_extras-static PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jxl-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jxl_threads-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl_tests.cmake.orig 2023-01-21 21:25:54.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl_tests.cmake 2023-01-21 21:26:19.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl_extras.cmake.orig 2023-12-23 01:33:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl_extras.cmake 2024-01-03 04:29:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(GIF 5.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(GIF_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_include_directories(jxl_extras_core-obj PRIVATE "${GIF_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(jxl_extras_core-obj BEFORE PRIVATE "${GIF_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(jxl_extras_core-obj PRIVATE -DJPEGXL_ENABLE_GIF=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES ${GIF_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(JPEGXL_DEP_LICENSE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,10 +118,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options("${LIB}" PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions("${LIB}" PRIVATE -DJXL_EXPORT=)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET "${LIB}" PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_include_directories("${LIB}" PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories("${LIB}" BEFORE PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PROJECT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories("${LIB}" SYSTEM PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${JXL_HWY_INCLUDE_DIRS}
</span> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_definitions(jxl_testlib-static PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl_testlib-static PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl_testlib-static BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${PROJECT_SOURCE_DIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl_testlib-static hwy jxl-static)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jpegli.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jpegli.cmake 2023-01-21 21:29:03.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(jpegli-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(jpegli-static PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(TARGET jpegli-static PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jpegli-static PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jpegli-static BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl.cmake.orig 2023-12-23 01:33:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl.cmake 2024-01-03 04:54:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,11 +80,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(jxl_base INTERFACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_base SYSTEM INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_base BEFORE INTERFACE
</span> "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_definitions(${TESTNAME} PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_include_directories(${TESTNAME} PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_include_directories(${TESTNAME} BEFORE PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(${TESTNAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hwy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jpegli-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(jpegli-libjpeg-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(jpegli-libjpeg-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(TARGET jpegli-libjpeg-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jpegli-libjpeg-obj PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jpegli-libjpeg-obj BEFORE PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_definitions(jpegli-libjpeg-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${JPEGLI_LIBJPEG_OBJ_COMPILE_DEFINITIONS}
</span> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl.cmake 2023-01-21 21:31:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -422,7 +422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_base INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_base BEFORE INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PROJECT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_base SYSTEM INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${JXL_HWY_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(jxl_base jxl_export)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,8 +96,10 @@
</span> target_compile_options(jxl_dec-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
target_compile_options(jxl_dec-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
set_property(TARGET jxl_dec-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(jxl_dec-obj PUBLIC
+target_include_directories(jxl_dec-obj BEFORE PUBLIC
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:$<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -440,7 +440,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_dec-obj SYSTEM PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${JXL_HWY_INCLUDE_DIRS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:$<TARGET_PROPERTY:brotlicommon,INTERFACE_INCLUDE_DIRECTORIES>>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,8 +113,10 @@
</span> target_compile_options(jxl_enc-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
target_compile_options(jxl_enc-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
set_property(TARGET jxl_enc-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(jxl_enc-obj PUBLIC
+target_include_directories(jxl_enc-obj BEFORE PUBLIC
${PROJECT_SOURCE_DIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,7 +474,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VISIBILITY_INLINES_HIDDEN 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINE_SYMBOL JXL_INTERNAL_LIBRARY_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_enc-obj SYSTEM PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${JXL_HWY_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<TARGET_PROPERTY:brotlicommon,INTERFACE_INCLUDE_DIRECTORIES>
</span> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl_dec-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl_dec-obj BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(jxl_enc-obj PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -485,7 +485,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- generate_export_header(jxl_enc-obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BASE_NAME JXL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPORT_FILE_NAME include/jxl/jxl_export.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl_enc-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl_enc-obj BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Private static library. This exposes all the internal functions and is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -495,7 +495,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jxl_cms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jxl_base
</span> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl_dec-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_DEC_INTERNAL_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl_dec-static PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl_dec-static BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -516,7 +516,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_library(jxl-static STATIC ${JPEGXL_INTERNAL_OBJECTS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_INTERNAL_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl-static PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl-static BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -567,7 +567,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl PRIVATE ${JPEGXL_INTERNAL_SHARED_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Shared library include path contains only the "include/" paths.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(jxl PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -582,7 +582,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl_dec PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(jxl_dec PRIVATE ${JPEGXL_DEC_INTERNAL_SHARED_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Shared library include path contains only the "include/" paths.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_include_directories(jxl_dec PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_include_directories(jxl_dec BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CURRENT_SOURCE_DIR}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CURRENT_BINARY_DIR}/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(jxl_dec PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl_profiler.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl_profiler.cmake 2023-01-21 21:32:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(TARGET jxl_profiler PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl-internal PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl-internal BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>")
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(jxl_profiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BEFORE PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(jxl-internal INTERFACE -DJXL_STATIC_DEFINE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl_cms.cmake.orig 2023-12-23 01:33:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl_cms.cmake 2024-01-03 04:39:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,13 +14,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jxl_cms PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(jxl_cms PROPERTIES POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl_cms PUBLIC jxl_base)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_cms PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_cms SYSTEM PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${JXL_HWY_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ generate_export_header(jxl_cms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASE_NAME JXL_CMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT_FILE_NAME include/jxl/jxl_cms_export.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_cms PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_cms BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>")
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(jxl_profiler PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX_VISIBILITY_PRESET hidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(JXL_CMS_PK_LIBS "")
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ff934fa419..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/files/unbreak-build-on-macOS-with-GCC-add.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,84 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/libjxl/libjxl/commit/97ec970d06ad04254f2cdcbe0bf8bba3166372b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/decode_oneshot.cc.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/decode_oneshot.cc 2023-04-28 00:07:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // available at once). The example outputs the pixels and color information to a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // floating point image and an ICC profile on disk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/decode_progressive.cc.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/decode_progressive.cc 2023-04-28 00:07:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,6 +6,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This C++ example decodes a JPEG XL image progressively (input bytes are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // passed in chunks). The example outputs the intermediate steps to PAM files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl/base/status.h.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl/base/status.h 2023-04-28 00:06:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,12 +94,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // #ifndef JXL_DEBUG_MYMODULE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // #define JXL_DEBUG_MYMODULE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // #endif JXL_DEBUG_MYMODULE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define JXL_DEBUG(enabled, format, ...) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (enabled) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ##__VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define JXL_DEBUG_TMP(format, ...) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define JXL_DEBUG(enabled, format, ...) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ do { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (enabled) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ JXL_DEBUG_TMP(format, ##__VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } while (0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // JXL_DEBUG version that prints the debug message if the global verbose level
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/jxl/image_test_utils.h.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/jxl/image_test_utils.h 2023-04-28 00:05:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef LIB_JXL_IMAGE_TEST_UTILS_H_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LIB_JXL_IMAGE_TEST_UTILS_H_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stddef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cmath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/speed_stats.cc.orig 2023-02-03 20:15:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/speed_stats.cc 2023-04-28 00:02:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "tools/speed_stats.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stddef.h>
</span></pre><pre style='margin:0'>
</pre>