Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changes: https://github.com/libjxl/libjxl/releases/tag/v0.9.1 Reported by: GitHub (watch releases)
- Loading branch information
Showing
6 changed files
with
61 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1703255621 | ||
| SHA256 (libjxl-libjxl-v0.9.0_GH0.tar.gz) = d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f | ||
| SIZE (libjxl-libjxl-v0.9.0_GH0.tar.gz) = 1871551 | ||
| TIMESTAMP = 1704880317 | ||
| SHA256 (libjxl-libjxl-v0.9.1_GH0.tar.gz) = a0e72e9ece26878147069ad4888ac3382021d4bbee71c2e1b687d5bde7fd7e01 | ||
| SIZE (libjxl-libjxl-v0.9.1_GH0.tar.gz) = 1872279 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,9 @@ | ||
| TIMESTAMP = 1703255621 | ||
| SHA256 (libjxl-libjxl-v0.9.0_GH0.tar.gz) = d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f | ||
| SIZE (libjxl-libjxl-v0.9.0_GH0.tar.gz) = 1871551 | ||
| TIMESTAMP = 1704880317 | ||
| SHA256 (libjxl-libjxl-v0.9.1_GH0.tar.gz) = a0e72e9ece26878147069ad4888ac3382021d4bbee71c2e1b687d5bde7fd7e01 | ||
| SIZE (libjxl-libjxl-v0.9.1_GH0.tar.gz) = 1872279 | ||
| SHA256 (jbeich-skcms-42030a7_GH0.tar.gz) = b7537267dd0fda80a98939cc4e4d15614d2d6f433cc8421b797e0f47078c2979 | ||
| SIZE (jbeich-skcms-42030a7_GH0.tar.gz) = 10050433 | ||
| SHA256 (libjxl-testdata-6c94363_GH0.tar.gz) = ffe4ab8ae3b80085c6f2107d1335804cfbe3729aad52f5ce382dae254d07505e | ||
| SIZE (libjxl-testdata-6c94363_GH0.tar.gz) = 69080987 | ||
| SHA256 (libjxl-testdata-ff8d743_GH0.tar.gz) = d225523e0576f21b6f8de106d2eac4e07650522bae7b65011993792a4dbc3eda | ||
| SIZE (libjxl-testdata-ff8d743_GH0.tar.gz) = 69102242 | ||
| SHA256 (webmproject-sjpeg-e5ab130_GH0.tar.gz) = 89d706381311af14e1124276266aebf41977f5facfd2a984cd365835e4bb55ff | ||
| SIZE (webmproject-sjpeg-e5ab130_GH0.tar.gz) = 2481141 | ||
| SHA256 (a0cb9b7c4249.patch) = bd34063afe71b6b736404417f85eeec84f14426be0b214d56be386aac193decf | ||
| SIZE (a0cb9b7c4249.patch) = 1358 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| Allow building jpegli against system libjpeg-turbo. | ||
|
|
||
| This is an old version of https://github.com/libjxl/libjxl/pull/3085 | ||
|
|
||
| --- CMakeLists.txt.orig 2024-01-10 09:51:57 UTC | ||
| +++ CMakeLists.txt | ||
| @@ -81,13 +81,6 @@ endif() | ||
| set(BUNDLE_LIBPNG_DEFAULT NO) | ||
| endif() | ||
|
|
||
| - | ||
| -if(EXISTS "${PROJECT_SOURCE_DIR}/third_party/libjpeg-turbo/jconfig.h.in") | ||
| - set(ENABLE_JPEGLI_DEFAULT YES) | ||
| -else() | ||
| - set(ENABLE_JPEGLI_DEFAULT NO) | ||
| -endif() | ||
| - | ||
| # Standard cmake naming for building shared libraries. | ||
| get_property(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS) | ||
| option(BUILD_SHARED_LIBS "Build shared libraries instead of static ones" ${SHARED_LIBS_SUPPORTED}) | ||
| @@ -98,7 +91,7 @@ set(JPEGXL_ENABLE_TOOLS true CACHE BOOL | ||
| "Build JPEGXL developer tools.") | ||
| set(JPEGXL_ENABLE_TOOLS true CACHE BOOL | ||
| "Build JPEGXL user tools: cjxl and djxl.") | ||
| -set(JPEGXL_ENABLE_JPEGLI ${ENABLE_JPEGLI_DEFAULT} CACHE BOOL | ||
| +set(JPEGXL_ENABLE_JPEGLI true CACHE BOOL | ||
| "Build jpegli library.") | ||
| set(JPEGXL_ENABLE_JPEGLI_LIBJPEG true CACHE BOOL | ||
| "Build libjpeg.so shared library based on jpegli.") | ||
| --- lib/jpegli.cmake.orig 2024-01-10 09:51:57 UTC | ||
| +++ lib/jpegli.cmake | ||
| @@ -23,12 +23,14 @@ endif() | ||
| set(JPEG_LIB_VERSION 80) | ||
| endif() | ||
|
|
||
| +if(JPEGXL_INSTALL_JPEGLI_LIBJPEG) | ||
| configure_file( | ||
| ../third_party/libjpeg-turbo/jconfig.h.in include/jpegli/jconfig.h) | ||
| configure_file( | ||
| ../third_party/libjpeg-turbo/jpeglib.h include/jpegli/jpeglib.h COPYONLY) | ||
| configure_file( | ||
| ../third_party/libjpeg-turbo/jmorecfg.h include/jpegli/jmorecfg.h COPYONLY) | ||
| +endif() | ||
|
|
||
| add_library(jpegli-static STATIC EXCLUDE_FROM_ALL "${JPEGXL_INTERNAL_JPEGLI_SOURCES}") | ||
| target_compile_options(jpegli-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters