Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAIL: re-enable JPEGXL #25575

Closed
wants to merge 1 commit into from
Closed

SAIL: re-enable JPEGXL #25575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions recipes/sail/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ def requirements(self):
if self.options.with_medium_priority_codecs:
self.requires("libavif/1.0.4")
self.requires("jasper/4.2.0")
# TODO Re-enable JPEG XL after merging either of the following:
# - https://github.com/conan-io/conan-center-index/pull/13898
# - https://github.com/conan-io/conan-center-index/pull/18812
# self.requires("libjxl/0.10.2")
self.requires("libjxl/0.10.3")
self.requires("libwebp/1.3.2")

def layout(self):
Expand Down Expand Up @@ -100,12 +97,9 @@ def generate(self):
tc.variables["SAIL_COMBINE_CODECS"] = True
tc.variables["SAIL_ENABLE_OPENMP"] = False
tc.variables["SAIL_ONLY_CODECS"] = ";".join(only_codecs)
# JPEGXL needs porting to Conan2
# SVG with nanosvg is supported in >= 0.9.1
if Version(self.version) >= "0.9.1":
tc.variables["SAIL_DISABLE_CODECS"] = "jpegxl"
else:
tc.variables["SAIL_DISABLE_CODECS"] = "jpegxl;svg"
if Version(self.version) < "0.9.1":
tc.variables["SAIL_DISABLE_CODECS"] = "svg"
tc.variables["SAIL_INSTALL_PDB"] = False
tc.variables["SAIL_THREAD_SAFE"] = self.options.thread_safe
# TODO: Remove after fixing https://github.com/conan-io/conan/issues/12012
Expand Down Expand Up @@ -169,7 +163,7 @@ def package_info(self):
if self.options.with_medium_priority_codecs:
self.cpp_info.components["sail-codecs"].requires.append("libavif::libavif")
self.cpp_info.components["sail-codecs"].requires.append("jasper::jasper")
# self.cpp_info.components["sail-codecs"].requires.append("libjxl::libjxl")
self.cpp_info.components["sail-codecs"].requires.append("libjxl::libjxl")
self.cpp_info.components["sail-codecs"].requires.append("libwebp::libwebp")

self.cpp_info.components["libsail"].set_property("cmake_target_name", "SAIL::Sail")
Expand Down
Loading