<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/0bebd96624c65c7f169ef696a5166c39a8968ca8">https://github.com/macports/macports-ports/commit/0bebd96624c65c7f169ef696a5166c39a8968ca8</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 0bebd96624c libjxl: update to 0.8.0
</span>0bebd96624c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0bebd96624c65c7f169ef696a5166c39a8968ca8
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 21 23:37:29 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> libjxl: update to 0.8.0
</span>---
graphics/libjxl/Portfile | 21 ++--
graphics/libjxl/files/find_asciidoc.patch | 78 +++++++++++++++
graphics/libjxl/files/include_order.patch | 155 ++++++++++++++++++++++++++++++
3 files changed, 244 insertions(+), 10 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 a69ecc437d9..7dda162874a 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.7.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libjxl libjxl 0.8.0 v
</span> categories graphics
maintainers {jmr @jmroot}
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,22 +16,21 @@ 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 64374756e03700d649f897dbd98c95e78c30c7da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set skcms_commit b25b07b4b07990811de121c0356155b2ba0f4318
</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 3de480cc57aa953e3ec2576a6eadbc9df4eafca1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 31b0c1a8d7ad9ba48d464c4d7447cb7553def752 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6b4c140c1738acbed6b7d22858e0526373f0e9938e3f6c0a6b8943189195aad1 \
</span> skcms-${skcms_commit}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c63bd713ad6f1b7d99b4044c4d3d71510c8318ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aabd4bae8b741c9bdc8b31bec95df3a3344b77c7d17bf9d25befb401f4971d18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 07667e498bdec4e2297ad845d99516ed3a55337a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c247bed9e063e104cc6c99ce0c29a9e3b01216a3e52fe9aa7782c0f0904233c0
</span>
depends_build-append \
port:asciidoc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span> depends_lib port:brotli \
port:giflib5 \
port:highway \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +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:#e0ffe0;'>+patchfiles giflib_include_order.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_order.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_asciidoc.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;background:#e0e0e0;'>@@ -63,7 +64,7 @@ configure.args-append \
</span> -DJPEGXL_ENABLE_SKCMS=YES \
-DJPEGXL_FORCE_SYSTEM_BROTLI=YES \
-DJPEGXL_FORCE_SYSTEM_HWY=YES \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPython3_EXECUTABLE:FILEPATH=${prefix}/bin/python3.10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DASCIIDOC:FILEPATH=${prefix}/bin/a2x \
</span> -DGIF_INCLUDE_DIR:FILEPATH=${prefix}/include/giflib5 \
-DGIF_LIBRARY:FILEPATH=${prefix}/lib/giflib5/lib/libgif.dylib
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dfe20f6cee4
</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/find_asciidoc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-01-21 23:21:52.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -412,33 +412,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif() # JPEGXL_ENABLE_DOXYGEN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(JPEGXL_ENABLE_MANPAGES)
</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;'>++ set(ASCIIDOC_PY_FOUND ON)
</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;'>+ 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;'>++ 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><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;'>+- 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;'>++ 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><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;'>+ if (ASCIIDOC_PY_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -461,9 +469,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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif() # JPEGXL_ENABLE_MANPAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Example usage code.
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ff6257cad5d
</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/include_order.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,155 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl_threads.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl_threads.cmake 2023-01-21 21:08:39.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(${_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BEFORE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${PROJECT_SOURCE_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl_extras.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl_extras.cmake 2023-01-21 21:24:22.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jxl_extras_codec-obj PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(jxl_extras_codec-obj PRIVATE -DJXL_EXPORT=)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jxl_extras_codec-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_extras_codec-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_extras_codec-obj BEFORE PUBLIC
</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;'>+@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${JPEGXL_EXTRAS_SOURCES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jxl_extras-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jxl_extras-static PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_extras-static PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_extras-static BEFORE PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl_extras-static PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jxl-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jxl_threads-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl_tests.cmake.orig 2023-01-21 21:25:54.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl_tests.cmake 2023-01-21 21:26:19.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(jxl_testlib-static PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_testlib-static PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_testlib-static BEFORE PUBLIC
</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_link_libraries(jxl_testlib-static hwy jxl-static)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jpegli.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jpegli.cmake 2023-01-21 21:29:03.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jpegli-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jpegli-static PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jpegli-static PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jpegli-static PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jpegli-static 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:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(${TESTNAME} PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_include_directories(${TESTNAME} PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(${TESTNAME} BEFORE PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${TESTNAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hwy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jpegli-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jpegli-libjpeg-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jpegli-libjpeg-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jpegli-libjpeg-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jpegli-libjpeg-obj PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jpegli-libjpeg-obj BEFORE PUBLIC "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(jpegli-libjpeg-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${JPEGLI_LIBJPEG_OBJ_COMPILE_DEFINITIONS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl.cmake 2023-01-21 21:31:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,7 +422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jxl_dec-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jxl_dec-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jxl_dec-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_dec-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_dec-obj 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:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:$<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -440,7 +440,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jxl_enc-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(jxl_enc-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jxl_enc-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_enc-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_enc-obj BEFORE PUBLIC
</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;'>+ $<TARGET_PROPERTY:hwy,INTERFACE_INCLUDE_DIRECTORIES>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -474,7 +474,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VISIBILITY_INLINES_HIDDEN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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_dec-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_dec-obj BEFORE PUBLIC
</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;'>+ set_target_properties(jxl_enc-obj PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -485,7 +485,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ generate_export_header(jxl_enc-obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASE_NAME JXL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT_FILE_NAME include/jxl/jxl_export.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_enc-obj PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_enc-obj BEFORE PUBLIC
</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;'>+ # Private static library. This exposes all the internal functions and is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -495,7 +495,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl_dec-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_DEC_INTERNAL_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_dec-static PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_dec-static 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:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -516,7 +516,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(jxl-static STATIC ${JPEGXL_INTERNAL_OBJECTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_INTERNAL_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl-static PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl-static 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:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -567,7 +567,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl PRIVATE ${JPEGXL_INTERNAL_SHARED_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Shared library include path contains only the "include/" paths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl BEFORE PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(jxl PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -582,7 +582,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl_dec PUBLIC ${JPEGXL_COVERAGE_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(jxl_dec PRIVATE ${JPEGXL_DEC_INTERNAL_SHARED_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Shared library include path contains only the "include/" paths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(jxl_dec PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(jxl_dec BEFORE PUBLIC
</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;'>+ set_target_properties(jxl_dec PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl_profiler.cmake.orig 2023-01-19 01:29:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl_profiler.cmake 2023-01-21 21:32:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET jxl_profiler PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(jxl_profiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BEFORE PRIVATE "${PROJECT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(jxl_profiler PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX_VISIBILITY_PRESET hidden
</span></pre><pre style='margin:0'>
</pre>