Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions recipes/cairo/1.18.0/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,21 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("pixman/0.43.4")
self.requires("pixman/0.46.2")
if self.options.with_zlib and self.options.with_png:
self.requires("expat/[>=2.6.2 <3]")
self.requires("expat/[>=2.7.3 <3]")
if self.options.with_lzo:
self.requires("lzo/2.10")
if self.options.with_zlib:
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_freetype:
self.requires("freetype/2.13.2", transitive_headers=True, transitive_libs=True)
self.requires("freetype/2.14.1", transitive_headers=True, transitive_libs=True)
if self.options.with_fontconfig:
self.requires("fontconfig/2.15.0-odr", transitive_headers=True, transitive_libs=True)
self.requires("fontconfig/2.15.0", transitive_headers=True, transitive_libs=True)
if self.options.with_png:
self.requires("libpng/[>=1.6 <2]")
self.requires("libpng/[>=1.6.53 <2]")
if self.options.with_glib:
self.requires("glib/2.81.0-odr")
self.requires("glib/2.85.3")
if self.settings.os in ["Linux", "FreeBSD"]:
if self.options.with_xlib or self.options.with_xlib_xrender or self.options.with_xcb:
self.requires("xorg/system", transitive_headers=True, transitive_libs=True)
Expand Down Expand Up @@ -136,9 +136,9 @@ def validate(self):
)

def build_requirements(self):
self.tool_requires("meson/1.4.0")
self.tool_requires("meson/1.9.1")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.1.0")
self.tool_requires("pkgconf/2.5.1")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
4 changes: 3 additions & 1 deletion recipes/fontconfig/2.15.0/conan.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
"util-linux-libuuid/2.39.2#637bd312b6310c18190469fae4e1d480%1729761467.688",
"libpng/1.6.50#c96b3b9fa67d44545d6583bb0c348904%1751616189.701",
"freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281",
"freetype/2.13.2#18656f7a6d52256a930f1cbd79f1509d%1756828316.696",
"expat/2.7.3#f529802a90f0758a01f498a18f8c657b%1759399780.465",
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
"brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1743158659.041"
],
"build_requires": [
"pkgconf/2.5.1#93c2051284cba1279494a43a4fcfeae2%1757684701.089",
"pkgconf/2.2.0#4ac315b50ef734072b00ff3aacbf52bf%1755505628.021",
"pkgconf/2.1.0#21f96520faf7660b99f872e956d2ac13%1755505630.82",
"ninja/1.13.1#294f8721dbcde145674f7ba44994700e%1753400352.374",
Expand All @@ -20,4 +22,4 @@
],
"python_requires": [],
"config_requires": []
}
}
8 changes: 4 additions & 4 deletions recipes/fontconfig/2.15.0/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("freetype/2.13.2")
self.requires("expat/[>=2.6.2 <3]")
self.requires("freetype/2.14.1")
self.requires("expat/[>=2.7.3 <3]")
if self.settings.os == "Linux":
self.requires("util-linux-libuuid/2.39.2")

def build_requirements(self):
self.tool_requires("gperf/3.1")
self.tool_requires("meson/1.4.0")
self.tool_requires("meson/1.9.1")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/2.1.0")
self.tool_requires("pkgconf/2.5.1")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
12 changes: 11 additions & 1 deletion recipes/fontforge/20240423/conan.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
{
"version": "0.5",
"requires": [
"zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
"xz_utils/5.8.1#0c67d0683aca2f1ca69a17730a65a1e7%1764347087.521",
"pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
"openlibm/0.8.3#61d8454cf655e95e0d3d3359bde58ac7%1761496872.7485492",
"libxml2/2.15.0#8d852c332225c0aa07a723fba8bcd0f5%1759824466.773",
"libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767",
"libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344",
"libpng/1.6.53#a55f084366cd7b81cfce80327507913e%1765191393.267",
"libpng/1.6.50#c96b3b9fa67d44545d6583bb0c348904%1751616189.701",
"libmount/2.39.2#64850679fa9d5ead878e5076b0cab2a8%1705591482.625",
"libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087",
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
"libgettext/0.22#766c603ca03bfbcad907369de5368c29%1755528994.227",
"libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396",
"libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
"glib/2.85.3#2fef4f1c3f92c9eaf077ccd54b9404a3%1755678176.882",
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1761496871.9808278",
"giflib/5.2.2#3923fc0f7ffec2f0bdbdee9b548f9248%1731663927.701",
"getopt-for-visual-studio/20200201#32ee360e2552fe65ad8bec52edcd64fd%1678877536.186",
"freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281",
"freetype/2.13.2#18656f7a6d52256a930f1cbd79f1509d%1756828316.696",
"elfutils/0.190#8e8c47bd9b2578e29a0341b09b977be8%1739188192.515",
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
"brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1743158659.041"
],
Expand All @@ -31,9 +39,11 @@
"gnu-config/cci.20210814#69fde734e1a46fd1655b4af46ab40945%1746203214.947",
"gettext/0.22.5#4705a1582f4a611eadb15d0417427993%1755528989.046",
"flex/2.6.4#e5cd857e69595b17f7599ba56be7dad2%1761206488.085",
"cmake/4.2.0#ae0a44f44a1ef9ab68fd4b3e9a1f8671%1764093466.37",
"bison/3.8.2#c3490cbe0078b6fd3eb4cf5ed64144dc%1755688988.644",
"automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
"autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86"
],
"python_requires": [],
"config_requires": []
}
}
10 changes: 5 additions & 5 deletions recipes/fontforge/20240423/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,23 @@ class FontForgeConan(ConanFile):
}

