RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade libjxl to v0.10.3

This commit is contained in:
Daniel Novomeský 2024-07-04 09:12:54 +02:00 committed by John Preston
parent e6e1b9446d
commit 9ca9904732
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/build/prepare/prepare.py
View File

@ -938,7 +938,7 @@ mac:
""") """)
stage('libjxl', """ stage('libjxl', """
git clone -b v0.8.2 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git git clone -b v0.10.3 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
cd libjxl cd libjxl
""" + setVar("cmake_defines", """ """ + setVar("cmake_defines", """
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
@ -954,12 +954,10 @@ stage('libjxl', """
-DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_SJPEG=OFF
-DJPEGXL_ENABLE_OPENEXR=OFF -DJPEGXL_ENABLE_OPENEXR=OFF
-DJPEGXL_ENABLE_SKCMS=ON -DJPEGXL_ENABLE_SKCMS=ON
-DJPEGXL_BUNDLE_SKCMS=ON
-DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF
-DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_TCMALLOC=OFF
-DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_PLUGINS=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF -DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_PROFILER=OFF
-DJPEGXL_WARNINGS_AS_ERRORS=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF
""") + """ """) + """
win: win:
@ -967,8 +965,8 @@ win:
-A %WIN32X64% ^ -A %WIN32X64% ^
-DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^ -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^ -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_C_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE" ^ -DCMAKE_C_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE /DJXL_CMS_STATIC_DEFINE" ^
-DCMAKE_CXX_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE" ^ -DCMAKE_CXX_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE /DJXL_CMS_STATIC_DEFINE" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^ -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^ -DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^ -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^

2
cmake

@ -1 +1 @@
Subproject commit 5742caae65e4163e7faec238eb4e3e5c219ad09c Subproject commit 4a4bc4cd34b3ade038541a2b8b2c79f05393d67b