ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-06-26 05:12:49 +00:00
Code Issues 6 Packages Projects Releases Wiki Activity

Fix libjxl usage in libvips (#26473)

Browse Source
This commit is contained in:
Abril Rincón Blanco
2025-02-26 18:23:31 +01:00
committed by GitHub
parent 02c8bc47a6
commit 46f465842c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
recipes/libjxl/all/conanfile.py
View File

@ -9,7 +9,7 @@ from conan.tools.gnu import PkgConfigDeps
from conan.tools.microsoft import is_msvc from conan.tools.microsoft import is_msvc
from conan.tools.scm import Version from conan.tools.scm import Version
required_conan_version = ">=1.53.0" required_conan_version = ">=2"
class LibjxlConan(ConanFile): class LibjxlConan(ConanFile):
@ -199,6 +199,7 @@ class LibjxlConan(ConanFile):
self.cpp_info.components["jxl"].defines.append("JXL_CMS_STATIC_DEFINE") self.cpp_info.components["jxl"].defines.append("JXL_CMS_STATIC_DEFINE")
if libcxx: if libcxx:
self.cpp_info.components["jxl_cms"].system_libs.append(libcxx) self.cpp_info.components["jxl_cms"].system_libs.append(libcxx)
self.cpp_info.components["jxl"].requires.append("jxl_cms")
# jxl_dec # jxl_dec
if Version(self.version) < "0.9.0": if Version(self.version) < "0.9.0":

6
recipes/libvips/all/conanfile.py
View File

@ -154,7 +154,7 @@ class LibvipsConan(ConanFile):
elif self.options.with_jpeg == "mozjpeg": elif self.options.with_jpeg == "mozjpeg":
self.requires("mozjpeg/4.1.5") self.requires("mozjpeg/4.1.5")
if self.options.with_jpeg_xl: if self.options.with_jpeg_xl:
self.requires("libjxl/0.6.1") self.requires("libjxl/0.11.1")
if self.options.with_lcms: if self.options.with_lcms:
self.requires("lcms/2.16") self.requires("lcms/2.16")
if self.options.with_magick: if self.options.with_magick:
@ -218,9 +218,9 @@ class LibvipsConan(ConanFile):
raise ConanInvalidConfiguration("librsvg recipe not available in conancenter yet") raise ConanInvalidConfiguration("librsvg recipe not available in conancenter yet")
def build_requirements(self): def build_requirements(self):
self.tool_requires("meson/1.4.0") self.tool_requires("meson/[>=1.2.3 <2]")
if not self.conf.get("tools.gnu:pkg_config", check_type=str): if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.1.0") self.tool_requires("pkgconf/[>=2.2 <3]")
if self.options.introspection: if self.options.introspection:
self.tool_requires("gobject-introspection/1.72.0") self.tool_requires("gobject-introspection/1.72.0")
self.tool_requires("glib/<host_version>") self.tool_requires("glib/<host_version>")