def requirements(self):
self.requires("freetype/2.13.2")
self.requires("freetype/2.14.1")

self.requires("libxml2/2.12.7")
self.requires("libxml2/2.15.0")
self.requires("giflib/5.2.2")
self.requires("libjpeg/9f")
self.requires("libpng/[>=1.6 <2]")
self.requires("libpng/[>=1.6.53 <2]")
self.requires("libgettext/0.22", transitive_headers=True, transitive_libs=True)

if self.options.with_tiff:
self.requires("libtiff/4.6.0")
self.requires("libtiff/4.7.1")

# jbig and libdeflate are required by libtiff
# Conan auto finds them, but linker doesn't, unless they're added here manually
# self.requires("jbig/20160605")
# self.requires("libdeflate/1.20")

self.requires("glib/2.81.0-odr")
self.requires("glib/2.85.3")

if self.settings.os == "Android" and int(self.settings.os.get_safe("api_level")) < 23:
self.requires("openlibm/0.8.3")
Expand Down
10 changes: 5 additions & 5 deletions recipes/glib/2.81.0/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,24 @@ def layout(self):
def requirements(self):
self.requires("zlib/[>=1.2.11 <2]")
self.requires("libffi/3.4.8")
self.requires("pcre2/10.42")
self.requires("pcre2/10.44")
if self.options.get_safe("with_elf"):
self.requires("libelf/0.8.13")
if self.options.get_safe("with_mount"):
self.requires("libmount/2.39")
self.requires("libmount/2.40.2")
if self.options.get_safe("with_selinux"):
self.requires("libselinux/3.6")
if self.settings.os != "Linux":
# for Linux, gettext is provided by libc
self.requires("libgettext/0.22", transitive_headers=True, transitive_libs=True)

if is_apple_os(self):
self.requires("libiconv/1.17")
self.requires("libiconv/1.18")

def build_requirements(self):
self.tool_requires("meson/[>=1.2.3 <2]")
self.tool_requires("meson/[>=1.9.1 <2]")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.0.3")
self.tool_requires("pkgconf/2.5.1")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
11 changes: 10 additions & 1 deletion recipes/libgsf/1.14.52/conan.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
{
"version": "0.5",
"requires": [
"zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
"xz_utils/5.8.1#0c67d0683aca2f1ca69a17730a65a1e7%1764347087.521",
"pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
"libxml2/2.15.0#8d852c332225c0aa07a723fba8bcd0f5%1759824466.773",
"libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767",
"libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344",
"libmount/2.39.2#64850679fa9d5ead878e5076b0cab2a8%1705591482.625",
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
"libgettext/0.22#766c603ca03bfbcad907369de5368c29%1755528994.227",
"libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396",
"libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
"glib/2.85.3#2fef4f1c3f92c9eaf077ccd54b9404a3%1755678176.882",
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1761496871.9808278",
"elfutils/0.190#8e8c47bd9b2578e29a0341b09b977be8%1739188192.515",
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178"
],
"build_requires": [
"pkgconf/2.5.1#93c2051284cba1279494a43a4fcfeae2%1757684701.089",
"pkgconf/2.2.0#4ac315b50ef734072b00ff3aacbf52bf%1755505628.021",
"pkgconf/2.1.0#21f96520faf7660b99f872e956d2ac13%1755505630.82",
"pkgconf/2.0.3#c7ba7fd1d7d22534ee070ae60ed79604%1755505633.107",
Expand All @@ -26,9 +33,11 @@
"gnu-config/cci.20210814#69fde734e1a46fd1655b4af46ab40945%1746203214.947",
"gettext/0.22.5#4705a1582f4a611eadb15d0417427993%1755528989.046",
"flex/2.6.4#e5cd857e69595b17f7599ba56be7dad2%1761206488.085",
"cmake/4.2.0#ae0a44f44a1ef9ab68fd4b3e9a1f8671%1764093466.37",
"bison/3.8.2#c3490cbe0078b6fd3eb4cf5ed64144dc%1755688988.644",
"automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
"autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86"
],
"python_requires": [],
"config_requires": []
}
}
6 changes: 3 additions & 3 deletions recipes/libgsf/1.14.52/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def configure(self):
# basic_layout(self, src_folder="src")

def requirements(self):
self.requires("glib/2.81.0-odr", transitive_headers=True)
self.requires("glib/2.85.3", transitive_headers=True)
self.requires("zlib/1.3.1")
self.requires("libxml2/2.12.7", transitive_headers=True)
self.requires("libxml2/2.15.0", transitive_headers=True)

