diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml index 3d5cfce1a1b65..1d459fba180a9 100644 --- a/.c3i/authorized_users.yml +++ b/.c3i/authorized_users.yml @@ -1246,3 +1246,6 @@ authorized_users: - tamaskenezlego - luizfeldmann - ma30002000 +- thbeu +- HypoYoung +- technoyes diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml index 802becc2d32bb..d07f509210a4e 100644 --- a/.c3i/config_v1.yml +++ b/.c3i/config_v1.yml @@ -58,6 +58,7 @@ tasks: job_name: "prod-v2/cci" # e.g. "cci-v2/cci" -> this means waiting for cci-v2/cci/PR- timeout_seconds: 600 # Maximum time to wait for the multibranch job merge_messages: true # Merge messages from the multibranch job waited for + merge_labels: true # Merge labels from the multibranch job waited for scheduled_export_check: report_issue_url: https://github.com/conan-io/conan-center-index/issues/20516 report_issue_append: false diff --git a/docs/developing_recipes_locally.md b/docs/developing_recipes_locally.md index f80ba1e6286cb..2d101facc3b5e 100644 --- a/docs/developing_recipes_locally.md +++ b/docs/developing_recipes_locally.md @@ -43,7 +43,7 @@ This file is intended to provide all the commands you need to run in order to be ### Installing the ConanCenter Hooks -> **Warning**: This is not yet supported with Conan 2.0 +> **Warning**: This is not yet supported with Conan 2.0. Please, follow the instructions below only in case you are using Conan 1.0. The system will use the [conan-center hooks](https://github.com/conan-io/hooks) to perform some quality checks. You can install the hooks by running: diff --git a/docs/package_templates/meson_package/all/conanfile.py b/docs/package_templates/meson_package/all/conanfile.py index ef4bad7fd4d3b..1d2b29f90aa8b 100644 --- a/docs/package_templates/meson_package/all/conanfile.py +++ b/docs/package_templates/meson_package/all/conanfile.py @@ -7,7 +7,7 @@ from conan.tools.gnu import PkgConfigDeps from conan.tools.layout import basic_layout from conan.tools.meson import Meson, MesonToolchain -from conan.tools.microsoft import check_min_vs, is_msvc +from conan.tools.microsoft import is_msvc from conan.tools.scm import Version import os @@ -35,10 +35,12 @@ class PackageConan(ConanFile): options = { "shared": [True, False], "fPIC": [True, False], + "feature": [True, False], } default_options = { "shared": False, "fPIC": True, + "feature": True, } @property @@ -49,9 +51,11 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): return { - "gcc": "7", - "clang": "7", "apple-clang": "10", + "clang": "7", + "gcc": "7", + "msvc": "191", + "Visual Studio": "15", } # no exports_sources attribute, but export_sources(self) method instead @@ -67,8 +71,8 @@ def configure(self): if self.options.shared: self.options.rm_safe("fPIC") # for plain C projects only - self.settings.rm_safe("compiler.libcxx") self.settings.rm_safe("compiler.cppstd") + self.settings.rm_safe("compiler.libcxx") def layout(self): # src_folder must use the same source folder name the project @@ -82,13 +86,11 @@ def validate(self): # validate the minimum cpp standard supported. For C++ projects only if self.settings.compiler.get_safe("cppstd"): check_min_cppstd(self, self._min_cppstd) - check_min_vs(self, 191) - if not is_msvc(self): - minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) - if minimum_version and Version(self.settings.compiler.version) < minimum_version: - raise ConanInvalidConfiguration( - f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support." - ) + minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) + if minimum_version and Version(self.settings.compiler.version) < minimum_version: + raise ConanInvalidConfiguration( + f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support." + ) # in case it does not work in another configuration, it should validated here too if is_msvc(self) and self.info.options.shared: raise ConanInvalidConfiguration(f"{self.ref} can not be built as shared on Visual Studio and msvc.") @@ -96,20 +98,27 @@ def validate(self): # if another tool than the compiler or Meson is required to build the project (pkgconf, bison, flex etc) def build_requirements(self): # CCI policy assumes that Meson may not be installed on consumers machine - self.tool_requires("meson/0.63.3") + self.tool_requires("meson/1.2.2") # pkgconf is largely used by Meson, it should be added in build requirement when there are dependencies if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) def generate(self): + # Meson feature options must be set to "enabled" or "disabled" + feature = lambda option: "enabled" if option else "disabled" + # default_library and b_staticpic are automatically parsed when self.options.shared and self.options.fpic exist # buildtype is automatically parsed for self.settings tc = MesonToolchain(self) # In case need to pass definitions directly to the compiler tc.preprocessor_definitions["MYDEFINE"] = "MYDEF_VALUE" + # Meson features are typically enabled automatically when possible. + # The default behavior can be changed to disable all features by setting "auto_features" to "disabled". + tc.project_options["auto_features"] = "disabled" + tc.project_options["feature"] = feature(self.options.get_safe("feature")) # Meson project options may vary their types tc.project_options["tests"] = False tc.generate() @@ -133,11 +142,12 @@ def build(self): meson.build() def package(self): - copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + copy(self, "LICENSE", self.source_folder, os.path.join(self.package_folder, "licenses")) meson = Meson(self) meson.install() # some files extensions and folders are not allowed. Please, read the FAQs to get informed. + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) rmdir(self, os.path.join(self.package_folder, "share")) rm(self, "*.pdb", os.path.join(self.package_folder, "lib")) rm(self, "*.pdb", os.path.join(self.package_folder, "bin")) diff --git a/docs/package_templates/meson_package/all/test_package/conanfile.py b/docs/package_templates/meson_package/all/test_package/conanfile.py index 61b7b28c28d9d..10b1dcc87c7f6 100644 --- a/docs/package_templates/meson_package/all/test_package/conanfile.py +++ b/docs/package_templates/meson_package/all/test_package/conanfile.py @@ -18,9 +18,9 @@ def requirements(self): self.requires(self.tested_reference_str) def build_requirements(self): - self.tool_requires("meson/0.63.3") + self.tool_requires("meson/1.2.2") if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") def build(self): meson = Meson(self) diff --git a/recipes/7zip/19.00/conandata.yml b/recipes/7zip/19.00/conandata.yml index a080fa528823a..e62dc40aa34ed 100644 --- a/recipes/7zip/19.00/conandata.yml +++ b/recipes/7zip/19.00/conandata.yml @@ -1,4 +1,9 @@ sources: + "23.01": + url: + - https://www.7-zip.org/a/7z2301-src.tar.xz + - https://sourceforge.net/projects/sevenzip/files/7-Zip/23.01/7z2301-src.tar.xz + sha256: "356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74" "22.01": url: - https://www.7-zip.org/a/7z2201-src.tar.xz diff --git a/recipes/7zip/19.00/conanfile.py b/recipes/7zip/19.00/conanfile.py index 746b1dee843e5..b1fa099b52650 100644 --- a/recipes/7zip/19.00/conanfile.py +++ b/recipes/7zip/19.00/conanfile.py @@ -90,6 +90,12 @@ def _patch_sources(self): os.chmod(fn, 0o644) replace_in_file(self, fn, "-MT", f"-{self.settings.compiler.runtime}") replace_in_file(self, fn, "-MD", f"-{self.settings.compiler.runtime}") + if self.version < Version("23.01"): + replace_in_file(self, fn, "-WX", "") + + pfc = os.path.join(self.source_folder, "CPP", "7zip", "UI", "FileManager", "PanelFolderChange.cpp") + os.chmod(pfc, 0o644) + replace_in_file(self, pfc, r'L"\\"', r'static_cast(L"\\")') def build(self): self._patch_sources() diff --git a/recipes/7zip/config.yml b/recipes/7zip/config.yml index 906f1e74d1d7b..5f2a8f313a5d8 100644 --- a/recipes/7zip/config.yml +++ b/recipes/7zip/config.yml @@ -1,4 +1,6 @@ versions: + "23.01": + folder: "19.00" "22.01": folder: "19.00" "19.00": diff --git a/recipes/ade/all/conandata.yml b/recipes/ade/all/conandata.yml index 668f432538437..0ce2795d9939c 100644 --- a/recipes/ade/all/conandata.yml +++ b/recipes/ade/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.1.2d": + url: "https://github.com/opencv/ade/archive/refs/tags/v0.1.2d.tar.gz" + sha256: "edefba61a33d6cd4b78a9976cb3309c95212610a81ba6dade09882d1794198ff" "0.1.2c": url: "https://github.com/opencv/ade/archive/refs/tags/v0.1.2c.tar.gz" sha256: "1387891c707c6e5c76448ea09e2df2e8bce1645c11f262c10b3f3ebec88749c2" diff --git a/recipes/ade/config.yml b/recipes/ade/config.yml index 373f3e14c45ff..922bcf0946745 100644 --- a/recipes/ade/config.yml +++ b/recipes/ade/config.yml @@ -1,4 +1,6 @@ versions: + "0.1.2d": + folder: "all" "0.1.2c": folder: "all" "0.1.2a": diff --git a/recipes/aeron/all/conanfile.py b/recipes/aeron/all/conanfile.py index 4bf9894df2c4c..813ca895247cd 100644 --- a/recipes/aeron/all/conanfile.py +++ b/recipes/aeron/all/conanfile.py @@ -17,7 +17,7 @@ class AeronConan(ConanFile): description = "Efficient reliable UDP unicast, UDP multicast, and IPC message transport" topics = ("udp", "messaging", "low-latency") url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/real-logic/aeron/wiki" + homepage = "https://github.com/real-logic/aeron" license = "Apache-2.0" package_type = "library" @@ -72,7 +72,7 @@ def validate(self): raise ConanInvalidConfiguration("This platform (os=Macos arch=armv8) is not yet supported by this recipe") def build_requirements(self): - self.tool_requires("zulu-openjdk/11.0.15") + self.tool_requires("zulu-openjdk/11.0.19") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -90,6 +90,12 @@ def generate(self): tc.cache_variables["AERON_BUILD_DOCUMENTATION"] = False tc.cache_variables["AERON_INSTALL_TARGETS"] = True tc.cache_variables["AERON_ENABLE_NONSTANDARD_OPTIMIZATIONS"] = True + # The finite-math-only optimization has no effect and can cause linking errors + # when linked against glibc >= 2.31 + tc.blocks["cmake_flags_init"].template += ( + 'string(APPEND CMAKE_CXX_FLAGS_INIT " -fno-finite-math-only")\n' + 'string(APPEND CMAKE_C_FLAGS_INIT " -fno-finite-math-only")\n' + ) tc.generate() def _patch_sources(self): diff --git a/recipes/avahi/all/conanfile.py b/recipes/avahi/all/conanfile.py index a5da3d9b034e3..48363ba227bf4 100644 --- a/recipes/avahi/all/conanfile.py +++ b/recipes/avahi/all/conanfile.py @@ -74,6 +74,7 @@ def generate(self): tc.configure_args.append("--disable-python") tc.configure_args.append("--disable-qt5") tc.configure_args.append("--with-systemdsystemunitdir=/lib/systemd/system") + tc.configure_args.append("ac_cv_func_strlcpy=no") if self.settings.os in ["Linux", "FreeBSD"]: tc.configure_args.append("ac_cv_func_setproctitle=no") tc.generate() @@ -106,7 +107,6 @@ def package_info(self): self.cpp_info.components[lib].names["cmake_find_package"] = lib self.cpp_info.components[lib].names["cmake_find_package_multi"] = lib self.cpp_info.components[lib].libs = [avahi_lib] - self.cpp_info.components[lib].includedirs = [os.path.join("include", avahi_lib)] self.cpp_info.components["compat-libdns_sd"].libs = ["dns_sd"] self.cpp_info.components["client"].requires = ["common", "dbus::dbus"] diff --git a/recipes/avahi/all/test_package/CMakeLists.txt b/recipes/avahi/all/test_package/CMakeLists.txt index a844c8e02eaa3..595c0faefb42e 100644 --- a/recipes/avahi/all/test_package/CMakeLists.txt +++ b/recipes/avahi/all/test_package/CMakeLists.txt @@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 3.15) project(test_package LANGUAGES C) find_package(Avahi CONFIG REQUIRED) - + add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} PRIVATE avahi::compat-libdns_sd) +target_link_libraries(${PROJECT_NAME} PRIVATE avahi::compat-libdns_sd avahi::core) diff --git a/recipes/avahi/all/test_package/test_package.c b/recipes/avahi/all/test_package/test_package.c index bae1467c7d687..5151e74257c78 100644 --- a/recipes/avahi/all/test_package/test_package.c +++ b/recipes/avahi/all/test_package/test_package.c @@ -1,18 +1,20 @@ -#include -#include +#include -int main() -{ +#include "avahi-compat-libdns_sd/dns_sd.h" +#include "avahi-core/log.h" + + +int main(void) { DNSServiceRef sdRef; DNSServiceErrorType err = DNSServiceBrowse(&sdRef, 0, 0, "_example._tcp", NULL, NULL, NULL); if (err == kDNSServiceErr_NoError) { - printf("DNSServiceBrowse succeeded\n"); + avahi_log_error("DNSServiceBrowse succeeded\n"); DNSServiceRefDeallocate(sdRef); } else { - printf("DNSServiceBrowse failed: %d\n", err); + avahi_log_info("DNSServiceBrowse failed: %d\n", err); } - return 0; + return EXIT_SUCCESS; } diff --git a/recipes/coin-clp/all/conanfile.py b/recipes/coin-clp/all/conanfile.py index 94e548dfba655..4a12a71981848 100644 --- a/recipes/coin-clp/all/conanfile.py +++ b/recipes/coin-clp/all/conanfile.py @@ -50,7 +50,7 @@ def layout(self): def requirements(self): # Symbols are exposed https://github.com/conan-io/conan-center-index/pull/16053#issuecomment-1512637106 - self.requires("coin-utils/2.11.6", transitive_headers=True, transitive_libs=True) + self.requires("coin-utils/2.11.9", transitive_headers=True, transitive_libs=True) self.requires("coin-osi/0.108.7", transitive_headers=True) def validate(self): @@ -63,7 +63,7 @@ def validate(self): def build_requirements(self): self.tool_requires("gnu-config/cci.20210814") if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") if self._settings_build.os == "Windows": self.win_bash = True if not self.conf.get("tools.microsoft.bash:path", check_type=str): diff --git a/recipes/coin-osi/all/conanfile.py b/recipes/coin-osi/all/conanfile.py index af104a9d3fcbb..25195bd85f4c6 100644 --- a/recipes/coin-osi/all/conanfile.py +++ b/recipes/coin-osi/all/conanfile.py @@ -49,7 +49,7 @@ def layout(self): basic_layout(self, src_folder="src") def requirements(self): - self.requires("coin-utils/2.11.6") + self.requires("coin-utils/2.11.9") def validate(self): if self.settings.os == "Windows" and self.options.shared: @@ -61,7 +61,7 @@ def validate(self): def build_requirements(self): self.tool_requires("gnu-config/cci.20210814") if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") if self._settings_build.os == "Windows": self.win_bash = True if not self.conf.get("tools.microsoft.bash:path", check_type=str): diff --git a/recipes/coin-osi/all/test_package/conanfile.py b/recipes/coin-osi/all/test_package/conanfile.py index af1af0ebb3d7f..7ab87ca07735c 100644 --- a/recipes/coin-osi/all/test_package/conanfile.py +++ b/recipes/coin-osi/all/test_package/conanfile.py @@ -17,7 +17,7 @@ def requirements(self): def build_requirements(self): if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") def build(self): cmake = CMake(self) diff --git a/recipes/cppbenchmark/all/conandata.yml b/recipes/cppbenchmark/all/conandata.yml index 2873a6dc352ca..798d4ebbff0a7 100644 --- a/recipes/cppbenchmark/all/conandata.yml +++ b/recipes/cppbenchmark/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.0.4.0": + url: "https://github.com/chronoxor/CppBenchmark/archive/1.0.4.0.tar.gz" + sha256: "44fec3d4264b6654999dfa0f6ceb8a7aeef4eca32db0d229fba70819e11cede0" "1.0.3.0": url: "https://github.com/chronoxor/CppBenchmark/archive/1.0.3.0.tar.gz" sha256: "6a62cfdb2aacf91523f74c6d0e42a3e2388ff94a2b7b983bec543c88554cc3e9" @@ -9,6 +12,10 @@ sources: url: "https://github.com/chronoxor/CppBenchmark/archive/8605a8e886647e964180cb7a622424404a1da01f.tar.gz" sha256: "f0b88802b4418b13c04ae4dfdb859b2cb81142a47ca473ad447a8be087e0adee" patches: + "1.0.4.0": + - patch_file: "patches/1.0.3.0-0001-fix-cmake.patch" + patch_description: "fix install path, use cci packages, disable tests" + patch_type: "conan" "1.0.3.0": - patch_file: "patches/1.0.3.0-0001-fix-cmake.patch" patch_description: "fix install path, use cci packages, disable tests" diff --git a/recipes/cppbenchmark/config.yml b/recipes/cppbenchmark/config.yml index d05d94032be0f..6a65865cd6cb1 100644 --- a/recipes/cppbenchmark/config.yml +++ b/recipes/cppbenchmark/config.yml @@ -1,4 +1,6 @@ versions: + "1.0.4.0": + folder: all "1.0.3.0": folder: all "1.0.0.0": diff --git a/recipes/doxygen/all/conandata.yml b/recipes/doxygen/all/conandata.yml index b6735dc89d517..32fdd824d1e93 100644 --- a/recipes/doxygen/all/conandata.yml +++ b/recipes/doxygen/all/conandata.yml @@ -23,23 +23,41 @@ patches: patch_description: "Enable modern compilers" patch_type: "portability" patch_source: "https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa" + - patch_file: "patches/1.9.4-0002-fix-iconv-linkage.patch" + patch_description: "Replace IConv CMake variables by Conan CMake targets" + patch_type: "conan" "1.9.2": - patch_file: "patches/1.9.2-0001-imported-target.patch" patch_description: "Fix includes" patch_type: "portability" + - patch_file: "patches/1.9.2-0002-fix-iconv-linkage.patch" + patch_description: "Replace IConv CMake variables by Conan CMake targets" + patch_type: "conan" "1.9.1": - patch_file: "patches/1.9.1-0001-imported-target.patch" patch_description: "Fix includes" patch_type: "portability" + - patch_file: "patches/1.9.1-0002-fix-iconv-linkage.patch" + patch_description: "Replace IConv CMake variables by Conan CMake targets" + patch_type: "conan" "1.8.20": - patch_file: "patches/1.8-0001-xapian.patch" patch_description: "Fix xapian find_package command" patch_type: "portability" + - patch_file: "patches/1.8.20-0002-fix-iconv-linkage.patch" + patch_description: "Replace IConv CMake variables by Conan CMake targets" + patch_type: "conan" "1.8.18": - patch_file: "patches/1.8-0001-xapian.patch" patch_description: "Fix xapian find_package command" patch_type: "portability" + - patch_file: "patches/1.8.18-0002-fix-iconv-linkage.patch" + patch_description: "Replace IConv CMake variables by Conan CMake targets" + patch_type: "conan" "1.8.17": - patch_file: "patches/1.8-0001-xapian.patch" patch_description: "Fix xapian find_package command" patch_type: "portability" + - patch_file: "patches/1.8.17-0002-fix-iconv-linkage.patch" + patch_description: "Replace IConv CMake variables by Conan CMake targets" + patch_type: "conan" diff --git a/recipes/doxygen/all/conanfile.py b/recipes/doxygen/all/conanfile.py index 7b30ce53b0060..e3bd611aea91d 100644 --- a/recipes/doxygen/all/conanfile.py +++ b/recipes/doxygen/all/conanfile.py @@ -21,10 +21,12 @@ class DoxygenConan(ConanFile): options = { "enable_parse": [True, False], "enable_search": [True, False], + "enable_app": [True, False], } default_options = { "enable_parse": True, "enable_search": True, + "enable_app": False, } @property @@ -52,10 +54,10 @@ def layout(self): def requirements(self): if self.options.enable_search: self.requires("xapian-core/1.4.19") - self.requires("zlib/1.2.13") - - def package_id(self): - del self.info.settings.compiler + self.requires("zlib/[>=1.2.11 <2]") + if self.options.enable_app or self.options.enable_parse: + # INFO: Doxygen uses upper case CMake variables to link/include IConv, so we are using patches for targets. + self.requires("libiconv/1.17") def compatibility(self): return [{"settings": [("build_type", "Release")]}] @@ -81,6 +83,7 @@ def generate(self): tc = CMakeToolchain(self) tc.variables["build_parse"] = self.options.enable_parse tc.variables["build_search"] = self.options.enable_search + tc.variables["build_app"] = self.options.enable_app tc.variables["use_libc++"] = self.settings.compiler.get_safe("libcxx") == "libc++" tc.variables["win_static"] = is_msvc_static_runtime(self) tc.generate() @@ -103,6 +106,8 @@ def package_info(self): self.cpp_info.set_property("cmake_find_mode", "none") self.cpp_info.libdirs = [] self.cpp_info.includedirs = [] + if self.settings.os in ["Linux", "FreeBSD"]: + self.cpp_info.system_libs = ["pthread", "m"] # TODO: to remove in conan v2 self.env_info.PATH.append(os.path.join(self.package_folder, "bin")) diff --git a/recipes/doxygen/all/patches/1.8.17-0002-fix-iconv-linkage.patch b/recipes/doxygen/all/patches/1.8.17-0002-fix-iconv-linkage.patch new file mode 100644 index 0000000000000..39ee763500256 --- /dev/null +++ b/recipes/doxygen/all/patches/1.8.17-0002-fix-iconv-linkage.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd0fcaaca..67e0808ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,6 +109,7 @@ if (sqlite3) + endif() + + find_package(Iconv REQUIRED) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${ICONV_INCLUDE_DIR}) + + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index ae52cabc3..73e1e3d29 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${CMAKE_SOURCE_DIR}/src +@@ -26,7 +27,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index 2387f1b3c..cbf451037 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${CMAKE_SOURCE_DIR}/src +@@ -26,7 +27,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 23460d004..8f2c51012 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -325,7 +325,7 @@ target_link_libraries(doxygen + doxygen_version + vhdlparser + ${SQLITE3_LIBRARIES} +- ${ICONV_LIBRARIES} ++ Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${EXTRA_LIBS} + ${CLANG_LIBS} +-- + diff --git a/recipes/doxygen/all/patches/1.8.18-0002-fix-iconv-linkage.patch b/recipes/doxygen/all/patches/1.8.18-0002-fix-iconv-linkage.patch new file mode 100644 index 0000000000000..9bd67ebc094cd --- /dev/null +++ b/recipes/doxygen/all/patches/1.8.18-0002-fix-iconv-linkage.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20c87dc6f..cd8527618 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,6 +110,7 @@ if (sqlite3) + endif() + + find_package(Iconv REQUIRED) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${ICONV_INCLUDE_DIR}) + + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index ae52cabc3..73e1e3d29 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${CMAKE_SOURCE_DIR}/src +@@ -26,7 +27,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index 2387f1b3c..cbf451037 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${CMAKE_SOURCE_DIR}/src +@@ -26,7 +27,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b7d4af271..6f9a032c0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -321,7 +321,7 @@ target_link_libraries(doxygen + doxygen_version + vhdlparser + ${SQLITE3_LIBRARIES} +- ${ICONV_LIBRARIES} ++ Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${EXTRA_LIBS} + ${CLANG_LIBS} +-- + diff --git a/recipes/doxygen/all/patches/1.8.20-0002-fix-iconv-linkage.patch b/recipes/doxygen/all/patches/1.8.20-0002-fix-iconv-linkage.patch new file mode 100644 index 0000000000000..c32eb98953039 --- /dev/null +++ b/recipes/doxygen/all/patches/1.8.20-0002-fix-iconv-linkage.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 35e6a0c2d..71f609898 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,6 +117,7 @@ if (sqlite3) + endif() + + find_package(Iconv REQUIRED) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${ICONV_INCLUDE_DIR}) + + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index a6a776a31..ba29331c0 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${CMAKE_SOURCE_DIR}/src +@@ -31,7 +32,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index 8df99ab6b..034a93a4f 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${CMAKE_SOURCE_DIR}/src +@@ -31,7 +32,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cb289116e..2dab461e2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -356,7 +356,7 @@ target_link_libraries(doxygen PRIVATE + doxygen_version + vhdlparser + ${SQLITE3_LIBRARIES} +- ${ICONV_LIBRARIES} ++ Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${EXTRA_LIBS} + ${CLANG_LIBS} +-- + diff --git a/recipes/doxygen/all/patches/1.9.1-0002-fix-iconv-linkage.patch b/recipes/doxygen/all/patches/1.9.1-0002-fix-iconv-linkage.patch new file mode 100644 index 0000000000000..6a3bb24247325 --- /dev/null +++ b/recipes/doxygen/all/patches/1.9.1-0002-fix-iconv-linkage.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 06b9696f2..a70245b54 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,6 +118,7 @@ if (sqlite3) + endif() + + find_package(Iconv REQUIRED) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${ICONV_INCLUDE_DIR}) + + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index 707fdedbf..8d51b76f7 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${PROJECT_SOURCE_DIR}/src +@@ -43,7 +44,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index fe2f2c2ff..131354e95 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${PROJECT_SOURCE_DIR}/src +@@ -31,7 +32,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5004a9578..c63399bc1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -351,7 +351,7 @@ target_link_libraries(doxygen PRIVATE + doxygen_version + vhdlparser + ${SQLITE3_LIBRARIES} +- ${ICONV_LIBRARIES} ++ Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${EXTRA_LIBS} + ${CLANG_LIBS} +-- + diff --git a/recipes/doxygen/all/patches/1.9.2-0002-fix-iconv-linkage.patch b/recipes/doxygen/all/patches/1.9.2-0002-fix-iconv-linkage.patch new file mode 100644 index 0000000000000..699ac1e93addc --- /dev/null +++ b/recipes/doxygen/all/patches/1.9.2-0002-fix-iconv-linkage.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 251e18b77..4df454b39 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,6 +118,7 @@ if (sqlite3) + endif() + + find_package(Iconv REQUIRED) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${ICONV_INCLUDE_DIR}) + + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index a6fde4285..e19fc3d22 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${PROJECT_SOURCE_DIR}/src +@@ -42,7 +43,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index f439c29d9..e56b9a1de 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${PROJECT_SOURCE_DIR}/src +@@ -30,7 +31,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 18406488d..5c7144582 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -360,7 +360,7 @@ target_link_libraries(doxygen PRIVATE + doxygen_version + vhdlparser + ${SQLITE3_LIBRARIES} +- ${ICONV_LIBRARIES} ++ Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${EXTRA_LIBS} + ${CLANG_LIBS} +-- + diff --git a/recipes/doxygen/all/patches/1.9.4-0002-fix-iconv-linkage.patch b/recipes/doxygen/all/patches/1.9.4-0002-fix-iconv-linkage.patch new file mode 100644 index 0000000000000..c8e1489aa5a64 --- /dev/null +++ b/recipes/doxygen/all/patches/1.9.4-0002-fix-iconv-linkage.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9765964e..05784dd8f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -147,6 +147,7 @@ if (sqlite3) + endif() + + find_package(Iconv REQUIRED) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + include_directories(${ICONV_INCLUDE_DIR}) + + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index bcc4393d4..95d06cee2 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${PROJECT_SOURCE_DIR}/src +@@ -44,7 +45,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index 774756640..eb64c8895 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,4 +1,5 @@ + find_package(Iconv) ++get_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES) + + include_directories( + ${PROJECT_SOURCE_DIR}/src +@@ -33,7 +34,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-${ICONV_LIBRARIES} ++Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + ${EXTRA_LIBS} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9f7e65364..8d332a30a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -359,7 +359,7 @@ target_link_libraries(doxygen PRIVATE + doxygen_version + vhdlparser + ${SQLITE3_LIBRARIES} +- ${ICONV_LIBRARIES} ++ Iconv::Iconv + ${CMAKE_THREAD_LIBS_INIT} + ${EXTRA_LIBS} + ${CLANG_LIBS} +-- + diff --git a/recipes/doxygen/all/test_package/CMakeLists.txt b/recipes/doxygen/all/test_package/CMakeLists.txt deleted file mode 100644 index f0e28d12efb4d..0000000000000 --- a/recipes/doxygen/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -project(test_package LANGUAGES CXX) - -find_package(Doxygen REQUIRED) - -add_executable(${PROJECT_NAME} test_package.cpp) - -doxygen_add_docs(docs test_package.cpp ALL COMMENT "generate HTML") diff --git a/recipes/doxygen/all/test_package/conanfile.py b/recipes/doxygen/all/test_package/conanfile.py index 0bcb6db477b62..17e0d51d2d0e2 100644 --- a/recipes/doxygen/all/test_package/conanfile.py +++ b/recipes/doxygen/all/test_package/conanfile.py @@ -1,28 +1,16 @@ from conan import ConanFile -from conan.tools.cmake import cmake_layout, CMake -from conan.errors import ConanException -import os +from conan.tools.build import can_run class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" - generators = "CMakeDeps", "CMakeToolchain", "VirtualBuildEnv" + generators = "VirtualBuildEnv" test_type = "explicit" - def layout(self): - cmake_layout(self) - def build_requirements(self): self.tool_requires(self.tested_reference_str) - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - def test(self): - if not os.path.isdir(os.path.join(self.build_folder, "html")): - raise ConanException("doxygen did not create html documentation directory") - - self.output.info("Version:") - self.run("doxygen --version") + if can_run(self): + self.output.info("Doxygen Version:") + self.run("doxygen --version") diff --git a/recipes/doxygen/all/test_package/test_package.cpp b/recipes/doxygen/all/test_package/test_package.cpp deleted file mode 100644 index 4caefdf4a378f..0000000000000 --- a/recipes/doxygen/all/test_package/test_package.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include - -/// \brief just a simple main function for the hello world -int main() -{ - std::cout << "bincrafters" << std::endl; - return 0; -} diff --git a/recipes/doxygen/all/test_v1_package/CMakeLists.txt b/recipes/doxygen/all/test_v1_package/CMakeLists.txt deleted file mode 100644 index 0d20897301b68..0000000000000 --- a/recipes/doxygen/all/test_v1_package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package - ${CMAKE_CURRENT_BINARY_DIR}/test_package) diff --git a/recipes/doxygen/all/test_v1_package/conanfile.py b/recipes/doxygen/all/test_v1_package/conanfile.py deleted file mode 100644 index d659dafd309f3..0000000000000 --- a/recipes/doxygen/all/test_v1_package/conanfile.py +++ /dev/null @@ -1,22 +0,0 @@ -from conans import ConanFile, CMake, tools -from conans.errors import ConanException -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake" - - def build(self): - if not tools.cross_building(self, skip_x64_x86=True): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self, skip_x64_x86=True): - if not os.path.isdir(os.path.join(self.build_folder, "test_package", "html")): - raise ConanException("doxygen did not create html documentation directory") - - self.output.info("Version:") - self.run("doxygen --version", run_environment=True) diff --git a/recipes/etl/all/conandata.yml b/recipes/etl/all/conandata.yml index 9a2f4ce536daa..63dae1f2c04ea 100644 --- a/recipes/etl/all/conandata.yml +++ b/recipes/etl/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "20.38.4": + url: "https://github.com/ETLCPP/etl/archive/20.38.4.tar.gz" + sha256: "4074583bacac17e7944030f099d18a4ea3591d5d58b8d8b85c1b7f080a3e9610" "20.38.3": url: "https://github.com/ETLCPP/etl/archive/20.38.3.tar.gz" sha256: "7d2f384dfa9a50c8e066b716524016d2b62e753b0b75fed09a2b7e2c260759d2" diff --git a/recipes/etl/config.yml b/recipes/etl/config.yml index 4bf96a5a20643..26484c5252d35 100644 --- a/recipes/etl/config.yml +++ b/recipes/etl/config.yml @@ -1,4 +1,6 @@ versions: + "20.38.4": + folder: all "20.38.3": folder: all "20.38.0": diff --git a/recipes/gdcm/all/conanfile.py b/recipes/gdcm/all/conanfile.py index 1990e92be0217..d65646a1f9550 100644 --- a/recipes/gdcm/all/conanfile.py +++ b/recipes/gdcm/all/conanfile.py @@ -60,7 +60,7 @@ def requirements(self): self.requires("expat/2.5.0") self.requires("openjpeg/2.5.0") if self.options.with_zlibng: - self.requires("zlib-ng/2.0.7") + self.requires("zlib-ng/2.1.3") else: self.requires("zlib/[>=1.2.11 <2]") if self.settings.os != "Windows": @@ -68,7 +68,7 @@ def requirements(self): if Version(self.version) >= Version("3.0.20"): self.requires("libiconv/1.17") if self.options.with_json: - self.requires("json-c/0.16") + self.requires("json-c/0.17") if self.options.with_openssl: self.requires("openssl/[>=1.1 <4]") @@ -104,8 +104,8 @@ def generate(self): # https://sourceforge.net/p/gdcm/bugs/548/ tc.preprocessor_definitions["CHARLS_NO_DEPRECATED_WARNING"] = "1" - #gdcm currently uses functionality that is deprecated since OpenSSL 3.0 - tc.preprocessor_definitions["OPENSSL_API_COMPAT"] = "0x10101000L" + #gdcm currently uses functionality that is deprecated since OpenSSL 1.1.0 + tc.preprocessor_definitions["OPENSSL_API_COMPAT"] = "0x10000000L" tc.generate() deps = CMakeDeps(self) diff --git a/recipes/glaze/all/conandata.yml b/recipes/glaze/all/conandata.yml index 06afa0bf6a87b..b014456b571b7 100644 --- a/recipes/glaze/all/conandata.yml +++ b/recipes/glaze/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.5.3": + url: "https://github.com/stephenberry/glaze/archive/v1.5.3.tar.gz" + sha256: "dc0fcd447f9edb65521033466aca820c9a955c696bd51709e12048e0a12291d8" "1.5.2": url: "https://github.com/stephenberry/glaze/archive/v1.5.2.tar.gz" sha256: "d9dff3570ae479123b8eadb890db41255c6c0c74c4cdb1b9ca3d1eb73f8ca5eb" diff --git a/recipes/glaze/config.yml b/recipes/glaze/config.yml index 37445784d6356..75566edc16803 100644 --- a/recipes/glaze/config.yml +++ b/recipes/glaze/config.yml @@ -1,4 +1,6 @@ versions: + "1.5.3": + folder: all "1.5.2": folder: all "1.5.1": diff --git a/recipes/grpc/all/conanfile.py b/recipes/grpc/all/conanfile.py index 2278045abf6b9..998e680f1000a 100644 --- a/recipes/grpc/all/conanfile.py +++ b/recipes/grpc/all/conanfile.py @@ -95,7 +95,7 @@ def requirements(self): self.requires("c-ares/1.19.1") self.requires("openssl/[>=1.1 <4]") self.requires("re2/20230301") - self.requires("zlib/1.2.13") + self.requires("zlib/[>=1.2.11 <2]") self.requires("protobuf/3.21.12", transitive_headers=True, transitive_libs=True, run=can_run(self)) def package_id(self): diff --git a/recipes/gsoap/all/conandata.yml b/recipes/gsoap/all/conandata.yml index 4a616af7b7a29..c340912f08348 100644 --- a/recipes/gsoap/all/conandata.yml +++ b/recipes/gsoap/all/conandata.yml @@ -1,21 +1,18 @@ sources: - "2.8.117": + "2.8.129": url: - - "https://sourceforge.net/projects/gsoap2/files/gsoap_2.8.117.zip/download" - - "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.117.zip" + - "https://downloads.sourceforge.net/project/gsoap2/gsoap_2.8.129.zip" + - "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.129.zip" + sha256: "16cb8852ea791a6aec8f0213d619c15eecc8171e0c888f3b0e0c66d3ef78e20a" + "2.8.117": + url: "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.117.zip" sha256: "7cadf8808cfd982629948fe09e4fa6cd18e23cafd40df0aaaff1b1f5b695c442" "2.8.116": - url: - - "https://sourceforge.net/projects/gsoap2/files/gsoap_2.8.116.zip/download" - - "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.116.zip" + url: "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.116.zip" sha256: "2a41e42aaddbcd603b99004af95bb83559dbd4fd2d842920f003d24867599192" "2.8.115": - url: - - "https://sourceforge.net/projects/gsoap2/files/gsoap_2.8.115.zip/download" - - "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.115.zip" + url: "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.115.zip" sha256: "6f6813b189d201022254a2879cc8ee005bdb1bcf126bc03238710f19ec4e7268" "2.8.114": - url: - - "https://sourceforge.net/projects/gsoap2/files/gsoap_2.8.114.zip/download" - - "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.114.zip" + url: "https://c3i.jfrog.io/artifactory/cci-sources-backup/sources/gsoap/gsoap_2.8.114.zip" sha256: "aa70a999258100c170a3f8750c1f91318a477d440f6a28117f68bc1ded32327f" diff --git a/recipes/gsoap/all/conanfile.py b/recipes/gsoap/all/conanfile.py index 38b4629ae4211..6f49eae5e182d 100644 --- a/recipes/gsoap/all/conanfile.py +++ b/recipes/gsoap/all/conanfile.py @@ -32,14 +32,16 @@ class GsoapConan(ConanFile): "with_cookies": True, "with_c_locale": True, } - - exports_sources = "CMakeLists.txt", "cmake/*.cmake" short_paths = True @property def _settings_build(self): return getattr(self, "settings_build", self.settings) + def export_sources(self): + copy(self, "CMakeLists.txt", self.recipe_folder, self.export_sources_folder) + copy(self, "cmake/*.cmake", self.recipe_folder, self.export_sources_folder) + def config_options(self): if self.settings.os == "Windows": del self.options.fPIC @@ -50,7 +52,7 @@ def layout(self): def requirements(self): if self.options.with_openssl: self.requires("openssl/[>=1.1 <4]", transitive_headers=True) - self.requires("zlib/1.2.13") + self.requires("zlib/[>=1.2.11 <2]") def build_requirements(self): if cross_building(self, skip_x64_x86=True) and hasattr(self, "settings_build"): @@ -95,11 +97,11 @@ def package(self): def package_info(self): defines = [] if self.options.with_openssl: - libs = ["gsoapssl++", ] + libs = ["gsoapssl++"] defines.append("WITH_OPENSSL") defines.append("WITH_GZIP") else: - libs = ["gsoap++", ] + libs = ["gsoap++"] self.cpp_info.libs = libs if self.options.with_ipv6: diff --git a/recipes/gsoap/all/test_package/CMakeLists.txt b/recipes/gsoap/all/test_package/CMakeLists.txt index 1464ab750d83b..9d9cb52d4bac7 100644 --- a/recipes/gsoap/all/test_package/CMakeLists.txt +++ b/recipes/gsoap/all/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.15) project(test_package LANGUAGES CXX) find_package(gsoap REQUIRED CONFIG) diff --git a/recipes/gsoap/all/test_package/conanfile.py b/recipes/gsoap/all/test_package/conanfile.py index 1ea623e022729..60209e04ba8a6 100644 --- a/recipes/gsoap/all/test_package/conanfile.py +++ b/recipes/gsoap/all/test_package/conanfile.py @@ -2,7 +2,6 @@ from conan.tools.build import can_run from conan.tools.cmake import CMake, cmake_layout from conan.tools.env import VirtualBuildEnv, VirtualRunEnv -from conan.tools.scm import Version import os @@ -32,7 +31,7 @@ def build(self): calc_wsdl = os.path.join(self.source_folder, "calc.wsdl") self.output.info(f"Generating code from WSDL '{calc_wsdl}'") self.run(f"wsdl2h -o calc.h {calc_wsdl}") - if Version(conan_version).major < "2": + if conan_version.major < "2": # conan v1 limitation: self.dependencies is not defined in build() method of test package import_dir = os.path.join(self.deps_cpp_info["gsoap"].rootpath, "bin", "import") else: @@ -45,5 +44,5 @@ def build(self): def test(self): if can_run(self): - bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package") + bin_path = os.path.join(self.cpp.build.bindir, "test_package") self.run(bin_path, env="conanrun") diff --git a/recipes/gsoap/all/test_v1_package/CMakeLists.txt b/recipes/gsoap/all/test_v1_package/CMakeLists.txt index 0d20897301b68..b21cc49efde95 100644 --- a/recipes/gsoap/all/test_v1_package/CMakeLists.txt +++ b/recipes/gsoap/all/test_v1_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.15) project(test_package) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) diff --git a/recipes/gsoap/config.yml b/recipes/gsoap/config.yml index 01534d05392ba..22f6a1710f735 100644 --- a/recipes/gsoap/config.yml +++ b/recipes/gsoap/config.yml @@ -1,4 +1,6 @@ versions: + "2.8.129": + folder: all "2.8.117": folder: all "2.8.116": diff --git a/recipes/harfbuzz/all/conandata.yml b/recipes/harfbuzz/all/conandata.yml index d7feed1d663dd..22af954513093 100644 --- a/recipes/harfbuzz/all/conandata.yml +++ b/recipes/harfbuzz/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "8.2.2": + url: "https://github.com/harfbuzz/harfbuzz/releases/download/8.2.2/harfbuzz-8.2.2.tar.xz" + sha256: "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3" "8.2.1": url: "https://github.com/harfbuzz/harfbuzz/releases/download/8.2.1/harfbuzz-8.2.1.tar.xz" sha256: "0fec78f98c9c8faf228957a201c8846f809452c20f8445eb092a1ba6f22dbea5" diff --git a/recipes/harfbuzz/config.yml b/recipes/harfbuzz/config.yml index 5cf33eaf299d0..b1db9524d3543 100644 --- a/recipes/harfbuzz/config.yml +++ b/recipes/harfbuzz/config.yml @@ -1,4 +1,6 @@ versions: + "8.2.2": + folder: all "8.2.1": folder: all "8.1.1": diff --git a/recipes/hwloc/all/conandata.yml b/recipes/hwloc/all/conandata.yml index 7281cec31bd36..c3a77f045e4ad 100644 --- a/recipes/hwloc/all/conandata.yml +++ b/recipes/hwloc/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.9.3": + sha256: "5985db3a30bbe51234c2cd26ebe4ae9b4c3352ab788b1a464c40c0483bf4de59" + url: https://download.open-mpi.org/release/hwloc/v2.9/hwloc-2.9.3.tar.gz "2.9.2": sha256: "ffb554d5735e0e0a19d1fd4b2b86e771d3b58b2d97f257eedacae67ade5054b3" url: https://download.open-mpi.org/release/hwloc/v2.9/hwloc-2.9.2.tar.gz diff --git a/recipes/hwloc/config.yml b/recipes/hwloc/config.yml index b0052643e431c..d1ef77599f89a 100644 --- a/recipes/hwloc/config.yml +++ b/recipes/hwloc/config.yml @@ -1,4 +1,6 @@ versions: + "2.9.3": + folder: all "2.9.2": folder: all "2.9.1": diff --git a/recipes/iowow/all/conandata.yml b/recipes/iowow/all/conandata.yml new file mode 100644 index 0000000000000..af9c35abfe648 --- /dev/null +++ b/recipes/iowow/all/conandata.yml @@ -0,0 +1,13 @@ +sources: + "1.4.16": + url: "https://github.com/Softmotions/iowow/archive/refs/tags/v1.4.16.tar.gz" + sha256: "6e3b92b6c342ef6ef4a2731ca2d43368749d66ca876b24b773587364cff01003" +patches: + "1.4.16": + - patch_file: "patches/1.4.16-0001-some-fix-for-macOS.patch" + patch_description: "Some fixes for macOS" + patch_type: "portability" + patch_source: "https://github.com/Softmotions/iowow/pull/56" + - patch_file: "patches/1.4.16-0002-fix-uint64_t-format.patch" + patch_description: "fix uint64_t printf format" + patch_type: "portability" diff --git a/recipes/iowow/all/conanfile.py b/recipes/iowow/all/conanfile.py new file mode 100644 index 0000000000000..5a4fade27f4f6 --- /dev/null +++ b/recipes/iowow/all/conanfile.py @@ -0,0 +1,78 @@ +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.files import get, copy, rmdir, export_conandata_patches, apply_conandata_patches +from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout +from conan.tools.microsoft import is_msvc +import os + +required_conan_version = ">=1.53.0" + +class IowowConan(ConanFile): + name = "iowow" + description = "A C utility library and persistent key/value storage engine." + license = "MIT" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://iowow.softmotions.com/" + topics = ("database", "nosql", "key-value", "kvstore", "skiplist", "ejdb") + package_type = "library" + settings = "os", "compiler", "build_type", "arch" + options = { + "shared": [True, False], + "fPIC": [True, False], + } + default_options = { + "shared": False, + "fPIC": True, + } + + def export_sources(self): + export_conandata_patches(self) + + def config_options(self): + if self.settings.os == "Windows": + del self.options.fPIC + + def configure(self): + if self.options.shared: + self.options.rm_safe("fPIC") + self.settings.rm_safe("compiler.libcxx") + self.settings.rm_safe("compiler.cppstd") + + def layout(self): + cmake_layout(self, src_folder="src") + + def validate(self): + if is_msvc(self): + raise ConanInvalidConfiguration(f"{self.ref} is not supported on Visual Studio") + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + tc = CMakeToolchain(self) + tc.variables["CMAKE_BUILD_TYPE"] = self.settings.build_type + tc.variables["BUILD_EXAMPLES"] = False + tc.variables["PACKAGE_ZIP"] = False + tc.variables["PACKAGE_TGZ"] = False + tc.generate() + + def build(self): + apply_conandata_patches(self) + cmake = CMake(self) + cmake.configure() + cmake.build() + + def package(self): + copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + cmake = CMake(self) + cmake.install() + + rmdir(self, os.path.join(self.package_folder, "share")) + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) + + def package_info(self): + self.cpp_info.libs = ["iowow-1"] + self.cpp_info.set_property("pkg_config_name", "package") + if self.settings.os in ["Linux", "FreeBSD"]: + self.cpp_info.system_libs.append("pthread") + self.cpp_info.system_libs.append("m") diff --git a/recipes/iowow/all/patches/1.4.16-0001-some-fix-for-macOS.patch b/recipes/iowow/all/patches/1.4.16-0001-some-fix-for-macOS.patch new file mode 100644 index 0000000000000..0a42af275a2ee --- /dev/null +++ b/recipes/iowow/all/patches/1.4.16-0001-some-fix-for-macOS.patch @@ -0,0 +1,148 @@ +diff --git a/a/src/CMakeLists.txt b/b/src/CMakeLists.txt +index 7fd40ff..6c5990e 100644 +--- a/a/src/CMakeLists.txt ++++ b/b/src/CMakeLists.txt +@@ -184,7 +184,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ + -Wno-sign-compare -Wno-unused-parameter \ + -Wno-implicit-fallthrough -Wno-unknown-pragmas -Wno-unused-function -Wno-missing-field-initializers \ + -Wno-missing-braces") +-if (APPLE) ++if (APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-shorten-64-to-32") + endif() + +diff --git a/a/src/platform/unix/unix.c b/b/src/platform/unix/unix.c +index 96b4920..0f8ceb4 100644 +--- a/a/src/platform/unix/unix.c ++++ b/b/src/platform/unix/unix.c +@@ -348,6 +348,7 @@ iwrc iwp_exec_path(char *opath, size_t opath_maxlen) { + if (ret < 0) { + return iwrc_set_errno(IW_ERROR_ERRNO, errno); + } ++ return 0; + #else + // TODO: + return IW_ERROR_NOT_IMPLEMENTED; +diff --git a/a/src/utils/iwhmap.c b/b/src/utils/iwhmap.c +index 07ae953..757e31f 100644 +--- a/a/src/utils/iwhmap.c ++++ b/b/src/utils/iwhmap.c +@@ -109,13 +109,13 @@ IW_INLINE uint32_t _hash_uint64(uint64_t x) { + } + + IW_INLINE uint32_t _hash_uint64_key(const void *key) { +- if (sizeof(uintptr_t) >= sizeof(uint64_t)) { ++#ifdef IW_64 + return _hash_uint64((uint64_t) key); +- } else { ++#else + uint64_t lv; + memcpy(&lv, key, sizeof(lv)); + return _hash_uint64(lv); +- } ++#endif + } + + IW_INLINE uint32_t _hash_uint32_key(const void *key) { +diff --git a/a/src/utils/murmur3.c b/b/src/utils/murmur3.c +index c09bf73..7f3a066 100644 +--- a/a/src/utils/murmur3.c ++++ b/b/src/utils/murmur3.c +@@ -7,7 +7,7 @@ + #include "murmur3.h" + #include + +-#if !defined(__x86_64__) || defined(IW_TESTS) ++#if !defined(IW64) || defined(IW_TESTS) + + IW_INLINE uint32_t rotl32(uint32_t x, int8_t r) { + return (x << r) | (x >> (32 - r)); +@@ -22,10 +22,28 @@ IW_INLINE uint64_t rotl64(uint64_t x, int8_t r) { + #define ROTL32(x, y) rotl32(x, y) + #define ROTL64(x, y) rotl64(x, y) + ++IW_INLINE uint32_t getblock32 (const uint32_t * p, size_t i) ++{ ++#ifndef IW_BIGENDIAN ++ return p[i]; ++#else ++ return IW_SWAB32(p[i]); ++#endif ++} ++ ++IW_INLINE uint64_t getblock64 (const uint64_t * p, size_t i) ++{ ++#ifndef IW_BIGENDIAN ++ return p[i]; ++#else ++ return IW_SWAB64(p[i]); ++#endif ++} ++ + static uint32_t seed_value = 0x2fa1bca; + + // Finalization mix - force all bits of a hash block to avalanche +-#if !defined(__x86_64__) || defined(IW_TESTS) ++#if !defined(IW64) || defined(IW_TESTS) + + IW_INLINE uint32_t fmix32(uint32_t h) { + h ^= h >> 16; +@@ -47,7 +65,7 @@ IW_INLINE uint64_t fmix64(uint64_t k) { + return k; + } + +-#if !defined(__x86_64__) || defined(IW_TESTS) ++#if !defined(IW64) || defined(IW_TESTS) + + void murmur3_x86_32(const void *key, size_t len, uint32_t seed, void *out) { + const uint8_t *data = (const uint8_t*) key; +@@ -59,9 +77,7 @@ void murmur3_x86_32(const void *key, size_t len, uint32_t seed, void *out) { + + const uint32_t *blocks = (const uint32_t*) (data + nblocks * 4); + for (i = -nblocks; i; i++) { +- uint32_t k1; +- +- memcpy(&k1, blocks + i, sizeof(k1)); ++ uint32_t k1 = getblock32(blocks, i); + + k1 *= c1; + k1 = ROTL32(k1, 15); +@@ -113,12 +129,10 @@ void murmur3_x86_128(const void *key, const size_t len, uint32_t seed, void *out + const uint32_t *blocks = (const uint32_t*) (data + nblocks * 16); + + for (i = -nblocks; i; i++) { +- uint32_t k1, k2, k3, k4; +- +- memcpy(&k1, blocks + i * 4 + 0, sizeof(k1)); +- memcpy(&k2, blocks + i * 4 + 1, sizeof(k2)); +- memcpy(&k3, blocks + i * 4 + 2, sizeof(k3)); +- memcpy(&k4, blocks + i * 4 + 3, sizeof(k4)); ++ uint32_t k1 = getblock32(blocks, i * 4 + 0); ++ uint32_t k2 = getblock32(blocks, i * 4 + 1); ++ uint32_t k3 = getblock32(blocks, i * 4 + 2); ++ uint32_t k4 = getblock32(blocks, i * 4 + 3); + + k1 *= c1; + k1 = ROTL32(k1, 15); +@@ -264,10 +278,8 @@ void murmur3_x64_128(const void *key, const size_t len, const uint32_t seed, voi + + const uint64_t *blocks = (const uint64_t*) (data); + for (i = 0; i < nblocks; i++) { +- uint64_t k1, k2; +- +- memcpy(&k1, blocks + i * 2 + 0, sizeof(k1)); +- memcpy(&k2, blocks + i * 2 + 1, sizeof(k2)); ++ uint64_t k1 = getblock64(blocks, i * 2 + 0); ++ uint64_t k2 = getblock64(blocks, i * 2 + 1); + + k1 *= c1; + k1 = ROTL64(k1, 31); +@@ -358,7 +370,7 @@ void murmur3_x64_128(const void *key, const size_t len, const uint32_t seed, voi + } + + uint32_t murmur3(const char *keyptr, size_t len) { +-#ifdef __x86_64__ ++#ifdef IW_64 + uint64_t hash[2]; + murmur3_x64_128(keyptr, len, seed_value, hash); + return (uint32_t) hash[1]; diff --git a/recipes/iowow/all/patches/1.4.16-0002-fix-uint64_t-format.patch b/recipes/iowow/all/patches/1.4.16-0002-fix-uint64_t-format.patch new file mode 100644 index 0000000000000..82d76f00b56a7 --- /dev/null +++ b/recipes/iowow/all/patches/1.4.16-0002-fix-uint64_t-format.patch @@ -0,0 +1,13 @@ +diff --git a/a/src/fs/iwfsmfile.c b/b/src/fs/iwfsmfile.c +index 75cc4d5..6ee3f7e 100644 +--- a/a/src/fs/iwfsmfile.c ++++ b/b/src/fs/iwfsmfile.c +@@ -1338,7 +1338,7 @@ static iwrc _fsm_read_meta_lr(struct fsm *fsm) { + fsm->bmlen = llv; + if (llv & (64 - 1)) { + rc = IWFS_ERROR_INVALID_FILEMETA; +- iwlog_ecode_error(rc, "Free-space bitmap length is not 64bit aligned: %" PRIuMAX "", fsm->bmlen); ++ iwlog_ecode_error(rc, "Free-space bitmap length is not 64bit aligned: %" PRIx64 "", fsm->bmlen); + } + rp += sizeof(llv); + diff --git a/recipes/iowow/all/test_package/CMakeLists.txt b/recipes/iowow/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..9e0ebfd3d59d1 --- /dev/null +++ b/recipes/iowow/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES C) + +find_package(iowow REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.c) +target_link_libraries(${PROJECT_NAME} PRIVATE iowow::iowow) +target_compile_features(${PROJECT_NAME} PRIVATE c_std_11) diff --git a/recipes/iowow/all/test_package/conanfile.py b/recipes/iowow/all/test_package/conanfile.py new file mode 100644 index 0000000000000..ef5d7042163ec --- /dev/null +++ b/recipes/iowow/all/test_package/conanfile.py @@ -0,0 +1,26 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import cmake_layout, CMake +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + test_type = "explicit" + + def requirements(self): + self.requires(self.tested_reference_str) + + def layout(self): + cmake_layout(self) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindir, "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/iowow/all/test_package/test_package.c b/recipes/iowow/all/test_package/test_package.c new file mode 100644 index 0000000000000..2ee836be4e2af --- /dev/null +++ b/recipes/iowow/all/test_package/test_package.c @@ -0,0 +1,14 @@ +#include "iowow/iwkv.h" + +int main() { + IWKV_OPTS opts = { + .path = "example1.db", + .oflags = IWKV_TRUNC // Cleanup database before open + }; + IWKV iwkv; + iwrc rc = iwkv_open(&opts, &iwkv); + + iwkv_close(&iwkv); + + return 0; +} diff --git a/recipes/iowow/config.yml b/recipes/iowow/config.yml new file mode 100644 index 0000000000000..f0c63cbdbe5f3 --- /dev/null +++ b/recipes/iowow/config.yml @@ -0,0 +1,3 @@ +versions: + "1.4.16": + folder: all diff --git a/recipes/libgeotiff/all/conanfile.py b/recipes/libgeotiff/all/conanfile.py index 74323fd2d39a0..85af88ca0856c 100644 --- a/recipes/libgeotiff/all/conanfile.py +++ b/recipes/libgeotiff/all/conanfile.py @@ -44,8 +44,8 @@ def layout(self): def requirements(self): # libgeotiff/include/xtiffio.h includes libtiff/include/tiffio.h - self.requires("libtiff/4.5.1", transitive_headers=True, transitive_libs=True) - self.requires("proj/9.2.1") + self.requires("libtiff/4.6.0", transitive_headers=True, transitive_libs=True) + self.requires("proj/9.3.0") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 9503a3cd195eb..91471af4e7c75 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -137,7 +137,9 @@ def package_info(self): if self.options.egl: self.cpp_info.components['egl'].libs = ["EGL"] self.cpp_info.components['egl'].system_libs.extend(["pthread", "dl", "m"]) - self.cpp_info.components['egl'].requires.extend(["xorg::x11", "gldispatch"]) + self.cpp_info.components['egl'].requires.append("gldispatch") + if self.options.x11: + self.cpp_info.components['egl'].requires.append("xorg::x11") self.cpp_info.components['egl'].set_property("pkg_config_name", "egl") if self.options.glx: diff --git a/recipes/librttopo/all/conanfile.py b/recipes/librttopo/all/conanfile.py index aeef7fdcae406..a6752906fedc2 100644 --- a/recipes/librttopo/all/conanfile.py +++ b/recipes/librttopo/all/conanfile.py @@ -45,7 +45,7 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("geos/3.11.2", transitive_headers=True, transitive_libs=True) + self.requires("geos/3.12.0", transitive_headers=True, transitive_libs=True) def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) diff --git a/recipes/libtiff/all/conanfile.py b/recipes/libtiff/all/conanfile.py index c650a266c17ca..efce29ff02503 100644 --- a/recipes/libtiff/all/conanfile.py +++ b/recipes/libtiff/all/conanfile.py @@ -65,7 +65,7 @@ def requirements(self): if self.options.zlib: self.requires("zlib/[>=1.2.11 <2]") if self.options.libdeflate: - self.requires("libdeflate/1.18") + self.requires("libdeflate/1.19") if self.options.lzma: self.requires("xz_utils/5.4.4") if self.options.jpeg == "libjpeg": diff --git a/recipes/libuvc/all/conanfile.py b/recipes/libuvc/all/conanfile.py index 798d7b5db6063..cb9de052b88cd 100644 --- a/recipes/libuvc/all/conanfile.py +++ b/recipes/libuvc/all/conanfile.py @@ -62,7 +62,7 @@ def requirements(self): elif self.options.with_jpeg == "libjpeg-turbo": self.requires("libjpeg-turbo/3.0.0") elif self.options.with_jpeg == "mozjpeg": - self.requires("mozjpeg/4.1.1") + self.requires("mozjpeg/4.1.3") def package_id(self): # TODO: to remove once deprecated jpeg_turbo option removed @@ -77,7 +77,7 @@ def validate(self): def build_requirements(self): if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) diff --git a/recipes/ls-qpack/all/conandata.yml b/recipes/ls-qpack/all/conandata.yml index 2760252082cf6..ac7d7d333e78b 100644 --- a/recipes/ls-qpack/all/conandata.yml +++ b/recipes/ls-qpack/all/conandata.yml @@ -1,13 +1,22 @@ sources: + "2.5.3": + url: "https://github.com/litespeedtech/ls-qpack/archive/refs/tags/v2.5.3.tar.gz" + sha256: "075a05efee27961eac5ac92a12a6e28a61bcd6c122a0276938ef993338577337" "2.5.1": url: "https://github.com/litespeedtech/ls-qpack/archive/refs/tags/v2.5.1.tar.gz" sha256: "dae1c159afc8541d51c12f5ad78209fe092815d37cb621b5ee46a9db049a283f" - patches: + "2.5.3": + - patch_file: "patches/2.5.1-0001-use-cci-package.patch" + patch_description: "use cci packages" + patch_type: "conan" + - patch_file: "patches/2.5.3-0002-add-installer.patch" + patch_description: "add installer" + patch_type: "conan" "2.5.1": - - patch_file: "patches/0001-use-cci-package.patch" + - patch_file: "patches/2.5.1-0001-use-cci-package.patch" patch_description: "use cci packages" patch_type: "conan" - - patch_file: "patches/0002-add-installer.patch" + - patch_file: "patches/2.5.1-0002-add-installer.patch" patch_description: "add installer" patch_type: "conan" diff --git a/recipes/ls-qpack/all/conanfile.py b/recipes/ls-qpack/all/conanfile.py index dd139a2740293..89421636cbe72 100644 --- a/recipes/ls-qpack/all/conanfile.py +++ b/recipes/ls-qpack/all/conanfile.py @@ -42,7 +42,7 @@ def layout(self): def requirements(self): if self.options.with_xxh: - self.requires("xxhash/0.8.1") + self.requires("xxhash/0.8.2") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) diff --git a/recipes/ls-qpack/all/patches/0001-use-cci-package.patch b/recipes/ls-qpack/all/patches/2.5.1-0001-use-cci-package.patch similarity index 79% rename from recipes/ls-qpack/all/patches/0001-use-cci-package.patch rename to recipes/ls-qpack/all/patches/2.5.1-0001-use-cci-package.patch index 21e1e856275c9..48af51a011e2d 100644 --- a/recipes/ls-qpack/all/patches/0001-use-cci-package.patch +++ b/recipes/ls-qpack/all/patches/2.5.1-0001-use-cci-package.patch @@ -9,7 +9,8 @@ index d9d9aa3..826e99b 100644 -target_include_directories(ls-qpack PRIVATE deps/xxhash/) if(LSQPACK_XXH) + find_package(xxHash REQUIRED CONFIG) - target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c) +- target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c) ++ # target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c) + target_link_libraries(ls-qpack PUBLIC xxHash::xxhash) endif() diff --git a/recipes/ls-qpack/all/patches/0002-add-installer.patch b/recipes/ls-qpack/all/patches/2.5.1-0002-add-installer.patch similarity index 100% rename from recipes/ls-qpack/all/patches/0002-add-installer.patch rename to recipes/ls-qpack/all/patches/2.5.1-0002-add-installer.patch diff --git a/recipes/ls-qpack/all/patches/2.5.3-0002-add-installer.patch b/recipes/ls-qpack/all/patches/2.5.3-0002-add-installer.patch new file mode 100644 index 0000000000000..bc34f0724108a --- /dev/null +++ b/recipes/ls-qpack/all/patches/2.5.3-0002-add-installer.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f7cd40..70e8fa8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -102,3 +102,18 @@ endif() + if(LSQPACK_BIN) + add_subdirectory(bin) + endif() ++ ++include(GNUInstallDirs) ++ ++install( ++ TARGETS ls-qpack ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++install(FILES lsqpack.h DESTINATION include) ++ ++if(WIN32) ++ install(DIRECTORY wincompat DESTINATION include) ++endif() diff --git a/recipes/ls-qpack/config.yml b/recipes/ls-qpack/config.yml index eab83a303df52..cbd3f0133afbb 100644 --- a/recipes/ls-qpack/config.yml +++ b/recipes/ls-qpack/config.yml @@ -1,3 +1,5 @@ versions: + "2.5.3": + folder: all "2.5.1": folder: all diff --git a/recipes/meson/all/conandata.yml b/recipes/meson/all/conandata.yml index d58e97ba5b952..d3dbac49e9710 100644 --- a/recipes/meson/all/conandata.yml +++ b/recipes/meson/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.2.3": + url: "https://github.com/mesonbuild/meson/releases/download/1.2.3/meson-1.2.3.tar.gz" + sha256: "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1" "1.2.2": url: "https://github.com/mesonbuild/meson/releases/download/1.2.2/meson-1.2.2.tar.gz" sha256: "4a0f04de331fbc7af3b802a844fc8838f4ccd1ded1e792ba4f8f2faf8c5fe4d6" diff --git a/recipes/meson/config.yml b/recipes/meson/config.yml index cde056a588deb..5fe93c9a6d5cd 100644 --- a/recipes/meson/config.yml +++ b/recipes/meson/config.yml @@ -1,4 +1,6 @@ versions: + "1.2.3": + folder: all "1.2.2": folder: all "1.2.1": diff --git a/recipes/mm_file/all/conandata.yml b/recipes/mm_file/all/conandata.yml new file mode 100644 index 0000000000000..2e4260fa45c64 --- /dev/null +++ b/recipes/mm_file/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "1.0.0": + url: "https://github.com/jermp/mm_file/archive/refs/tags/v1.0.0.tar.gz" + sha256: "1bb1b057ea1f1b06366513a198c39277740f743b59a0e5669f2694698f52018b" diff --git a/recipes/mm_file/all/conanfile.py b/recipes/mm_file/all/conanfile.py new file mode 100644 index 0000000000000..781246e7dfea4 --- /dev/null +++ b/recipes/mm_file/all/conanfile.py @@ -0,0 +1,51 @@ +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.build import check_min_cppstd +from conan.tools.files import get, copy +from conan.tools.layout import basic_layout +import os + +required_conan_version = ">=1.52.0" + +class MMFileConan(ConanFile): + name = "mm_file" + description = "A self-contained, header-only, implementation of memory-mapped files in C++ for fast integration into larger projects." + license = "MIT" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/jermp/mm_file" + topics = ("memory-mapped-file", "header-only") + package_type = "header-library" + settings = "os", "arch", "compiler", "build_type" + no_copy_source = True + + @property + def _min_cppstd(self): + return 11 + + def layout(self): + basic_layout(self, src_folder="src") + + def package_id(self): + self.info.clear() + + def validate(self): + if self.settings.compiler.cppstd: + check_min_cppstd(self, self._min_cppstd) + if self.settings.os == "Windows": + raise ConanInvalidConfiguration(f"{self.ref} doesn't support Windows") + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def package(self): + copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + copy( + self, + pattern="*.hpp", + dst=os.path.join(self.package_folder, "include"), + src=os.path.join(self.source_folder, "include"), + ) + + def package_info(self): + self.cpp_info.bindirs = [] + self.cpp_info.libdirs = [] diff --git a/recipes/mm_file/all/test_package/CMakeLists.txt b/recipes/mm_file/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..5c2d17e17789e --- /dev/null +++ b/recipes/mm_file/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES CXX) + +find_package(mm_file REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE mm_file::mm_file) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/recipes/mm_file/all/test_package/conanfile.py b/recipes/mm_file/all/test_package/conanfile.py new file mode 100644 index 0000000000000..3a91c9439218e --- /dev/null +++ b/recipes/mm_file/all/test_package/conanfile.py @@ -0,0 +1,26 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import cmake_layout, CMake +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + test_type = "explicit" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires(self.tested_reference_str) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindir, "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/mm_file/all/test_package/test_package.cpp b/recipes/mm_file/all/test_package/test_package.cpp new file mode 100644 index 0000000000000..708d34f560ee3 --- /dev/null +++ b/recipes/mm_file/all/test_package/test_package.cpp @@ -0,0 +1,31 @@ +#include +#include + +#include "mm_file/mm_file.hpp" + +int main() { + std::string filename("tmp.bin"); + static const size_t n = 13; + + { + // write n uint32_t integers + mm::file_sink fout(filename, n); + std::cout << "mapped " << fout.bytes() << " bytes " + << "for " << fout.size() << " integers" << std::endl; + + auto *data = fout.data(); + for (uint32_t i = 0; i != fout.size(); ++i) { + data[i] = i; + std::cout << "written " << data[i] << std::endl; + } + + // test iterator + for (auto x : fout) { + std::cout << "written " << x << std::endl; + } + + fout.close(); + } + + return 0; +} diff --git a/recipes/mm_file/config.yml b/recipes/mm_file/config.yml new file mode 100644 index 0000000000000..40341aa3db6cd --- /dev/null +++ b/recipes/mm_file/config.yml @@ -0,0 +1,3 @@ +versions: + "1.0.0": + folder: all diff --git a/recipes/nghttp3/all/conandata.yml b/recipes/nghttp3/all/conandata.yml index 44235cb3f54de..dab729864ca6f 100644 --- a/recipes/nghttp3/all/conandata.yml +++ b/recipes/nghttp3/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.0.0": + url: "https://github.com/ngtcp2/nghttp3/releases/download/v1.0.0/nghttp3-1.0.0.tar.bz2" + sha256: "c4aa8a38056e3b286a4102612d690e0c21f584784364f04215100e74efc95a61" "0.15.0": url: "https://github.com/ngtcp2/nghttp3/releases/download/v0.15.0/nghttp3-0.15.0.tar.gz" sha256: "3c56d9fa6f1b58b37bd7b1b53eaf16cd71118bc2d5cadbc904f09d6f6466b42f" diff --git a/recipes/nghttp3/all/conanfile.py b/recipes/nghttp3/all/conanfile.py index c7b6057509787..618ddcb3adf32 100644 --- a/recipes/nghttp3/all/conanfile.py +++ b/recipes/nghttp3/all/conanfile.py @@ -1,11 +1,9 @@ from conan import ConanFile -from conan.errors import ConanInvalidConfiguration from conan.tools.apple import is_apple_os from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout from conan.tools.env import VirtualBuildEnv from conan.tools.files import get, rmdir, copy from conan.tools.microsoft import is_msvc -from conan.tools.scm import Version import os @@ -14,11 +12,11 @@ class Nghttp3Conan(ConanFile): name = "nghttp3" - description = "HTTP/2 C Library and tools" - topics = ("http", "http3") + description = "HTTP/3 library written in C" + license = "MIT" url = "https://github.com/conan-io/conan-center-index" homepage = "https://nghttp2.org/nghttp3/" - license = "MIT" + topics = ("http", "http3", "quic", "qpack") package_type = "library" settings = "os", "arch", "compiler", "build_type" options = { @@ -30,9 +28,6 @@ class Nghttp3Conan(ConanFile): "fPIC": True, } - def build_requirements(self): - self.tool_requires("cmake/[>=3.20 <4]") - def config_options(self): if self.settings.os == "Windows": del self.options.fPIC @@ -44,6 +39,9 @@ def configure(self): def layout(self): cmake_layout(self, src_folder="src") + def build_requirements(self): + self.tool_requires("cmake/[>=3.20 <4]") + def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) diff --git a/recipes/nghttp3/all/test_package/CMakeLists.txt b/recipes/nghttp3/all/test_package/CMakeLists.txt index 0b418770cdb55..c52d61a995b33 100644 --- a/recipes/nghttp3/all/test_package/CMakeLists.txt +++ b/recipes/nghttp3/all/test_package/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.8) -project(test_package) +project(test_package LANGUAGES C) find_package(nghttp3 REQUIRED CONFIG) -add_executable(${PROJECT_NAME} test_package.cpp) +add_executable(${PROJECT_NAME} test_package.c) target_link_libraries(${PROJECT_NAME} PRIVATE nghttp3::nghttp3) diff --git a/recipes/nghttp3/all/test_package/test_package.cpp b/recipes/nghttp3/all/test_package/test_package.c similarity index 92% rename from recipes/nghttp3/all/test_package/test_package.cpp rename to recipes/nghttp3/all/test_package/test_package.c index 1455f3ae65f55..f093072babb72 100644 --- a/recipes/nghttp3/all/test_package/test_package.cpp +++ b/recipes/nghttp3/all/test_package/test_package.c @@ -1,7 +1,7 @@ #include #if defined(_MSC_VER) -// nghttp2 defaults to int +/* nghttp3 defaults to int */ typedef int ssize_t; #endif #include diff --git a/recipes/nghttp3/config.yml b/recipes/nghttp3/config.yml index e3fd6190a5166..b80b93245d90a 100644 --- a/recipes/nghttp3/config.yml +++ b/recipes/nghttp3/config.yml @@ -1,3 +1,5 @@ versions: + "1.0.0": + folder: all "0.15.0": folder: all diff --git a/recipes/numcpp/all/conandata.yml b/recipes/numcpp/all/conandata.yml index ce085d59bfe2b..bc13c5f8f97d8 100644 --- a/recipes/numcpp/all/conandata.yml +++ b/recipes/numcpp/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.12.1": + url: "https://github.com/dpilger26/NumCpp/archive/Version_2.12.1.tar.gz" + sha256: "f462ecd27126e6057b31fa38f1f72cef2c4223c9d848515412970714a5bb6d16" "2.12.0": url: "https://github.com/dpilger26/NumCpp/archive/Version_2.12.0.tar.gz" sha256: "4c7266d405c8058f87467732129362b5a5c810d36df91e8655defa4d93fc141b" diff --git a/recipes/numcpp/config.yml b/recipes/numcpp/config.yml index f22aa27e65517..a222baacafc0a 100644 --- a/recipes/numcpp/config.yml +++ b/recipes/numcpp/config.yml @@ -1,4 +1,6 @@ versions: + "2.12.1": + folder: "all" "2.12.0": folder: "all" "2.11.0": diff --git a/recipes/onetbb/all/conanfile.py b/recipes/onetbb/all/conanfile.py index 5317849db9bac..bb5887dc31122 100644 --- a/recipes/onetbb/all/conanfile.py +++ b/recipes/onetbb/all/conanfile.py @@ -90,7 +90,7 @@ def layout(self): def requirements(self): if self._tbbbind_build: - self.requires("hwloc/2.9.2") + self.requires("hwloc/2.9.3") def build_requirements(self): if not self._tbbbind_explicit_hwloc and not self.conf.get("tools.gnu:pkg_config", check_type=str): diff --git a/recipes/opencv/2.x/conanfile.py b/recipes/opencv/2.x/conanfile.py index 4b96731d9f7b2..1db730c337ba3 100644 --- a/recipes/opencv/2.x/conanfile.py +++ b/recipes/opencv/2.x/conanfile.py @@ -358,14 +358,14 @@ def requirements(self): self.requires("eigen/3.4.0") if self.options.with_tbb: # opencv 2.x doesn't support onetbb >= 2021 - self.requires("onetbb/2020.3") + self.requires("onetbb/2020.3.3") # highgui module options if self.options.get_safe("with_jpeg") == "libjpeg": self.requires("libjpeg/9e") elif self.options.get_safe("with_jpeg") == "libjpeg-turbo": - self.requires("libjpeg-turbo/2.1.5") + self.requires("libjpeg-turbo/3.0.0") elif self.options.get_safe("with_jpeg") == "mozjpeg": - self.requires("mozjpeg/4.1.1") + self.requires("mozjpeg/4.1.3") if self.options.get_safe("with_png"): self.requires("libpng/1.6.40") if self.options.get_safe("with_jasper"): @@ -374,7 +374,7 @@ def requirements(self): # opencv 2.x doesn't support openexr >= 3 self.requires("openexr/2.5.7") if self.options.get_safe("with_tiff"): - self.requires("libtiff/4.5.1") + self.requires("libtiff/4.6.0") if self.options.get_safe("with_gtk"): self.requires("gtk/system") diff --git a/recipes/openjdk/all/conandata.yml b/recipes/openjdk/all/conandata.yml index 55fa3138ee966..bb0f8bea50c9b 100644 --- a/recipes/openjdk/all/conandata.yml +++ b/recipes/openjdk/all/conandata.yml @@ -1,11 +1,30 @@ sources: + "21.0.1": + Windows: + url: "https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_windows-x64_bin.zip" + sha256: "77ea464f4fa7cbcbffe0124af44707e8e5ad8c1ce2373f1d94a64d9b20ba0c69" + Linux_x86_64: + url: "https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz" + sha256: "7e80146b2c3f719bf7f56992eb268ad466f8854d5d6ae11805784608e458343f" + Linux_armv8: + url: "https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-aarch64_bin.tar.gz" + sha256: "f5e4e4622756fafe05ac0105a8efefa1152c8aad085a2bbb9466df0721bf2ba4" + Macos_x86_64: + url: "https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_macos-x64_bin.tar.gz" + sha256: "1ca6db9e6c09752f842eee6b86a2f7e51b76ae38e007e936b9382b4c3134e9ea" + Macos_armv8: + url: "https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_macos-aarch64_bin.tar.gz" + sha256: "9760eaa019b6d214a06bd44a304f3700ac057d025000bdfb9739b61080969a96" "19.0.2": Windows: url: "https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_windows-x64_bin.zip" sha256: "9f70eba3f2631674a2d7d3aa01150d697f68be16ad76662ff948d7fe1b4985d8" - Linux: + Linux_x86_64: url: "https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-x64_bin.tar.gz" sha256: "34cf8d095cc071e9e10165f5c45023f96ec68397fdaabf6c64bfec1ffeee6198" + Linux_armv8: + url: "https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-aarch64_bin.tar.gz" + sha256: "95728187b4b5607c49de751a209ecda6e04d9ed7cee603cf36f454239106527b" Macos_x86_64: url: "https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_macos-x64_bin.tar.gz" sha256: "c57c7c511706738fff6540945e0159e97b8b328777e6460977dd64e00f4c2c0b" @@ -16,7 +35,7 @@ sources: Windows: url: "https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL/openjdk-16.0.1_windows-x64_bin.zip" sha256: "733b45b09463c97133d70c2368f1b9505da58e88f2c8a84358dd4accfd06a7a4" - Linux: + Linux_x86_64: url: "https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL/openjdk-16.0.1_linux-x64_bin.tar.gz" sha256: "b1198ffffb7d26a3fdedc0fa599f60a0d12aa60da1714b56c1defbce95d8b235" Macos_x86_64: diff --git a/recipes/openjdk/all/conanfile.py b/recipes/openjdk/all/conanfile.py index f6296d73d515d..b9d462756f800 100644 --- a/recipes/openjdk/all/conanfile.py +++ b/recipes/openjdk/all/conanfile.py @@ -30,7 +30,7 @@ def validate(self): def build(self): key = self.settings.os - if self.settings.os == "Macos": + if self.settings.os in ["Macos", "Linux"]: key = f"{self.settings.os}_{self.settings.arch}" get(self, **self.conan_data["sources"][self.version][str(key)], destination=self.source_folder, strip_root=True) diff --git a/recipes/openjdk/config.yml b/recipes/openjdk/config.yml index 71fa68c00fc9a..1e9a2a92440d2 100644 --- a/recipes/openjdk/config.yml +++ b/recipes/openjdk/config.yml @@ -1,4 +1,6 @@ versions: + "21.0.1": + folder: all "19.0.2": folder: all "16.0.1": diff --git a/recipes/pdf-writer/all/conandata.yml b/recipes/pdf-writer/all/conandata.yml index 4775a5371af8e..396c829a1f253 100644 --- a/recipes/pdf-writer/all/conandata.yml +++ b/recipes/pdf-writer/all/conandata.yml @@ -1,8 +1,15 @@ sources: + "4.6.1": + url: "https://github.com/galkahana/PDF-Writer/archive/refs/tags/v4.6.1.tar.gz" + sha256: "6e95fcb26ec679fa12ce6638d35a591e80960b35956a142d9a80b9a8c80ca824" "4.5.12": url: "https://github.com/galkahana/PDF-Writer/archive/refs/tags/v4.5.12.tar.gz" sha256: "40fcbaa66fc46fcb588ceda119ba8839ff6d2c886191ac5e68ed702475c7336e" patches: + "4.6.1": + - patch_file: "patches/4.5.12-0001-fix-cmake.patch" + patch_description: "disable test/cpack, use cci package" + patch_type: "conan" "4.5.12": - patch_file: "patches/4.5.12-0001-fix-cmake.patch" patch_description: "disable test/cpack, use cci package" diff --git a/recipes/pdf-writer/config.yml b/recipes/pdf-writer/config.yml index f15bafabcf228..a4aeb1f1b89b4 100644 --- a/recipes/pdf-writer/config.yml +++ b/recipes/pdf-writer/config.yml @@ -1,3 +1,5 @@ versions: + "4.6.1": + folder: all "4.5.12": folder: all diff --git a/recipes/proj/all/conanfile.py b/recipes/proj/all/conanfile.py index ecf7a505fd31b..f38fb9b497bc3 100644 --- a/recipes/proj/all/conanfile.py +++ b/recipes/proj/all/conanfile.py @@ -61,7 +61,7 @@ def layout(self): def requirements(self): self.requires("nlohmann_json/3.11.2") - self.requires("sqlite3/3.43.1") + self.requires("sqlite3/3.43.2") if self.options.get_safe("with_tiff"): self.requires("libtiff/4.6.0") if self.options.get_safe("with_curl"): diff --git a/recipes/rapidfuzz/all/conandata.yml b/recipes/rapidfuzz/all/conandata.yml index 72d797c618c5e..279749d57341f 100644 --- a/recipes/rapidfuzz/all/conandata.yml +++ b/recipes/rapidfuzz/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.1.1": + url: "https://github.com/maxbachmann/rapidfuzz-cpp/archive/refs/tags/v2.1.1.tar.gz" + sha256: "1680c0dbf77d228ea81825c24755db99ee0e21a8db3663b5136741b3e108c3f2" "2.0.0": url: "https://github.com/maxbachmann/rapidfuzz-cpp/archive/refs/tags/v2.0.0.tar.gz" sha256: "0d6d399be1de151631bbc189b72089600884831a4dac91e22f17351cef18ae64" diff --git a/recipes/rapidfuzz/config.yml b/recipes/rapidfuzz/config.yml index 62df69f5c8745..11ecec1d15429 100644 --- a/recipes/rapidfuzz/config.yml +++ b/recipes/rapidfuzz/config.yml @@ -1,4 +1,6 @@ versions: + "2.1.1": + folder: "all" "2.0.0": folder: "all" "1.10.4": diff --git a/recipes/samurai/all/conandata.yml b/recipes/samurai/all/conandata.yml index ea3efb8533667..6907e16b729a6 100644 --- a/recipes/samurai/all/conandata.yml +++ b/recipes/samurai/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.7.0": + url: "https://github.com/hpc-maths/samurai/archive/v0.7.0.tar.gz" + sha256: "159dea32bdce95ddc6bc62c202e60754407d4e5e910d0a382c2030410fe2e729" "0.6.0": url: "https://github.com/hpc-maths/samurai/archive/v0.6.0.tar.gz" sha256: "bab96adac8e1553b79678a22de2248bec67c7c205b5fd35e9e1aaccaca41286e" diff --git a/recipes/samurai/config.yml b/recipes/samurai/config.yml index 570ab7165280c..3ab2f5cec43d3 100644 --- a/recipes/samurai/config.yml +++ b/recipes/samurai/config.yml @@ -1,4 +1,6 @@ versions: + "0.7.0": + folder: all "0.6.0": folder: all "0.3.0": diff --git a/recipes/so5extra/all/conandata.yml b/recipes/so5extra/all/conandata.yml index 18c9023e61809..4896683389169 100644 --- a/recipes/so5extra/all/conandata.yml +++ b/recipes/so5extra/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.6.0": + url: "https://github.com/Stiffstream/so5extra/archive/v.1.6.0.tar.gz" + sha256: "224a156a840d707138189da5ebe78d87814832252f90673db631e93e0171433f" "1.5.2": url: "https://github.com/Stiffstream/so5extra/archive/v.1.5.2.tar.gz" sha256: "5409dc255c970d2085381ceded122b80b9ac896a34bafc5ffc431bae304d485d" diff --git a/recipes/so5extra/all/conanfile.py b/recipes/so5extra/all/conanfile.py index 57a11fc2bf146..c69c7ea0da2de 100644 --- a/recipes/so5extra/all/conanfile.py +++ b/recipes/so5extra/all/conanfile.py @@ -28,18 +28,31 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): + if self.version >= Version("1.6.0"): + # Since v1.6.0 requirements to compilers were updated: + return { + "gcc": "10", + "clang": "11", + "apple-clang": "13", + "Visual Studio": "17", + "msvc": "192" + } return { "gcc": "7", "clang": "6", "apple-clang": "10", "Visual Studio": "15", + "msvc": "191" } def layout(self): basic_layout(self, src_folder="src") def requirements(self): - self.requires("sobjectizer/5.8.0") + if self.version >= Version("1.6.0"): + self.requires("sobjectizer/5.8.0") + else: + self.requires("sobjectizer/5.7.4") def package_id(self): self.info.clear() diff --git a/recipes/so5extra/config.yml b/recipes/so5extra/config.yml index f77c4a7405ffe..f068b0b20df7f 100644 --- a/recipes/so5extra/config.yml +++ b/recipes/so5extra/config.yml @@ -1,4 +1,6 @@ versions: + "1.6.0": + folder: all "1.5.2": folder: all "1.5.1": diff --git a/recipes/soundtouch/all/conanfile.py b/recipes/soundtouch/all/conanfile.py index dd8ee78498090..66a875621a86d 100644 --- a/recipes/soundtouch/all/conanfile.py +++ b/recipes/soundtouch/all/conanfile.py @@ -48,10 +48,16 @@ def source(self): def generate(self): tc = CMakeToolchain(self) - tc.variables["INTEGER_SAMPLES"] = self.options.integer_samples - tc.variables["SOUNDTOUCH_DLL"] = self.options.with_dll - tc.variables["SOUNDSTRETCH"] = self.options.with_util - tc.variables["OPENMP"] = self.options.with_openmp + tc.cache_variables["INTEGER_SAMPLES"] = self.options.integer_samples + tc.cache_variables["SOUNDTOUCH_DLL"] = self.options.with_dll + tc.cache_variables["SOUNDSTRETCH"] = self.options.with_util + tc.cache_variables["OPENMP"] = self.options.with_openmp + # The finite-math-only optimization has no effect and can cause linking errors + # when linked against glibc >= 2.31 + tc.blocks["cmake_flags_init"].template = tc.blocks["cmake_flags_init"].template + """ + string(APPEND CMAKE_CXX_FLAGS_INIT " -fno-finite-math-only") + string(APPEND CMAKE_C_FLAGS_INIT " -fno-finite-math-only") + """ tc.generate() def build(self): diff --git a/recipes/tesseract/all/conanfile.py b/recipes/tesseract/all/conanfile.py index bbdcc2c253a14..0970f98b4339d 100644 --- a/recipes/tesseract/all/conanfile.py +++ b/recipes/tesseract/all/conanfile.py @@ -82,12 +82,14 @@ def layout(self): def requirements(self): self.requires("leptonica/1.82.0") + if self.settings.os == "Windows" and Version(self.version) >= "5.0.0": + self.requires("libtiff/4.6.0") # libarchive is required for 4.x so default value is true if self.options.get_safe("with_libarchive", default=True): - self.requires("libarchive/3.6.2") + self.requires("libarchive/3.7.1") # libcurl is not required for 4.x if self.options.get_safe("with_libcurl", default=False): - self.requires("libcurl/8.0.1") + self.requires("libcurl/8.2.1") def validate(self): if self.settings.compiler.get_safe("cppstd"): @@ -185,6 +187,8 @@ def package_info(self): # TODO: back to global scope once cmake_find_package* generators removed self.cpp_info.components["libtesseract"].libs = [self._libname] self.cpp_info.components["libtesseract"].requires = ["leptonica::leptonica"] + if self.settings.os == "Windows" and Version(self.version) >= "5.0.0": + self.cpp_info.components["libtesseract"].requires.append("libtiff::libtiff") if self.options.get_safe("with_libcurl", default=False): self.cpp_info.components["libtesseract"].requires.append("libcurl::libcurl") if self.options.get_safe("with_libarchive", default=True): diff --git a/recipes/tracy/all/conandata.yml b/recipes/tracy/all/conandata.yml index e66204ae4d119..de70002df8416 100644 --- a/recipes/tracy/all/conandata.yml +++ b/recipes/tracy/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.10": + url: "https://github.com/wolfpld/tracy/archive/refs/tags/v0.10.tar.gz" + sha256: "a76017d928f3f2727540fb950edd3b736caa97b12dbb4e5edce66542cbea6600" "0.9.1": url: "https://github.com/wolfpld/tracy/archive/refs/tags/v0.9.1.tar.gz" sha256: "c2de9f35ab2a516a9689ff18f5b62a55b73b93b66514bd09ba013d7957993cd7" diff --git a/recipes/tracy/config.yml b/recipes/tracy/config.yml index 6bea7d9080e33..7f42fe99a398a 100644 --- a/recipes/tracy/config.yml +++ b/recipes/tracy/config.yml @@ -1,4 +1,6 @@ versions: + "0.10": + folder: all "0.9.1": folder: all "0.9": diff --git a/recipes/tre/all/CMakeLists.txt b/recipes/tre/all/CMakeLists.txt new file mode 100644 index 0000000000000..cf9c37d17b6e1 --- /dev/null +++ b/recipes/tre/all/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required (VERSION 3.15) +project (tre) + +set(HEADERS + local_includes/regex.h + local_includes/tre.h + win32/tre-config.h +) +file(GLOB SRCS lib/*.c) + +include_directories(win32 local_includes) +add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) +add_definitions(-DHAVE_CONFIG_H -DHAVE_MALLOC_H) +add_library(tre ${SRCS} win32/tre.def) + +install(TARGETS tre + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES ${HEADERS} + DESTINATION include/tre +) diff --git a/recipes/tre/all/conandata.yml b/recipes/tre/all/conandata.yml new file mode 100644 index 0000000000000..683be30ad0ede --- /dev/null +++ b/recipes/tre/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "cci.20230717": + url: "https://github.com/laurikari/tre/archive/07e66d07b44ae95a7a89f79c7ce1090f0f4d64db.tar.gz" + sha256: "f2390091a35c31e90efcce88006c2396f5698759f2f7abd136e771c3e0996961" diff --git a/recipes/tre/all/conanfile.py b/recipes/tre/all/conanfile.py new file mode 100644 index 0000000000000..8991cbd800567 --- /dev/null +++ b/recipes/tre/all/conanfile.py @@ -0,0 +1,90 @@ +import os + +from conan import ConanFile +from conan.tools.apple import fix_apple_shared_install_name +from conan.tools.build import cross_building +from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout +from conan.tools.env import VirtualBuildEnv, VirtualRunEnv +from conan.tools.files import copy, get, rm, rmdir +from conan.tools.gnu import Autotools, AutotoolsToolchain + +required_conan_version = ">=1.53.0" + + +class TreConan(ConanFile): + name = "tre" + description = "TRE is a lightweight, robust, and efficient POSIX-compliant regexp matching library with some exciting features such as approximate (fuzzy) matching." + license = "BSD-2-Clause" + homepage = "https://github.com/laurikari/tre" + url = "https://github.com/conan-io/conan-center-index" + topics = "regex", "fuzzy matching" + + package_type = "library" + settings = "os", "arch", "compiler", "build_type" + options = {"shared": [True, False], "fPIC": [True, False]} + default_options = {"shared": False, "fPIC": True} + + def export_sources(self): + copy(self, "CMakeLists.txt", src=self.recipe_folder, dst=self.export_sources_folder) + + def config_options(self): + if self.settings.os == "Windows": + del self.options.fPIC + + def configure(self): + if self.options.shared: + self.options.rm_safe("fPIC") + self.settings.rm_safe("compiler.libcxx") + self.settings.rm_safe("compiler.cppstd") + + def layout(self): + cmake_layout(self, src_folder="src") + + def build_requirements(self): + if self.settings.os != "Windows": + self.tool_requires("libtool/2.4.7") + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + if self.settings.os == "Windows": + tc = CMakeToolchain(self) + tc.generate() + else: + env = VirtualBuildEnv(self) + env.generate() + if not cross_building(self): + env = VirtualRunEnv(self) + env.generate(scope="build") + tc = AutotoolsToolchain(self) + tc.generate() + + def build(self): + if self.settings.os == "Windows": + copy(self, "CMakeLists.txt", src=self.export_sources_folder, dst=self.source_folder) + cmake = CMake(self) + cmake.configure() + cmake.build() + else: + autotools = Autotools(self) + autotools.autoreconf() + autotools.configure() + autotools.make() + + def package(self): + copy(self, "LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + if self.settings.os == "Windows": + cmake = CMake(self) + cmake.install() + else: + autotools = Autotools(self) + autotools.install() + rm(self, "*.la", os.path.join(self.package_folder, "lib")) + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) + rmdir(self, os.path.join(self.package_folder, "share")) + fix_apple_shared_install_name(self) + + def package_info(self): + self.cpp_info.set_property("pkg_config_name", "tre") + self.cpp_info.libs = ["tre"] diff --git a/recipes/tre/all/test_package/CMakeLists.txt b/recipes/tre/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..dff3b713e92cc --- /dev/null +++ b/recipes/tre/all/test_package/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES C) + +find_package(tre REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.c) +target_link_libraries(${PROJECT_NAME} PRIVATE tre::tre) diff --git a/recipes/tre/all/test_package/conanfile.py b/recipes/tre/all/test_package/conanfile.py new file mode 100644 index 0000000000000..3a91c9439218e --- /dev/null +++ b/recipes/tre/all/test_package/conanfile.py @@ -0,0 +1,26 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import cmake_layout, CMake +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + test_type = "explicit" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires(self.tested_reference_str) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindir, "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/tre/all/test_package/test_package.c b/recipes/tre/all/test_package/test_package.c new file mode 100644 index 0000000000000..605527c604de8 --- /dev/null +++ b/recipes/tre/all/test_package/test_package.c @@ -0,0 +1,21 @@ +#include "tre/tre.h" +#include + +int main() +{ + regex_t rx; + tre_regcomp(&rx, "(January|February)", REG_EXTENDED); + + regaparams_t params = {0}; + tre_regaparams_default(¶ms); + + regamatch_t match = {0}; + + if (!tre_regaexec(&rx, "Janvary", &match, params, 0)) { + printf("Levenshtein distance: %d\n", match.cost); + } else { + printf("Failed to match\n"); + } + + return 0; +} diff --git a/recipes/tre/config.yml b/recipes/tre/config.yml new file mode 100644 index 0000000000000..b32c668575dde --- /dev/null +++ b/recipes/tre/config.yml @@ -0,0 +1,3 @@ +versions: + "cci.20230717": + folder: all diff --git a/recipes/vulkan-loader/all/conanfile.py b/recipes/vulkan-loader/all/conanfile.py index d0c415a0ecae6..b8abe5e70b213 100644 --- a/recipes/vulkan-loader/all/conanfile.py +++ b/recipes/vulkan-loader/all/conanfile.py @@ -77,7 +77,7 @@ def requirements(self): if self.options.get_safe("with_wsi_xcb") or self.options.get_safe("with_wsi_xlib"): self.requires("xorg/system") if Version(self.version) < "1.3.231" and self.options.get_safe("with_wsi_wayland"): - self.requires("wayland/1.21.0") + self.requires("wayland/1.22.0") def validate(self): if self.options.get_safe("with_wsi_directfb"): @@ -92,7 +92,7 @@ def validate(self): def build_requirements(self): if self._is_pkgconf_needed: if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") if self._is_mingw: self.tool_requires("jwasm/2.13") if Version(self.version) >= "1.3.234": diff --git a/recipes/wt/all/conandata.yml b/recipes/wt/all/conandata.yml index 2b98a42d759a5..7c33a1e76efa3 100644 --- a/recipes/wt/all/conandata.yml +++ b/recipes/wt/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "4.10.1": + url: "https://github.com/emweb/wt/archive/4.10.1.tar.gz" + sha256: "f6d6114416a628604793197cd077066a9d4d98799bbb288b97de42f66705bde5" "4.10.0": url: "https://github.com/emweb/wt/archive/4.10.0.tar.gz" sha256: "7090023d4fc4b6594bf4cb11072d9d3d775269327aece9a8993c7bbe46decb9d" @@ -18,6 +21,10 @@ sources: url: "https://github.com/emweb/wt/archive/4.6.0.tar.gz" sha256: "7f709e132d32c4925e6db0a590c7ccc5613344e8b9052676ef891a25ccb550e6" patches: + "4.10.1": + - patch_file: "patches/4.8.0-0001-use-cci-package.patch" + patch_description: "use cci package" + patch_type: "conan" "4.10.0": - patch_file: "patches/4.8.0-0001-use-cci-package.patch" patch_description: "use cci package" diff --git a/recipes/wt/all/conanfile.py b/recipes/wt/all/conanfile.py index 7316afc068219..341e5e1481c9c 100644 --- a/recipes/wt/all/conanfile.py +++ b/recipes/wt/all/conanfile.py @@ -1,10 +1,11 @@ -from conan import ConanFile +from conan import ConanFile, conan_version from conan.errors import ConanException, ConanInvalidConfiguration from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy, rmdir, replace_in_file from conan.tools.scm import Version from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.microsoft import is_msvc import os +import sys import shutil required_conan_version = ">=1.54.0" @@ -120,6 +121,13 @@ def validate(self): f"{self.ref} requires non header-only boost with these components: " f"{', '.join(self._required_boost_components)}" ) + # FIXME: check_max_cppstd is only available for Conan 2.x. Remove it after dropping support for Conan 1.x + if conan_version.major == 2 and Version(self.version) >= "4.10.1": + # FIXME: linter complains, but function is there + # https://docs.conan.io/2.0/reference/tools/build.html?highlight=check_min_cppstd#conan-tools-build-check-max-cppstd + check_max_cppstd = getattr(sys.modules['conan.tools.build'], 'check_max_cppstd') + # INFO: error C2661: 'std::to_chars': no overloaded function takes 2 arguments. Removed in C++17. + check_max_cppstd(self, 14) def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) diff --git a/recipes/wt/config.yml b/recipes/wt/config.yml index 6ef848d4e1336..fec9d209ef876 100644 --- a/recipes/wt/config.yml +++ b/recipes/wt/config.yml @@ -1,4 +1,6 @@ versions: + "4.10.1": + folder: all "4.10.0": folder: all "4.9.1": diff --git a/recipes/xmlsec/all/conanfile.py b/recipes/xmlsec/all/conanfile.py index 146dd548ccbb5..7b8e66f3a136e 100644 --- a/recipes/xmlsec/all/conanfile.py +++ b/recipes/xmlsec/all/conanfile.py @@ -60,7 +60,7 @@ def layout(self): basic_layout(self, src_folder="src") def requirements(self): - self.requires("libxml2/2.11.4", transitive_headers=True) + self.requires("libxml2/2.11.5", transitive_headers=True) if self.options.with_openssl: self.requires("openssl/[>=1.1 <4]", transitive_headers=True) if self.options.with_xslt: @@ -80,7 +80,7 @@ def build_requirements(self): if not is_msvc(self): self.tool_requires("libtool/2.4.7") if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.3") if self._settings_build.os == "Windows": self.win_bash = True if not self.conf.get("tools.microsoft.bash:path", check_type=str): diff --git a/recipes/xmlsec/all/test_package/conanfile.py b/recipes/xmlsec/all/test_package/conanfile.py index b846bc292a759..813061264560d 100644 --- a/recipes/xmlsec/all/test_package/conanfile.py +++ b/recipes/xmlsec/all/test_package/conanfile.py @@ -14,7 +14,7 @@ def layout(self): def requirements(self): self.requires(self.tested_reference_str) - self.requires("libxml2/2.11.4") + self.requires("libxml2/2.11.5") def generate(self): tc = CMakeToolchain(self) diff --git a/recipes/zlib-ng/all/conandata.yml b/recipes/zlib-ng/all/conandata.yml index 27e5a03a3afe2..83e5af856aeeb 100644 --- a/recipes/zlib-ng/all/conandata.yml +++ b/recipes/zlib-ng/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.1.4": + url: "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.1.4.tar.gz" + sha256: "a0293475e6a44a3f6c045229fe50f69dc0eebc62a42405a51f19d46a5541e77a" "2.1.3": url: "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.1.3.tar.gz" sha256: "d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a" diff --git a/recipes/zlib-ng/config.yml b/recipes/zlib-ng/config.yml index 96567d37e1ee8..cc680233f4b5c 100644 --- a/recipes/zlib-ng/config.yml +++ b/recipes/zlib-ng/config.yml @@ -1,4 +1,6 @@ versions: + "2.1.4": + folder: all "2.1.3": folder: all "2.1.2": diff --git a/recipes/zulu-openjdk/all/conandata.yml b/recipes/zulu-openjdk/all/conandata.yml index 4c8a8b5afbd6a..9e14b09c940cf 100644 --- a/recipes/zulu-openjdk/all/conandata.yml +++ b/recipes/zulu-openjdk/all/conandata.yml @@ -1,4 +1,42 @@ sources: + "21.0.1": + "Windows": + "x86_64": + url: "https://cdn.azul.com/zulu/bin/zulu21.30.15-ca-jdk21.0.1-win_x64.zip" + sha256: "f6541ceed2eb0b793fd27f22d9f8192ad1c9c4c53e528dd0a1e6ec8d7c3a33d3" + "Linux": + "x86_64": + url: "https://cdn.azul.com/zulu/bin/zulu21.30.15-ca-jdk21.0.1-linux_x64.tar.gz" + sha256: "bf4842dd3a17cfe85523be5848b5ec3bc3d811afc74feab791befa4c895c4449" + "armv8": + url: "https://cdn.azul.com/zulu/bin/zulu21.30.15-ca-jdk21.0.1-linux_aarch64.tar.gz" + sha256: "00863e2b9910a5ed4f55183b89459d2162147e871d96ab532479ab06d9fae03b" + "Macos": + "x86_64": + url: "https://cdn.azul.com/zulu/bin/zulu21.30.15-ca-jdk21.0.1-macosx_x64.tar.gz" + sha256: "667e3945ffd394317b5faf1f5bd4847d1f1d091f76543df27d9b3a2ee7bf7a7e" + "armv8": + url: "https://cdn.azul.com/zulu/bin/zulu21.30.15-ca-jdk21.0.1-macosx_aarch64.tar.gz" + sha256: "6e89b6ed60c0efcc1b5bb7c6b36710ce746751b316a16cc3f9915470c4eb2a00" + "17.0.9": + "Windows": + "x86_64": + url: "https://cdn.azul.com/zulu/bin/zulu17.46.19-ca-jdk17.0.9-win_x64.zip" + sha256: "32e110628ea0bd750b84e0f937e7c98874505e76a0590d759565dfa803f89ccf" + "Linux": + "x86_64": + url: "https://cdn.azul.com/zulu/bin/zulu17.46.19-ca-jdk17.0.9-linux_x64.tar.gz" + sha256: "5317630424ee4e4d2c1024240d2e6f94a7c06d17b01dd36859df4a4d679fc287" + "armv8": + url: "https://cdn.azul.com/zulu/bin/zulu17.46.19-ca-jdk17.0.9-linux_aarch64.tar.gz" + sha256: "90062201e7911696a449431a61dc0a55cd10cda516a9f2db54c410633a79302a" + "Macos": + "x86_64": + url: "https://cdn.azul.com/zulu/bin/zulu17.46.19-ca-jdk17.0.9-macosx_x64.tar.gz" + sha256: "19271b74c3f3b21f4978eda8f09908c063c456cea57265d71475ceefef5aa0ac" + "armv8": + url: "https://cdn.azul.com/zulu/bin/zulu17.46.19-ca-jdk17.0.9-macosx_aarch64.tar.gz" + sha256: "d6837676e55b97772b6512e253fdaf8ab282bb216c0f8366b6c5905cd02b5056" "11.0.19": "Windows": "x86_64": diff --git a/recipes/zulu-openjdk/all/conanfile.py b/recipes/zulu-openjdk/all/conanfile.py index 1aa178e14ab52..648597913dd65 100644 --- a/recipes/zulu-openjdk/all/conanfile.py +++ b/recipes/zulu-openjdk/all/conanfile.py @@ -44,7 +44,7 @@ def build(self): def package(self): copy(self, pattern="*", dst=os.path.join(self.package_folder, "bin"), src=os.path.join(self.source_folder, "bin"), - excludes=("msvcp140.dll", "vcruntime140.dll")) + excludes=("msvcp140.dll", "vcruntime140.dll", "vcruntime140_1.dll")) copy(self, pattern="*", dst=os.path.join(self.package_folder, "include"), src=os.path.join(self.source_folder, "include")) copy(self, pattern="*", dst=os.path.join(self.package_folder, "lib"), diff --git a/recipes/zulu-openjdk/config.yml b/recipes/zulu-openjdk/config.yml index a92b329e254ee..d9b1272d1abe9 100644 --- a/recipes/zulu-openjdk/config.yml +++ b/recipes/zulu-openjdk/config.yml @@ -1,4 +1,8 @@ versions: + "21.0.1": + folder: all + "17.0.9": + folder: all "11.0.19": folder: all "11.0.15":