From 07b3a4d4ad8e0b706e5923d1bddc54d6b209ccf2 Mon Sep 17 00:00:00 2001 From: Dannie Sim Date: Mon, 21 Oct 2024 09:32:23 +0100 Subject: [PATCH 01/30] (#25606) bgfx: add msvc version 194 --- recipes/bgfx/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/bgfx/all/conanfile.py b/recipes/bgfx/all/conanfile.py index 9de812b7f94ea..7ce8c351c03cf 100644 --- a/recipes/bgfx/all/conanfile.py +++ b/recipes/bgfx/all/conanfile.py @@ -160,7 +160,7 @@ def build(self): if is_msvc(self): # Conan to Genie translation maps vs_ver_to_genie = {"17": "2022", "16": "2019", "15": "2017", - "193": "2022", "192": "2019", "191": "2017"} + "194": "2022", "193": "2022", "192": "2019", "191": "2017"} # Use genie directly, then msbuild on specific projects based on requirements genie_VS = f"vs{vs_ver_to_genie[str(self.settings.compiler.version)]}" From 6896ddc9f2d7b69e2dd755e0248f3e1e1e3e44bd Mon Sep 17 00:00:00 2001 From: Roberto Turrado Camblor Date: Mon, 21 Oct 2024 11:14:33 +0100 Subject: [PATCH 02/30] (#25653) libqasm: add version 0.6.8. * Update libqasm version to 0.6.8. * Fix test_package.cpp. libqasm files and folders have now been reorganized. As part of this reorganization, all the include files live now under libqasm folder. * Trying to fix test_package.cpp compilation. libqasm releases up to 0.6.7 use "cqasm.hpp" header. libqasm release 0.6.8 uses "libqasm/cqasm.hpp". --- recipes/libqasm/all/conandata.yml | 3 +++ recipes/libqasm/all/test_package/src/test_package.cpp | 5 ++++- recipes/libqasm/config.yml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/recipes/libqasm/all/conandata.yml b/recipes/libqasm/all/conandata.yml index 11f0ecaaf3931..84b1a8d8bd8e7 100644 --- a/recipes/libqasm/all/conandata.yml +++ b/recipes/libqasm/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.6.8": + url: "https://github.com/QuTech-Delft/libqasm/archive/refs/tags/0.6.8.tar.gz" + sha256: "b98ff44f0c569a0cc20b3728ba7d4711299aaac07d4dadfe52e638b366b91251" "0.6.7": url: "https://github.com/QuTech-Delft/libqasm/archive/refs/tags/0.6.7.tar.gz" sha256: "3e85be4f433b178b89e32bc738bd4f69266cd1c4ad0ed12b5367381ac6e44eb2" diff --git a/recipes/libqasm/all/test_package/src/test_package.cpp b/recipes/libqasm/all/test_package/src/test_package.cpp index d961b8daa4a16..07ad803c4364b 100644 --- a/recipes/libqasm/all/test_package/src/test_package.cpp +++ b/recipes/libqasm/all/test_package/src/test_package.cpp @@ -1,8 +1,11 @@ +#if __has_include("cqasm.hpp") #include "cqasm.hpp" +#else +#include "libqasm/cqasm.hpp" +#endif #include - int main() { auto analyzer = cqasm::v3x::default_analyzer(); auto result = analyzer.analyze_string("version 3.0; qubit[2] q; H q[0]; CNOT q[0], q[1]; measure q", ""); diff --git a/recipes/libqasm/config.yml b/recipes/libqasm/config.yml index 70cd514abf1d8..d6940cdc093d7 100644 --- a/recipes/libqasm/config.yml +++ b/recipes/libqasm/config.yml @@ -1,4 +1,6 @@ versions: + "0.6.8": + folder: all "0.6.7": folder: all "0.6.6": From d1c52687d06d9a69dcfd29054be4fad93b8b9de5 Mon Sep 17 00:00:00 2001 From: Ingmar Rieger Date: Mon, 21 Oct 2024 12:31:49 +0200 Subject: [PATCH 03/30] (#25661) imgui: Add version 1.91.4 --- recipes/imgui/all/conandata.yml | 6 ++++++ recipes/imgui/config.yml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/recipes/imgui/all/conandata.yml b/recipes/imgui/all/conandata.yml index c3fd237c5414c..60726e912afc5 100644 --- a/recipes/imgui/all/conandata.yml +++ b/recipes/imgui/all/conandata.yml @@ -1,4 +1,10 @@ sources: + "1.91.4": + url: "https://github.com/ocornut/imgui/archive/v1.91.4.tar.gz" + sha256: "a455c28d987c78ddf56aab98ce0ff0fda791a23a2ec88ade46dd106b837f0923" + "1.91.4-docking": + url: "https://github.com/ocornut/imgui/archive/v1.91.4-docking.tar.gz" + sha256: "7405bdaf304b77d6d03e6d17d1f31ca3586fa0c65a466fa1dd71b6ca6a222023" "1.91.3": url: "https://github.com/ocornut/imgui/archive/v1.91.3.tar.gz" sha256: "29949d7b300c30565fbcd66398100235b63aa373acfee0b76853a7aeacd1be28" diff --git a/recipes/imgui/config.yml b/recipes/imgui/config.yml index 3b5152c257e44..f13dd4816765d 100644 --- a/recipes/imgui/config.yml +++ b/recipes/imgui/config.yml @@ -1,4 +1,8 @@ versions: + "1.91.4": + folder: all + "1.91.4-docking": + folder: all "1.91.3": folder: all "1.91.3-docking": From 7f503a75c6e065bc07ee9872fce9e9bd6e28d661 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 21 Oct 2024 19:51:27 +0900 Subject: [PATCH 04/30] (#25662) cpp-httplib: add version 0.18.1, remove older versions --- recipes/cpp-httplib/all/conandata.yml | 15 +++------------ recipes/cpp-httplib/config.yml | 10 ++-------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/recipes/cpp-httplib/all/conandata.yml b/recipes/cpp-httplib/all/conandata.yml index 0670cdc087177..6d1aa245d833b 100644 --- a/recipes/cpp-httplib/all/conandata.yml +++ b/recipes/cpp-httplib/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.18.1": + url: "https://github.com/yhirose/cpp-httplib/archive/v0.18.1.tar.gz" + sha256: "405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00" "0.18.0": url: "https://github.com/yhirose/cpp-httplib/archive/v0.18.0.tar.gz" sha256: "6ed5894bbbc4a34a0f4c5e962672d0003d2ea099bbadacc66f6dee2b213ff394" @@ -24,15 +27,3 @@ sources: "0.14.1": url: "https://github.com/yhirose/cpp-httplib/archive/v0.14.1.tar.gz" sha256: "2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96" - "0.13.3": - url: "https://github.com/yhirose/cpp-httplib/archive/v0.13.3.tar.gz" - sha256: "2a4503f9f2015f6878baef54cd94b01849cc3ed19dfe95f2c9775655bea8b73f" - "0.12.6": - url: "https://github.com/yhirose/cpp-httplib/archive/v0.12.6.tar.gz" - sha256: "24bc594a9efcc08a5a6f3928e848d046d411a88b07bcd6f7f3851227a1f0133e" - "0.11.4": - url: "https://github.com/yhirose/cpp-httplib/archive/v0.11.4.tar.gz" - sha256: "28f76b875a332fb80972c3212980c963f0a7d2e11a8fe94a8ed0d847b9a2256f" - "0.10.9": - url: "https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.10.9.tar.gz" - sha256: "95ac0740ef760829a079c01a44164fd74af3fdc0748a40fc6beefd0276fd2345" diff --git a/recipes/cpp-httplib/config.yml b/recipes/cpp-httplib/config.yml index c86ca5c2b8cb2..edcd017dbed1b 100644 --- a/recipes/cpp-httplib/config.yml +++ b/recipes/cpp-httplib/config.yml @@ -1,4 +1,6 @@ versions: + "0.18.1": + folder: all "0.18.0": folder: all "0.17.3": @@ -15,11 +17,3 @@ versions: folder: all "0.14.1": folder: all - "0.13.3": - folder: all - "0.12.6": - folder: all - "0.11.4": - folder: all - "0.10.9": - folder: all From 8c26d613b1e9140c209165971a85d75eeb356b77 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 21 Oct 2024 20:11:30 +0900 Subject: [PATCH 05/30] (#25663) libuv: add version 1.49.2, remove older versions * libuv: add version 1.49.2, remove older versions * fix sha256 --- recipes/libuv/all/conandata.yml | 32 ++------ .../libuv/all/patches/1.40.0/fix-ios.patch | 28 ------- .../libuv/all/patches/1.41.0/fix-cmake.patch | 77 ------------------- recipes/libuv/config.yml | 8 +- 4 files changed, 9 insertions(+), 136 deletions(-) delete mode 100644 recipes/libuv/all/patches/1.40.0/fix-ios.patch delete mode 100644 recipes/libuv/all/patches/1.41.0/fix-cmake.patch diff --git a/recipes/libuv/all/conandata.yml b/recipes/libuv/all/conandata.yml index 9b545ab77de56..d0ee02e78c23d 100644 --- a/recipes/libuv/all/conandata.yml +++ b/recipes/libuv/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.49.2": + url: "https://github.com/libuv/libuv/archive/v1.49.2.tar.gz" + sha256: "388ffcf3370d4cf7c4b3a3205504eea06c4be5f9e80d2ab32d19f8235accc1cf" "1.49.1": url: "https://github.com/libuv/libuv/archive/v1.49.1.tar.gz" sha256: "94312ede44c6cae544ae316557e2651aea65efce5da06f8d44685db08392ec5d" @@ -20,22 +23,17 @@ sources: "1.44.2": url: "https://github.com/libuv/libuv/archive/v1.44.2.tar.gz" sha256: "e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da" - "1.44.1": - url: "https://github.com/libuv/libuv/archive/v1.44.1.tar.gz" - sha256: "e91614e6dc2dd0bfdd140ceace49438882206b7a6fb00b8750914e67a9ed6d6b" "1.43.0": url: "https://github.com/libuv/libuv/archive/v1.43.0.tar.gz" sha256: "9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d" "1.42.0": url: "https://github.com/libuv/libuv/archive/v1.42.0.tar.gz" sha256: "371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764" - "1.41.1": - url: "https://github.com/libuv/libuv/archive/v1.41.1.tar.gz" - sha256: "62c29d1d76b0478dc8aaed0ed1f874324f6cd2d6ff4cb59a44026c09e818cd53" - "1.41.0": - url: "https://github.com/libuv/libuv/archive/v1.41.0.zip" - sha256: "cb89a8b9f686c5ccf7ed09a9e0ece151a73ebebc17af3813159c335b02181794" patches: + "1.49.2": + - patch_file: "patches/1.49.0/fix-cmake.patch" + patch_description: "separate shared and static library build" + patch_type: "conan" "1.49.1": - patch_file: "patches/1.49.0/fix-cmake.patch" patch_description: "separate shared and static library build" @@ -64,10 +62,6 @@ patches: - patch_file: "patches/1.44.2/fix-cmake.patch" patch_description: "separate shared and static library build" patch_type: "conan" - "1.44.1": - - patch_file: "patches/1.44.1/fix-cmake.patch" - patch_description: "separate shared and static library build" - patch_type: "conan" "1.43.0": - patch_file: "patches/1.43.0/fix-cmake.patch" patch_description: "separate shared and static library build" @@ -76,15 +70,3 @@ patches: - patch_file: "patches/1.42.0/fix-cmake.patch" patch_description: "separate shared and static library build" patch_type: "conan" - "1.41.1": - - patch_file: "patches/1.41.0/fix-cmake.patch" - patch_description: "separate shared and static library build" - patch_type: "conan" - - patch_file: "patches/1.40.0/fix-ios.patch" - "1.41.0": - - patch_file: "patches/1.41.0/fix-cmake.patch" - patch_description: "separate shared and static library build" - patch_type: "conan" - - patch_file: "patches/1.40.0/fix-ios.patch" - patch_description: "fix dlopen filename" - patch_type: "portability" diff --git a/recipes/libuv/all/patches/1.40.0/fix-ios.patch b/recipes/libuv/all/patches/1.40.0/fix-ios.patch deleted file mode 100644 index 616e7c2083eea..0000000000000 --- a/recipes/libuv/all/patches/1.40.0/fix-ios.patch +++ /dev/null @@ -1,28 +0,0 @@ -patch from https://github.com/libuv/libuv/commit/1addf9b88a17bc32d009d377a14d540ccddd06db -fixed in 1.42.0 - ---- a/src/unix/darwin.c -+++ b/src/unix/darwin.c -@@ -33,9 +33,7 @@ - #include - #include /* sysconf */ - --#if !TARGET_OS_IPHONE - #include "darwin-stub.h" --#endif - - static uv_once_t once = UV_ONCE_INIT; - static uint64_t (*time_func)(void); -@@ -223,10 +221,10 @@ static int uv__get_cpu_speed(uint64_t* speed) { - err = UV_ENOENT; - core_foundation_handle = dlopen("/System/Library/Frameworks/" - "CoreFoundation.framework/" -- "Versions/A/CoreFoundation", -+ "CoreFoundation", - RTLD_LAZY | RTLD_LOCAL); - iokit_handle = dlopen("/System/Library/Frameworks/IOKit.framework/" -- "Versions/A/IOKit", -+ "IOKit", - RTLD_LAZY | RTLD_LOCAL); - - if (core_foundation_handle == NULL || iokit_handle == NULL) diff --git a/recipes/libuv/all/patches/1.41.0/fix-cmake.patch b/recipes/libuv/all/patches/1.41.0/fix-cmake.patch deleted file mode 100644 index 08dd6f34be1b3..0000000000000 --- a/recipes/libuv/all/patches/1.41.0/fix-cmake.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c8e881d1..82daa0d2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -335,13 +335,19 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD") - list(APPEND uv_test_libraries util) - endif() - --add_library(uv SHARED ${uv_sources}) --target_compile_definitions(uv -- INTERFACE -- USING_UV_SHARED=1 -- PRIVATE -- BUILDING_UV_SHARED=1 -- ${uv_defines}) -+add_library(uv ${uv_sources}) -+get_target_property(target_type uv TYPE) -+if (target_type STREQUAL "SHARED_LIBRARY") -+ target_compile_definitions(uv -+ INTERFACE -+ USING_UV_SHARED=1 -+ PRIVATE -+ BUILDING_UV_SHARED=1 -+ ) -+else() -+ set_property(TARGET uv PROPERTY OUTPUT_NAME "uv_a") -+endif() -+target_compile_definitions(uv PRIVATE ${uv_defines}) - target_compile_options(uv PRIVATE ${uv_cflags}) - target_include_directories(uv - PUBLIC -@@ -351,17 +357,6 @@ target_include_directories(uv - $) - target_link_libraries(uv ${uv_libraries}) - --add_library(uv_a STATIC ${uv_sources}) --target_compile_definitions(uv_a PRIVATE ${uv_defines}) --target_compile_options(uv_a PRIVATE ${uv_cflags}) --target_include_directories(uv_a -- PUBLIC -- $ -- $ -- PRIVATE -- $) --target_link_libraries(uv_a ${uv_libraries}) -- - if(LIBUV_BUILD_TESTS) - # Small hack: use ${uv_test_sources} now to get the runner skeleton, - # before the actual tests are added. -@@ -605,19 +600,18 @@ if(UNIX OR MINGW) - configure_file(libuv-static.pc.in libuv-static.pc @ONLY) - - install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -- install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) -- install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -- install(TARGETS uv LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(TARGETS uv_a ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}/licenses) -+ install(TARGETS uv -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - if(MSVC) - install(DIRECTORY include/ DESTINATION include) -- install(FILES LICENSE DESTINATION .) -- install(TARGETS uv uv_a -- RUNTIME DESTINATION lib/$ -- ARCHIVE DESTINATION lib/$) -+ install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}/licenses) -+ install(TARGETS uv -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib) - endif() - - message(STATUS "summary of build options: diff --git a/recipes/libuv/config.yml b/recipes/libuv/config.yml index 535417f5b5f8f..341ae1de60810 100644 --- a/recipes/libuv/config.yml +++ b/recipes/libuv/config.yml @@ -1,4 +1,6 @@ versions: + "1.49.2": + folder: all "1.49.1": folder: all "1.49.0": @@ -13,13 +15,7 @@ versions: folder: all "1.44.2": folder: all - "1.44.1": - folder: all "1.43.0": folder: all "1.42.0": folder: all - "1.41.1": - folder: all - "1.41.0": - folder: all From 5e6925b8f4325eee32f7dd12869155cbece44592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 21 Oct 2024 13:21:51 +0200 Subject: [PATCH 06/30] (#25445) ulfius: Cleanup recipe, add missing gnutls deps * Add missing zlib requirement when using websockets * Fix Orcania/Yder target names * Websockets is not an option in Windows at all --- recipes/ulfius/all/conanfile.py | 85 ++++++++++++--------------------- 1 file changed, 30 insertions(+), 55 deletions(-) diff --git a/recipes/ulfius/all/conanfile.py b/recipes/ulfius/all/conanfile.py index cfafd90c8a600..22361ddec897d 100644 --- a/recipes/ulfius/all/conanfile.py +++ b/recipes/ulfius/all/conanfile.py @@ -31,8 +31,8 @@ class UlfiusConan(ConanFile): default_options = { "shared": False, "fPIC": True, - "enable_websockets": False, # FIXME: should be True (cannot be True because of missing gnutls recipe) - "with_gnutls": False, # FIXME: should be True + "enable_websockets": True, + "with_gnutls": True, "with_jansson": True, "with_libcurl": True, "with_yder": True, @@ -40,14 +40,13 @@ class UlfiusConan(ConanFile): def config_options(self): if self.settings.os == "Windows": - self.options.enable_websockets = False + # INSTALL.md says that websockets are not supported on Windows + del self.options.enable_websockets del self.options.fPIC def validate(self): - if self.options.with_gnutls: - raise ConanInvalidConfiguration("with_gnutls=True is not yet implemented due to missing gnutls CCI recipe") - if self.settings.os == "Windows" and self.options.enable_websockets: - raise ConanInvalidConfiguration("ulfius does not support with_websockets=True on Windows") + if self.options.get_safe("enable_websockets") and not self.options.with_gnutls: + raise ConanInvalidConfiguration(f"{self.ref} requires -o=&:with_gnutls=True when -o=&:enable_websockets=True") def configure(self): if self.options.shared: @@ -56,7 +55,7 @@ def configure(self): self.settings.rm_safe("compiler.libcxx") def requirements(self): - self.requires("orcania/2.3.1", transitive_headers=True) + self.requires("orcania/2.3.3", transitive_headers=True) self.requires("libmicrohttpd/0.9.75", transitive_headers=True) if self.options.with_yder: self.requires("yder/1.4.18", transitive_headers=True) @@ -64,6 +63,11 @@ def requirements(self): self.requires("jansson/2.14", transitive_headers=True) if self.options.with_libcurl: self.requires("libcurl/[>=7.78.0 <9]") + if self.options.with_gnutls: + # Used in public ulfius.h:43 + self.requires("gnutls/3.8.2", transitive_headers=True) + if self.options.get_safe("enable_websockets"): + self.requires("zlib/[>=1.2.11 <2]") def source(self): get(self, **self.conan_data["sources"][self.version], @@ -81,62 +85,33 @@ def generate(self): tc.variables["BUILD_STATIC"] = not self.options.shared tc.variables["DOWNLOAD_DEPENDENCIES"] = False tc.variables["WITH_GNUTLS"] = self.options.with_gnutls - tc.variables["WITH_WEBSOCKETS"] = self.options.enable_websockets + tc.variables["WITH_WEBSOCKET"] = self.options.get_safe("enable_websockets") tc.variables["WITH_CURL"] = self.options.with_libcurl tc.variables["WITH_JANSSON"] = self.options.with_jansson + + # Compilation issues when setting Ulifus as a dependency internally + tc.variables["BUILD_UWSC"] = False + tc.generate() deps = CMakeDeps(self) - deps.generate() - # https://github.com/conan-io/conan/issues/12367 + move this before running CMakeDeps.generate() - save(self, os.path.join(self.generators_folder, "MHDConfig.cmake"), textwrap.dedent(f"""\ - include(CMakeFindDependencyMacro) - find_dependency(libmicrohttpd) - - set(MHD_FOUND TRUE) - add_library(MHD::MHD INTERFACE IMPORTED) - set_target_properties(MHD::MHD PROPERTIES INTERFACE_LINK_LIBRARIES "libmicrohttpd::libmicrohttpd") - set(MHD_VERSION_STRING {self.dependencies['libmicrohttpd'].ref.version}) - """)) - save(self, os.path.join(self.generators_folder, "MHDConfigVersion.cmake"), textwrap.dedent(f"""\ - set(PACKAGE_VERSION "{ self.dependencies['libmicrohttpd'].ref.version }") - - if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) - set(PACKAGE_VERSION_COMPATIBLE FALSE) - else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT TRUE) - endif() - endif() - """)) + deps.set_property("libmicrohttpd", "cmake_file_name", "MHD") + deps.set_property("libmicrohttpd", "cmake_target_name", "MHD::MHD") + + # Orcania generates -static targets for static libraries, but Ulfius does not check for them, + # unconditionally set the target name to Orcania::Orcania + deps.set_property("orcania", "cmake_target_name", "Orcania::Orcania") + + # Same for Yder + if self.options.with_yder: + deps.set_property("yder", "cmake_target_name", "Yder::Yder") - # Shared ulfius looks for Orcania::Orcania and Yder::Yder - # Static ulfius looks for Orcania::Orcania-static and Yder::Yder-static - if self.options.shared: - if not self.dependencies["orcania"].options.shared: - save(self, os.path.join(self.generators_folder, "OrcaniaConfig.cmake"), textwrap.dedent("""\ - add_library(Orcania::Orcania INTERFACE IMPORTED) - set_target_properties(Orcania::Orcania PROPERTIES INTERFACE_LINK_LIBRARIES "Orcania::Orcania-static") - """), append=True) - if self.options.with_yder and not self.dependencies["yder"].options.shared: - save(self, os.path.join(self.generators_folder, "YderConfig.cmake"), textwrap.dedent("""\ - add_library(Yder::Yder INTERFACE IMPORTED) - set_target_properties(Yder::Yder PROPERTIES INTERFACE_LINK_LIBRARIES "Yder::Yder-static") - """), append=True) - - # Create Jansson::Jansson if self.options.with_jansson: - save(self, os.path.join(self.generators_folder, "jansson-config.cmake"), textwrap.dedent(f"""\ - add_library(Jansson::Jansson INTERFACE IMPORTED) - set_target_properties(Jansson::Jansson PROPERTIES INTERFACE_LINK_LIBRARIES "jansson::jansson") - set(JANSSON_VERSION_STRING {self.dependencies['jansson'].ref.version}) - """), append=True) + deps.set_property("jansson", "cmake_file_name", "Jansson") + deps.set_property("jansson", "cmake_target_name", "Jansson::Jansson") - if self.options.with_gnutls: - # FIXME: make sure gnutls creates GnuTLSCOnfig.cmake + GnuTLS::GnuTLS target + GNUTLS_VERSION_STRING - pass + deps.generate() def _patch_sources(self): apply_conandata_patches(self) From 177c97345323b278e16bb3787538bbe415914298 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 21 Oct 2024 20:50:57 +0900 Subject: [PATCH 07/30] (#25530) tl-ranges: add recipe * tl-ranges: add recipe * drop support clang < 15 * drop support apple-clang 13 --- recipes/tl-ranges/all/conandata.yml | 4 ++ recipes/tl-ranges/all/conanfile.py | 65 +++++++++++++++++++ .../tl-ranges/all/test_package/CMakeLists.txt | 8 +++ .../tl-ranges/all/test_package/conanfile.py | 26 ++++++++ .../all/test_package/test_package.cpp | 12 ++++ recipes/tl-ranges/config.yml | 3 + 6 files changed, 118 insertions(+) create mode 100644 recipes/tl-ranges/all/conandata.yml create mode 100644 recipes/tl-ranges/all/conanfile.py create mode 100644 recipes/tl-ranges/all/test_package/CMakeLists.txt create mode 100644 recipes/tl-ranges/all/test_package/conanfile.py create mode 100644 recipes/tl-ranges/all/test_package/test_package.cpp create mode 100644 recipes/tl-ranges/config.yml diff --git a/recipes/tl-ranges/all/conandata.yml b/recipes/tl-ranges/all/conandata.yml new file mode 100644 index 0000000000000..52e4715a40621 --- /dev/null +++ b/recipes/tl-ranges/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "cci.20221207": + url: "https://github.com/TartanLlama/ranges/archive/361dae81e48ea9d0099e8783b56b903c2a6cd01c.tar.gz" + sha256: "9174e368d1f6e89d2ab5b059454dc402e68afdfe6d9bf5376d6634dab7aa2a36" diff --git a/recipes/tl-ranges/all/conanfile.py b/recipes/tl-ranges/all/conanfile.py new file mode 100644 index 0000000000000..a6ce8136be512 --- /dev/null +++ b/recipes/tl-ranges/all/conanfile.py @@ -0,0 +1,65 @@ +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.build import check_min_cppstd +from conan.tools.files import copy, get +from conan.tools.layout import basic_layout +from conan.tools.scm import Version +import os + +required_conan_version = ">=1.52.0" + +class TLRangesConan(ConanFile): + name = "tl-ranges" + description = "Ranges that didn't make C++20" + license = "CC0-1.0" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/TartanLlama/ranges" + topics = ("ranges", "views", "header-only") + package_type = "header-library" + settings = "os", "arch", "compiler", "build_type" + no_copy_source = True + + @property + def _min_cppstd(self): + return 20 + + @property + def _compilers_minimum_version(self): + return { + "gcc": "11", + "clang": "15", + "apple-clang": "14", + "Visual Studio": "16", + "msvc": "192", + } + + def layout(self): + basic_layout(self, src_folder="src") + + def package_id(self): + self.info.clear() + + def validate(self): + if self.settings.compiler.get_safe("cppstd"): + check_min_cppstd(self, self._min_cppstd) + 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." + ) + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def package(self): + copy(self, "COPYING", self.source_folder, os.path.join(self.package_folder, "licenses")) + copy( + self, + "*.hpp", + os.path.join(self.source_folder, "include"), + os.path.join(self.package_folder, "include"), + ) + + def package_info(self): + self.cpp_info.bindirs = [] + self.cpp_info.libdirs = [] diff --git a/recipes/tl-ranges/all/test_package/CMakeLists.txt b/recipes/tl-ranges/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..03b4aa241a9d0 --- /dev/null +++ b/recipes/tl-ranges/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES CXX) + +find_package(tl-ranges REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE tl-ranges::tl-ranges) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20) diff --git a/recipes/tl-ranges/all/test_package/conanfile.py b/recipes/tl-ranges/all/test_package/conanfile.py new file mode 100644 index 0000000000000..3a91c9439218e --- /dev/null +++ b/recipes/tl-ranges/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/tl-ranges/all/test_package/test_package.cpp b/recipes/tl-ranges/all/test_package/test_package.cpp new file mode 100644 index 0000000000000..76c10d34a8bc4 --- /dev/null +++ b/recipes/tl-ranges/all/test_package/test_package.cpp @@ -0,0 +1,12 @@ +#include +#include + +#include "tl/enumerate.hpp" + +int main() { + std::vector data = {1, 2, 3, 4, 5}; + + for (auto&& [index, element] : data | tl::views::enumerate) { + std::cout << index << " " << element << '\n'; + } +} diff --git a/recipes/tl-ranges/config.yml b/recipes/tl-ranges/config.yml new file mode 100644 index 0000000000000..676cc76a125dc --- /dev/null +++ b/recipes/tl-ranges/config.yml @@ -0,0 +1,3 @@ +versions: + "cci.20221207": + folder: all From a602ff8d42bd2bf60d6520ff6efbbd8e98c754c6 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 21 Oct 2024 21:10:54 +0900 Subject: [PATCH 08/30] (#25580) rc_ptr: add recipe --- recipes/rc_ptr/all/conandata.yml | 4 ++ recipes/rc_ptr/all/conanfile.py | 65 +++++++++++++++++++ .../rc_ptr/all/test_package/CMakeLists.txt | 8 +++ recipes/rc_ptr/all/test_package/conanfile.py | 26 ++++++++ .../rc_ptr/all/test_package/test_package.cpp | 6 ++ recipes/rc_ptr/config.yml | 3 + 6 files changed, 112 insertions(+) create mode 100644 recipes/rc_ptr/all/conandata.yml create mode 100644 recipes/rc_ptr/all/conanfile.py create mode 100644 recipes/rc_ptr/all/test_package/CMakeLists.txt create mode 100644 recipes/rc_ptr/all/test_package/conanfile.py create mode 100644 recipes/rc_ptr/all/test_package/test_package.cpp create mode 100644 recipes/rc_ptr/config.yml diff --git a/recipes/rc_ptr/all/conandata.yml b/recipes/rc_ptr/all/conandata.yml new file mode 100644 index 0000000000000..64179a15ea35b --- /dev/null +++ b/recipes/rc_ptr/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "0.0.2": + url: "https://github.com/Chylynsky/rc_ptr/archive/refs/tags/v0.0.2.tar.gz" + sha256: "4682e0235b6def843b52e9327c7f1f87c98998b58c1b39a27cbf13dae27f7977" diff --git a/recipes/rc_ptr/all/conanfile.py b/recipes/rc_ptr/all/conanfile.py new file mode 100644 index 0000000000000..4325cec38cda1 --- /dev/null +++ b/recipes/rc_ptr/all/conanfile.py @@ -0,0 +1,65 @@ +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.build import check_min_cppstd +from conan.tools.files import copy, get +from conan.tools.layout import basic_layout +from conan.tools.scm import Version +import os + +required_conan_version = ">=1.52.0" + +class RcPtrConan(ConanFile): + name = "rc_ptr" + description = "Reference counted smart pointer for single-threaded environments" + license = "BSL-1.0" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/Chylynsky/rc_ptr" + topics = ("memory", "smart-pointer", "header-only") + package_type = "header-library" + settings = "os", "arch", "compiler", "build_type" + no_copy_source = True + + @property + def _min_cppstd(self): + return 17 + + @property + def _compilers_minimum_version(self): + return { + "gcc": "8", + "clang": "7", + "apple-clang": "12", + "Visual Studio": "16", + "msvc": "192", + } + + def layout(self): + basic_layout(self, src_folder="src") + + def package_id(self): + self.info.clear() + + def validate(self): + if self.settings.compiler.get_safe("cppstd"): + check_min_cppstd(self, self._min_cppstd) + 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." + ) + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def package(self): + copy(self, "LICENSE_1_0.txt", self.source_folder, os.path.join(self.package_folder, "licenses")) + copy( + self, + "*.hpp", + os.path.join(self.source_folder, "include"), + os.path.join(self.package_folder, "include"), + ) + + def package_info(self): + self.cpp_info.bindirs = [] + self.cpp_info.libdirs = [] diff --git a/recipes/rc_ptr/all/test_package/CMakeLists.txt b/recipes/rc_ptr/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..06ceb32987cf9 --- /dev/null +++ b/recipes/rc_ptr/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES CXX) + +find_package(rc_ptr REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE rc_ptr::rc_ptr) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) diff --git a/recipes/rc_ptr/all/test_package/conanfile.py b/recipes/rc_ptr/all/test_package/conanfile.py new file mode 100644 index 0000000000000..3a91c9439218e --- /dev/null +++ b/recipes/rc_ptr/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/rc_ptr/all/test_package/test_package.cpp b/recipes/rc_ptr/all/test_package/test_package.cpp new file mode 100644 index 0000000000000..1ecc4ab4aea91 --- /dev/null +++ b/recipes/rc_ptr/all/test_package/test_package.cpp @@ -0,0 +1,6 @@ +#include "rc_ptr/rc_ptr.hpp" + +int main() { + auto first = memory::rc_ptr{new int{24}}; + auto second = first; +} diff --git a/recipes/rc_ptr/config.yml b/recipes/rc_ptr/config.yml new file mode 100644 index 0000000000000..8c82b1d025a67 --- /dev/null +++ b/recipes/rc_ptr/config.yml @@ -0,0 +1,3 @@ +versions: + "0.0.2": + folder: all From 99d25e55a4243cc45ba6d221eaf9861aa6ece4e9 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 21 Oct 2024 21:31:30 +0900 Subject: [PATCH 09/30] (#25665) highs: add version 1.8.0 --- recipes/highs/all/conandata.yml | 3 +++ recipes/highs/all/test_package/CMakeLists.txt | 4 ++-- recipes/highs/config.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/highs/all/conandata.yml b/recipes/highs/all/conandata.yml index 006006dd92224..96869f3b27dba 100644 --- a/recipes/highs/all/conandata.yml +++ b/recipes/highs/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.8.0": + url: "https://github.com/ERGO-Code/HiGHS/archive/refs/tags/v1.8.0.tar.gz" + sha256: "e184e63101cf19688a02102f58447acc7c021d77eef0d3475ceaceb61f035539" "1.7.2": url: "https://github.com/ERGO-Code/HiGHS/archive/refs/tags/v1.7.2.tar.gz" sha256: "5ff96c14ae19592d3568e9ae107624cbaf3409d328fb1a586359f0adf9b34bf7" diff --git a/recipes/highs/all/test_package/CMakeLists.txt b/recipes/highs/all/test_package/CMakeLists.txt index d953c847e1679..ef56bb8244acc 100644 --- a/recipes/highs/all/test_package/CMakeLists.txt +++ b/recipes/highs/all/test_package/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.8) -project(test_package CXX) -set(CMAKE_CXX_STANDARD 11) +project(test_package LANGUAGES CXX) find_package(highs REQUIRED CONFIG) add_executable(${PROJECT_NAME} main.cpp) target_link_libraries(${PROJECT_NAME} PRIVATE highs::highs) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/recipes/highs/config.yml b/recipes/highs/config.yml index bf38309e9bf30..0fd3fafecde27 100644 --- a/recipes/highs/config.yml +++ b/recipes/highs/config.yml @@ -1,4 +1,6 @@ versions: + "1.8.0": + folder: all "1.7.2": folder: all "1.7.0": From 3611534469f69ddd4186469554e9cce0b5d4361b Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 21 Oct 2024 21:51:57 +0900 Subject: [PATCH 10/30] (#25670) libgit2: add version 1.8.2 --- recipes/libgit2/all/conandata.yml | 7 +++++++ recipes/libgit2/config.yml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/recipes/libgit2/all/conandata.yml b/recipes/libgit2/all/conandata.yml index c112809f65932..90f0b57dfff31 100644 --- a/recipes/libgit2/all/conandata.yml +++ b/recipes/libgit2/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.8.2": + url: "https://github.com/libgit2/libgit2/archive/v1.8.2.tar.gz" + sha256: "184699f0d9773f96eeeb5cb245ba2304400f5b74671f313240410f594c566a28" "1.8.1": url: "https://github.com/libgit2/libgit2/archive/v1.8.1.tar.gz" sha256: "8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e" @@ -24,6 +27,10 @@ sources: url: "https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz" sha256: "1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2" patches: + "1.8.2": + - patch_file: "patches/1.8.1-0001-fix-cmake.patch" + patch_description: "use cci's packages" + patch_type: "conan" "1.8.1": - patch_file: "patches/1.8.1-0001-fix-cmake.patch" patch_description: "use cci's packages" diff --git a/recipes/libgit2/config.yml b/recipes/libgit2/config.yml index 17396f92e3be0..49a57a32b3880 100644 --- a/recipes/libgit2/config.yml +++ b/recipes/libgit2/config.yml @@ -1,4 +1,6 @@ versions: + "1.8.2": + folder: "all" "1.8.1": folder: "all" "1.7.2": From 76b50024c837474f34ea4f695e90ca701b374c3a Mon Sep 17 00:00:00 2001 From: Ivan Baidakou Date: Mon, 21 Oct 2024 16:13:12 +0300 Subject: [PATCH 11/30] (#25667) [bump] add rotor v0.31 --- recipes/rotor/all/conandata.yml | 3 +++ recipes/rotor/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/rotor/all/conandata.yml b/recipes/rotor/all/conandata.yml index 4119e3f61f535..216ceff141b71 100644 --- a/recipes/rotor/all/conandata.yml +++ b/recipes/rotor/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.31": + url: "https://github.com/basiliscos/cpp-rotor/archive/refs/tags/v0.31.tar.gz" + sha256: "c8d9b28083c7a9c32af2cbff1d90fe1e62def989f0f89baba1244c44fb8ec9e4" "0.30": url: "https://github.com/basiliscos/cpp-rotor/archive/refs/tags/v0.30.tar.gz" sha256: "d143bfce1d18d42ab0f072acfe239d1cc07a495411537579e02260673cbe8121" diff --git a/recipes/rotor/config.yml b/recipes/rotor/config.yml index 706ccf0a88afa..b97b8fdf6c94f 100644 --- a/recipes/rotor/config.yml +++ b/recipes/rotor/config.yml @@ -1,4 +1,6 @@ versions: + "0.31": + folder: all "0.30": folder: all "0.29": From 178fe508d7bfba0464cfc8945085afc619b452b7 Mon Sep 17 00:00:00 2001 From: Conan Center Index Bot <54393557+conan-center-bot@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:21:29 +0100 Subject: [PATCH 12/30] (#25677) [bot] Update authorized users list (2024-10-21) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: conan-center-bot Co-authored-by: Abril Rincón Blanco --- .c3i/authorized_users.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml index b7e0d57a911e8..a55b46bc54e6f 100644 --- a/.c3i/authorized_users.yml +++ b/.c3i/authorized_users.yml @@ -1442,3 +1442,4 @@ authorized_users: - witcherofthorns - amerry - kulkarniamit +- hypengw From 89db43be94154cdb3b2e18ceca3e8ae1af2d61a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 21 Oct 2024 15:43:20 +0200 Subject: [PATCH 13/30] (#25650) jemalloc: Remove unecessary build_type checks --- recipes/jemalloc/all/conanfile.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes/jemalloc/all/conanfile.py b/recipes/jemalloc/all/conanfile.py index 7273a9fcaa3fb..6c77bdecc8679 100644 --- a/recipes/jemalloc/all/conanfile.py +++ b/recipes/jemalloc/all/conanfile.py @@ -18,7 +18,8 @@ class JemallocConan(ConanFile): url = "https://github.com/conan-io/conan-center-index" license = "BSD-2-Clause" homepage = "https://jemalloc.net/" - topics = ("conan", "jemalloc", "malloc", "free") + topics = ("jemalloc", "malloc", "free") + package_type = "library" settings = "os", "arch", "compiler", "build_type" options = { "shared": [True, False], @@ -119,10 +120,7 @@ def validate(self): if self.options.enable_cxx and self.settings.compiler.get_safe("libcxx") == "libc++" and \ Version(self.settings.compiler.version) < "10": raise ConanInvalidConfiguration("Clang 9 or earlier with libc++ is not supported due to the missing mutex implementation.") - # 3. Verify the build type - if self.settings.build_type not in ("Release", "Debug", None): - raise ConanInvalidConfiguration("Only Release and Debug builds are supported.") - # 4: Apple Silicon specific checks + # 3: Apple Silicon specific checks if self.settings.os == "Macos" and self.settings.arch == "armv8": if Version(self.version) < "5.3.0": raise ConanInvalidConfiguration("Support for Apple Silicon is only available as of 5.3.0.") From c30b2cb61ce6699bafc818e1ea6e91b319388d45 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 21 Oct 2024 23:13:32 +0900 Subject: [PATCH 14/30] (#25554) libassert: add version 2.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Abril Rincón Blanco --- recipes/libassert/config.yml | 2 ++ recipes/libassert/v2/conandata.yml | 3 +++ recipes/libassert/v2/conanfile.py | 10 ++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/recipes/libassert/config.yml b/recipes/libassert/config.yml index 2580cb77dc154..635e69403c99f 100644 --- a/recipes/libassert/config.yml +++ b/recipes/libassert/config.yml @@ -1,4 +1,6 @@ versions: + "2.1.2": + folder: v2 "2.1.1": folder: v2 "2.1.0": diff --git a/recipes/libassert/v2/conandata.yml b/recipes/libassert/v2/conandata.yml index 7f7d8d108d21c..b97af2f4b26ef 100644 --- a/recipes/libassert/v2/conandata.yml +++ b/recipes/libassert/v2/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.1.2": + url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.2.tar.gz" + sha256: "a7220ca354270deca08a7a162b93523c738ba3c8037a4df1a46ababfdc664196" "2.1.1": url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.1.tar.gz" sha256: "2bdf27523f964f41668d266cfdbd7f5f58988af963d976577195969ed44359d1" diff --git a/recipes/libassert/v2/conanfile.py b/recipes/libassert/v2/conanfile.py index f9f5f93bdcbe8..7026af82c23fe 100644 --- a/recipes/libassert/v2/conanfile.py +++ b/recipes/libassert/v2/conanfile.py @@ -16,9 +16,8 @@ class LibassertConan(ConanFile): license = "MIT" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/jeremy-rifkin/libassert" - package_type = "library" - topics = ("assert", "library", "assertions", "stacktrace", "diagnostics", "defensive programming", "testing") + package_type = "library" settings = "os", "arch", "compiler", "build_type" options = { "shared": [True, False], @@ -52,7 +51,10 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("cpptrace/0.7.1", transitive_headers=True, transitive_libs=True) + if Version(self.version) >= "2.1.2": + self.requires("cpptrace/0.7.2", transitive_headers=True, transitive_libs=True) + else: + self.requires("cpptrace/0.7.1", transitive_headers=True, transitive_libs=True) def validate(self): if self.settings.compiler.cppstd: @@ -129,7 +131,7 @@ def package_info(self): self.cpp_info.components["assert"].libs = ["assert"] if not self.options.shared: self.cpp_info.components["assert"].defines.append("LIBASSERT_STATIC_DEFINE") - + if self.settings.os in ["Linux", "FreeBSD"]: self.cpp_info.system_libs.append("m") self.cpp_info.requires = ["cpptrace::cpptrace"] From 08b7fc643cfdf8ac91f398093cc1263c108c5483 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 21 Oct 2024 23:53:22 +0900 Subject: [PATCH 15/30] (#25664) thorvg: updated topic --- recipes/thorvg/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/thorvg/all/conanfile.py b/recipes/thorvg/all/conanfile.py index 7927393f764c9..ff575bcfdae32 100644 --- a/recipes/thorvg/all/conanfile.py +++ b/recipes/thorvg/all/conanfile.py @@ -21,7 +21,7 @@ class ThorvgConan(ConanFile): license = "MIT" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/thorvg/thorvg" - topics = ("svg", "animation", "tvg") + topics = ("svg", "lottie", "animation", "graphics", "rendering") package_type = "library" settings = "os", "arch", "compiler", "build_type" options = { From ad6ff2bc3c82d712f6e4199e5aede0cba463fc09 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 22 Oct 2024 00:32:31 +0900 Subject: [PATCH 16/30] (#25674) meson: add version 1.6.0 --- recipes/meson/all/conandata.yml | 3 +++ recipes/meson/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/meson/all/conandata.yml b/recipes/meson/all/conandata.yml index 1be722fba90a3..ad55ba8f8a439 100644 --- a/recipes/meson/all/conandata.yml +++ b/recipes/meson/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.6.0": + url: "https://github.com/mesonbuild/meson/archive/1.6.0.tar.gz" + sha256: "342300656bfdafb6cc09325bdd0fd507366ecaa6be25fa4525f50889adf7c606" "1.5.1": url: "https://github.com/mesonbuild/meson/archive/1.5.1.tar.gz" sha256: "55f6acd5bf72c14d4aa5a781993633f84a1d117bdf2c2057735902ced9b81390" diff --git a/recipes/meson/config.yml b/recipes/meson/config.yml index 9b74b18776ede..d2e19a97433c1 100644 --- a/recipes/meson/config.yml +++ b/recipes/meson/config.yml @@ -1,4 +1,6 @@ versions: + "1.6.0": + folder: all "1.5.1": folder: all "1.5.0": From 77076554b59ec29ecbd38e08fc50c82b8ad6b7f0 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 22 Oct 2024 00:51:46 +0900 Subject: [PATCH 17/30] (#25675) date: add version 3.0.3 --- recipes/date/all/conandata.yml | 3 +++ recipes/date/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/date/all/conandata.yml b/recipes/date/all/conandata.yml index 2cfa1090c0b33..94e4bf0b1e51f 100644 --- a/recipes/date/all/conandata.yml +++ b/recipes/date/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.0.3": + url: "https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.3.tar.gz" + sha256: "30de45a34a2605cca33a993a9ea54e8f140f23b1caf1acf3c2fd436c42c7d942" "3.0.2": url: "https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.2.tar.gz" sha256: "0449667ea85c5b411c28d08a53f1e420c73416caa5b693c249dac9763eb97b7c" diff --git a/recipes/date/config.yml b/recipes/date/config.yml index 14b2f944da9f5..7fe264ed2099a 100644 --- a/recipes/date/config.yml +++ b/recipes/date/config.yml @@ -1,4 +1,6 @@ versions: + "3.0.3": + folder: all "3.0.2": folder: all "3.0.1": From a4373f20ffc40164cb34c0742b92fa0e30d47b94 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 21 Oct 2024 19:03:30 +0300 Subject: [PATCH 18/30] (#21927) aruco: add v3.1.15, bump opencv, add transitive_libs=True MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * aruco: add v3.1.15, bump opencv * aruco: set transitive_*=True * aruco: bump opencv * Minor changes * Prefer cmake_additional_variables_prefixes --------- Co-authored-by: Abril Rincón Blanco --- recipes/aruco/3.x.x/conandata.yml | 3 +++ recipes/aruco/3.x.x/conanfile.py | 10 +++++++--- recipes/aruco/3.x.x/test_package/test_package.cpp | 6 +++--- recipes/aruco/config.yml | 2 ++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/recipes/aruco/3.x.x/conandata.yml b/recipes/aruco/3.x.x/conandata.yml index eb3415158ea14..ac03e59367f66 100644 --- a/recipes/aruco/3.x.x/conandata.yml +++ b/recipes/aruco/3.x.x/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.1.15": + url: "https://downloads.sourceforge.net/project/aruco/3.1.15/3.1.15.zip" + sha256: "8408ad1621b92c885b0740641ab98ec022705d48a08deb6f071ffebf455cc8b2" "3.1.12": url: "https://downloads.sourceforge.net/project/aruco/3.1.12/aruco-3.1.12.zip" sha256: "70b9ec8aa8eac6fe3f622201747a3e32c77bbb5f015e28a95c1c7c91f8ee8a09" diff --git a/recipes/aruco/3.x.x/conanfile.py b/recipes/aruco/3.x.x/conanfile.py index fb95bc3ec62e7..2e12e936c956e 100644 --- a/recipes/aruco/3.x.x/conanfile.py +++ b/recipes/aruco/3.x.x/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout -from conan.tools.files import collect_libs, copy, get, rmdir +from conan.tools.files import collect_libs, copy, get, rmdir, replace_in_file import os required_conan_version = ">=1.53.0" @@ -37,8 +37,11 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("opencv/4.5.5") - self.requires("eigen/3.4.0") + # Header used in public markerdetector.h + # cv::FileStorage::FileStorage used by aruco::CameraParameters::saveToFile + self.requires("opencv/4.9.0", transitive_headers=True, transitive_libs=True) + # Header used in levmarq.h + self.requires("eigen/3.4.0", transitive_headers=False) def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -55,6 +58,7 @@ def generate(self): tc.variables["USE_OWN_EIGEN3"] = False tc.generate() deps = CMakeDeps(self) + deps.set_property("eigen", "cmake_additional_variables_prefixes", ["Eigen3"]) deps.generate() def build(self): diff --git a/recipes/aruco/3.x.x/test_package/test_package.cpp b/recipes/aruco/3.x.x/test_package/test_package.cpp index 4632ed7b42bd6..6a6b41f258933 100644 --- a/recipes/aruco/3.x.x/test_package/test_package.cpp +++ b/recipes/aruco/3.x.x/test_package/test_package.cpp @@ -1,10 +1,10 @@ -#include -#include +#include #include #include -#include +#include +#include int main() { cv::Mat image = cv::Mat::zeros(600,600,CV_8UC3); diff --git a/recipes/aruco/config.yml b/recipes/aruco/config.yml index 243128b45c736..84539a1974a56 100644 --- a/recipes/aruco/config.yml +++ b/recipes/aruco/config.yml @@ -1,3 +1,5 @@ versions: + "3.1.15": + folder: 3.x.x "3.1.12": folder: 3.x.x From 5640d10f9263635cfabde0c63f83a031e7c7a094 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 22 Oct 2024 01:32:15 +0900 Subject: [PATCH 19/30] (#25671) tree-sitter-c: add version 0.23.1, update tree-sitter * tree-sitter-c: add version 0.23.1, update tree-sitter * add version 0.20.7 --- recipes/tree-sitter-c/all/CMakeLists.txt | 3 +-- recipes/tree-sitter-c/all/conandata.yml | 6 ++++++ recipes/tree-sitter-c/all/conanfile.py | 9 +++------ recipes/tree-sitter-c/all/test_package/CMakeLists.txt | 4 ++-- recipes/tree-sitter-c/all/test_package/test_package.c | 1 + recipes/tree-sitter-c/config.yml | 4 ++++ 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/recipes/tree-sitter-c/all/CMakeLists.txt b/recipes/tree-sitter-c/all/CMakeLists.txt index a028ec4e4627c..afdc4445b1ec2 100644 --- a/recipes/tree-sitter-c/all/CMakeLists.txt +++ b/recipes/tree-sitter-c/all/CMakeLists.txt @@ -1,12 +1,11 @@ cmake_minimum_required(VERSION 3.0) -project(tree-sitter-c C) +project(tree-sitter-c LANGUAGES C) find_package(tree-sitter REQUIRED CONFIG) include(GenerateExportHeader) file(WRITE api.h [[ #pragma once -#include #include "tree_sitter_c_export.h" #ifdef __cplusplus diff --git a/recipes/tree-sitter-c/all/conandata.yml b/recipes/tree-sitter-c/all/conandata.yml index f225285a8fae5..32f5e8ac891a6 100644 --- a/recipes/tree-sitter-c/all/conandata.yml +++ b/recipes/tree-sitter-c/all/conandata.yml @@ -1,4 +1,10 @@ sources: + "0.23.1": + url: "https://github.com/tree-sitter/tree-sitter-c/archive/refs/tags/v0.23.1.tar.gz" + sha256: "8f90f481c28a45c7dcba84d05fc07853df043ff813868cdfa074a3835e89467a" + "0.20.7": + url: "https://github.com/tree-sitter/tree-sitter-c/archive/refs/tags/v0.20.7.tar.gz" + sha256: "00abd71259093983fc7e2b51f3efc724ccab3e69af3a37d3cdd0a2a01d703061" "0.20.3": url: "https://github.com/tree-sitter/tree-sitter-c/archive/refs/tags/v0.20.3.tar.gz" sha256: "8c72a765230324f2b64e9ed66e027daf1a2ed24dde5fbf21398ad8ff7fca2a2d" diff --git a/recipes/tree-sitter-c/all/conanfile.py b/recipes/tree-sitter-c/all/conanfile.py index 9f73c2c805dce..f0bb475259e82 100644 --- a/recipes/tree-sitter-c/all/conanfile.py +++ b/recipes/tree-sitter-c/all/conanfile.py @@ -9,10 +9,10 @@ class TreeSitterCConan(ConanFile): name = "tree-sitter-c" description = "C grammar for tree-sitter." - topics = ("parser", "grammar", "tree", "c", "ide") + license = "MIT" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/tree-sitter/tree-sitter-c" - license = "MIT" + topics = ("parser", "grammar", "tree", "c", "ide") settings = "os", "arch", "compiler", "build_type" package_type = "library" @@ -25,9 +25,6 @@ class TreeSitterCConan(ConanFile): "fPIC": True, } - - exports_sources = "CMakeLists.txt" - def layout(self): cmake_layout(self, src_folder="src") @@ -55,7 +52,7 @@ def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) def requirements(self): - self.requires("tree-sitter/0.20.8", transitive_headers=True, transitive_libs=True) + self.requires("tree-sitter/0.24.3", transitive_headers=True, transitive_libs=True) def _patch_sources(self): if not self.options.shared: diff --git a/recipes/tree-sitter-c/all/test_package/CMakeLists.txt b/recipes/tree-sitter-c/all/test_package/CMakeLists.txt index 177a777e8ddf7..1b3fe337b8e92 100644 --- a/recipes/tree-sitter-c/all/test_package/CMakeLists.txt +++ b/recipes/tree-sitter-c/all/test_package/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1) -project(test_package C) +project(test_package LANGUAGES C) find_package(tree-sitter-c REQUIRED CONFIG) add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} tree-sitter-c::tree-sitter-c) +target_link_libraries(${PROJECT_NAME} PRIVATE tree-sitter-c::tree-sitter-c) diff --git a/recipes/tree-sitter-c/all/test_package/test_package.c b/recipes/tree-sitter-c/all/test_package/test_package.c index d5f86eae18cce..5588357055b9a 100644 --- a/recipes/tree-sitter-c/all/test_package/test_package.c +++ b/recipes/tree-sitter-c/all/test_package/test_package.c @@ -3,6 +3,7 @@ #include #include +#include int main() { TSParser *parser = ts_parser_new(); diff --git a/recipes/tree-sitter-c/config.yml b/recipes/tree-sitter-c/config.yml index 7070a273f171a..b5f665440c8f8 100644 --- a/recipes/tree-sitter-c/config.yml +++ b/recipes/tree-sitter-c/config.yml @@ -1,4 +1,8 @@ versions: + "0.23.1": + folder: all + "0.20.7": + folder: all "0.20.3": folder: all "0.20.2": From faa7040228a587807584ffded21aabe232ef8877 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 22 Oct 2024 02:11:25 +0900 Subject: [PATCH 20/30] (#25676) rocksdb: add version 9.7.3 --- recipes/rocksdb/all/conandata.yml | 3 +++ recipes/rocksdb/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/rocksdb/all/conandata.yml b/recipes/rocksdb/all/conandata.yml index 771ad19b3d30e..6dcb192bd3272 100644 --- a/recipes/rocksdb/all/conandata.yml +++ b/recipes/rocksdb/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "9.7.3": + url: "https://github.com/facebook/rocksdb/archive/refs/tags/v9.7.3.tar.gz" + sha256: "acfabb989cbfb5b5c4d23214819b059638193ec33dad2d88373c46448d16d38b" "9.7.2": url: "https://github.com/facebook/rocksdb/archive/refs/tags/v9.7.2.tar.gz" sha256: "13e9c41d290199ee0185590d4fa9d327422aaf75765b3193945303c3c314e07d" diff --git a/recipes/rocksdb/config.yml b/recipes/rocksdb/config.yml index 66354e1a0305a..835327597a08c 100644 --- a/recipes/rocksdb/config.yml +++ b/recipes/rocksdb/config.yml @@ -1,4 +1,6 @@ versions: + "9.7.3": + folder: all "9.7.2": folder: all "9.5.2": From 516fd6491941f75bd9c8afd872f2d82026e04a30 Mon Sep 17 00:00:00 2001 From: seppeon <68693576+seppeon@users.noreply.github.com> Date: Tue, 22 Oct 2024 04:31:40 +1100 Subject: [PATCH 21/30] (#25678) add socket system library to crowcpp's package * initial * initial --- recipes/crowcpp-crow/all/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/crowcpp-crow/all/conanfile.py b/recipes/crowcpp-crow/all/conanfile.py index f86149ab6d350..5e2434c0c17d3 100644 --- a/recipes/crowcpp-crow/all/conanfile.py +++ b/recipes/crowcpp-crow/all/conanfile.py @@ -117,6 +117,8 @@ def package_info(self): if self.settings.os in ("FreeBSD", "Linux"): self.cpp_info.system_libs = ["pthread"] + if self.settings.os == "Windows": + self.cpp_info.system_libs = ["wsock32", "ws2_32"] self.cpp_info.set_property("cmake_file_name", "Crow") self.cpp_info.set_property("cmake_target_name", "Crow::Crow") From 0c800d5424a5e7b645457aaa3bbff36f28bc9498 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 22 Oct 2024 02:51:04 +0900 Subject: [PATCH 22/30] (#25679) uwebsockets: add version 20.68.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Abril Rincón Blanco --- recipes/uwebsockets/all/conandata.yml | 3 +++ recipes/uwebsockets/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/uwebsockets/all/conandata.yml b/recipes/uwebsockets/all/conandata.yml index 26c0a0d553445..e2a40bfde001d 100644 --- a/recipes/uwebsockets/all/conandata.yml +++ b/recipes/uwebsockets/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "20.68.0": + url: "https://github.com/uNetworking/uWebSockets/archive/v20.68.0.tar.gz" + sha256: "02dd1dd2925c639c01222d19f4ddd6fe12261571bcb3befc7eedaf8fa75c008f" "20.67.0": url: "https://github.com/uNetworking/uWebSockets/archive/v20.67.0.tar.gz" sha256: "8124bb46326f81d99ad3552b7a3bf78489784d3660fb60d7fe5f5337a21203a3" diff --git a/recipes/uwebsockets/config.yml b/recipes/uwebsockets/config.yml index 34989aee1a9c1..9d5e5e0611732 100644 --- a/recipes/uwebsockets/config.yml +++ b/recipes/uwebsockets/config.yml @@ -1,4 +1,6 @@ versions: + "20.68.0": + folder: all "20.67.0": folder: all "20.66.0": From 774bb1be1c07c838aeec69a6ad0f0ca9e9bb408b Mon Sep 17 00:00:00 2001 From: Conan Center Index Bot <54393557+conan-center-bot@users.noreply.github.com> Date: Tue, 22 Oct 2024 03:21:31 +0100 Subject: [PATCH 23/30] (#25682) [bot] Update list of references (prod-v2/ListPackages) Co-authored-by: conan-center-bot --- .c3i/conan_v2_ready_references.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml index 309e49d012e03..cc225fa2a7603 100644 --- a/.c3i/conan_v2_ready_references.yml +++ b/.c3i/conan_v2_ready_references.yml @@ -61,6 +61,7 @@ required_for_references: - asyncplusplus - asyncpp - atomic_queue +- au - audiofile - audiowaveform - autoconf @@ -285,6 +286,7 @@ required_for_references: - cuda-kat - cuda-samples - cunit +- curlpp - cute_headers - cutlass - cvplot From 578eed285e3dbf043d83822a705374b53230c773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meusel?= Date: Tue, 22 Oct 2024 10:31:56 +0200 Subject: [PATCH 24/30] (#25684) Botan: add version 3.6.0 --- recipes/botan/all/conandata.yml | 3 +++ recipes/botan/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/botan/all/conandata.yml b/recipes/botan/all/conandata.yml index 311b92ac7d1b5..3bbe531ce39d9 100644 --- a/recipes/botan/all/conandata.yml +++ b/recipes/botan/all/conandata.yml @@ -38,6 +38,9 @@ sources: "3.5.0": url: "https://github.com/randombit/botan/archive/3.5.0.tar.gz" sha256: "7d91d3349e6029e1a6929a50ab587f9fd4e29a9af3f3d698553451365564001f" + "3.6.0": + url: "https://github.com/randombit/botan/archive/3.6.0.tar.gz" + sha256: "950199a891fab62dca78780b36e12f89031c37350b2a16a2c35f2e423c041bad" patches: "2.18.2": - patch_file: "patches/fix-amalgamation-build.patch" diff --git a/recipes/botan/config.yml b/recipes/botan/config.yml index 0d0ff4ded0853..0085319085cb9 100644 --- a/recipes/botan/config.yml +++ b/recipes/botan/config.yml @@ -25,3 +25,5 @@ versions: folder: all "3.5.0": folder: all + "3.6.0": + folder: all From 5ef197148d734d527c71334cd0eaad164411a061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meusel?= Date: Tue, 22 Oct 2024 10:50:57 +0200 Subject: [PATCH 25/30] (#25686) Botan: add version 2.19.5 --- recipes/botan/all/conandata.yml | 3 +++ recipes/botan/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/botan/all/conandata.yml b/recipes/botan/all/conandata.yml index 3bbe531ce39d9..476de68ae002c 100644 --- a/recipes/botan/all/conandata.yml +++ b/recipes/botan/all/conandata.yml @@ -17,6 +17,9 @@ sources: "2.19.4": url: "https://github.com/randombit/botan/archive/2.19.4.tar.gz" sha256: "5754a6b5ddc3c74b0cb8671531feea69d03a4f3b5bdafa5f75e4c73a1242e5b1" + "2.19.5": + url: "https://github.com/randombit/botan/archive/2.19.5.tar.gz" + sha256: "8d4a3826787f9febbdc225172ad2d39d7d3960346c5721fe46cb27d480d7e1de" "3.0.0": url: "https://github.com/randombit/botan/archive/3.0.0.tar.gz" sha256: "8bafe2e965fa9ccf92ef5741165d735c9fbbe6376c373bbf5702495ad2dfb814" diff --git a/recipes/botan/config.yml b/recipes/botan/config.yml index 0085319085cb9..a2d2e0075f01c 100644 --- a/recipes/botan/config.yml +++ b/recipes/botan/config.yml @@ -11,6 +11,8 @@ versions: folder: all "2.19.4": folder: all + "2.19.5": + folder: all "3.0.0": folder: all "3.1.0": From 84dced8ab13641f0b585e028f782ae29aac41786 Mon Sep 17 00:00:00 2001 From: Klaus Holst Jacobsen <48069914+klausholstjacobsen@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:32:14 +0200 Subject: [PATCH 26/30] (#25688) openssh: Added openssh 9.9p1 --- recipes/openssh/all/conandata.yml | 3 +++ recipes/openssh/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/openssh/all/conandata.yml b/recipes/openssh/all/conandata.yml index e3ccaa5b6d5e6..a3e0ea1fc2e6b 100644 --- a/recipes/openssh/all/conandata.yml +++ b/recipes/openssh/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "9.9p1": + url: "https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.9p1.tar.gz" + sha256: "b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02" "9.6p1": url: "https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.6p1.tar.gz" sha256: "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c" diff --git a/recipes/openssh/config.yml b/recipes/openssh/config.yml index a033c3a0343f3..4bf3079108d3e 100644 --- a/recipes/openssh/config.yml +++ b/recipes/openssh/config.yml @@ -1,4 +1,6 @@ versions: + "9.9p1": + folder: all "9.6p1": folder: all "9.1p1": From 0b1bf87ea36414c2a1d2d5e1019bd21f48b8b9a3 Mon Sep 17 00:00:00 2001 From: Jacob Bandes-Storch Date: Wed, 23 Oct 2024 02:51:43 -0700 Subject: [PATCH 27/30] (#25697) foxglove-websocket: add version 1.3.1 --- recipes/foxglove-websocket/all/conandata.yml | 3 +++ recipes/foxglove-websocket/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/foxglove-websocket/all/conandata.yml b/recipes/foxglove-websocket/all/conandata.yml index 82e61d0221936..1a4d0efe6e5f6 100644 --- a/recipes/foxglove-websocket/all/conandata.yml +++ b/recipes/foxglove-websocket/all/conandata.yml @@ -1,4 +1,7 @@ sources: + 1.3.1: + url: https://github.com/foxglove/ws-protocol/archive/refs/tags/releases/cpp/v1.3.1.tar.gz + sha256: 48bae8599603da893e559b952e7fec1392aeb55cc6d59288feac6e6428e61bef 1.3.0: url: https://github.com/foxglove/ws-protocol/archive/refs/tags/releases/cpp/v1.3.0.tar.gz sha256: 5c1d4cda60a89bf635ef0150e8cd2f4da569f92beb8ac8555795ed7fd47f2a21 diff --git a/recipes/foxglove-websocket/config.yml b/recipes/foxglove-websocket/config.yml index 6431a1556fee0..5aacc0f786340 100644 --- a/recipes/foxglove-websocket/config.yml +++ b/recipes/foxglove-websocket/config.yml @@ -1,4 +1,6 @@ versions: + 1.3.1: + folder: all 1.3.0: folder: all 1.2.0: From c99be0cb8c6762ffaa4aeb75557fecc95f3e927c Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 24 Oct 2024 02:23:55 +0900 Subject: [PATCH 28/30] (#21767) wasm-micro-runtime: add version 1.3.3, 2.2.0 * wasm-micro-runtime: add version 1.3.0 * link ntdll on msvc * link ntdll on Win32 * fix condition for ntdll * update 1.3.2 * Updated v1.3.2 to v1.3.3 and adapted patch * Added new version v2.1.0 * Fixed missing versions on config.yml * update 2.1.2 * update 2.2.0 --------- Co-authored-by: PerseoGI --- recipes/wasm-micro-runtime/all/conandata.yml | 14 ++++ recipes/wasm-micro-runtime/all/conanfile.py | 3 + .../all/patches/1.3.3-0001-fix-cmake.patch | 64 +++++++++++++++++++ .../all/patches/2.2.0-0001-fix-cmake.patch | 55 ++++++++++++++++ recipes/wasm-micro-runtime/config.yml | 4 ++ 5 files changed, 140 insertions(+) create mode 100644 recipes/wasm-micro-runtime/all/patches/1.3.3-0001-fix-cmake.patch create mode 100644 recipes/wasm-micro-runtime/all/patches/2.2.0-0001-fix-cmake.patch diff --git a/recipes/wasm-micro-runtime/all/conandata.yml b/recipes/wasm-micro-runtime/all/conandata.yml index 507fb63f45893..ba4fdc32928ed 100644 --- a/recipes/wasm-micro-runtime/all/conandata.yml +++ b/recipes/wasm-micro-runtime/all/conandata.yml @@ -1,4 +1,10 @@ sources: + "2.2.0": + url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-2.2.0.tar.gz" + sha256: "93b6ba03f681e061967106046b1908631ee705312b9a6410f3baee7af7c6aac9" + "1.3.3": + url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.3.3.tar.gz" + sha256: "94d18b081b6fac0574faf36338c7762a659ff175b9ae2cbc1c0a8f045edcbe7a" "1.2.3": url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.2.3.tar.gz" sha256: "85057f788630dc1b8c371f5443cc192627175003a8ea63c491beaff29a338346" @@ -6,6 +12,14 @@ sources: url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.2.2.tar.gz" sha256: "d328fc1e19c54cfdb4248b861de54b62977b9b85c0a40eaaeb9cd9b628c0c788" patches: + "2.2.0": + - patch_file: "patches/2.2.0-0001-fix-cmake.patch" + patch_description: "link ntdll on Windows" + patch_type: "conan" + "1.3.3": + - patch_file: "patches/1.3.3-0001-fix-cmake.patch" + patch_description: "separate static and shared build, link ntdll on Windows" + patch_type: "conan" "1.2.3": - patch_file: "patches/1.2.3-0001-fix-cmake.patch" patch_description: "separate static and shasred build" diff --git a/recipes/wasm-micro-runtime/all/conanfile.py b/recipes/wasm-micro-runtime/all/conanfile.py index 4cd796f406c9c..e8354068cc7fd 100644 --- a/recipes/wasm-micro-runtime/all/conanfile.py +++ b/recipes/wasm-micro-runtime/all/conanfile.py @@ -4,6 +4,7 @@ from conan.tools.build import check_min_cppstd from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout from conan.tools.microsoft import is_msvc +from conan.tools.scm import Version import os required_conan_version = ">=1.53.0" @@ -136,3 +137,5 @@ def package_info(self): self.cpp_info.system_libs.append("pthread") if self.settings.os == "Windows": self.cpp_info.system_libs.append("ws2_32") + if Version(self.version) >= "1.3.0": + self.cpp_info.system_libs.append("ntdll") diff --git a/recipes/wasm-micro-runtime/all/patches/1.3.3-0001-fix-cmake.patch b/recipes/wasm-micro-runtime/all/patches/1.3.3-0001-fix-cmake.patch new file mode 100644 index 0000000000000..c86c12d4bcbe1 --- /dev/null +++ b/recipes/wasm-micro-runtime/all/patches/1.3.3-0001-fix-cmake.patch @@ -0,0 +1,64 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ffba05..68d03d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,10 +114,10 @@ set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + + include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake) + +-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wshadow -Wno-unused-parameter") ++# set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wshadow -Wno-unused-parameter") + # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wsign-conversion") + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused") ++# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused") + + if (WAMR_BUILD_TARGET MATCHES "X86_.*" OR WAMR_BUILD_TARGET STREQUAL "AMD_64") + if (NOT (CMAKE_C_COMPILER MATCHES ".*clang.*" OR CMAKE_C_COMPILER_ID MATCHES ".*Clang")) +@@ -135,22 +135,34 @@ endif () + + include (${SHARED_DIR}/utils/uncommon/shared_uncommon.cmake) + ++if (NOT BUILD_SHARED_LIBS) + # STATIC LIBRARY + add_library(iwasm_static STATIC ${WAMR_RUNTIME_LIB_SOURCE}) + set_target_properties (iwasm_static PROPERTIES OUTPUT_NAME vmlib) + target_include_directories(iwasm_static INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include) +-target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread) ++# target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread) ++target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS}) ++if(NOT MSVC) ++ target_link_libraries (iwasm_static INTERFACE -lm -ldl -lpthread) ++endif() + if (WAMR_BUILD_WASM_CACHE EQUAL 1) + target_link_libraries(iwasm_static INTERFACE boringssl_crypto) + endif () + + install (TARGETS iwasm_static ARCHIVE DESTINATION lib) +- ++else() + # SHARED LIBRARY + add_library (iwasm_shared SHARED ${WAMR_RUNTIME_LIB_SOURCE}) + set_target_properties (iwasm_shared PROPERTIES OUTPUT_NAME iwasm) + target_include_directories(iwasm_shared INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include) +-target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread) ++# target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread) ++target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS}) ++if(NOT MSVC) ++ target_link_libraries (iwasm_shared INTERFACE -lm -ldl -lpthread) ++endif() ++if(WIN32) ++ target_link_libraries (iwasm_shared PUBLIC ntdll) ++endif() + if (WAMR_BUILD_WASM_CACHE EQUAL 1) + target_link_libraries(iwasm_shared INTERFACE boringssl_crypto) + endif () +@@ -160,6 +172,7 @@ if (MINGW) + endif () + + install (TARGETS iwasm_shared LIBRARY DESTINATION lib) ++endif() + + # HEADERS + install (FILES + diff --git a/recipes/wasm-micro-runtime/all/patches/2.2.0-0001-fix-cmake.patch b/recipes/wasm-micro-runtime/all/patches/2.2.0-0001-fix-cmake.patch new file mode 100644 index 0000000000000..c386cfb73769f --- /dev/null +++ b/recipes/wasm-micro-runtime/all/patches/2.2.0-0001-fix-cmake.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40658e9..05538a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,13 +122,13 @@ set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake) + + if (NOT WIN32) +- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security \ +- -ffunction-sections -fdata-sections \ +- -Wno-unused-parameter -Wno-pedantic \ +- -fvisibility=hidden") ++ # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security \ ++ # -ffunction-sections -fdata-sections \ ++ # -Wno-unused-parameter -Wno-pedantic \ ++ # -fvisibility=hidden") + # Remove the extra spaces for better make log + string (REGEX REPLACE " *" " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused") ++ # set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused") + endif() + + if (WAMR_BUILD_TARGET MATCHES "X86_.*" OR WAMR_BUILD_TARGET STREQUAL "AMD_64") +@@ -159,7 +159,14 @@ if (WAMR_BUILD_STATIC) + add_library(iwasm_static STATIC ${WAMR_RUNTIME_LIB_SOURCE}) + set_target_properties (iwasm_static PROPERTIES OUTPUT_NAME vmlib) + target_include_directories(iwasm_static INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include) +- target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl ${CMAKE_THREAD_LIBS_INIT}) ++ target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT}) ++ target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT}) ++ if(NOT MSVC) ++ target_link_libraries (iwasm_static INTERFACE -lm -ldl) ++ endif() ++ if(WIN32) ++ target_link_libraries (iwasm_static PUBLIC ntdll) ++ endif() + if (WAMR_BUILD_WASM_CACHE EQUAL 1) + target_link_libraries(iwasm_static INTERFACE boringssl_crypto) + endif () +@@ -180,7 +187,14 @@ if (WAMR_BUILD_SHARED) + add_library (iwasm_shared SHARED ${WAMR_RUNTIME_LIB_SOURCE}) + set_target_properties (iwasm_shared PROPERTIES OUTPUT_NAME iwasm) + target_include_directories(iwasm_shared INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include) +- target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl ${CMAKE_THREAD_LIBS_INIT}) ++ target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT}) ++ target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT}) ++ if(NOT MSVC) ++ target_link_libraries (iwasm_shared INTERFACE -lm -ldl) ++ endif() ++ if(WIN32) ++ target_link_libraries (iwasm_shared PUBLIC ntdll) ++ endif() + if (WAMR_BUILD_WASM_CACHE EQUAL 1) + target_link_libraries(iwasm_shared INTERFACE boringssl_crypto) + endif () diff --git a/recipes/wasm-micro-runtime/config.yml b/recipes/wasm-micro-runtime/config.yml index 6d9f399765e2d..542597ea3f803 100644 --- a/recipes/wasm-micro-runtime/config.yml +++ b/recipes/wasm-micro-runtime/config.yml @@ -1,4 +1,8 @@ versions: + "2.2.0": + folder: all + "1.3.3": + folder: all "1.2.3": folder: all "1.2.2": From 5526c3a7752364c7d530cc3861a87cb8c8c09cea Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 24 Oct 2024 02:52:24 +0900 Subject: [PATCH 29/30] (#25689) sqlite3: add version 3.47.0 --- recipes/sqlite3/all/conandata.yml | 3 +++ recipes/sqlite3/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/sqlite3/all/conandata.yml b/recipes/sqlite3/all/conandata.yml index cc14778b41f4c..09dedceb22aa0 100644 --- a/recipes/sqlite3/all/conandata.yml +++ b/recipes/sqlite3/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.47.0": + url: "https://sqlite.org/2024/sqlite-amalgamation-3470000.zip" + sha256: "2842fddbb1cc33f66c7da998a57535f14a6bfee159676a07bb4bf3e59375d93e" "3.46.1": url: "https://sqlite.org/2024/sqlite-amalgamation-3460100.zip" sha256: "77823cb110929c2bcb0f5d48e4833b5c59a8a6e40cdea3936b99e199dbbe5784" diff --git a/recipes/sqlite3/config.yml b/recipes/sqlite3/config.yml index 379a6a6a50b9a..f5054a322bf3f 100644 --- a/recipes/sqlite3/config.yml +++ b/recipes/sqlite3/config.yml @@ -1,4 +1,6 @@ versions: + "3.47.0": + folder: all "3.46.1": folder: all "3.46.0": From 7522a129e30eba51615537aa4a7d57d2a726f225 Mon Sep 17 00:00:00 2001 From: Ivan Baidakou Date: Thu, 24 Oct 2024 13:06:24 +0300 Subject: [PATCH 30/30] (#23612) util-linux-libuuid, make python bindings optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Optionalize python bindings * Feedback * Update recipes/util-linux-libuuid/all/conanfile.py Co-authored-by: Abril Rincón Blanco --------- Co-authored-by: Abril Rincón Blanco --- recipes/util-linux-libuuid/all/conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/util-linux-libuuid/all/conanfile.py b/recipes/util-linux-libuuid/all/conanfile.py index 0a90fad2ce052..33b4289d276d1 100644 --- a/recipes/util-linux-libuuid/all/conanfile.py +++ b/recipes/util-linux-libuuid/all/conanfile.py @@ -23,10 +23,12 @@ class UtilLinuxLibuuidConan(ConanFile): options = { "shared": [True, False], "fPIC": [True, False], + "with_python_bindings": [True, False], } default_options = { "shared": False, "fPIC": True, + "with_python_bindings": True, } @property @@ -82,6 +84,8 @@ def generate(self): tc = AutotoolsToolchain(self) tc.configure_args.append("--disable-all-programs") tc.configure_args.append("--enable-libuuid") + if not self.options.with_python_bindings: + tc.configure_args.append("--without-python") if self._has_sys_file_header: tc.extra_defines.append("HAVE_SYS_FILE_H") if "x86" in self.settings.arch: