Commit 6ffb48d1 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

Libjxl: use right patch file name and compile in source code

CCBUGS: 436533
parent 96492950
......@@ -22,7 +22,7 @@ if(MINGW)
GIT_REPOSITORY https://github.com/libjxl/libjxl.git
GIT_TAG v0.6.1
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/jxl-lib-alone.patch
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/jxl-lib-only.patch
CONFIGURE_COMMAND git submodule update --init --recursive --depth 1 --recommend-shallow &&
cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.mxe <SOURCE_DIR>/. &&
......@@ -48,7 +48,7 @@ elseif(APPLE)
GIT_REPOSITORY https://github.com/libjxl/libjxl.git
GIT_TAG v0.6.1
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/jxl-lib-alone.patch
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/jxl-lib-only.patch
CONFIGURE_COMMAND git submodule update --init --recursive --depth 1 --recommend-shallow &&
cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
......@@ -72,7 +72,7 @@ else() # Linux
GIT_REPOSITORY https://github.com/libjxl/libjxl.git
GIT_TAG v0.6.1
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/jxl-lib-alone.patch
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/jxl-lib-only.patch
CONFIGURE_COMMAND git submodule update --init --recursive --depth 1 --recommend-shallow &&
$(CMAKE_COMMAND) . -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libjxl}
......@@ -85,6 +85,8 @@ else() # Linux
INSTALL_COMMAND cd <SOURCE_DIR> && $(MAKE) install/fast
BUILD_IN_SOURCE 1
UPDATE_COMMAND ""
ALWAYS 0
)
......
......@@ -58,21 +58,3 @@ index c2790ab..003dee8 100644
# Binary tools
-add_subdirectory(tools)
+#add_subdirectory(tools)
diff --git a/third_party/brotli b/third_party/brotli
--- a/third_party/brotli
+++ b/third_party/brotli
@@ -1 +1 @@
-Subproject commit 35ef5c554d888bef217d449346067de05e269b30
+Subproject commit 35ef5c554d888bef217d449346067de05e269b30-dirty
diff --git a/third_party/highway b/third_party/highway
--- a/third_party/highway
+++ b/third_party/highway
@@ -1 +1 @@
-Subproject commit e2397743fe092df68b760d358253773699a16c93
+Subproject commit e2397743fe092df68b760d358253773699a16c93-dirty
diff --git a/third_party/sjpeg b/third_party/sjpeg
--- a/third_party/sjpeg
+++ b/third_party/sjpeg
@@ -1 +1 @@
-Subproject commit 868ab558fad70fcbe8863ba4e85179eeb81cc840
+Subproject commit 868ab558fad70fcbe8863ba4e85179eeb81cc840-dirty
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment