diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml index d5beb3f10c604..b6af7a64a5048 100644 --- a/.c3i/authorized_users.yml +++ b/.c3i/authorized_users.yml @@ -1275,3 +1275,6 @@ authorized_users: - anthonyliot - obnyis - johningve +- stefansli +- wgtmac +- kevinAlbs diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml index 14e8b6b61af0d..312d7c7c8d526 100644 --- a/.c3i/conan_v2_ready_references.yml +++ b/.c3i/conan_v2_ready_references.yml @@ -219,6 +219,7 @@ required_for_references: - cppdap - cppfront - cppitertools +- cppkafka - cpprestsdk - cpptoml - cpptrace @@ -379,6 +380,7 @@ required_for_references: - flex - flint - fltk +- flux - fmi1 - fmi2 - fmi3 @@ -1042,6 +1044,7 @@ required_for_references: - picojson - picosha2 - pipes +- pistache - pixman - pkgconf - platform.converters @@ -1165,6 +1168,7 @@ required_for_references: - safeint - sail - samurai +- sassc - sbepp - sbp - scdoc @@ -1237,6 +1241,7 @@ required_for_references: - sqlpp11 - sqlpp11-connector-sqlite3 - squirrel +- srt - ssht - ssp - st_tree @@ -1349,6 +1354,7 @@ required_for_references: - tsl-sparse-map - tuplet - turtle +- tweenerspp - tweetnacl - twitch-native-ipc - twitchtv-libsoundtrackutil diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml index 9f1e9165a4c48..28ed528e88732 100644 --- a/.c3i/config_v1.yml +++ b/.c3i/config_v1.yml @@ -29,6 +29,7 @@ tasks: automatic_merge: reviews_required_total: 2 # Reviews that a PR needs so it can be merged reviews_required_team: 1 # Reviews from the Conan team that a PR needs so it can be merged + reviews_required_bump: 1 # Total reviews required for a bump PR to be merged branches: # PRs from automations that have these as base-branches will be merged automatically - "conan-io:action-doc-toc" # Requirements to merge a given pull-request: diff --git a/.c3i/config_v2.yml b/.c3i/config_v2.yml index ddc9a435fe82a..dd1830ee80183 100644 --- a/.c3i/config_v2.yml +++ b/.c3i/config_v2.yml @@ -29,6 +29,7 @@ tasks: automatic_merge: reviews_required_total: 1000 # AutomaticMerge shouldn't run with this file, but just in case reviews_required_team: 1000 # AutomaticMerge shouldn't run with this file, but just in case + reviews_required_bump: 1000 # AutomaticMerge shouldn't run with this file, but just in case access_request: request_issue_url: https://github.com/conan-io/conan-center-index/issues/4 max_inactivity_days: 0 diff --git a/docs/changelog.md b/docs/changelog.md index 10cbbd6810dde..242fce4e25c14 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,14 @@ # Changelog +### 24-January-2024 - 12:13 CET + +- [feature] Update Conan 1.x branch to version 1.62.0 +- [feature] Update Conan 2.x branch to version 2.0.16 +- [feature] Require review from maintainers for Bump version and Bump requirements +- [fix] Show header-only option in the build CI summary table +- [fix] Use build/host profile conf also in test package +- [fix] Use only string to handle Github labels + ### 05-December-2023 - 16:23 CET - [fix] Use the correct profile to test a tool_require. diff --git a/docs/review_process.md b/docs/review_process.md index cf9d98f130d9b..b5abea3471d39 100644 --- a/docs/review_process.md +++ b/docs/review_process.md @@ -82,9 +82,8 @@ At least 2 approving reviews are required, and at least one of them has to be fr So, it might be 1 official + 1 community, or 2 official, but it couldn't be just 2 community reviews. Approvals are only counted if they are associated with the latest commit in the PR, while "Change requested" ones (from the Conan team) will persist even if there are new commits. Don't hesitate to dismiss old reviews if the issues have already been addressed. -> **Note** Pull requests labelled as [`Bump version`](https://github.com/conan-io/conan-center-index/pulls?q=is%3Aopen+is%3Apr+label%3A%22Bump+version%22) -> or [`Bump dependencies`](https://github.com/conan-io/conan-center-index/pulls?q=is%3Aopen+is%3Apr+label%3A%22Bump+dependencies%22+) are merged by -> the bot without requiring any approval. +Pull requests labelled as [`Bump version`](https://github.com/conan-io/conan-center-index/pulls?q=is%3Aopen+is%3Apr+label%3A%22Bump+version%22) +or [`Bump dependencies`](https://github.com/conan-io/conan-center-index/pulls?q=is%3Aopen+is%3Apr+label%3A%22Bump+dependencies%22+) require **just 1 approving review from an official reviewer**. Community reviewers are not required but are still welcome. ### Reviews from others diff --git a/recipes/bshoshany-thread-pool/all/conandata.yml b/recipes/bshoshany-thread-pool/all/conandata.yml index dee19ad62ca27..3f31e9885d1c3 100644 --- a/recipes/bshoshany-thread-pool/all/conandata.yml +++ b/recipes/bshoshany-thread-pool/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "4.0.1": + sha256: "34d25503e17e58198613d9306313f8358cfaaa9320f2b7694dc599b90a1858a7" + url: "https://github.com/bshoshany/thread-pool/archive/refs/tags/v4.0.1.tar.gz" "3.5.0": sha256: "d3efd5c434f6e99f4cff7b8219cbb586dc06bc0aeaf17cd174813a2333961306" url: "https://github.com/bshoshany/thread-pool/archive/refs/tags/v3.5.0.tar.gz" diff --git a/recipes/bshoshany-thread-pool/all/test_package/test_package.cpp b/recipes/bshoshany-thread-pool/all/test_package/test_package.cpp index bbde93d5eba55..94a1ee699375b 100644 --- a/recipes/bshoshany-thread-pool/all/test_package/test_package.cpp +++ b/recipes/bshoshany-thread-pool/all/test_package/test_package.cpp @@ -1,59 +1,18 @@ #include "BS_thread_pool.hpp" - -BS::synced_stream sync_out; -BS::thread_pool pool; - -std::condition_variable ID_cv, total_cv; -std::mutex ID_mutex, total_mutex; -BS::concurrency_t count_unique_threads() -{ - const BS::concurrency_t num_tasks = pool.get_thread_count() * 2; - std::vector thread_IDs(num_tasks); - std::unique_lock total_lock(total_mutex); - BS::concurrency_t total_count = 0; - bool ID_release = false; - pool.wait_for_tasks(); - for (std::thread::id& id : thread_IDs) - pool.push_task( - [&total_count, &id, &ID_release] - { - id = std::this_thread::get_id(); - { - const std::scoped_lock total_lock_local(total_mutex); - ++total_count; - } - total_cv.notify_one(); - std::unique_lock ID_lock_local(ID_mutex); - ID_cv.wait(ID_lock_local, [&ID_release] { return ID_release; }); - }); - total_cv.wait(total_lock, [&total_count] { return total_count == pool.get_thread_count(); }); - { - const std::scoped_lock ID_lock(ID_mutex); - ID_release = true; - } - ID_cv.notify_all(); - total_cv.wait(total_lock, [&total_count, &num_tasks] { return total_count == num_tasks; }); - pool.wait_for_tasks(); - std::sort(thread_IDs.begin(), thread_IDs.end()); - return static_cast(std::unique(thread_IDs.begin(), thread_IDs.end()) - thread_IDs.begin()); -} +#include int main() { - const char* line = "------------------------------------------"; - sync_out.println(line); - sync_out.println("Testing thread pool..."); - BS::concurrency_t unique_threads = count_unique_threads(); - if (pool.get_thread_count() == unique_threads) + BS::thread_pool pool; + std::cout << "Testing thread pool...\n"; + if (pool.get_thread_count() == std::thread::hardware_concurrency()) { - sync_out.println("SUCCESS: Created ", unique_threads, " unique threads!"); - sync_out.println(line); + std::cout << "SUCCESS: Created " << pool.get_thread_count() << " unique threads!\n"; return EXIT_SUCCESS; } else { - sync_out.println("ERROR: Failed to create ", unique_threads, " unique threads!"); - sync_out.println(line); + std::cout << "ERROR: Failed to create " << pool.get_thread_count() << " unique threads!\n"; return EXIT_FAILURE; } } diff --git a/recipes/bshoshany-thread-pool/config.yml b/recipes/bshoshany-thread-pool/config.yml index cabaf98e03ae7..31ec3f0d00429 100644 --- a/recipes/bshoshany-thread-pool/config.yml +++ b/recipes/bshoshany-thread-pool/config.yml @@ -1,4 +1,6 @@ versions: + "4.0.1": + folder: all "3.5.0": folder: all "3.4.0": diff --git a/recipes/c-blosc2/all/conandata.yml b/recipes/c-blosc2/all/conandata.yml index 610af582fe0d6..001863dae7f9d 100644 --- a/recipes/c-blosc2/all/conandata.yml +++ b/recipes/c-blosc2/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.13.0": + url: "https://github.com/Blosc/c-blosc2/archive/v2.13.0.tar.gz" + sha256: "d886798ff0a63948a4076f2ed60f0dc18be3aa1299ac1aff2cf705419cbe1bea" "2.12.0": url: "https://github.com/Blosc/c-blosc2/archive/v2.12.0.tar.gz" sha256: "b8fa07ab0627c19fb652e08a5ada197eb0939b75e97e2fb76bbee145eaedc6e9" @@ -33,6 +36,10 @@ sources: url: "https://github.com/Blosc/c-blosc2/archive/v2.4.3.tar.gz" sha256: "d4aa5e0794598794f20ab950e973d44f0d0d9c133ea1a5a07cb200fa54d2e036" patches: + "2.13.0": + - patch_file: "patches/2.11.1-0001-fix-cmake.patch" + patch_description: "use cci package" + patch_type: "conan" "2.12.0": - patch_file: "patches/2.11.1-0001-fix-cmake.patch" patch_description: "use cci package" diff --git a/recipes/c-blosc2/config.yml b/recipes/c-blosc2/config.yml index acf966bc19e73..2c82bd54e5c12 100644 --- a/recipes/c-blosc2/config.yml +++ b/recipes/c-blosc2/config.yml @@ -1,4 +1,6 @@ versions: + "2.13.0": + folder: all "2.12.0": folder: all "2.11.3": diff --git a/recipes/circularbuffer/all/conandata.yml b/recipes/circularbuffer/all/conandata.yml index ba45559184f9d..3b5cc436148eb 100644 --- a/recipes/circularbuffer/all/conandata.yml +++ b/recipes/circularbuffer/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.4.0": + url: "https://github.com/rlogiacco/CircularBuffer/archive/refs/tags/1.4.0.tar.gz" + sha256: "e01a837d2fe46fea168e8d36e1a4225d9414a855484d55b5a240f239ab53fc0a" "1.3.3": url: "https://github.com/rlogiacco/CircularBuffer/archive/refs/tags/1.3.3.tar.gz" sha256: "d558029c9ab5012a8bbf9a89bd130eb320bdeb69e3f8bd96851ddc1e5dc24eba" diff --git a/recipes/circularbuffer/all/conanfile.py b/recipes/circularbuffer/all/conanfile.py index 695a6ea119334..2bdc97e38979c 100644 --- a/recipes/circularbuffer/all/conanfile.py +++ b/recipes/circularbuffer/all/conanfile.py @@ -10,10 +10,10 @@ class CircularBufferConan(ConanFile): name = "circularbuffer" description = "Arduino circular buffer library" - topics = ("circular buffer", "arduino", "data-structures") license = "LGPL-3.0" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/rlogiacco/CircularBuffer" + topics = ("circular buffer", "arduino", "data-structures", "header-only") package_type = "header-library" settings = "os", "arch", "compiler", "build_type" no_copy_source = True @@ -29,7 +29,7 @@ def source(self): def package(self): copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses")) - copy(self, "CircularBuffer.h", + copy(self, "CircularBuffer.h*", dst=os.path.join(self.package_folder, "include"), src=self.source_folder) copy(self, "CircularBuffer.tpp", dst=os.path.join(self.package_folder, "include"), src=self.source_folder) diff --git a/recipes/circularbuffer/all/test_package/CMakeLists.txt b/recipes/circularbuffer/all/test_package/CMakeLists.txt index 933c1c7ab13f6..95df0ee16539a 100644 --- a/recipes/circularbuffer/all/test_package/CMakeLists.txt +++ b/recipes/circularbuffer/all/test_package/CMakeLists.txt @@ -6,3 +6,7 @@ find_package(circularbuffer CONFIG REQUIRED) add_executable(${PROJECT_NAME} test_package.cpp) target_link_libraries(${PROJECT_NAME} PRIVATE circularbuffer::circularbuffer) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) + +if(circularbuffer_VERSION VERSION_GREATER_EQUAL "1.4.0") + target_compile_definitions(${PROJECT_NAME} PRIVATE CIRCULARBUFFER_1_4_0_LATER) +endif() diff --git a/recipes/circularbuffer/all/test_package/test_package.cpp b/recipes/circularbuffer/all/test_package/test_package.cpp index c9d59e4b258c6..eb914270c4c82 100644 --- a/recipes/circularbuffer/all/test_package/test_package.cpp +++ b/recipes/circularbuffer/all/test_package/test_package.cpp @@ -1,4 +1,8 @@ +#ifdef CIRCULARBUFFER_1_4_0_LATER +#include +#else #include +#endif int main() { CircularBuffer buffer; diff --git a/recipes/circularbuffer/config.yml b/recipes/circularbuffer/config.yml index 3abfca40293f6..623dc27ffe730 100644 --- a/recipes/circularbuffer/config.yml +++ b/recipes/circularbuffer/config.yml @@ -1,3 +1,5 @@ versions: + "1.4.0": + folder: all "1.3.3": folder: all diff --git a/recipes/cppkafka/all/conandata.yml b/recipes/cppkafka/all/conandata.yml index 741ef5502bb96..19152c1beae0c 100644 --- a/recipes/cppkafka/all/conandata.yml +++ b/recipes/cppkafka/all/conandata.yml @@ -1,9 +1,15 @@ sources: + "0.4.1": + url: "https://github.com/mfontanini/cppkafka/archive/refs/tags/v0.4.1.tar.gz" + sha256: "45770ae0404cb9ba73d659618c51cd55b574c66ed3c7b148360222fb524b0ff7" "0.4.0": url: "https://github.com/mfontanini/cppkafka/archive/refs/tags/0.4.0.tar.gz" sha256: "f4f05eb7a180a856663b02ec0b777283275ef88e5523f3013fd51c6c4ab63b5a" patches: + "0.4.1": + - patch_file: "patches/0.4.0-0001-no-template-export.patch" + - patch_file: "patches/0.4.1-0003-clean-rpath.patch" "0.4.0": - - patch_file: "patches/0001-no-template-export.patch" - - patch_file: "patches/0002-cppstd.patch" - - patch_file: "patches/0003-clean-rpath.patch" + - patch_file: "patches/0.4.0-0001-no-template-export.patch" + - patch_file: "patches/0.4.0-0002-cppstd.patch" + - patch_file: "patches/0.4.0-0003-clean-rpath.patch" diff --git a/recipes/cppkafka/all/conanfile.py b/recipes/cppkafka/all/conanfile.py index 41a226efdbb76..1f97490b74bf8 100644 --- a/recipes/cppkafka/all/conanfile.py +++ b/recipes/cppkafka/all/conanfile.py @@ -2,6 +2,7 @@ from conan.tools.build import check_min_cppstd from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir +from conan.tools.scm import Version import os required_conan_version = ">=1.53.0" @@ -10,11 +11,10 @@ class CppKafkaConan(ConanFile): name = "cppkafka" description = "Modern C++ Apache Kafka client library (wrapper for librdkafka)" - topics = ("librdkafka", "kafka") + license = "MIT" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/mfontanini/cppkafka" - license = "MIT" - + topics = ("librdkafka", "kafka") package_type = "library" settings = "os", "arch", "compiler", "build_type" options = { @@ -41,8 +41,8 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("boost/1.81.0") - self.requires("librdkafka/2.0.2") + self.requires("boost/1.83.0", transitive_headers=True) + self.requires("librdkafka/2.3.0", transitive_headers=True) def validate(self): if self.settings.compiler.get_safe("cppstd"): @@ -57,7 +57,7 @@ def generate(self): tc.variables["CPPKAFKA_DISABLE_TESTS"] = True tc.variables["CPPKAFKA_DISABLE_EXAMPLES"] = True tc.variables["CPPKAFKA_RDKAFKA_STATIC_LIB"] = False # underlying logic is useless - if self.settings.os == "Windows": + if Version(self.version) < "0.4.1" and self.settings.os == "Windows": tc.preprocessor_definitions["NOMINMAX"] = 1 tc.generate() cd = CMakeDeps(self) diff --git a/recipes/cppkafka/all/patches/0001-no-template-export.patch b/recipes/cppkafka/all/patches/0.4.0-0001-no-template-export.patch similarity index 100% rename from recipes/cppkafka/all/patches/0001-no-template-export.patch rename to recipes/cppkafka/all/patches/0.4.0-0001-no-template-export.patch diff --git a/recipes/cppkafka/all/patches/0002-cppstd.patch b/recipes/cppkafka/all/patches/0.4.0-0002-cppstd.patch similarity index 100% rename from recipes/cppkafka/all/patches/0002-cppstd.patch rename to recipes/cppkafka/all/patches/0.4.0-0002-cppstd.patch diff --git a/recipes/cppkafka/all/patches/0003-clean-rpath.patch b/recipes/cppkafka/all/patches/0.4.0-0003-clean-rpath.patch similarity index 100% rename from recipes/cppkafka/all/patches/0003-clean-rpath.patch rename to recipes/cppkafka/all/patches/0.4.0-0003-clean-rpath.patch diff --git a/recipes/cppkafka/all/patches/0.4.1-0003-clean-rpath.patch b/recipes/cppkafka/all/patches/0.4.1-0003-clean-rpath.patch new file mode 100644 index 0000000000000..86c2d7f5ce27a --- /dev/null +++ b/recipes/cppkafka/all/patches/0.4.1-0003-clean-rpath.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c667df..46c5590 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,7 +28,7 @@ if (NOT CMAKE_CXX_FLAGS) + add_definitions("-DNOGDI=1") + add_definitions("-DNOMINMAX=1") + else() +- set(CMAKE_CXX_FLAGS "-Wall") ++# set(CMAKE_CXX_FLAGS "-Wall") + endif() + endif() + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 214ccd4..d2667ce 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -46,8 +46,8 @@ set_target_properties(${TARGET_NAME} PROPERTIES + ARCHIVE_OUTPUT_NAME "${TARGET_NAME}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}" + LIBRARY_OUTPUT_NAME "${TARGET_NAME}" +- INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}" +- INSTALL_RPATH_USE_LINK_PATH TRUE ++ # INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}" ++ # INSTALL_RPATH_USE_LINK_PATH TRUE + VERSION ${CPPKAFKA_VERSION} + SOVERSION ${CPPKAFKA_VERSION}) + # In CMake >= 3.15 Boost::boost == Boost::headers diff --git a/recipes/cppkafka/config.yml b/recipes/cppkafka/config.yml index da269653d6e6b..bf6438ecd493c 100644 --- a/recipes/cppkafka/config.yml +++ b/recipes/cppkafka/config.yml @@ -1,3 +1,5 @@ versions: + "0.4.1": + folder: "all" "0.4.0": folder: "all" diff --git a/recipes/fftw/all/conanfile.py b/recipes/fftw/all/conanfile.py index ef1e6d55efb6e..a5537aff62517 100644 --- a/recipes/fftw/all/conanfile.py +++ b/recipes/fftw/all/conanfile.py @@ -117,6 +117,9 @@ def on_off(value): cmake.configure(variables=variables) cmake.build() + # Potentially avoid side effects due to build_folder property tweak. + self._current_precision = None + def package(self): copy(self, "COPYRIGHT", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses")) for self._current_precision in self._all_precisions: @@ -125,6 +128,9 @@ def package(self): rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) rmdir(self, os.path.join(self.package_folder, "lib", "cmake")) + # Potentially avoid side effects due to build_folder property tweak. + self._current_precision = None + def package_info(self): cmake_config_name = cmake_namespace = "FFTW3" @@ -136,10 +142,10 @@ def package_info(self): self.cpp_info.names["cmake_find_package"] = cmake_namespace self.cpp_info.names["cmake_find_package_multi"] = cmake_namespace - for self._current_precision in self._all_precisions: - prec_suffix = self._prec_suffix[self._current_precision] + for precision in self._all_precisions: + prec_suffix = self._prec_suffix[precision] cmake_target_name = pkgconfig_name = lib_name = "fftw3" + prec_suffix - component_name = f"fftwlib_{self._current_precision}" + component_name = f"fftwlib_{precision}" component = self.cpp_info.components[component_name] # TODO: back to global scope in conan v2 once cmake_find_package_* & pkg_config generators removed @@ -150,7 +156,7 @@ def package_info(self): self.cpp_info.components[component_name].libs.append(lib_name) if self.settings.os in ["Linux", "FreeBSD"]: component.system_libs.append("m") - if self._current_precision == QUAD: + if precision == QUAD: component.system_libs.extend(['quadmath']) if self.options.threads: component.system_libs.append("pthread") diff --git a/recipes/glaze/all/conandata.yml b/recipes/glaze/all/conandata.yml index 5df1ea4417f3b..5573aaa9a0d2c 100644 --- a/recipes/glaze/all/conandata.yml +++ b/recipes/glaze/all/conandata.yml @@ -20,36 +20,9 @@ sources: "1.9.9": url: "https://github.com/stephenberry/glaze/archive/v1.9.9.tar.gz" sha256: "7e2605046742a89ec455887a5a0d6b3188ed5c14ea309c5eb9814848c26bedca" - "1.9.8.1": - url: "https://github.com/stephenberry/glaze/archive/v1.9.8.1.tar.gz" - sha256: "f1dd8d93440096d186695814848c9cd350a9ec5b0e114e933579ef2467a35558" "1.9.5": url: "https://github.com/stephenberry/glaze/archive/v1.9.5.tar.gz" sha256: "3800fa7283a1d4e5bd2c746fe9e268d2f8af76d3a75be7318b2084f38f529c7f" "1.8.5": url: "https://github.com/stephenberry/glaze/archive/v1.8.5.tar.gz" sha256: "5d876eed5689f1947ea4eafd9f13a4e0b527611a6b1857c79a5d598a856287b4" - "1.8.4": - url: "https://github.com/stephenberry/glaze/archive/v1.8.4.tar.gz" - sha256: "794f68d74264ebd4d26c9e1b2a9098134622751a089a45ed5a97d90e58b7d9e6" - "1.8.3": - url: "https://github.com/stephenberry/glaze/archive/v1.8.3.tar.gz" - sha256: "3f0f6f9393daf29cef2772fadf46d9f22669899ee8f025f17889a22c84d2c6e8" - "1.8.2": - url: "https://github.com/stephenberry/glaze/archive/v1.8.2.tar.gz" - sha256: "dddc7b9c87739e0266a6a868316e692975651e9e77684cfb7d3a6a4be32c95fc" - "1.8.1": - url: "https://github.com/stephenberry/glaze/archive/v1.8.1.tar.gz" - sha256: "ea804976d55a27e6df49390c3ec8600daea0c72780ea7094d79d1edcbe525fcd" - "1.7.0": - url: "https://github.com/stephenberry/glaze/archive/v1.7.0.tar.gz" - sha256: "e8ccb925cf45f8974ba8d9af56c29eed12dd5fd9253c02015a6780b7c861e4df" - "1.6.1": - url: "https://github.com/stephenberry/glaze/archive/v1.6.1.tar.gz" - sha256: "c52c0f66d98d829ae1f2b859abddc84132ad49aea4c76f3286970fbab1489c10" -patches: - "1.9.8.1": - - patch_file: "patches/1.9.8.1-0001-fix-msvc-bug.patch" - patch_description: "workaround MSVC compilation error for some versions" - patch_type: "portability" - patch_source: "https://github.com/stephenberry/glaze/pull/653" diff --git a/recipes/glaze/all/conanfile.py b/recipes/glaze/all/conanfile.py index 3e5f358c8c908..f991920259f6a 100644 --- a/recipes/glaze/all/conanfile.py +++ b/recipes/glaze/all/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration -from conan.tools.files import get, copy, export_conandata_patches, apply_conandata_patches +from conan.tools.files import get, copy from conan.tools.build import check_min_cppstd from conan.tools.scm import Version from conan.tools.layout import basic_layout @@ -17,6 +17,7 @@ class GlazeConan(ConanFile): topics = ("json", "memory", "header-only") package_type = "header-library" settings = "os", "arch", "compiler", "build_type" + no_copy_source = True @property def _min_cppstd(self): @@ -32,9 +33,6 @@ def _compilers_minimum_version(self): "apple-clang": "13.1", } - def export_sources(self): - export_conandata_patches(self) - def layout(self): basic_layout(self, src_folder="src") @@ -53,9 +51,6 @@ def validate(self): def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) - def build(self): - apply_conandata_patches(self) - def package(self): copy(self, pattern="LICENSE*", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) copy( diff --git a/recipes/glaze/all/patches/1.9.8.1-0001-fix-msvc-bug.patch b/recipes/glaze/all/patches/1.9.8.1-0001-fix-msvc-bug.patch deleted file mode 100644 index c1c12e5675383..0000000000000 --- a/recipes/glaze/all/patches/1.9.8.1-0001-fix-msvc-bug.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/glaze/csv/write.hpp b/include/glaze/csv/write.hpp -index 4c2c24b..68b513a 100644 ---- a/include/glaze/csv/write.hpp -+++ b/include/glaze/csv/write.hpp -@@ -205,7 +205,7 @@ namespace glz - using Element = glaze_tuple_element; - static constexpr size_t member_index = Element::member_index; - -- using item_type = std::decay_t; -+ using item_type = typename std::decay::type; - using value_type = typename item_type::value_type; - - static constexpr sv key = key_name; diff --git a/recipes/glaze/config.yml b/recipes/glaze/config.yml index 74e4ebae7e752..4091325ce2c5a 100644 --- a/recipes/glaze/config.yml +++ b/recipes/glaze/config.yml @@ -13,21 +13,7 @@ versions: folder: all "1.9.9": folder: all - "1.9.8.1": - folder: all "1.9.5": folder: all "1.8.5": folder: all - "1.8.4": - folder: all - "1.8.3": - folder: all - "1.8.2": - folder: all - "1.8.1": - folder: all - "1.7.0": - folder: all - "1.6.1": - folder: all diff --git a/recipes/libcurl/all/conanfile.py b/recipes/libcurl/all/conanfile.py index 942a9be8530db..7c2f02e93b679 100644 --- a/recipes/libcurl/all/conanfile.py +++ b/recipes/libcurl/all/conanfile.py @@ -199,6 +199,8 @@ def validate(self): openssl = self.dependencies["openssl"] if self.options.with_ntlm and openssl.options.no_des: raise ConanInvalidConfiguration("option with_ntlm=True requires openssl:no_des=False") + if self.options.with_ssl == "wolfssl" and not self.dependencies["wolfssl"].options.with_curl: + raise ConanInvalidConfiguration("option with_ssl=wolfssl requires wolfssl:with_curl=True") def build_requirements(self): if self._is_using_cmake_build: diff --git a/recipes/libdrm/all/conandata.yml b/recipes/libdrm/all/conandata.yml index d027d5e2e31c2..55110631134de 100644 --- a/recipes/libdrm/all/conandata.yml +++ b/recipes/libdrm/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.4.120": + url: "https://dri.freedesktop.org/libdrm/libdrm-2.4.120.tar.xz" + sha256: "3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a" "2.4.119": url: "https://dri.freedesktop.org/libdrm/libdrm-2.4.119.tar.xz" sha256: "0a49f12f09b5b6e68eaaaff3f02ca7cff9aa926939b212d343161d3e8ac56291" diff --git a/recipes/libdrm/config.yml b/recipes/libdrm/config.yml index 856b2ef77e459..a68056835f7b2 100644 --- a/recipes/libdrm/config.yml +++ b/recipes/libdrm/config.yml @@ -1,4 +1,6 @@ versions: + "2.4.120": + folder: all "2.4.119": folder: all "2.4.114": diff --git a/recipes/libjpeg-turbo/all/conandata.yml b/recipes/libjpeg-turbo/all/conandata.yml index 6b84ea73c442f..0fb3e348f183d 100644 --- a/recipes/libjpeg-turbo/all/conandata.yml +++ b/recipes/libjpeg-turbo/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.0.2": + url: "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.2/libjpeg-turbo-3.0.2.tar.gz" + sha256: "c2ce515a78d91b09023773ef2770d6b0df77d674e144de80d63e0389b3a15ca6" "3.0.1": url: "https://sourceforge.net/projects/libjpeg-turbo/files/3.0.1/libjpeg-turbo-3.0.1.tar.gz" sha256: "22429507714ae147b3acacd299e82099fce5d9f456882fc28e252e4579ba2a75" diff --git a/recipes/libjpeg-turbo/config.yml b/recipes/libjpeg-turbo/config.yml index 382a6fb1070c9..b86a136393472 100644 --- a/recipes/libjpeg-turbo/config.yml +++ b/recipes/libjpeg-turbo/config.yml @@ -1,4 +1,6 @@ versions: + "3.0.2": + folder: all "3.0.1": folder: all "3.0.0": diff --git a/recipes/libpng/all/conandata.yml b/recipes/libpng/all/conandata.yml index bb5cbe33cccce..40b3b1fcdc4f1 100644 --- a/recipes/libpng/all/conandata.yml +++ b/recipes/libpng/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.6.41": + url: "https://sourceforge.net/projects/libpng/files/libpng16/1.6.41/libpng-1.6.41.tar.xz" + sha256: "d6a49a7a4abca7e44f72542030e53319c081fea508daccf4ecc7c6d9958d190f" "1.6.40": url: "https://sourceforge.net/projects/libpng/files/libpng16/1.6.40/libpng-1.6.40.tar.xz" sha256: "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1" diff --git a/recipes/libpng/all/conanfile.py b/recipes/libpng/all/conanfile.py index f5410a3afa2d7..a5aa7d7b88067 100644 --- a/recipes/libpng/all/conanfile.py +++ b/recipes/libpng/all/conanfile.py @@ -118,7 +118,10 @@ def generate(self): tc.variables["PNG_INTEL_SSE"] = self._neon_msa_sse_vsx_mapping[str(self.options.sse)] if self._has_vsx_support: tc.variables["PNG_POWERPC_VSX"] = self._neon_msa_sse_vsx_mapping[str(self.options.vsx)] - if Version(self.version) >= "1.6.38": + if Version(self.version) >= "1.6.41": + tc.variables["PNG_FRAMEWORK"] = False # changed from False to True by default in PNG 1.6.41 + tc.variables["PNG_TOOLS"] = False + elif Version(self.version) >= "1.6.38": tc.variables["PNG_EXECUTABLES"] = False tc.cache_variables["CMAKE_MACOSX_BUNDLE"] = False diff --git a/recipes/libpng/all/test_package/CMakeLists.txt b/recipes/libpng/all/test_package/CMakeLists.txt index 59e144e90a535..171081056d70e 100644 --- a/recipes/libpng/all/test_package/CMakeLists.txt +++ b/recipes/libpng/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 C) find_package(PNG REQUIRED) diff --git a/recipes/libpng/config.yml b/recipes/libpng/config.yml index e93a6a24ec85a..b68333a0b8609 100644 --- a/recipes/libpng/config.yml +++ b/recipes/libpng/config.yml @@ -1,4 +1,6 @@ versions: + "1.6.41": + folder: all "1.6.40": folder: all "1.6.39": diff --git a/recipes/md4qt/all/conandata.yml b/recipes/md4qt/all/conandata.yml index bc4bdba660829..0cba22d652847 100644 --- a/recipes/md4qt/all/conandata.yml +++ b/recipes/md4qt/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.6.0": + url: "https://github.com/igormironchik/md4qt/archive/refs/tags/2.6.0.tar.gz" + sha256: "8884a3b18fd923dd49994190e0b11c1882e409fce59fb6e5ee8e866dd889b8d0" "2.5.2": url: "https://github.com/igormironchik/md4qt/archive/refs/tags/2.5.2.tar.gz" sha256: "f6af98d2b7c405419b4505bf25eb0363cad3561fa78c34001e8dada082812d76" diff --git a/recipes/md4qt/config.yml b/recipes/md4qt/config.yml index 3198a4a0679bb..99ee89b18595a 100644 --- a/recipes/md4qt/config.yml +++ b/recipes/md4qt/config.yml @@ -1,4 +1,6 @@ versions: + "2.6.0": + folder: all "2.5.2": folder: all "2.5.1": diff --git a/recipes/opene57/all/conandata.yml b/recipes/opene57/all/conandata.yml index 901bec5f90435..01fe8da487209 100644 --- a/recipes/opene57/all/conandata.yml +++ b/recipes/opene57/all/conandata.yml @@ -1,10 +1,10 @@ sources: + "1.6.5": + url: "https://github.com/openE57/openE57/archive/1.6.5.tar.gz" + sha256: "23f3c159550a70b6a1c2330f0f03ed816cbc27ff5656410bfee527bae31eb186" "1.6.4": url: "https://github.com/openE57/openE57/archive/1.6.4.tar.gz" sha256: "97accc32ae294113a97b8d3f0ecf0d608057a6f0fcdfee17db0c5db4ab28ce69" "1.6.3": url: "https://github.com/openE57/openE57/archive/refs/tags/1.6.3.tar.gz" sha256: "e335afdda98a2707d05ec4bce99f362a6f7f0eb2e8bbf2d7346eae292046f827" - "1.6.2": - url: "https://github.com/openE57/openE57/archive/refs/tags/1.6.2.tar.gz" - sha256: "2d487e663cf43105b19653d34250fd45f947af839e327336b6878464a99d5423" diff --git a/recipes/opene57/all/conanfile.py b/recipes/opene57/all/conanfile.py index f3bcaea5080c3..b1ef9f3a3554a 100644 --- a/recipes/opene57/all/conanfile.py +++ b/recipes/opene57/all/conanfile.py @@ -8,7 +8,7 @@ from conan.tools.microsoft import is_msvc, is_msvc_static_runtime from conan.tools.scm import Version -required_conan_version = ">=1.53.0" +required_conan_version = ">=1.54.0" class Opene57Conan(ConanFile): @@ -25,11 +25,13 @@ class Opene57Conan(ConanFile): "shared": [True, False], "fPIC": [True, False], "with_tools": [True, False], + "with_docs": [True, False] } default_options = { "shared": False, "fPIC": True, "with_tools": False, + "with_docs": False } @property @@ -64,9 +66,14 @@ def layout(self): def requirements(self): if self.options.with_tools: - self.requires("boost/1.83.0") + self.requires("boost/1.84.0") + + if self.options.with_docs: + self.requires("doxygen/1.9.4") + if self.settings.os != "Windows": - self.requires("icu/73.2") + self.requires("icu/74.1") + self.requires("xerces-c/3.2.4") def validate(self): @@ -88,6 +95,8 @@ def generate(self): tc.variables["BUILD_EXAMPLES"] = False tc.variables["BUILD_TOOLS"] = self.options.with_tools tc.variables["BUILD_TESTS"] = False + tc.variables["BUILD_DOCS"] = self.options.with_docs + if is_msvc(self): tc.variables["BUILD_WITH_MT"] = is_msvc_static_runtime(self) tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = self.options.shared @@ -127,6 +136,8 @@ def package_info(self): self.cpp_info.defines.append(f"E57_REFIMPL_REVISION_ID={self.name}-{self.version}") self.cpp_info.defines.append("XERCES_STATIC_LIBRARY") + self.cpp_info.defines.append("CRCPP_INCLUDE_ESOTERIC_CRC_DEFINITIONS") + self.cpp_info.defines.append("CRCPP_USE_CPP11") # TODO: to remove in conan v2 if self.options.with_tools: diff --git a/recipes/opene57/config.yml b/recipes/opene57/config.yml index ad9f3c8967822..0cbc2473d6c2f 100644 --- a/recipes/opene57/config.yml +++ b/recipes/opene57/config.yml @@ -1,7 +1,7 @@ versions: + "1.6.5": + folder: all "1.6.4": folder: all "1.6.3": folder: all - "1.6.2": - folder: all diff --git a/recipes/openvino/all/conanfile.py b/recipes/openvino/all/conanfile.py index b1cfc1fd2fe86..d7d8677eb943d 100644 --- a/recipes/openvino/all/conanfile.py +++ b/recipes/openvino/all/conanfile.py @@ -1,8 +1,9 @@ from conan import ConanFile from conan.errors import ConanException, ConanInvalidConfiguration -from conan.tools.build import check_min_cppstd, cross_building +from conan.tools.build import check_min_cppstd from conan.tools.scm import Version from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout +from conan.tools.env import VirtualBuildEnv, VirtualRunEnv from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir import functools import os @@ -117,6 +118,10 @@ def _compilers_minimum_version(self): "msvc": "192", } + @property + def _is_legacy_one_profile(self): + return not hasattr(self, "settings_build") + def source(self): get(self, **self.conan_data["sources"][self.version]["openvino"], strip_root=True) get(self, **self.conan_data["sources"][self.version]["onednn_cpu"], strip_root=True, @@ -152,7 +157,7 @@ def configure(self): def build_requirements(self): if self._target_arm: self.tool_requires("scons/4.3.0") - if cross_building(self): + if not self._is_legacy_one_profile: if self._protobuf_required: self.tool_requires("protobuf/") if self.options.enable_tf_lite_frontend: @@ -183,6 +188,12 @@ def layout(self): cmake_layout(self, src_folder="src") def generate(self): + env = VirtualBuildEnv(self) + env.generate() + if self._is_legacy_one_profile: + env = VirtualRunEnv(self) + env.generate(scope="build") + deps = CMakeDeps(self) deps.generate() @@ -299,6 +310,8 @@ def package_info(self): openvino_runtime.system_libs.append("shlwapi") if self._preprocessing_available: openvino_runtime.system_libs.extend(["wsock32", "ws2_32"]) + if Version(self.version) < "2024.0.0": + openvino_runtime.includedirs.append(os.path.join("include", "ie")) # Have to expose all internal libraries for static libraries case if not self.options.shared: diff --git a/recipes/pulseaudio/all/conanfile.py b/recipes/pulseaudio/all/conanfile.py index a97d2d4216634..d4ada3ef9ee78 100644 --- a/recipes/pulseaudio/all/conanfile.py +++ b/recipes/pulseaudio/all/conanfile.py @@ -146,7 +146,7 @@ def package_info(self): if self.options.get_safe("with_fftw"): self.cpp_info.components["pulse"].requires.append("fftw::fftw") if self.options.with_x11: - self.cpp_info.components["pulse"].requires.append("xorg::xorg") + self.cpp_info.components["pulse"].requires.extend(["xorg::x11", "xorg::x11-xcb"]) if self.options.with_openssl: self.cpp_info.components["pulse"].requires.append("openssl::openssl") if self.options.with_dbus: diff --git a/recipes/rocksdb/all/conandata.yml b/recipes/rocksdb/all/conandata.yml index 1792c3284fadc..d4cc95fcc067b 100644 --- a/recipes/rocksdb/all/conandata.yml +++ b/recipes/rocksdb/all/conandata.yml @@ -17,3 +17,8 @@ patches: patch_description: "Fix build with gcc 13 by including cstdint" patch_type: "portability" patch_source: "https://github.com/facebook/rocksdb/pull/11118" + "6.27.3": + - patch_file: "patches/6.27.3-0001-add-include-cstdint-for-gcc-13.patch" + patch_description: "Fix build with gcc 13 by including cstdint" + patch_type: "portability" + patch_source: "https://github.com/facebook/rocksdb/pull/11118" diff --git a/recipes/rocksdb/all/patches/6.27.3-0001-add-include-cstdint-for-gcc-13.patch b/recipes/rocksdb/all/patches/6.27.3-0001-add-include-cstdint-for-gcc-13.patch new file mode 100644 index 0000000000000..bd7cc0411046f --- /dev/null +++ b/recipes/rocksdb/all/patches/6.27.3-0001-add-include-cstdint-for-gcc-13.patch @@ -0,0 +1,30 @@ +--- include/rocksdb/utilities/checkpoint.h ++++ include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include + #include + #include + #include "rocksdb/status.h" +--- table/block_based/data_block_hash_index.h ++++ table/block_based/data_block_hash_index.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + #include + #include + +--- util/string_util.h ++++ util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include diff --git a/recipes/tweenerspp/all/conandata.yml b/recipes/tweenerspp/all/conandata.yml new file mode 100644 index 0000000000000..1e9cad7f97a08 --- /dev/null +++ b/recipes/tweenerspp/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "1.1": + url: "https://github.com/j-jorge/tweenerspp/archive/refs/tags/v1.1.tar.gz" + sha256: "b3c111b05c5e480993238ed794cc524521bb2d4889e59c49a99b714fff566623" diff --git a/recipes/tweenerspp/all/conanfile.py b/recipes/tweenerspp/all/conanfile.py new file mode 100644 index 0000000000000..b4a432e3792d6 --- /dev/null +++ b/recipes/tweenerspp/all/conanfile.py @@ -0,0 +1,60 @@ +from conan import ConanFile +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.microsoft import is_msvc +import os + +required_conan_version = ">=1.52.0" + +class TweenersppConan(ConanFile): + name = "tweenerspp" + description = "Yet another C++ tweeners library" + license = "Apache-2.0" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/j-jorge/tweenerspp" + topics = ("tweener", "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.get_safe("cppstd"): + check_min_cppstd(self, self._min_cppstd) + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def package(self): + copy(self, "LICENSE", 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"), + ) + copy( + self, + "*.tpp", + 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 = [] + if is_msvc(self): + self.cpp_info.defines = ["_USE_MATH_DEFINES"] + self.cpp_info.set_property("cmake_file_name", "tweeners") + self.cpp_info.set_property("cmake_target_name", "tweeners::tweeners") + self.cpp_info.set_property("cmake_target_aliases", ["tweeners"]) diff --git a/recipes/tweenerspp/all/test_package/CMakeLists.txt b/recipes/tweenerspp/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..7f72f56d7679a --- /dev/null +++ b/recipes/tweenerspp/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES CXX) + +find_package(tweeners REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE tweeners::tweeners) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/recipes/tweenerspp/all/test_package/conanfile.py b/recipes/tweenerspp/all/test_package/conanfile.py new file mode 100644 index 0000000000000..e730ad6dc0dfc --- /dev/null +++ b/recipes/tweenerspp/all/test_package/conanfile.py @@ -0,0 +1,25 @@ +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/tweenerspp/all/test_package/test_package.cpp b/recipes/tweenerspp/all/test_package/test_package.cpp new file mode 100644 index 0000000000000..ccc39ffab8d02 --- /dev/null +++ b/recipes/tweenerspp/all/test_package/test_package.cpp @@ -0,0 +1,27 @@ +#include + +#include +#include +#include + +auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int { + std::cout << std::boolalpha; + std::cin.tie(nullptr); + std::ios_base::sync_with_stdio(false); + + constexpr auto from = 0; + constexpr auto to = 100; + constexpr auto duration = 10.f; + + auto system = tweeners::system {}; + + auto x = 0; + tweeners::builder().range_transform(from, to, duration, x, tweeners::easing::sine<>).build(system); + + for (auto i = 0; i != 10; ++i) { + system.update(1.0f); + std::cout << i << "->" << x << std::endl; + } + + return 0; +} diff --git a/recipes/tweenerspp/config.yml b/recipes/tweenerspp/config.yml new file mode 100644 index 0000000000000..3f8a45fae5832 --- /dev/null +++ b/recipes/tweenerspp/config.yml @@ -0,0 +1,3 @@ +versions: + "1.1": + folder: all diff --git a/recipes/wayland-protocols/all/conandata.yml b/recipes/wayland-protocols/all/conandata.yml index 9574e69bcf1e9..f1d13be6a19d7 100644 --- a/recipes/wayland-protocols/all/conandata.yml +++ b/recipes/wayland-protocols/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.33": + url: "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.33/downloads/wayland-protocols-1.33.tar.xz" + sha256: "94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a" "1.32": url: "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.32/downloads/wayland-protocols-1.32.tar.xz" sha256: "7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11" diff --git a/recipes/wayland-protocols/config.yml b/recipes/wayland-protocols/config.yml index f707ca2da06d2..cc206c4509688 100644 --- a/recipes/wayland-protocols/config.yml +++ b/recipes/wayland-protocols/config.yml @@ -1,4 +1,6 @@ versions: + "1.33": + folder: all "1.32": folder: all "1.31": diff --git a/recipes/zlib/all/conandata.yml b/recipes/zlib/all/conandata.yml index bcebfb9b13b6d..6af954549998d 100644 --- a/recipes/zlib/all/conandata.yml +++ b/recipes/zlib/all/conandata.yml @@ -1,4 +1,9 @@ sources: + "1.3.1": + url: + - "https://zlib.net/fossils/zlib-1.3.1.tar.gz" + - "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.1.tar.gz" + sha256: "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" "1.3": url: - "https://zlib.net/fossils/zlib-1.3.tar.gz" @@ -16,6 +21,10 @@ sources: url: "https://zlib.net/fossils/zlib-1.2.11.tar.gz" sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1" patches: + "1.3.1": + - patch_file: "patches/1.3.1/0001-fix-cmake.patch" + patch_description: "separate static/shared builds, disable debug suffix" + patch_type: "conan" "1.3": - patch_file: "patches/1.3/0001-fix-cmake.patch" patch_description: "separate static/shared builds, disable debug suffix, disable building examples" diff --git a/recipes/zlib/all/conanfile.py b/recipes/zlib/all/conanfile.py index 716ee2007ab06..834fcf918bf94 100644 --- a/recipes/zlib/all/conanfile.py +++ b/recipes/zlib/all/conanfile.py @@ -60,6 +60,7 @@ def generate(self): # Correct for misuse of "${CMAKE_INSTALL_PREFIX}/" in CMakeLists.txt tc.variables["INSTALL_LIB_DIR"] = "lib" tc.variables["INSTALL_INC_DIR"] = "include" + tc.variables["ZLIB_BUILD_EXAMPLES"] = False tc.generate() def _patch_sources(self): diff --git a/recipes/zlib/all/patches/1.3.1/0001-fix-cmake.patch b/recipes/zlib/all/patches/1.3.1/0001-fix-cmake.patch new file mode 100644 index 0000000000000..036af67bc9b38 --- /dev/null +++ b/recipes/zlib/all/patches/1.3.1/0001-fix-cmake.patch @@ -0,0 +1,81 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 15ceebe..2f08574 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,6 @@ endif() + check_include_file(unistd.h Z_HAVE_UNISTD_H) + + if(MSVC) +- set(CMAKE_DEBUG_POSTFIX "d") + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +@@ -122,7 +121,7 @@ set(ZLIB_SRCS + zutil.c + ) + +-if(NOT MINGW) ++if(MSVC) + set(ZLIB_DLL_SRCS + win32/zlib1.rc # If present will override custom build rule below. + ) +@@ -133,7 +132,7 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) + string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" + "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) + +-if(MINGW) ++if(WIN32 AND NOT MSVC) + # This gets us DLL resource information when compiling on MinGW. + if(NOT CMAKE_RC_COMPILER) + set(CMAKE_RC_COMPILER windres.exe) +@@ -147,14 +146,16 @@ if(MINGW) + -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) +-endif(MINGW) ++endif() + ++if(BUILD_SHARED_LIBS) + add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + set_target_properties(zlib PROPERTIES SOVERSION 1) ++else() ++add_library(zlib STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++endif() + + if(NOT CYGWIN) + # This property causes shared libraries on Linux to have the full version +@@ -167,19 +168,25 @@ if(NOT CYGWIN) + set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) + endif() + +-if(UNIX) ++if(WIN32 AND NOT MINGW) ++ if(BUILD_SHARED_LIBS) ++ set_target_properties(zlib PROPERTIES ARCHIVE_OUTPUT_NAME zdll) ++ endif() ++else() + # On unix-like platforms the library is almost always called libz +- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) ++ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) + if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +-elseif(BUILD_SHARED_LIBS AND WIN32) ++endif() ++if(BUILD_SHARED_LIBS AND WIN32) + # Creates zlib1.dll when building shared library version +- set_target_properties(zlib PROPERTIES SUFFIX "1.dll") ++ set_target_properties(zlib PROPERTIES PREFIX "" RUNTIME_OUTPUT_NAME "zlib1") + endif() + ++ + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) +- install(TARGETS zlib zlibstatic ++ install(TARGETS zlib + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) diff --git a/recipes/zlib/config.yml b/recipes/zlib/config.yml index 132003f7c53b5..79c9c7d4f7785 100644 --- a/recipes/zlib/config.yml +++ b/recipes/zlib/config.yml @@ -1,4 +1,6 @@ versions: + "1.3.1": + folder: all "1.3": folder: all "1.2.13":