# if another tool than the compiler or autotools is required to build the project (pkgconf, bison, flex etc)
def build_requirements(self):
Expand All @@ -61,7 +61,7 @@ def build_requirements(self):
self.tool_requires("libtool/2.4.7")
# only if upstream configure.ac relies on PKG_CHECK_MODULES macro
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.2.0")
self.tool_requires("pkgconf/2.5.1")
# required to suppport windows as a build machine
if self._settings_build.os == "Windows":
self.win_bash = True
Expand Down
6 changes: 5 additions & 1 deletion recipes/odrcore/2.1/conan.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
"version": "0.5",
"requires": [
"vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177",
"utfcpp/4.0.8#2b56ab30c4747169f419f9a82a47d45c%1758199947.264",
"utfcpp/4.0.4#cd6efc5d62de4e9ee0b5f3abd0df37a9%1722968964.685",
"uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978",
"pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483",
"pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014",
"nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94",
"nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259",
"miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805",
"gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1755784855.585",
"gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169",
"cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119"
],
Expand All @@ -15,4 +19,4 @@
],
"python_requires": [],
"config_requires": []
}
}
8 changes: 4 additions & 4 deletions recipes/odrcore/2.1/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ def configure(self):
self.options.rm_safe("fPIC")

def requirements(self):
self.requires("pugixml/1.14")
self.requires("pugixml/1.15")
self.requires("cryptopp/8.9.0")
self.requires("miniz/3.0.2")
self.requires("nlohmann_json/3.11.3")
self.requires("nlohmann_json/3.12.0")
self.requires("vincentlaucsb-csv-parser/2.3.0")
self.requires("uchardet/0.0.8")
self.requires("utfcpp/4.0.4")
self.requires("utfcpp/4.0.8")

def build_requirements(self):
self.test_requires("gtest/1.14.0")
self.test_requires("gtest/1.17.0")

def validate_build(self):
if self.settings.get_safe("compiler.cppstd"):
Expand Down
6 changes: 5 additions & 1 deletion recipes/odrcore/2.2/conan.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
"version": "0.5",
"requires": [
"vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177",
"utfcpp/4.0.8#2b56ab30c4747169f419f9a82a47d45c%1758199947.264",
"utfcpp/4.0.4#cd6efc5d62de4e9ee0b5f3abd0df37a9%1722968964.685",
"uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978",
"pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483",
"pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014",
"nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94",
"nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259",
"miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805",
"gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1755784855.585",
"gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169",
"cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119"
],
Expand All @@ -15,4 +19,4 @@
],
"python_requires": [],
"config_requires": []
}
}
8 changes: 4 additions & 4 deletions recipes/odrcore/2.2/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ def configure(self):
self.options.rm_safe("fPIC")

def requirements(self):
self.requires("pugixml/1.14")
self.requires("pugixml/1.15")
self.requires("cryptopp/8.9.0")
self.requires("miniz/3.0.2")
self.requires("nlohmann_json/3.11.3")
self.requires("nlohmann_json/3.12.0")
self.requires("vincentlaucsb-csv-parser/2.3.0")
self.requires("uchardet/0.0.8")
self.requires("utfcpp/4.0.4")
self.requires("utfcpp/4.0.8")

def build_requirements(self):
self.test_requires("gtest/1.14.0")
self.test_requires("gtest/1.17.0")

def validate_build(self):
if self.settings.get_safe("compiler.cppstd"):
Expand Down
6 changes: 5 additions & 1 deletion recipes/odrcore/3/conan.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
"version": "0.5",
"requires": [
"vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177",
"utfcpp/4.0.8#2b56ab30c4747169f419f9a82a47d45c%1758199947.264",
"utfcpp/4.0.4#cd6efc5d62de4e9ee0b5f3abd0df37a9%1722968964.685",
"uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978",
"pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483",
"pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014",
"nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94",
"nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259",
"miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805",
"gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1755784855.585",
"gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169",
"cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119"
],
Expand All @@ -15,4 +19,4 @@
],
"python_requires": [],
"config_requires": []
}
}
8 changes: 4 additions & 4 deletions recipes/odrcore/3/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ def configure(self):
self.options.rm_safe("fPIC")

def requirements(self):
self.requires("pugixml/1.14")
self.requires("pugixml/1.15")
self.requires("cryptopp/8.9.0")
self.requires("miniz/3.0.2")
self.requires("nlohmann_json/3.11.3")
self.requires("nlohmann_json/3.12.0")
self.requires("vincentlaucsb-csv-parser/2.3.0")
self.requires("uchardet/0.0.8")
self.requires("utfcpp/4.0.4")
self.requires("utfcpp/4.0.8")

def build_requirements(self):
self.test_requires("gtest/1.14.0")
self.test_requires("gtest/1.17.0")

def validate_build(self):
if self.settings.get_safe("compiler.cppstd"):
Expand Down
Loading
Loading