From f2a8ee86cbc80c04e3de33c86f3f917510b8efed Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Fri, 22 Jul 2022 09:20:11 -0500 Subject: [PATCH] Revert "Merge branch 'master' into xorg-system-package_manager" This reverts commit 0888c365938949f308e492f316fd7e14317ad8a0, reversing changes made to 3a251cde35d5a3cabad72ce4ee0f474215765b2f. --- .c3i/authorized_users.yml | 5 - docs/changelog.md | 12 -- docs/error_knowledge_base.md | 5 +- docs/faqs.md | 6 - docs/how_to_add_packages.md | 4 - docs/review_process.md | 2 +- docs/reviewing.md | 5 - docs/v2_linter.md | 21 --- recipes/aaf/all/conandata.yml | 10 -- recipes/aaf/all/conanfile.py | 4 +- recipes/amgcl/all/conandata.yml | 3 - recipes/amgcl/config.yml | 2 - recipes/argon2/all/conanfile.py | 1 - recipes/asio/all/conandata.yml | 3 - recipes/asio/config.yml | 2 - recipes/benchmark/all/conandata.yml | 3 - recipes/benchmark/config.yml | 2 - recipes/bertrand/all/conandata.yml | 3 - recipes/bertrand/config.yml | 2 - recipes/bitmagic/all/conandata.yml | 9 +- recipes/bitmagic/all/conanfile.py | 22 ++- .../bitmagic/all/test_package/CMakeLists.txt | 3 +- recipes/bitmagic/config.yml | 6 +- .../bshoshany-thread-pool/all/conandata.yml | 3 - .../all/test_package/test_package.cpp | 47 ++---- recipes/bshoshany-thread-pool/config.yml | 2 - recipes/c-blosc2/all/conandata.yml | 9 -- recipes/c-blosc2/all/conanfile.py | 136 ---------------- .../all/patches/2.2.0-0001-fix-cmake.patch | 53 ------- .../c-blosc2/all/test_package/CMakeLists.txt | 10 -- .../c-blosc2/all/test_package/conanfile.py | 18 --- .../c-blosc2/all/test_package/test_package.c | 79 ---------- recipes/c-blosc2/config.yml | 3 - recipes/catch2/3.x.x/conandata.yml | 6 - recipes/catch2/config.yml | 2 - recipes/cmake/3.x.x/conanfile.py | 2 +- recipes/continuable/all/conandata.yml | 3 - recipes/continuable/config.yml | 2 - recipes/cpr/all/conandata.yml | 29 +++- recipes/cpr/all/conanfile.py | 88 +++++------ .../cpr/all/patches/001-fix-curl-define.patch | 15 ++ .../patches/002-1.3.0-create-install.patch | 14 ++ .../patches/003-1.3.0-curl-use-target.patch | 15 ++ .../patches/004-1.3.0-curl-global-scope.patch | 14 ++ .../005-1.6.0-fix-curl-components.patch | 36 +++++ .../005-1.9.0-fix-curl-components.patch | 21 --- .../cpr/all/patches/006-patch-sanitizer.patch | 39 +++++ recipes/cpr/all/test_package/conanfile.py | 5 +- recipes/cpr/config.yml | 8 +- .../daw_header_libraries/all/conandata.yml | 3 - recipes/daw_header_libraries/config.yml | 2 - recipes/diligent-core/all/CMakeLists.txt | 7 - recipes/diligent-core/all/conandata.yml | 15 +- recipes/diligent-core/all/conanfile.py | 16 +- .../patches/0019-252003-exclude-tests.patch | 13 ++ ...252003-dont-install-3d-party-license.patch | 11 ++ .../0021-252003-fix-glslang-usage.patch | 28 ++++ .../0022-252003-fix-glslang-include.patch | 12 ++ ...252003-dont-install-3d-party-license.patch | 36 +++++ ...0025-252003-fix-warning-as-error-win.patch | 13 ++ ...025-253-fix-warning-as-error-win.patch.bak | 13 ++ .../all/test_package/conanfile.py | 4 +- recipes/diligent-core/config.yml | 2 - recipes/djinni-generator/all/conandata.yml | 3 - recipes/djinni-generator/all/conanfile.py | 1 - recipes/djinni-generator/config.yml | 2 - recipes/emsdk/all/conandata.yml | 3 - recipes/emsdk/config.yml | 2 - recipes/enjincppsdk/all/conandata.yml | 3 - recipes/enjincppsdk/config.yml | 2 - recipes/erikzenker-hsm/all/conanfile.py | 30 ++-- .../all/test_package/CMakeLists.txt | 3 + .../all/test_package/conanfile.py | 20 +-- recipes/etl/all/conandata.yml | 6 - recipes/etl/config.yml | 4 - recipes/ezc3d/all/conandata.yml | 22 ++- recipes/ezc3d/all/conanfile.py | 15 +- .../all/patches/0001-fix-cmake-1.3.8.patch | 35 ----- .../all/patches/0001-fix-cmake-1.4.8.patch | 35 ----- .../all/patches/fix-export-symbols.patch | 45 ++++++ recipes/ezc3d/config.yml | 10 +- recipes/{c-blosc2 => fmt}/all/CMakeLists.txt | 2 +- recipes/fmt/all/conandata.yml | 1 + recipes/fmt/all/conanfile.py | 121 +++++++------- .../CMakeLists.txt | 3 - recipes/fmt/all/test_cmakedeps/conanfile.py | 30 ++++ .../test_package.cpp | 1 - .../test_ranges.cpp | 0 recipes/fmt/all/test_package/CMakeLists.txt | 3 + recipes/fmt/all/test_package/conanfile.py | 29 +--- recipes/fmt/all/test_v1_package/conanfile.py | 19 --- recipes/glib/all/conandata.yml | 3 - recipes/glib/all/conanfile.py | 25 ++- recipes/glib/config.yml | 2 - recipes/glm/all/conandata.yml | 3 - recipes/glm/all/conanfile.py | 2 +- recipes/glm/config.yml | 2 - recipes/godot_headers/all/conandata.yml | 3 - recipes/godot_headers/config.yml | 2 - recipes/grpc/all/conandata.yml | 6 - recipes/grpc/config.yml | 2 - recipes/gtest/all/conanfile.py | 8 +- recipes/hlslpp/all/conandata.yml | 3 - recipes/hlslpp/config.yml | 2 - recipes/iceoryx/all/conandata.yml | 14 +- ...l.patch => 2.0.0-0001-fix-find-toml.patch} | 0 recipes/iceoryx/config.yml | 4 - recipes/iir1/all/conandata.yml | 1 + recipes/iir1/all/conanfile.py | 3 - recipes/imagl/all/conanfile.py | 2 + recipes/inih/all/conandata.yml | 3 - recipes/inih/all/conanfile.py | 23 +-- recipes/inih/config.yml | 2 - recipes/isa-l/all/conandata.yml | 4 - recipes/isa-l/all/conanfile.py | 72 --------- recipes/isa-l/all/test_package/CMakeLists.txt | 8 - recipes/isa-l/all/test_package/conanfile.py | 23 --- .../isa-l/all/test_package/test_package.cpp | 18 --- recipes/isa-l/config.yml | 3 - recipes/kmod/all/conandata.yml | 3 - recipes/kmod/config.yml | 2 - recipes/kuba-zip/all/conandata.yml | 3 - recipes/kuba-zip/config.yml | 2 - recipes/libalsa/all/conandata.yml | 3 - recipes/libalsa/config.yml | 2 - recipes/libarchive/all/conanfile.py | 8 +- recipes/libgettext/all/conanfile.py | 4 +- recipes/libgit2/all/conandata.yml | 6 - recipes/libgit2/config.yml | 2 - recipes/libmp3lame/all/conanfile.py | 7 +- recipes/libmysqlclient/all/conanfile.py | 7 +- .../all/test_package/conanfile.py | 5 +- recipes/libnfnetlink/all/conandata.yml | 3 - recipes/libnfnetlink/all/conanfile.py | 25 ++- recipes/libnfnetlink/config.yml | 2 - recipes/libnghttp2/all/conandata.yml | 8 - recipes/libnghttp2/config.yml | 2 - recipes/libsecret/all/conandata.yml | 3 - recipes/libsecret/config.yml | 2 - recipes/libselinux/all/conanfile.py | 2 +- recipes/libwebp/all/conandata.yml | 6 - recipes/libwebp/config.yml | 2 - recipes/libxft/all/conanfile.py | 2 +- recipes/libxml2/all/conanfile.py | 2 +- recipes/libxmlpp/2.x.x/conandata.yml | 8 +- recipes/libxmlpp/2.x.x/conanfile.py | 99 +++++------- ....1-0001-enable_static_builds_on_msvc.patch | 38 ----- ...tch => enable_static_builds_on_msvc.patch} | 0 .../2.x.x/test_package/CMakeLists.txt | 12 +- recipes/libxmlpp/config.yml | 2 - recipes/lightgbm/all/conanfile.py | 2 +- recipes/luau/all/CMakeLists.txt | 99 ------------ recipes/luau/all/conandata.yml | 11 -- recipes/luau/all/conanfile.py | 134 ---------------- .../all/patches/0.536-0001-fix-cmake.patch | 23 --- .../all/patches/0.536-0002-rename-lerp.patch | 28 ---- recipes/luau/all/test_package/CMakeLists.txt | 11 -- recipes/luau/all/test_package/conanfile.py | 17 -- .../luau/all/test_package/test_package.cpp | 10 -- recipes/luau/config.yml | 3 - recipes/mbedtls/all/conandata.yml | 3 - recipes/mbedtls/config.yml | 2 - recipes/mcap/all/conandata.yml | 3 - recipes/mcap/config.yml | 2 - recipes/mdns/all/conandata.yml | 9 ++ recipes/mdns/all/conanfile.py | 19 +-- recipes/mdns/config.yml | 6 + recipes/modern-cpp-kafka/all/conandata.yml | 4 - recipes/modern-cpp-kafka/all/conanfile.py | 45 ------ .../all/test_package/CMakeLists.txt | 12 -- .../all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.cpp | 8 - recipes/modern-cpp-kafka/config.yml | 3 - recipes/mongo-c-driver/all/CMakeLists.txt | 4 +- recipes/mongo-c-driver/all/conanfile.py | 14 +- ...22.0-0001-disable-shared-when-static.patch | 25 +-- recipes/mongo-cxx-driver/all/conandata.yml | 10 -- recipes/mongo-cxx-driver/config.yml | 2 - recipes/nanodbc/all/conandata.yml | 8 - recipes/nanodbc/config.yml | 2 - recipes/nfrechette-acl/all/conandata.yml | 3 - recipes/nfrechette-acl/config.yml | 2 - recipes/nv-codec-headers/all/conandata.yml | 3 - recipes/nv-codec-headers/config.yml | 2 - recipes/odbc/all/conanfile.py | 2 +- recipes/openal/all/conandata.yml | 6 - ...-fix-al-optional-in-if-compile-error.patch | 47 ------ recipes/openal/config.yml | 2 - recipes/openssl/3.x.x/conanfile.py | 4 +- .../openssl/3.x.x/test_package/CMakeLists.txt | 19 --- .../openssl/3.x.x/test_package/conanfile.py | 15 +- .../3.x.x/test_package/digest_legacy.c | 148 ------------------ recipes/osmanip/all/CMakeLists.txt | 27 ++-- recipes/osmanip/all/conandata.yml | 3 - recipes/osmanip/all/conanfile.py | 1 - .../osmanip/all/test_package/test_package.cpp | 5 - recipes/osmanip/config.yml | 2 - recipes/pdfium/all/CMakeLists.txt | 7 - recipes/pdfium/all/conandata.yml | 15 -- recipes/pdfium/all/conanfile.py | 107 ------------- .../pdfium/all/test_package/CMakeLists.txt | 8 - recipes/pdfium/all/test_package/conanfile.py | 18 --- .../pdfium/all/test_package/test_package.c | 7 - recipes/pdfium/config.yml | 3 - recipes/picobench/all/CMakeLists.txt | 7 - recipes/picobench/all/conandata.yml | 9 -- recipes/picobench/all/conanfile.py | 75 --------- .../all/patches/2.01-0001-add-install.patch | 30 ---- .../picobench/all/test_package/CMakeLists.txt | 13 -- .../picobench/all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.cpp | 38 ----- recipes/picobench/config.yml | 3 - recipes/platform.hashing/all/conandata.yml | 4 - recipes/platform.hashing/all/conanfile.py | 24 ++- recipes/platform.hashing/config.yml | 2 - recipes/playrho/all/CMakeLists.txt | 9 -- recipes/playrho/all/conandata.yml | 9 -- recipes/playrho/all/conanfile.py | 103 ------------ .../patches/1.1.0-0001-fix-target-name.patch | 24 --- .../playrho/all/test_package/CMakeLists.txt | 11 -- recipes/playrho/all/test_package/conanfile.py | 18 --- .../playrho/all/test_package/test_package.cpp | 5 - recipes/playrho/config.yml | 3 - recipes/poco/all/conandata.yml | 8 - recipes/poco/all/conanfile.py | 3 - recipes/poco/all/patches/1.12.1.patch | 36 ----- recipes/poco/all/test_package/CMakeLists.txt | 9 -- recipes/poco/all/test_package/conanfile.py | 10 +- .../poco/all/test_package/test_prometheus.cpp | 21 --- recipes/poco/config.yml | 2 - recipes/pybind11/all/conandata.yml | 3 - recipes/pybind11/all/conanfile.py | 11 +- recipes/pybind11/config.yml | 2 - recipes/quill/all/conandata.yml | 18 ++- recipes/quill/all/conanfile.py | 9 +- recipes/quill/all/test_package/CMakeLists.txt | 4 +- recipes/quill/config.yml | 12 +- recipes/re2/all/CMakeLists.txt | 4 +- recipes/re2/all/conandata.yml | 3 - recipes/re2/config.yml | 2 - recipes/redboltz-mqtt_cpp/all/conandata.yml | 4 - recipes/redboltz-mqtt_cpp/all/conanfile.py | 64 -------- .../all/test_package/CMakeLists.txt | 12 -- .../all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.cpp | 14 -- recipes/redboltz-mqtt_cpp/config.yml | 3 - recipes/rmlui/4.x/conandata.yml | 3 - recipes/rmlui/config.yml | 2 - recipes/ruby/all/conanfile.py | 10 +- recipes/safeint/all/conandata.yml | 3 - recipes/safeint/config.yml | 2 - .../simple-websocket-server/all/conanfile.py | 6 +- recipes/skyr-url/all/CMakeLists.txt | 4 +- recipes/skyr-url/all/conandata.yml | 12 +- recipes/skyr-url/all/conanfile.py | 98 +++++------- .../all/patches/1.12.0-0001-fix-cmake.patch | 38 ----- .../all/patches/1.13.0-0001-fix-cmake.patch | 38 ----- .../skyr-url/all/test_package/CMakeLists.txt | 6 +- .../skyr-url/all/test_package/conanfile.py | 5 +- recipes/sqlite3/all/conandata.yml | 6 +- recipes/sqlite3/config.yml | 4 +- recipes/srt/all/conanfile.py | 2 +- recipes/swig/all/conanfile.py | 6 +- recipes/taocpp-pegtl/3.x.x/conandata.yml | 3 - recipes/taocpp-pegtl/config.yml | 2 - recipes/tgbot/all/conanfile.py | 6 +- recipes/thrust/all/conandata.yml | 3 - recipes/thrust/config.yml | 2 - recipes/tinyply/all/conandata.yml | 3 - recipes/tinyply/config.yml | 2 - recipes/tinyspline/all/conandata.yml | 3 - recipes/tinyspline/config.yml | 2 - recipes/transwarp/all/conandata.yml | 3 - recipes/transwarp/config.yml | 2 - recipes/trantor/all/conandata.yml | 3 - recipes/trantor/all/conanfile.py | 2 +- recipes/trantor/config.yml | 2 - recipes/vulkan-headers/all/conandata.yml | 3 - recipes/vulkan-headers/config.yml | 2 - recipes/vulkan-loader/all/conandata.yml | 3 - recipes/vulkan-loader/config.yml | 2 - recipes/wayland/all/conanfile.py | 7 +- recipes/wolfssl/all/conandata.yml | 3 - recipes/wolfssl/config.yml | 2 - recipes/xbyak/all/conandata.yml | 3 - recipes/xbyak/config.yml | 2 - recipes/xorg-proto/all/conanfile.py | 16 +- .../xorg-proto/all/test_package/conanfile.py | 6 +- recipes/zbar/all/conanfile.py | 14 +- recipes/zxing-cpp/all/conandata.yml | 16 +- recipes/zxing-cpp/all/conanfile.py | 32 ++-- ...tch => 0001-Fix-C2327-for-MSVC-2015.patch} | 0 ...limits.patch => 0002-include-limits.patch} | 0 ...ept.patch => 0003-include-stdexcept.patch} | 0 ...tddef.patch => 0004-include-cstddef.patch} | 0 .../patches/1.4.0-0001-fix-string-view.patch | 22 --- recipes/zxing-cpp/config.yml | 2 - 297 files changed, 892 insertions(+), 3127 deletions(-) delete mode 100644 recipes/c-blosc2/all/conandata.yml delete mode 100644 recipes/c-blosc2/all/conanfile.py delete mode 100644 recipes/c-blosc2/all/patches/2.2.0-0001-fix-cmake.patch delete mode 100644 recipes/c-blosc2/all/test_package/CMakeLists.txt delete mode 100644 recipes/c-blosc2/all/test_package/conanfile.py delete mode 100644 recipes/c-blosc2/all/test_package/test_package.c delete mode 100644 recipes/c-blosc2/config.yml create mode 100644 recipes/cpr/all/patches/001-fix-curl-define.patch create mode 100644 recipes/cpr/all/patches/002-1.3.0-create-install.patch create mode 100644 recipes/cpr/all/patches/003-1.3.0-curl-use-target.patch create mode 100644 recipes/cpr/all/patches/004-1.3.0-curl-global-scope.patch create mode 100644 recipes/cpr/all/patches/005-1.6.0-fix-curl-components.patch delete mode 100644 recipes/cpr/all/patches/005-1.9.0-fix-curl-components.patch create mode 100644 recipes/cpr/all/patches/006-patch-sanitizer.patch create mode 100644 recipes/diligent-core/all/patches/0019-252003-exclude-tests.patch create mode 100644 recipes/diligent-core/all/patches/0020-252003-dont-install-3d-party-license.patch create mode 100644 recipes/diligent-core/all/patches/0021-252003-fix-glslang-usage.patch create mode 100644 recipes/diligent-core/all/patches/0022-252003-fix-glslang-include.patch create mode 100644 recipes/diligent-core/all/patches/0024-252003-dont-install-3d-party-license.patch create mode 100644 recipes/diligent-core/all/patches/0025-252003-fix-warning-as-error-win.patch create mode 100644 recipes/diligent-core/all/patches/0025-253-fix-warning-as-error-win.patch.bak delete mode 100644 recipes/ezc3d/all/patches/0001-fix-cmake-1.3.8.patch delete mode 100644 recipes/ezc3d/all/patches/0001-fix-cmake-1.4.8.patch create mode 100644 recipes/ezc3d/all/patches/fix-export-symbols.patch rename recipes/{c-blosc2 => fmt}/all/CMakeLists.txt (76%) rename recipes/fmt/all/{test_v1_package => test_cmakedeps}/CMakeLists.txt (91%) create mode 100644 recipes/fmt/all/test_cmakedeps/conanfile.py rename recipes/fmt/all/{test_v1_package => test_cmakedeps}/test_package.cpp (99%) rename recipes/fmt/all/{test_v1_package => test_cmakedeps}/test_ranges.cpp (100%) delete mode 100644 recipes/fmt/all/test_v1_package/conanfile.py rename recipes/iceoryx/all/patches/{2.0.X-0001-fix-find-toml.patch => 2.0.0-0001-fix-find-toml.patch} (100%) delete mode 100644 recipes/isa-l/all/conandata.yml delete mode 100644 recipes/isa-l/all/conanfile.py delete mode 100644 recipes/isa-l/all/test_package/CMakeLists.txt delete mode 100644 recipes/isa-l/all/test_package/conanfile.py delete mode 100644 recipes/isa-l/all/test_package/test_package.cpp delete mode 100644 recipes/isa-l/config.yml delete mode 100644 recipes/libxmlpp/2.x.x/patches/5.0.1-0001-enable_static_builds_on_msvc.patch rename recipes/libxmlpp/2.x.x/patches/{2.42.1-0001-enable_static_builds_on_msvc.patch => enable_static_builds_on_msvc.patch} (100%) delete mode 100644 recipes/luau/all/CMakeLists.txt delete mode 100644 recipes/luau/all/conandata.yml delete mode 100644 recipes/luau/all/conanfile.py delete mode 100644 recipes/luau/all/patches/0.536-0001-fix-cmake.patch delete mode 100644 recipes/luau/all/patches/0.536-0002-rename-lerp.patch delete mode 100644 recipes/luau/all/test_package/CMakeLists.txt delete mode 100644 recipes/luau/all/test_package/conanfile.py delete mode 100644 recipes/luau/all/test_package/test_package.cpp delete mode 100644 recipes/luau/config.yml delete mode 100644 recipes/modern-cpp-kafka/all/conandata.yml delete mode 100644 recipes/modern-cpp-kafka/all/conanfile.py delete mode 100644 recipes/modern-cpp-kafka/all/test_package/CMakeLists.txt delete mode 100644 recipes/modern-cpp-kafka/all/test_package/conanfile.py delete mode 100644 recipes/modern-cpp-kafka/all/test_package/test_package.cpp delete mode 100644 recipes/modern-cpp-kafka/config.yml delete mode 100644 recipes/openal/all/patches/1.22.2-fix-al-optional-in-if-compile-error.patch delete mode 100644 recipes/openssl/3.x.x/test_package/digest_legacy.c delete mode 100644 recipes/pdfium/all/CMakeLists.txt delete mode 100644 recipes/pdfium/all/conandata.yml delete mode 100644 recipes/pdfium/all/conanfile.py delete mode 100644 recipes/pdfium/all/test_package/CMakeLists.txt delete mode 100644 recipes/pdfium/all/test_package/conanfile.py delete mode 100644 recipes/pdfium/all/test_package/test_package.c delete mode 100644 recipes/pdfium/config.yml delete mode 100644 recipes/picobench/all/CMakeLists.txt delete mode 100644 recipes/picobench/all/conandata.yml delete mode 100644 recipes/picobench/all/conanfile.py delete mode 100644 recipes/picobench/all/patches/2.01-0001-add-install.patch delete mode 100644 recipes/picobench/all/test_package/CMakeLists.txt delete mode 100644 recipes/picobench/all/test_package/conanfile.py delete mode 100644 recipes/picobench/all/test_package/test_package.cpp delete mode 100644 recipes/picobench/config.yml delete mode 100644 recipes/playrho/all/CMakeLists.txt delete mode 100644 recipes/playrho/all/conandata.yml delete mode 100644 recipes/playrho/all/conanfile.py delete mode 100644 recipes/playrho/all/patches/1.1.0-0001-fix-target-name.patch delete mode 100644 recipes/playrho/all/test_package/CMakeLists.txt delete mode 100644 recipes/playrho/all/test_package/conanfile.py delete mode 100644 recipes/playrho/all/test_package/test_package.cpp delete mode 100644 recipes/playrho/config.yml delete mode 100644 recipes/poco/all/patches/1.12.1.patch delete mode 100644 recipes/poco/all/test_package/test_prometheus.cpp delete mode 100644 recipes/redboltz-mqtt_cpp/all/conandata.yml delete mode 100644 recipes/redboltz-mqtt_cpp/all/conanfile.py delete mode 100644 recipes/redboltz-mqtt_cpp/all/test_package/CMakeLists.txt delete mode 100644 recipes/redboltz-mqtt_cpp/all/test_package/conanfile.py delete mode 100644 recipes/redboltz-mqtt_cpp/all/test_package/test_package.cpp delete mode 100644 recipes/redboltz-mqtt_cpp/config.yml delete mode 100644 recipes/skyr-url/all/patches/1.12.0-0001-fix-cmake.patch delete mode 100644 recipes/skyr-url/all/patches/1.13.0-0001-fix-cmake.patch rename recipes/zxing-cpp/all/patches/{1.0.8-0001-Fix-C2327-for-MSVC-2015.patch => 0001-Fix-C2327-for-MSVC-2015.patch} (100%) rename recipes/zxing-cpp/all/patches/{1.0.8-0002-include-limits.patch => 0002-include-limits.patch} (100%) rename recipes/zxing-cpp/all/patches/{1.0.8-0003-include-stdexcept.patch => 0003-include-stdexcept.patch} (100%) rename recipes/zxing-cpp/all/patches/{1.0.8-0004-include-cstddef.patch => 0004-include-cstddef.patch} (100%) delete mode 100644 recipes/zxing-cpp/all/patches/1.4.0-0001-fix-string-view.patch diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml index 3e1da876d26f2..404c6a9f9450b 100644 --- a/.c3i/authorized_users.yml +++ b/.c3i/authorized_users.yml @@ -893,8 +893,3 @@ authorized_users: - "netheril96" - "atimin" - "ssophie01" - - "mietzen" - - "mourogurt" - - "hoisunng" - - "abouvier" - - "jadamwilson2" diff --git a/docs/changelog.md b/docs/changelog.md index 74d08e3443f6e..eac2c5d78957e 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,17 +1,5 @@ # Changelog -### 22-July-2022 - 12:13 CEST - -- [feature]: ValidateInfrastructure: Add check to verify CMake 3.21 is installed in Windows machines. -- [feature]: ValidateInfrastructure: Execute the validation when a pull-request is modifying configuration files. -- [feature]: Conan v2: Iterate `cppstd` values in profiles to build first match. -- [feature]: Conan v2: Apply `shared` option for the whole dependency graph. -- [feature]: Add `tools.apple.sdk_path` to configuration in Macos (required by new build helpers). -- [feature]: Set `tools.system.package_manager:mode=install` and `tools.system.package_manager:sudo=True` in configuration files (required by new system package manager helpers to mimic the behavior of old ones). -- [feature]: Upgrade required Conan versions to work with the library. Minimum versions tested are now `1.49.0` and `2.0.0b1`. -- [fix]: ValidateInfrastructure: Fix error message split. -- [bugfix]: Accept missing HTTP code for requests. - ### 06-July-2022 - 14:28 CEST - [feature]: Configure AccessRequest job to run on Mondays and Thursdays. diff --git a/docs/error_knowledge_base.md b/docs/error_knowledge_base.md index a18d7b348b995..22c2e2f38fb34 100644 --- a/docs/error_knowledge_base.md +++ b/docs/error_knowledge_base.md @@ -360,9 +360,8 @@ The duality creates a heterogeneous way of solving dependencies, making it diffi #### **#KB-H056: "LICENSE PUBLIC DOMAIN"** -[Public Domain](https://en.wikipedia.org/wiki/Public-domain-equivalent_license) is not a license by itself, but consists of all the creative work to which -no exclusive intellectual property rights apply. If a project is under Public Domain and there is no license listed, the -[Unlicense](https://spdx.org/licenses/Unlicense) should be used as described in the [FAQ](faqs.md#what-license-should-i-use-for-public-domain). +[Public Domain](https://en.wikipedia.org/wiki/Public-domain-equivalent_license) is not a license by itself, but consists of all the creative work to which no exclusive intellectual property rights apply. +If a project is under Public Domain and there is no license listed, the [Unlicense](https://spdx.org/licenses/Unlicense) should be used. #### **#KB-H057: "TOOLS RENAME"** diff --git a/docs/faqs.md b/docs/faqs.md index 69ad6f6638768..70596e3234752 100644 --- a/docs/faqs.md +++ b/docs/faqs.md @@ -21,7 +21,6 @@ This section gathers the most common questions from the community related to pac * [Can I remove an option from a recipe?](#can-i-remove-an-option-from-a-recipe) * [Can I split a project into an installer and library package?](#can-i-split-a-project-into-an-installer-and-library-package) * [What license should I use for Public Domain?](#what-license-should-i-use-for-public-domain) - * [What license should I use for a custom project specific license?](#what-license-should-i-use-for-a-custom-project-specific-license) * [Why is a `tools.check_min_cppstd` call not enough?](#why-is-a-toolscheck_min_cppstd-call-not-enough) * [What is the policy for adding older versions of a package?](#what-is-the-policy-for-adding-older-versions-of-a-package) * [What is the policy for removing older versions of a package?](#what-is-the-policy-for-removing-older-versions-of-a-package) @@ -173,11 +172,6 @@ No. Some projects provide more than a simple library, but also applications. For [The Public Domain](https://fairuse.stanford.edu/overview/public-domain/welcome/) is not a license by itselt. Thus, we have [equivalent licenses](https://en.wikipedia.org/wiki/Public-domain-equivalent_license) to be used instead. By default, if a project uses Public Domain and there is no offcial license listed, you should use [Unlicense](https://spdx.org/licenses/Unlicense). -## What license should I use for a custom project specific license? - -When a non standard open-source license is used, we have decided to use `LicenseRef-` as a prefix, followed by the name of the file which contains a custom license. -See [the reviewing guidlines](reviewing.md#license-attribute) for more details. - ## Why is a `tools.check_min_cppstd` call not enough? Very often C++ projects require a minimum standard version, such as 14 or 17, in order to compile. Conan offers tools which enable checking the relevant setting is enabled and above this support for a certain version is present. Otherwise, it uses the compiler's default. diff --git a/docs/how_to_add_packages.md b/docs/how_to_add_packages.md index 449d1f8726d06..2bd68064bd7a3 100644 --- a/docs/how_to_add_packages.md +++ b/docs/how_to_add_packages.md @@ -188,10 +188,6 @@ project files as simple as possible, without the need of extra logic to handle d The CI will explore all the folders and run the tests for the ones matching `test_*/conanfile.py` pattern. You can find the output of all of them together in the testing logs. -> **Note.-** If, for any reason, it is useful to write a test that should only be checked using Conan v1, you can do so by using the pattern -> `test_v1_*/conanfile.py` for the folder. Please, have a look to [linter notes](v2_linter.md) to know how to prevent the linter from -> checking these files. - > Remember that the `test_` recipes should **test the package configuration that has just been generated** for the _host_ context, otherwise > it will fail in crossbuilding scenarios. diff --git a/docs/review_process.md b/docs/review_process.md index 177430e94ed09..9610737f5e9ca 100644 --- a/docs/review_process.md +++ b/docs/review_process.md @@ -138,7 +138,7 @@ PR is selected for the merge only if: - PR is not a Draft. - PR has a green status (successful build). - PR doesn't have merge conflicts with `master` branch. -- PR has approved reviews (as described above). +- PR has 3 approved reviews (as described above). - PR does not have any [official reviewers](#official-reviewers) requesting changes - Master build is not running already (see below) diff --git a/docs/reviewing.md b/docs/reviewing.md index 58093e8a7874b..cb80a16afaed3 100644 --- a/docs/reviewing.md +++ b/docs/reviewing.md @@ -81,11 +81,6 @@ the order above resembles the execution order of methods on CI. therefore, for i The mandatory license attribute of each recipe **should** be a [SPDX license](https://spdx.org/licenses/) [short Identifiers](https://spdx.dev/ids/) when applicable. -Outside cases of the SPDX guidelines should do the following: - -- When no license is provided or when it's given to the "public domain", the value should be set to [Unlicense](https://spdx.org/licenses/Unlicense) as per [KB-H056](error_knowledge_base.md#kb-h056-license-public-domain) and [FAQ](faqs.md#what-license-should-i-use-for-public-domain). -- When a custom (e.g. project specific) license is given, the value should be set to `LicenseRef-` as a prefix, followed by the name of the file which contains a custom license. See [this example](https://github.com/conan-io/conan-center-index/blob/e604534bbe0ef56bdb1f8513b83404eff02aebc8/recipes/fft/all/conanfile.py#L8). For more details, [read this conversation](https://github.com/conan-io/conan-center-index/pull/4928/files#r596216206) - ## Applying Patches Patches can be applied in a different protected method, the pattern name is `_patch_sources`. When applying patch files, `tools.patch` is the best option. diff --git a/docs/v2_linter.md b/docs/v2_linter.md index 5b0a6b0371f92..0e51cf4d81a0b 100644 --- a/docs/v2_linter.md +++ b/docs/v2_linter.md @@ -1,12 +1,6 @@ Linter to help migration to Conan v2 ==================================== - -## Contents - - * [Import ConanFile from `conan`](#import-conanfile-from-conan) - * [Import tools from `conan`](#import-tools-from-conan) - On our [path to Conan v2](v2_roadmap.md) we are leveraging on custom Pylint rules. This linter will run for every pull-request that is submitted to the repository and will raise some warnings and errors that should be addressed in order to migrate the @@ -48,18 +42,3 @@ class Recipe(ConanFile): if not cross_building(self): pass ``` - -# Disable linter for `test_v1_*/conanfile.py` - -Using the pattern `test_v1_*/conanfile.py` you can write a test that will be executed using only Conan v1, -you probably don't want v2-migration linter to check this file, as it will likely contain syntax that is -specific to Conan v1. - -To skip the file you just need to add the following comment to the file and `pylint` will skip it: - -**`test_v1_*/conanfile.py`** -```python -# pylint: skip-file -from conans import ConanFile, CMake, tools -... -``` diff --git a/recipes/aaf/all/conandata.yml b/recipes/aaf/all/conandata.yml index 6deeda4a0cea7..6f47599ee6f82 100644 --- a/recipes/aaf/all/conandata.yml +++ b/recipes/aaf/all/conandata.yml @@ -6,21 +6,11 @@ patches: "1.2.0": - patch_file: "patches/1.2.0-001-simpler-cmakelists.patch" base_path: "source_subfolder" - patch_type: "conan" - patch_description: "Simplify CMakeLists.txt" - patch_file: "patches/1.2.0-002-link-core-with-find-library.patch" base_path: "source_subfolder" - patch_type: "portability" - patch_description: "Link CoreFoundation and CoreServices with find_library" - patch_file: "patches/1.2.0-003-remove-register-keyword.patch" base_path: "source_subfolder" - patch_type: "portability" - patch_description: "Remove deprecated use of register keyword for c++11 builds" - patch_file: "patches/1.2.0-004-remove-expat.patch" base_path: "source_subfolder" - patch_type: "conan" - patch_description: "Remove expat dependency directory" - patch_file: "patches/1.2.0-005-remove-libjpeg.patch" base_path: "source_subfolder" - patch_type: "conan" - patch_description: "Remove libjpeg dependency directory" diff --git a/recipes/aaf/all/conanfile.py b/recipes/aaf/all/conanfile.py index ab1bf99fe216b..f6d7102580e4d 100644 --- a/recipes/aaf/all/conanfile.py +++ b/recipes/aaf/all/conanfile.py @@ -1,4 +1,3 @@ -from conan.tools.files import apply_conandata_patches from conans import ConanFile, CMake, tools from conans.errors import ConanInvalidConfiguration import os @@ -44,7 +43,8 @@ def source(self): tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) def build(self): - apply_conandata_patches(self) + for patch in self.conan_data.get("patches", {}).get(self.version, []): + tools.patch(**patch) cmake = CMake(self) diff --git a/recipes/amgcl/all/conandata.yml b/recipes/amgcl/all/conandata.yml index 97da314dcfe0d..8b23573559181 100644 --- a/recipes/amgcl/all/conandata.yml +++ b/recipes/amgcl/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.4.3": - url: "https://github.com/ddemidov/amgcl/archive/1.4.3.tar.gz" - sha256: "e920d5767814ce697d707d1f359a16c9b9eb79eba28fe19e14c18c2a505fe0ad" "1.4.2": url: "https://github.com/ddemidov/amgcl/archive/1.4.2.tar.gz" sha256: "db0de6b75e6c205f44542c3ac8d9935c8357a58072963228d0bb11a54181aea8" diff --git a/recipes/amgcl/config.yml b/recipes/amgcl/config.yml index 1d12970eb4fba..7fc7e0b908158 100644 --- a/recipes/amgcl/config.yml +++ b/recipes/amgcl/config.yml @@ -1,6 +1,4 @@ versions: - "1.4.3": - folder: all "1.4.2": folder: all "1.4.0": diff --git a/recipes/argon2/all/conanfile.py b/recipes/argon2/all/conanfile.py index 95aff495247cc..475babcf66100 100644 --- a/recipes/argon2/all/conanfile.py +++ b/recipes/argon2/all/conanfile.py @@ -70,7 +70,6 @@ def build(self): tools.replace_in_file(argon2_header, "__declspec(dllexport)", "") tools.replace_in_file(vcxproj, "DynamicLibrary", "StaticLibrary") tools.replace_in_file(vcxproj, "", "$(SolutionDir)include;%(AdditionalIncludeDirectories)") - tools.replace_in_file(vcxproj, "8.1", "") if self.settings.compiler == "Visual Studio": msbuild = MSBuild(self) msbuild.build(os.path.join(self._source_subfolder, "Argon2.sln"), targets=("Argon2OptDll",))#, platforms={"x86": "Win32"}) diff --git a/recipes/asio/all/conandata.yml b/recipes/asio/all/conandata.yml index 3b3d5e588b2ab..a7a1051e8d718 100644 --- a/recipes/asio/all/conandata.yml +++ b/recipes/asio/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.23.0": - url: "https://github.com/chriskohlhoff/asio/archive/asio-1-23-0.tar.gz" - sha256: "facae7627ce6c716add3f328eee3d78c2e6e133a46ac5ecb80897b37ebacf05e" "1.22.1": url: "https://github.com/chriskohlhoff/asio/archive/asio-1-22-1.tar.gz" sha256: "30cb54a5de5e465d10ec0c2026d6b5917f5e89fffabdbabeb1475846fc9a2cf0" diff --git a/recipes/asio/config.yml b/recipes/asio/config.yml index f723cf1c56e46..7ded867cf1e05 100644 --- a/recipes/asio/config.yml +++ b/recipes/asio/config.yml @@ -1,6 +1,4 @@ versions: - "1.23.0": - folder: all "1.22.1": folder: all "1.22.0": diff --git a/recipes/benchmark/all/conandata.yml b/recipes/benchmark/all/conandata.yml index 6c9f73c7ebb6d..672f4ea97f786 100644 --- a/recipes/benchmark/all/conandata.yml +++ b/recipes/benchmark/all/conandata.yml @@ -23,6 +23,3 @@ sources: "1.6.1": url: "https://github.com/google/benchmark/archive/v1.6.1.tar.gz" sha256: "6132883bc8c9b0df5375b16ab520fac1a85dc9e4cf5be59480448ece74b278d4" - "1.6.2": - url: "https://github.com/google/benchmark/archive/v1.6.2.tar.gz" - sha256: "6adf850c2be6aa15843c94ac63d0819d5bf9f5678ae41244f25a1f4bf9480827" diff --git a/recipes/benchmark/config.yml b/recipes/benchmark/config.yml index 0696f1275cd17..474ee53433d48 100644 --- a/recipes/benchmark/config.yml +++ b/recipes/benchmark/config.yml @@ -15,5 +15,3 @@ versions: folder: all "1.6.1": folder: all - "1.6.2": - folder: all diff --git a/recipes/bertrand/all/conandata.yml b/recipes/bertrand/all/conandata.yml index 7bf2628360394..c2323e0b91617 100644 --- a/recipes/bertrand/all/conandata.yml +++ b/recipes/bertrand/all/conandata.yml @@ -11,6 +11,3 @@ sources: 0.0.17: url: https://github.com/bernedom/bertrand/archive/0.0.17.tar.gz sha256: 72e59971bd8ae48d95da9337ad78004b99ba4e8d0eeb3b613ce17b577ca41012 - "0.013": - url: "https://github.com/bernedom/bertrand/archive/0.013.tar.gz" - sha256: "f2f071006d3a9b31382957b84e81405adba44cbf1a9bb8242ad4d0f44d7af7fb" diff --git a/recipes/bertrand/config.yml b/recipes/bertrand/config.yml index 6317c45fb5e19..96763f05c1dff 100644 --- a/recipes/bertrand/config.yml +++ b/recipes/bertrand/config.yml @@ -7,5 +7,3 @@ versions: folder: all 0.0.17: folder: all - "0.013": - folder: all diff --git a/recipes/bitmagic/all/conandata.yml b/recipes/bitmagic/all/conandata.yml index be5ff4fa07b8e..d39a09670287e 100644 --- a/recipes/bitmagic/all/conandata.yml +++ b/recipes/bitmagic/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "7.12.3": - url: "https://github.com/tlk00/BitMagic/archive/refs/tags/v7.12.3.tar.gz" - sha256: "5e59507a01a8295bb57aebcf557a4a25b992244736f7924300cdb9635f1b2780" "7.11.2": url: "https://github.com/tlk00/BitMagic/archive/refs/tags/v7.11.2.tar.gz" sha256: "09faf5b9da4e0cee4947e05b7af0bd834e63e90c8877c115b719b4f390709a6f" @@ -23,3 +20,9 @@ sources: "7.5.0": url: "https://github.com/tlk00/BitMagic/archive/refs/tags/v7.5.0.tar.gz" sha256: "dec7d316baf3be9cb058d9da302a7e4cb694ac429d4bd29138c24b1b0157a9e8" + "7.4.0": + url: "https://github.com/tlk00/BitMagic/archive/refs/tags/v7.4.0.tar.gz" + sha256: "80304bcfde1f263b2a680f6cf7b22aa72c757d7214688ec74de626778d332fb9" + "7.3.1": + url: "https://github.com/tlk00/BitMagic/archive/refs/tags/v7.3.1.tar.gz" + sha256: "a45a764c3519d64afdc734a6606645007e102aef799390a36426d2dc77919303" diff --git a/recipes/bitmagic/all/conanfile.py b/recipes/bitmagic/all/conanfile.py index 14e0343d38c63..af26b37518295 100644 --- a/recipes/bitmagic/all/conanfile.py +++ b/recipes/bitmagic/all/conanfile.py @@ -11,23 +11,26 @@ class BitmagicConan(ConanFile): "promote combination of hardware optimizations and on the fly compression to fit " \ "inverted indexes and binary fingerprints into memory, minimize disk and network footprint." license = "Apache-2.0" - url = "https://github.com/conan-io/conan-center-index" - homepage = "http://bitmagic.io" - topics = ("information-retrieval", "algorithm", "bit-manipulation", + topics = ("bitmagic", "information-retrieval", "algorithm", "bit-manipulation", "integer-compression", "sparse-vector", "sparse-matrix", "bit-array", "bit-vector", "indexing-engine", "adjacency-matrix", "associative-array") - settings = "os", "arch", "compiler", "build_type" + homepage = "http://bitmagic.io" + url = "https://github.com/conan-io/conan-center-index" + settings = "compiler" no_copy_source = True @property def _source_subfolder(self): return "source_subfolder" - def package_id(self): - self.info.header_only() - def _minimum_compilers_version(self, cppstd): standards = { + "11": { + "Visual Studio": "15", + "gcc": "4.8", + "clang": "4", + "apple-clang": "9", + }, "17": { "Visual Studio": "16", "gcc": "7", @@ -39,7 +42,7 @@ def _minimum_compilers_version(self, cppstd): @property def _cppstd(self): - return "17" + return "11" if tools.Version(self.version) < "7.5.0" else "17" def validate(self): if self.settings.compiler.get_safe("cppstd"): @@ -52,6 +55,9 @@ def validate(self): else: self.output.warn("{0} requires C++{1}. Your compiler is unknown. Assuming it supports C++{1}.".format(self.name, self._cppstd)) + def package_id(self): + self.info.header_only() + def source(self): tools.get(**self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True) diff --git a/recipes/bitmagic/all/test_package/CMakeLists.txt b/recipes/bitmagic/all/test_package/CMakeLists.txt index 5ebf4f53c34cf..0b83779e08dc7 100644 --- a/recipes/bitmagic/all/test_package/CMakeLists.txt +++ b/recipes/bitmagic/all/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.1) project(test_package) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) @@ -8,4 +8,3 @@ find_package(bitmagic REQUIRED CONFIG) add_executable(${PROJECT_NAME} test_package.cpp) target_link_libraries(${PROJECT_NAME} bitmagic::bitmagic) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) diff --git a/recipes/bitmagic/config.yml b/recipes/bitmagic/config.yml index 34c9a540c22c6..4c2577992996c 100644 --- a/recipes/bitmagic/config.yml +++ b/recipes/bitmagic/config.yml @@ -1,6 +1,4 @@ versions: - "7.12.3": - folder: all "7.11.2": folder: all "7.10.3": @@ -15,3 +13,7 @@ versions: folder: all "7.5.0": folder: all + "7.4.0": + folder: all + "7.3.1": + folder: all diff --git a/recipes/bshoshany-thread-pool/all/conandata.yml b/recipes/bshoshany-thread-pool/all/conandata.yml index 80ebb5488fcf8..04b68a01147ff 100644 --- a/recipes/bshoshany-thread-pool/all/conandata.yml +++ b/recipes/bshoshany-thread-pool/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.1.0": - sha256: "c8b70ee63822ee21f25c201806e464100686b1faca5aeabeee96378d2a2c3be8" - url: "https://github.com/bshoshany/thread-pool/archive/refs/tags/v3.1.0.tar.gz" "3.0.0": sha256: "c36052b28b4f28698a6d6f3ad988d7979f6bf6823ebf2af2074714fde15dc19c" url: "https://github.com/bshoshany/thread-pool/archive/refs/tags/v3.0.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 0b72a1bc43622..d0786253fa922 100644 --- a/recipes/bshoshany-thread-pool/all/test_package/test_package.cpp +++ b/recipes/bshoshany-thread-pool/all/test_package/test_package.cpp @@ -1,48 +1,25 @@ #include "BS_thread_pool.hpp" -BS::synced_stream sync_out; -BS::thread_pool pool; - -BS::concurrency_t count_unique_threads() +void store_ID(std::thread::id* location) { - const BS::concurrency_t num_tasks = pool.get_thread_count() * 2; - std::vector thread_IDs(num_tasks); - std::mutex ID_mutex, total_mutex; - std::condition_variable ID_cv, total_cv; - 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( - [&] - { - 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, [&] { return ID_release; }); - }); - total_cv.wait_for(total_lock, std::chrono::milliseconds(500), [&] { 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_for(total_lock, std::chrono::milliseconds(500), [&] { return total_count == num_tasks; }); - std::sort(thread_IDs.begin(), thread_IDs.end()); - return static_cast(std::unique(thread_IDs.begin(), thread_IDs.end()) - thread_IDs.begin()); + *location = std::this_thread::get_id(); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } int main() { + BS::synced_stream sync_out; const char* line = "------------------------------------------"; sync_out.println(line); sync_out.println("Testing thread pool..."); - BS::concurrency_t unique_threads = count_unique_threads(); + BS::thread_pool pool; + std::vector thread_IDs(pool.get_thread_count() * 4); + BS::multi_future futures; + for (std::thread::id& id : thread_IDs) + futures.f.push_back(pool.submit(store_ID, &id)); + futures.wait(); + std::sort(thread_IDs.begin(), thread_IDs.end()); + BS::concurrency_t unique_threads = (BS::concurrency_t)(std::unique(thread_IDs.begin(), thread_IDs.end()) - thread_IDs.begin()); if (pool.get_thread_count() == unique_threads) { sync_out.println("SUCCESS: Created ", unique_threads, " unique threads!"); diff --git a/recipes/bshoshany-thread-pool/config.yml b/recipes/bshoshany-thread-pool/config.yml index f0f7ed21d1898..51e071412a0a7 100644 --- a/recipes/bshoshany-thread-pool/config.yml +++ b/recipes/bshoshany-thread-pool/config.yml @@ -1,5 +1,3 @@ versions: - "3.1.0": - folder: all "3.0.0": folder: all diff --git a/recipes/c-blosc2/all/conandata.yml b/recipes/c-blosc2/all/conandata.yml deleted file mode 100644 index 81c0e81ea55e8..0000000000000 --- a/recipes/c-blosc2/all/conandata.yml +++ /dev/null @@ -1,9 +0,0 @@ -sources: - "2.2.0": - url: "https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.2.0.tar.gz" - sha256: "66f9977de26d6bc9ea1c0e623d873c3225e4fff709aa09b3335fd09d41d57c0e" - -patches: - "2.2.0": - - patch_file: "patches/2.2.0-0001-fix-cmake.patch" - base_path: "source_subfolder" diff --git a/recipes/c-blosc2/all/conanfile.py b/recipes/c-blosc2/all/conanfile.py deleted file mode 100644 index 598a57dd49f99..0000000000000 --- a/recipes/c-blosc2/all/conanfile.py +++ /dev/null @@ -1,136 +0,0 @@ -from conans import ConanFile, CMake, tools -from conan.tools.microsoft import is_msvc -import os -import functools -import glob - -required_conan_version = ">=1.45.0" - -class CBlosc2Conan(ConanFile): - name = "c-blosc2" - description = "A fast, compressed, persistent binary data store library for C." - license = "BSD-3-Clause" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/Blosc/c-blosc2" - topics = ("c-blosc", "blosc", "compression") - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "simd_intrinsics": [None, "sse2", "avx2"], - "with_lz4": [True, False], - "with_zlib": [None, "zlib", "zlib-ng"], - "with_zstd": [True, False], - "with_plugins": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - "simd_intrinsics": "avx2", - "with_lz4": True, - "with_zlib": "zlib", - "with_zstd": True, - "with_plugins": True, - } - generators = "cmake", "cmake_find_package_multi" - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def export_sources(self): - self.copy("CMakeLists.txt") - for patch in self.conan_data.get("patches", {}).get(self.version, []): - self.copy(patch["patch_file"]) - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - if self.settings.arch not in ["x86", "x86_64"]: - del self.options.simd_intrinsics - - def configure(self): - if self.options.shared: - del self.options.fPIC - del self.settings.compiler.cppstd - del self.settings.compiler.libcxx - # c-blosc2 uses zlib-ng with zlib compat options. - if self.options.with_zlib == "zlib-ng": - self.options["zlib-ng"].zlib_compat = True - - def requirements(self): - if self.options.with_lz4: - self.requires("lz4/1.9.3") - if self.options.with_zlib == "zlib-ng": - self.requires("zlib-ng/2.0.6") - elif self.options.with_zlib == "zlib": - self.requires("zlib/1.2.12") - if self.options.with_zstd: - self.requires("zstd/1.5.2") - - def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) - - @functools.lru_cache(1) - def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["BLOSC_IS_SUBPROJECT"] = False - cmake.definitions["BLOSC_INSTALL"] = True - cmake.definitions["BUILD_STATIC"] = not self.options.shared - cmake.definitions["BUILD_SHARED"] = self.options.shared - cmake.definitions["BUILD_TESTS"] = False - cmake.definitions["BUILD_FUZZERS"] = False - cmake.definitions["BUILD_BENCHMARKS"] = False - cmake.definitions["BUILD_EXAMPLES"] = False - simd_intrinsics = self.options.get_safe("simd_intrinsics", False) - cmake.definitions["DEACTIVATE_AVX2"] = simd_intrinsics != "avx2" - cmake.definitions["DEACTIVATE_LZ4"] = not self.options.with_lz4 - cmake.definitions["PREFER_EXTERNAL_LZ4"] = self.options.with_lz4 - cmake.definitions["DEACTIVATE_ZLIB"] = self.options.with_zlib == None - cmake.definitions["PREFER_EXTERNAL_ZLIB"] = self.options.with_zlib != None - cmake.definitions["DEACTIVATE_ZSTD"] = not self.options.with_zstd - cmake.definitions["PREFER_EXTERNAL_ZSTD"] = self.options.with_zstd - cmake.definitions["BUILD_PLUGINS"] = self.options.with_plugins - cmake.configure(build_folder=self._build_subfolder) - return cmake - - def _patch_sources(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) - - for filename in glob.glob(os.path.join(self._source_subfolder, "cmake", "Find*.cmake")): - if os.path.basename(filename) not in [ - "FindSIMD.cmake", - ]: - os.remove(filename) - - def build(self): - self._patch_sources() - cmake = self._configure_cmake() - cmake.build() - - def package(self): - licenses = ["BLOSC.txt", "BITSHUFFLE.txt", "FASTLZ.txt", "LZ4.txt", "ZLIB.txt", "STDINT.txt"] - for license_file in licenses: - self.copy(license_file, dst="licenses", src=os.path.join(self._source_subfolder, "LICENSES")) - cmake = self._configure_cmake() - cmake.install() - tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) - - # Remove MS runtime files - for dll_pattern_to_remove in ["concrt*.dll", "msvcp*.dll", "vcruntime*.dll"]: - tools.remove_files_by_mask(os.path.join(self.package_folder, "bin"), dll_pattern_to_remove) - - def package_info(self): - self.cpp_info.set_property("pkg_config_name", "blosc2") - prefix = "lib" if is_msvc(self) and not self.options.shared else "" - self.cpp_info.libs = ["{}blosc2".format(prefix)] - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.system_libs = ["rt", "m", "pthread"] - - # TODO: to remove in conan v2 once pkg_config generator removed - self.cpp_info.names["pkg_config"] = "blosc2" diff --git a/recipes/c-blosc2/all/patches/2.2.0-0001-fix-cmake.patch b/recipes/c-blosc2/all/patches/2.2.0-0001-fix-cmake.patch deleted file mode 100644 index ea02b0e3d45f3..0000000000000 --- a/recipes/c-blosc2/all/patches/2.2.0-0001-fix-cmake.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd8cb34..5d8981f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,7 +68,8 @@ if(NOT WIN32) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") - endif() - --cmake_minimum_required(VERSION 3.16.3) -+## TODO: dirty fix. -+cmake_minimum_required(VERSION 3.15) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.4) - cmake_policy(SET CMP0063 NEW) - endif() -@@ -144,26 +145,17 @@ if(BUILD_LITE) - endif() - - if(PREFER_EXTERNAL_LZ4) -- find_package(LZ4) -+ find_package(lz4) - else() - message(STATUS "Using LZ4 internal sources.") - endif() - - if(NOT DEACTIVATE_ZLIB) - if(PREFER_EXTERNAL_ZLIB) -- find_package(ZLIB_NG) -- if (ZLIB_NG_FOUND) -- set(HAVE_ZLIB_NG TRUE) -- else() -- find_package(ZLIB) -- endif() -- -- if(NOT (ZLIB_NG_FOUND OR ZLIB_FOUND)) -- message(STATUS "No ZLIB found. Using ZLIB-NG internal sources.") -- endif() -+ find_package(ZLIB REQUIRED) - endif() - -- if (NOT (ZLIB_NG_FOUND OR ZLIB_FOUND)) -+ if (0) - message(STATUS "Using ZLIB-NG internal sources for ZLIB support.") - set(HAVE_ZLIB_NG TRUE) - add_definitions(-DZLIB_COMPAT) -@@ -184,7 +176,7 @@ endif() - - if(NOT DEACTIVATE_ZSTD) - if(PREFER_EXTERNAL_ZSTD) -- find_package(ZSTD) -+ find_package(zstd) - if(NOT ZSTD_FOUND) - message(STATUS "No ZSTD library found. Using internal sources.") - endif() diff --git a/recipes/c-blosc2/all/test_package/CMakeLists.txt b/recipes/c-blosc2/all/test_package/CMakeLists.txt deleted file mode 100644 index 2b52be6633ff8..0000000000000 --- a/recipes/c-blosc2/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package C) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(c-blosc2 REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} c-blosc2::c-blosc2) diff --git a/recipes/c-blosc2/all/test_package/conanfile.py b/recipes/c-blosc2/all/test_package/conanfile.py deleted file mode 100644 index 333435871c7d8..0000000000000 --- a/recipes/c-blosc2/all/test_package/conanfile.py +++ /dev/null @@ -1,18 +0,0 @@ -from conans import ConanFile, CMake -from conan import tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.build.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/c-blosc2/all/test_package/test_package.c b/recipes/c-blosc2/all/test_package/test_package.c deleted file mode 100644 index 57eacc94c15a2..0000000000000 --- a/recipes/c-blosc2/all/test_package/test_package.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - Copyright (C) 2014 Francesc Alted - http://blosc.org - License: MIT (see LICENSE.txt) - Example program demonstrating use of the Blosc filter from C code. - To compile this program: - $ gcc simple.c -o simple -lblosc - or, if you don't have the blosc library installed: - $ gcc -O3 -msse2 simple.c -I../blosc -o simple -L../build/blosc - Using MSVC on Windows: - $ cl /arch:SSE2 /Ox /Fesimple.exe /Iblosc examples\simple.c blosc\blosc.c blosc\blosclz.c blosc\shuffle.c blosc\shuffle-sse2.c blosc\shuffle-generic.c blosc\bitshuffle-generic.c blosc\bitshuffle-sse2.c - To run: - $ ./simple - Blosc version info: 1.4.2.dev ($Date:: 2014-07-08 #$) - Compression: 4000000 -> 158494 (25.2x) - Decompression succesful! - Succesful roundtrip! -*/ - -#include "blosc2.h" - -#include - -#define SIZE 100*100*100 - -int main(){ - static float data[SIZE]; - static float data_out[SIZE]; - static float data_dest[SIZE]; - int isize = SIZE*sizeof(float), osize = SIZE*sizeof(float); - int dsize = SIZE*sizeof(float), csize; - int i; - - for(i=0; i %d (%.1fx)\n", isize, csize, (1.*isize) / csize); - - /* Decompress */ - dsize = blosc_decompress(data_out, data_dest, dsize); - if (dsize < 0) { - printf("Decompression error. Error code: %d\n", dsize); - return dsize; - } - - printf("Decompression succesful!\n"); - - /* After using it, destroy the Blosc environment */ - blosc_destroy(); - - for(i=0;i= 7.71.0. Update your curl version, use WinSSL, disable SSL or use the build in version of curl.") +- endif() +- else() +- find_package(CURL COMPONENTS HTTP) +- if(CURL_FOUND) +- message(FATAL_ERROR "Curl found on this system but WITHOUT HTTPS/SSL support. Either disable SSL by setting CPR_ENABLE_SSL to OFF or use the build in version of curl by setting CPR_FORCE_USE_SYSTEM_CURL to OFF.") +- else() +- message(FATAL_ERROR "Curl not found on this system. To use the build in version set CPR_FORCE_USE_SYSTEM_CURL to OFF.") +- endif() +- endif() ++ find_package(CURL REQUIRED) ++ if(CURL_FOUND) ++ message(STATUS "Curl found on this system.") + else() +- find_package(CURL COMPONENTS HTTP) +- if(CURL_FOUND) +- message(STATUS "Curl found on this system.") +- else() +- message(FATAL_ERROR "Curl not found on this system. To use the build in version set CPR_FORCE_USE_SYSTEM_CURL to OFF.") +- endif() ++ message(FATAL_ERROR "Curl not found on this system. To use the build in version set CPR_FORCE_USE_SYSTEM_CURL to OFF.") + endif() + else() + message(STATUS "Configuring build in curl...") diff --git a/recipes/cpr/all/patches/005-1.9.0-fix-curl-components.patch b/recipes/cpr/all/patches/005-1.9.0-fix-curl-components.patch deleted file mode 100644 index f20781e9ef90e..0000000000000 --- a/recipes/cpr/all/patches/005-1.9.0-fix-curl-components.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb7c5f0..c6c19e4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -162,6 +162,8 @@ endif() - - # Curl configuration - if(CPR_FORCE_USE_SYSTEM_CURL) -+ find_package(CURL REQUIRED) -+ if(0) - if(CPR_ENABLE_SSL) - find_package(CURL COMPONENTS HTTP HTTPS) - if(CURL_FOUND) -@@ -186,6 +188,7 @@ if(CPR_FORCE_USE_SYSTEM_CURL) - message(FATAL_ERROR "Curl not found on this system. To use the build in version set CPR_FORCE_USE_SYSTEM_CURL to OFF.") - endif() - endif() -+ endif() - else() - message(STATUS "Configuring build in curl...") - diff --git a/recipes/cpr/all/patches/006-patch-sanitizer.patch b/recipes/cpr/all/patches/006-patch-sanitizer.patch new file mode 100644 index 0000000000000..ecb7d53ae55e8 --- /dev/null +++ b/recipes/cpr/all/patches/006-patch-sanitizer.patch @@ -0,0 +1,39 @@ +--- a/cmake/sanitizer.cmake ++++ b/cmake/sanitizer.cmake +@@ -16,6 +16,7 @@ if(THREAD_SANITIZER_AVAILABLE) + endif() + set(CMAKE_C_FLAGS_THREADSAN "${CMAKE_C_FLAGS_DEBUG} ${THREAD_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C compiler during thread sanitizer builds." FORCE) + set(CMAKE_CXX_FLAGS_THREADSAN "${CMAKE_CXX_FLAGS_DEBUG} ${THREAD_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C++ compiler during thread sanitizer builds." FORCE) ++set(CMAKE_SHARED_LINKER_FLAGS_THREADSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during thread sanitizer builds" FORCE) + + # Address sanitizer + set(ADDR_SAN_FLAGS "-fsanitize=address") +@@ -29,6 +30,7 @@ if(ADDRESS_SANITIZER_AVAILABLE) + endif() + set(CMAKE_C_FLAGS_ADDRSAN "${CMAKE_C_FLAGS_DEBUG} ${ADDR_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C compiler during address sanitizer builds." FORCE) + set(CMAKE_CXX_FLAGS_ADDRSAN "${CMAKE_CXX_FLAGS_DEBUG} ${ADDR_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C++ compiler during address sanitizer builds." FORCE) ++set(CMAKE_SHARED_LINKER_FLAGS_ADDRSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during address sanitizer builds" FORCE) + + # Leak sanitizer + set(LEAK_SAN_FLAGS "-fsanitize=leak") +@@ -39,6 +41,7 @@ if(LEAK_SANITIZER_AVAILABLE) + endif() + set(CMAKE_C_FLAGS_LEAKSAN "${CMAKE_C_FLAGS_DEBUG} ${LEAK_SAN_FLAGS} -fno-omit-frame-pointer" CACHE INTERNAL "Flags used by the C compiler during leak sanitizer builds." FORCE) + set(CMAKE_CXX_FLAGS_LEAKSAN "${CMAKE_CXX_FLAGS_DEBUG} ${LEAK_SAN_FLAGS} -fno-omit-frame-pointer" CACHE INTERNAL "Flags used by the C++ compiler during leak sanitizer builds." FORCE) ++set(CMAKE_SHARED_LINKER_FLAGS_LEAKSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during leak sanitizer builds" FORCE) + + # Undefined behavior sanitizer + set(UDEF_SAN_FLAGS "-fsanitize=undefined") +@@ -49,6 +52,7 @@ if(UNDEFINED_BEHAVIOUR_SANITIZER_AVAILABLE) + endif() + set(CMAKE_C_FLAGS_UDEFSAN "${CMAKE_C_FLAGS_DEBUG} ${UDEF_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C compiler during undefined behaviour sanitizer builds." FORCE) + set(CMAKE_CXX_FLAGS_UDEFSAN "${CMAKE_CXX_FLAGS_DEBUG} ${UDEF_SAN_FLAGS}" CACHE INTERNAL "Flags used by the C++ compiler during undefined behaviour sanitizer builds." FORCE) ++set(CMAKE_SHARED_LINKER_FLAGS_UDEFSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during undefined behaviour sanitizer builds" FORCE) + + # All sanitizer (without thread sanitizer) + if(NOT ALL_SAN_FLAGS STREQUAL "") +@@ -63,3 +67,4 @@ endif() + + set(CMAKE_C_FLAGS_ALLSAN "${CMAKE_C_FLAGS_DEBUG} ${ALL_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C compiler during most possible sanitizer builds." FORCE) + set(CMAKE_CXX_FLAGS_ALLSAN "${CMAKE_CXX_FLAGS_DEBUG} ${ALL_SAN_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls" CACHE INTERNAL "Flags used by the C++ compiler during most possible sanitizer builds." FORCE) ++set(CMAKE_SHARED_LINKER_FLAGS_ALLSAN "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" "Flags used for the linker during most possible sanitizer builds" FORCE) diff --git a/recipes/cpr/all/test_package/conanfile.py b/recipes/cpr/all/test_package/conanfile.py index 2490acfa82ff8..38f4483872d47 100644 --- a/recipes/cpr/all/test_package/conanfile.py +++ b/recipes/cpr/all/test_package/conanfile.py @@ -1,5 +1,4 @@ -from conans import ConanFile, CMake -from conan.tools.build import cross_building +from conans import ConanFile, CMake, tools import os @@ -13,6 +12,6 @@ def build(self): cmake.build() def test(self): - if not cross_building(self): + if not tools.cross_building(self): bin_path = os.path.join("bin", "test_package") self.run(bin_path, run_environment=True) diff --git a/recipes/cpr/config.yml b/recipes/cpr/config.yml index 3ceff74829cd9..fd40da8347f0e 100644 --- a/recipes/cpr/config.yml +++ b/recipes/cpr/config.yml @@ -1,13 +1,17 @@ versions: - "1.9.0": - folder: all "1.8.1": folder: all "1.7.2": folder: all "1.6.2": folder: all + "1.6.0": + folder: all "1.5.2": folder: all + "1.5.0": + folder: all "1.4.0": folder: all + "1.3.0": + folder: all diff --git a/recipes/daw_header_libraries/all/conandata.yml b/recipes/daw_header_libraries/all/conandata.yml index aa2ec05318d30..09bc4285898b7 100644 --- a/recipes/daw_header_libraries/all/conandata.yml +++ b/recipes/daw_header_libraries/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "2.65.1": - url: "https://github.com/beached/header_libraries/archive/v2.65.1.tar.gz" - sha256: "fd52024bb361d1ac8011cd03def39b4d6aea35015f26163f3865ca65df91ca57" "2.65.0": url: "https://github.com/beached/header_libraries/archive/v2.65.0.tar.gz" sha256: "9059d12bcacf2895ffa98cfa59d32914247e9cd601945ba6d574348babf7fdb4" diff --git a/recipes/daw_header_libraries/config.yml b/recipes/daw_header_libraries/config.yml index e80480700d374..f7b8c60fc50ed 100644 --- a/recipes/daw_header_libraries/config.yml +++ b/recipes/daw_header_libraries/config.yml @@ -1,6 +1,4 @@ versions: - "2.65.1": - folder: all "2.65.0": folder: all "2.64.2": diff --git a/recipes/diligent-core/all/CMakeLists.txt b/recipes/diligent-core/all/CMakeLists.txt index 3c184a638f2ac..8b2bfcc40fc83 100644 --- a/recipes/diligent-core/all/CMakeLists.txt +++ b/recipes/diligent-core/all/CMakeLists.txt @@ -10,11 +10,4 @@ find_package(glslang REQUIRED CONFIG) find_package(volk REQUIRED CONFIG) find_package(xxHash REQUIRED CONFIG) -add_library(glslang INTERFACE) -target_link_libraries(glslang INTERFACE glslang::glslang) -target_include_directories(glslang INTERFACE ${CONAN_INCLUDE_DIRS_GLSLANG}/glslang) - -add_library(SPIRV ALIAS glslang::SPIRV) -add_library(SPIRV-Headers ALIAS SPIRV-Headers::SPIRV-Headers) - add_subdirectory(source_subfolder) diff --git a/recipes/diligent-core/all/conandata.yml b/recipes/diligent-core/all/conandata.yml index 0b9b5a5985bfa..28b13ee61a4f7 100644 --- a/recipes/diligent-core/all/conandata.yml +++ b/recipes/diligent-core/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "api.252004": - url: "https://github.com/DiligentGraphics/DiligentCore/archive/refs/tags/API252004.tar.gz" - sha256: "f1a5a46f60b26cd7f07e27a64b90e76e28643a09cb3af786d04141ce7c306452" "api.252003": url: "https://github.com/DiligentGraphics/DiligentCore/archive/refs/tags/API252003.tar.gz" sha256: "18f17eaa0b6425022be4019c61fede441b9feec4b94c2b7e8ab73d86a7f6a913" @@ -16,8 +13,20 @@ sources: sha256: "8f85fc55c6241f9215875df58a077f797e9134c9b51f330f1489df91d8553b7d" patches: "api.252003": + - patch_file: "patches/0019-252003-exclude-tests.patch" + base_path: "source_subfolder" + - patch_file: "patches/0020-252003-dont-install-3d-party-license.patch" + base_path: "source_subfolder" + - patch_file: "patches/0021-252003-fix-glslang-usage.patch" + base_path: "source_subfolder" + - patch_file: "patches/0022-252003-fix-glslang-include.patch" + base_path: "source_subfolder" - patch_file: "patches/0023-252003-fix-warning-as-error.patch" base_path: "source_subfolder" + - patch_file: "patches/0024-252003-dont-install-3d-party-license.patch" + base_path: "source_subfolder" + - patch_file: "patches/0025-252003-fix-warning-as-error-win.patch" + base_path: "source_subfolder" "2.5.2": - patch_file: "patches/0014-252-exclude-tests.patch" base_path: "source_subfolder" diff --git a/recipes/diligent-core/all/conanfile.py b/recipes/diligent-core/all/conanfile.py index 8f3afdf2864e7..5051ca82fbbb6 100644 --- a/recipes/diligent-core/all/conanfile.py +++ b/recipes/diligent-core/all/conanfile.py @@ -1,7 +1,6 @@ from conans import ConanFile, tools, CMake from conans.errors import ConanInvalidConfiguration import os -from conan.tools.build import cross_building required_conan_version = ">=1.33.0" @@ -92,18 +91,17 @@ def build_requirements(self): def requirements(self): self.requires("opengl/system") - self.requires("spirv-cross/1.3.216.0") - self.requires("spirv-tools/1.3.216.0") + self.requires("spirv-cross/1.3.211.0") + self.requires("spirv-tools/1.3.211.0") if self.options.with_glslang: - self.requires("glslang/1.3.216.0") - self.requires("vulkan-headers/1.3.216.0") - self.requires("vulkan-validationlayers/1.3.216.0") - self.requires("volk/1.3.216.0") + self.requires("glslang/1.3.211.0") + self.requires("vulkan-headers/1.3.211.0") + self.requires("volk/1.3.204") self.requires("xxhash/0.8.1") if self.settings.os in ["Linux", "FreeBSD"]: self.requires("xorg/system") - if not cross_building(self, skip_x64_x86=True): + if not tools.cross_building(self, skip_x64_x86=True): self.requires("xkbcommon/1.4.1") def _diligent_platform(self): @@ -133,8 +131,6 @@ def _configure_cmake(self): self._cmake.definitions["DILIGENT_NO_GLSLANG"] = not self.options.with_glslang self._cmake.definitions["SPIRV_CROSS_NAMESPACE_OVERRIDE"] = self.options["spirv-cross"].namespace self._cmake.definitions["BUILD_SHARED_LIBS"] = False - self._cmake.definitions["DILIGENT_CLANG_COMPILE_OPTIONS"] = "" - self._cmake.definitions["DILIGENT_MSVC_COMPILE_OPTIONS"] = "" self._cmake.definitions["ENABLE_RTTI"] = True self._cmake.definitions["ENABLE_EXCEPTIONS"] = True diff --git a/recipes/diligent-core/all/patches/0019-252003-exclude-tests.patch b/recipes/diligent-core/all/patches/0019-252003-exclude-tests.patch new file mode 100644 index 0000000000000..213231996648e --- /dev/null +++ b/recipes/diligent-core/all/patches/0019-252003-exclude-tests.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 59f53e55..5baa9c83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -455,7 +455,7 @@ add_subdirectory(Primitives) + add_subdirectory(Platforms) + add_subdirectory(Common) + add_subdirectory(Graphics) +-add_subdirectory(Tests) ++#add_subdirectory(Tests) + + + # Installation instructions diff --git a/recipes/diligent-core/all/patches/0020-252003-dont-install-3d-party-license.patch b/recipes/diligent-core/all/patches/0020-252003-dont-install-3d-party-license.patch new file mode 100644 index 0000000000000..61148a6b69bdf --- /dev/null +++ b/recipes/diligent-core/all/patches/0020-252003-dont-install-3d-party-license.patch @@ -0,0 +1,11 @@ +diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt +index 88b89f84..278a72df 100644 +--- a/ThirdParty/CMakeLists.txt ++++ b/ThirdParty/CMakeLists.txt +@@ -167,6 +167,3 @@ if (NOT TARGET xxHash::xxhash) + install(FILES "${xxHash_SOURCE_DIR}/../LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME xxHash-License.txt) + endif() + +-install(FILES stb/stb_image_write_license.txt DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}") +-install(FILES DirectXShaderCompiler/LICENSE.TXT DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME DXC-License.txt) +-install(FILES DirectXShaderCompiler/ThirdPartyNotices.txt DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME DXC-ThirdPartyNotices.txt) diff --git a/recipes/diligent-core/all/patches/0021-252003-fix-glslang-usage.patch b/recipes/diligent-core/all/patches/0021-252003-fix-glslang-usage.patch new file mode 100644 index 0000000000000..522c69b9c78ca --- /dev/null +++ b/recipes/diligent-core/all/patches/0021-252003-fix-glslang-usage.patch @@ -0,0 +1,28 @@ +diff --git a/Graphics/ShaderTools/CMakeLists.txt b/Graphics/ShaderTools/CMakeLists.txt +index 015425a9..53507f61 100644 +--- a/Graphics/ShaderTools/CMakeLists.txt ++++ b/Graphics/ShaderTools/CMakeLists.txt +@@ -152,8 +152,8 @@ if(ENABLE_SPIRV) + if (${USE_GLSLANG}) + target_link_libraries(Diligent-ShaderTools + PRIVATE +- SPIRV +- glslang ++ SPIRV-Tools-opt ++ glslang::SPIRV glslang::glslang glslang::MachineIndependent glslang::GenericCodeGen glslang::OSDependent glslang::OGLCompiler glslang::HLSL + ) + endif() + endif() +diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt +index 278a72df..f0183b05 100644 +--- a/ThirdParty/CMakeLists.txt ++++ b/ThirdParty/CMakeLists.txt +@@ -64,7 +64,7 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED) + install(FILES "${spirv-tools_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Tools-License.txt) + endif() + +- if (NOT ${DILIGENT_NO_GLSLANG} AND (NOT TARGET glslang)) ++ if (NOT ${DILIGENT_NO_GLSLANG} AND (NOT TARGET glslang::glslang)) + set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Do not build glslang binaries") + set(ENABLE_SPVREMAPPER OFF CACHE BOOL "Do not build SPIRV remapper") + set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "Skip glslang installation") diff --git a/recipes/diligent-core/all/patches/0022-252003-fix-glslang-include.patch b/recipes/diligent-core/all/patches/0022-252003-fix-glslang-include.patch new file mode 100644 index 0000000000000..7618a5399e494 --- /dev/null +++ b/recipes/diligent-core/all/patches/0022-252003-fix-glslang-include.patch @@ -0,0 +1,12 @@ +diff --git a/Graphics/ShaderTools/src/GLSLangUtils.cpp b/Graphics/ShaderTools/src/GLSLangUtils.cpp +--- a/Graphics/ShaderTools/src/GLSLangUtils.cpp ++++ b/Graphics/ShaderTools/src/GLSLangUtils.cpp +@@ -34,7 +34,7 @@ + # include + #else + # define ENABLE_HLSL +-# include "SPIRV/GlslangToSpv.h" ++# include + #endif + + #include "GLSLangUtils.hpp" diff --git a/recipes/diligent-core/all/patches/0024-252003-dont-install-3d-party-license.patch b/recipes/diligent-core/all/patches/0024-252003-dont-install-3d-party-license.patch new file mode 100644 index 0000000000000..080a7e743b540 --- /dev/null +++ b/recipes/diligent-core/all/patches/0024-252003-dont-install-3d-party-license.patch @@ -0,0 +1,36 @@ +diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt +index f0183b05..dd7d2e3d 100644 +--- a/ThirdParty/CMakeLists.txt ++++ b/ThirdParty/CMakeLists.txt +@@ -26,7 +26,6 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED) + # Note that SPIRV-Headers_SOURCE_DIR variable is normally created by project(SPIRV-Headers) + set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers") + target_include_directories(SPIRV-Headers INTERFACE "${SPIRV-Headers_SOURCE_DIR}/include") +- install(FILES "${SPIRV-Headers_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Headers-License.txt) + endif() + + if (NOT TARGET Vulkan::Headers) +@@ -37,7 +36,6 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED) + set(Vulkan-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") + add_library(Vulkan::Headers ALIAS Vulkan-Headers) + target_include_directories(Vulkan-Headers INTERFACE "${Vulkan-Headers_SOURCE_DIR}/include") +- install(FILES "${Vulkan-Headers_SOURCE_DIR}/LICENSE.txt" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME Vulkan-Headers-License.txt) + endif() + + option(DILIGENT_NO_GLSLANG "Do NOT build glslang compiler" OFF) +@@ -61,7 +59,6 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED) + set_target_properties(${SPIRV_TOOLS_EXCLUDE_TARGETS} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1) + + set(THIRD_PARTY_LIBS SPIRV-Tools-static SPIRV-Tools-opt) +- install(FILES "${spirv-tools_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Tools-License.txt) + endif() + + if (NOT ${DILIGENT_NO_GLSLANG} AND (NOT TARGET glslang::glslang)) +@@ -101,7 +98,6 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED) + list(APPEND THIRD_PARTY_LIBS spirv-cross-msl spirv-cross-glsl) + endif() + +- install(FILES "${SPIRV-Cross_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Cross-License.txt) + endif() + + if (DILIGENT_INSTALL_CORE) diff --git a/recipes/diligent-core/all/patches/0025-252003-fix-warning-as-error-win.patch b/recipes/diligent-core/all/patches/0025-252003-fix-warning-as-error-win.patch new file mode 100644 index 0000000000000..901206ca98692 --- /dev/null +++ b/recipes/diligent-core/all/patches/0025-252003-fix-warning-as-error-win.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fc8aafc..aa8b8cf8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -311,7 +311,7 @@ if(MSVC) + # - w4100 - unreferenced formal parameter + # - w4201 - nonstandard extension used: nameless struct/union + # - w4505 - unreferenced local function has been removed +- target_compile_options(Diligent-BuildSettings INTERFACE /W4 /wd4100 /wd4201 /wd4505 /MP ${DILIGENT_MSVC_COMPILE_OPTIONS}) ++ target_compile_options(Diligent-BuildSettings INTERFACE /W0 /wd4100 /wd4201 /wd4505 /MP ${DILIGENT_MSVC_COMPILE_OPTIONS}) + + # In all release modes also: + # - disable w4189 - local variable is initialized but not referenced diff --git a/recipes/diligent-core/all/patches/0025-253-fix-warning-as-error-win.patch.bak b/recipes/diligent-core/all/patches/0025-253-fix-warning-as-error-win.patch.bak new file mode 100644 index 0000000000000..8ced14bfe7913 --- /dev/null +++ b/recipes/diligent-core/all/patches/0025-253-fix-warning-as-error-win.patch.bak @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fc8aafc..aa8b8cf8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -311,7 +311,7 @@ if(MSVC) + # - w4100 - unreferenced formal parameter + # - w4201 - nonstandard extension used: nameless struct/union + # - w4505 - unreferenced local function has been removed +- target_compile_options(Diligent-BuildSettings INTERFACE /W4 /wd4100 /wd4201 /wd4505 /MP ${DILIGENT_MSVC_COMPILE_OPTIONS}) ++ target_compile_options(Diligent-BuildSettings INTERFACE /W1 /wd4100 /wd4201 /wd4505 /MP ${DILIGENT_MSVC_COMPILE_OPTIONS}) + + # In all release modes also: + # - disable w4189 - local variable is initialized but not referenced diff --git a/recipes/diligent-core/all/test_package/conanfile.py b/recipes/diligent-core/all/test_package/conanfile.py index f2355b8294daf..d4128b0450777 100644 --- a/recipes/diligent-core/all/test_package/conanfile.py +++ b/recipes/diligent-core/all/test_package/conanfile.py @@ -1,6 +1,6 @@ from conans import ConanFile, CMake, tools import os -from conan.tools.build import cross_building + class TestPackageConan(ConanFile): settings = "os", "compiler", "build_type", "arch" @@ -12,6 +12,6 @@ def build(self): cmake.build() def test(self): - if not cross_building(self): + if not tools.cross_building(self): bin_path = os.path.join("bin", "test_package") self.run(bin_path, run_environment=True) diff --git a/recipes/diligent-core/config.yml b/recipes/diligent-core/config.yml index 67c44ebd2001b..2e83aab867395 100644 --- a/recipes/diligent-core/config.yml +++ b/recipes/diligent-core/config.yml @@ -1,6 +1,4 @@ versions: - "api.252004": - folder: "all" "api.252003": folder: "all" "2.5.2": diff --git a/recipes/djinni-generator/all/conandata.yml b/recipes/djinni-generator/all/conandata.yml index f0faa524fc522..ccd425fd870e7 100644 --- a/recipes/djinni-generator/all/conandata.yml +++ b/recipes/djinni-generator/all/conandata.yml @@ -26,6 +26,3 @@ sources: "1.3.1": url: https://github.com/cross-language-cpp/djinni-generator/releases/download/v1.3.1/djinni sha256: "bfba34fcb83cd42e41657b4951615b823677e3de7674e66d2b26e436e202dd5a" - "1.3.2": - url: https://github.com/cross-language-cpp/djinni-generator/releases/download/v1.3.2/djinni - sha256: "8e618aeb8e9138e7fefaca804263317846799fee59d9465a4eee6625b8266ea1" diff --git a/recipes/djinni-generator/all/conanfile.py b/recipes/djinni-generator/all/conanfile.py index ae2c62ed78bb5..88cc8b79ba87e 100644 --- a/recipes/djinni-generator/all/conanfile.py +++ b/recipes/djinni-generator/all/conanfile.py @@ -32,6 +32,5 @@ def package(self): self.copy("LICENSE", dst="licenses", keep_path=False) def package_info(self): - self.cpp_info.includedirs = [] self.env_info.PATH.append(os.path.join(self.package_folder, "bin")) diff --git a/recipes/djinni-generator/config.yml b/recipes/djinni-generator/config.yml index 47d0ee6875d8a..b603cc5447154 100644 --- a/recipes/djinni-generator/config.yml +++ b/recipes/djinni-generator/config.yml @@ -17,5 +17,3 @@ versions: folder: "all" "1.3.1": folder: "all" - "1.3.2": - folder: "all" diff --git a/recipes/emsdk/all/conandata.yml b/recipes/emsdk/all/conandata.yml index bbed3354bd82e..8e8fd14153cac 100644 --- a/recipes/emsdk/all/conandata.yml +++ b/recipes/emsdk/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.1.16": - url: "https://github.com/emscripten-core/emsdk/archive/3.1.16.tar.gz" - sha256: "0a7a822e09bb22d081a49bf4229377689aef473376f36b5fe62db040d7e1c065" "3.1.15": url: "https://github.com/emscripten-core/emsdk/archive/3.1.15.tar.gz" sha256: "74c7c54b3544555ec38d1e9dcc7e90b9f49ed0e04f2cc3fd44663c598af24124" diff --git a/recipes/emsdk/config.yml b/recipes/emsdk/config.yml index 67df3d5a493db..05362b21df896 100644 --- a/recipes/emsdk/config.yml +++ b/recipes/emsdk/config.yml @@ -1,6 +1,4 @@ versions: - "3.1.16": - folder: all "3.1.15": folder: all "3.1.12": diff --git a/recipes/enjincppsdk/all/conandata.yml b/recipes/enjincppsdk/all/conandata.yml index 51b1a6998b1de..a0847dc92cc28 100644 --- a/recipes/enjincppsdk/all/conandata.yml +++ b/recipes/enjincppsdk/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.0.0-beta.1": - url: "https://github.com/enjin/enjin-cpp-sdk/archive/1.0.0.2000.tar.gz" - sha256: "ba1ea4800a73dc25e0e5261108cf7245531ec5bfd3a12b989f72cf5c23778d7e" "1.0.0-alpha.7": url: "https://github.com/enjin/enjin-cpp-sdk/archive/1.0.0.1006.tar.gz" sha256: "3b75bf2bb5b0fb9dc995e7c319dc0795d3bee802ebdbd7ed5565a944bf87f6ec" diff --git a/recipes/enjincppsdk/config.yml b/recipes/enjincppsdk/config.yml index cd6f8cc467b7b..8b09d19794df0 100644 --- a/recipes/enjincppsdk/config.yml +++ b/recipes/enjincppsdk/config.yml @@ -1,6 +1,4 @@ versions: - "1.0.0-beta.1": - folder: all "1.0.0-alpha.7": folder: all "1.0.0-alpha.6": diff --git a/recipes/erikzenker-hsm/all/conanfile.py b/recipes/erikzenker-hsm/all/conanfile.py index dc1bc116a100a..7b12f233d671b 100644 --- a/recipes/erikzenker-hsm/all/conanfile.py +++ b/recipes/erikzenker-hsm/all/conanfile.py @@ -1,7 +1,6 @@ -from conan import ConanFile, tools -from conan.tools.cmake import CMake, cmake_layout -from conan.errors import ConanInvalidConfiguration -from conan.tools.scm import Version +from conans import ConanFile, CMake, tools +from conans.errors import ConanInvalidConfiguration +from conans.tools import Version import os required_conan_version = ">=1.43.0" @@ -15,31 +14,32 @@ class HsmConan(ConanFile): topics = ("state-machine", "template-meta-programming") requires = "boost/1.79.0" no_copy_source = True + generators = "cmake" settings = "os", "arch", "build_type", "compiler" - generators = "CMakeDeps", "CMakeToolchain" - def layout(self): - cmake_layout(self) + @property + def _source_subfolder(self): + return "source_subfolder" def validate(self): # https://github.com/erikzenker/hsm#dependencies - if self.settings.compiler == "clang" and Version(str(self.settings.compiler.version)) < '8': + if self.settings.compiler == "clang" and Version(self.settings.compiler.version) < 8: raise ConanInvalidConfiguration("clang 8+ is required") - if self.settings.compiler == "gcc" and Version(str(self.settings.compiler.version)) < '8': + if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < 8: raise ConanInvalidConfiguration("GCC 8+ is required") def source(self): - tools.files.get(**self.conan_data["sources"][self.version], conanfile=self, destination=self.source_folder, strip_root=True) + tools.get(**self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True) def build(self): cmake = CMake(self) - cmake.configure() + cmake.configure(source_folder=self._source_subfolder) def package(self): - cmake = CMake(self) + cmake = CMake(self) cmake.install() - tools.files.rmdir(conanfile=self, path=os.path.join(self.package_folder, "lib", "cmake")) - self.copy("LICENSE", src=self.source_folder, dst="licenses") + tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) + self.copy("LICENSE", src=self._source_subfolder, dst="licenses") def package_id(self): self.info.header_only() @@ -47,5 +47,3 @@ def package_id(self): def package_info(self): self.cpp_info.names["cmake_find_package"] = "hsm" self.cpp_info.names["cmake_find_package_multi"] = "hsm" - self.cpp_info.set_property("cmake_file_name", "hsm") - self.cpp_info.set_property("cmake_target_name", "hsm::hsm") diff --git a/recipes/erikzenker-hsm/all/test_package/CMakeLists.txt b/recipes/erikzenker-hsm/all/test_package/CMakeLists.txt index dbde9a69f30b9..bf89a74945aaa 100644 --- a/recipes/erikzenker-hsm/all/test_package/CMakeLists.txt +++ b/recipes/erikzenker-hsm/all/test_package/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.1) project(PackageTest CXX) +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup(TARGETS) + find_package(hsm CONFIG REQUIRED) set(CMAKE_CXX_STANDARD 17) diff --git a/recipes/erikzenker-hsm/all/test_package/conanfile.py b/recipes/erikzenker-hsm/all/test_package/conanfile.py index 13b3d03de4018..37f5a447212a9 100644 --- a/recipes/erikzenker-hsm/all/test_package/conanfile.py +++ b/recipes/erikzenker-hsm/all/test_package/conanfile.py @@ -1,19 +1,11 @@ import os -from conan import ConanFile -from conan.tools.cmake import CMake, cmake_layout -from conan.tools.build import cross_building +from conans import ConanFile, CMake, tools class HsmTestConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "CMakeDeps", "CMakeToolchain" - - def requirements(self): - self.requires(self.tested_reference_str) - - def layout(self): - cmake_layout(self) + settings = "cppstd", "os", "compiler", "build_type", "arch" + generators = "cmake", "cmake_find_package_multi" def build(self): cmake = CMake(self) @@ -22,6 +14,6 @@ def build(self): def test(self): - if not cross_building(self): - bin_path = os.path.join(self.cpp.build.bindirs[0], "example") - self.run(bin_path, env="conanrun") + if not tools.cross_building(self): + bin_path = os.path.join("bin", "example") + self.run(bin_path, run_environment=True) diff --git a/recipes/etl/all/conandata.yml b/recipes/etl/all/conandata.yml index c4bf2278291e8..a9034eee57fc6 100644 --- a/recipes/etl/all/conandata.yml +++ b/recipes/etl/all/conandata.yml @@ -1,10 +1,4 @@ sources: - "20.31.1": - url: "https://github.com/ETLCPP/etl/archive/20.31.1.tar.gz" - sha256: "292313959c2b67bf8db8e1f9fc5b342739d67be157e1875b9095eb8bb679f940" - "20.31.0": - url: "https://github.com/ETLCPP/etl/archive/20.31.0.tar.gz" - sha256: "1f10bbcdcc148646a4421830fbde8565403f55cd4f9a7c7047c5c085fd375fad" "20.30.1": url: "https://github.com/ETLCPP/etl/archive/20.30.1.tar.gz" sha256: "10b50ca3ae406ae379e85504546843fc9d97be18924e71d8eb7e8e5a418e91cd" diff --git a/recipes/etl/config.yml b/recipes/etl/config.yml index baf19b025d44d..1da227297c048 100644 --- a/recipes/etl/config.yml +++ b/recipes/etl/config.yml @@ -1,8 +1,4 @@ versions: - "20.31.1": - folder: all - "20.31.0": - folder: all "20.30.1": folder: all "20.29.3": diff --git a/recipes/ezc3d/all/conandata.yml b/recipes/ezc3d/all/conandata.yml index 414dbc3f883f6..c5ae886c95864 100644 --- a/recipes/ezc3d/all/conandata.yml +++ b/recipes/ezc3d/all/conandata.yml @@ -1,17 +1,23 @@ sources: - "1.5.0": - url: "https://github.com/pyomeca/ezc3d/archive/refs/tags/Release_1.5.0.tar.gz" - sha256: "8387857d989f5bbb62869ec930b417e6d0a303eef9b39e8b0e6b35437d5809ce" "1.4.8": url: "https://github.com/pyomeca/ezc3d/archive/refs/tags/Release_1.4.8.tar.gz" sha256: "ebe69a97ba64b463b0d4b0bd1657fa55af9bc17572a3b6bf9e8b321846cd30c8" + "1.4.7": + url: "https://github.com/pyomeca/ezc3d/archive/refs/tags/Release_1.4.7.tar.gz" + sha256: "b11921ecd9ff5716f19b4a4eeede36f8cfa5ff08e6fd2c9c12e55f83e9d782bd" + "1.4.6": + url: "https://github.com/pyomeca/ezc3d/archive/refs/tags/Release_1.4.6.tar.gz" + sha256: "bdc75cb2c930f8bd39b7fdb527fa4db79ffa8797496b34525beb88efa7cfda32" + "1.4.5": + url: "https://github.com/pyomeca/ezc3d/archive/refs/tags/Release_1.4.5.tar.gz" + sha256: "01602b2ccfc0edd88089e89d249e10086022f7ed7ef40caa3eb3b048ccfa40aa" "1.3.8": url: "https://github.com/pyomeca/ezc3d/archive/Release_1.3.8.tar.gz" sha256: "888cb191c7939b31891e93356aa5bfcf21edb8785d3b5d4d9ec215984bc8b83e" + "1.3.7": + url: "https://github.com/pyomeca/ezc3d/archive/Release_1.3.7.tar.gz" + sha256: "17cd3d4e20840710d58b8987c01ef0f880bc0c063ab52e0cb86ba41665ec33a0" patches: - "1.4.8": - - patch_file: "patches/0001-fix-cmake-1.4.8.patch" - base_path: "source_subfolder" - "1.3.8": - - patch_file: "patches/0001-fix-cmake-1.3.8.patch" + "1.3.7": + - patch_file: "patches/fix-export-symbols.patch" base_path: "source_subfolder" diff --git a/recipes/ezc3d/all/conanfile.py b/recipes/ezc3d/all/conanfile.py index ea819a23d97a5..ac7d8ecf71681 100644 --- a/recipes/ezc3d/all/conanfile.py +++ b/recipes/ezc3d/all/conanfile.py @@ -54,6 +54,19 @@ def source(self): def _patch_sources(self): for patch in self.conan_data.get("patches", {}).get(self.version, []): tools.patch(**patch) + # don't force PIC + tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), + "set(CMAKE_POSITION_INDEPENDENT_CODE ON)", "") + # fix install + tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), + "set(${PROJECT_NAME}_LIB_FOLDER Lib", + "set(${PROJECT_NAME}_LIB_FOLDER lib") + tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), + "set(${PROJECT_NAME}_LIB_FOLDER lib/${PROJECT_NAME}", + "set(${PROJECT_NAME}_LIB_FOLDER lib") + tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), + "set(${PROJECT_NAME}_BIN_FOLDER lib/${PROJECT_NAME}", + "set(${PROJECT_NAME}_BIN_FOLDER bin") @functools.lru_cache(1) def _configure_cmake(self): @@ -61,8 +74,6 @@ def _configure_cmake(self): cmake.definitions["USE_MATRIX_FAST_ACCESSOR"] = True cmake.definitions["BINDER_PYTHON3"] = False cmake.definitions["BINDER_MATLAB"] = False - if tools.Version(self.version) >= "1.4.3": - cmake.definitions["BINDER_OCTAVE"] = False cmake.definitions["BUILD_EXAMPLE"] = False cmake.definitions["BUILD_DOC"] = False cmake.definitions["GET_OFFICIAL_DOCUMENTATION"] = False diff --git a/recipes/ezc3d/all/patches/0001-fix-cmake-1.3.8.patch b/recipes/ezc3d/all/patches/0001-fix-cmake-1.3.8.patch deleted file mode 100644 index 29143b93ecbef..0000000000000 --- a/recipes/ezc3d/all/patches/0001-fix-cmake-1.3.8.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.8) - cmake_policy(SET CMP0048 NEW) - project(ezc3d VERSION 1.3.7) - set(EZC3D_NAME ${PROJECT_NAME}) --set(CMAKE_CXX_STANDARD 11) --set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(EZC3D_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) - set(EZC3D_VERSION_MINOR ${PROJECT_VERSION_MINOR}) - set(EZC3D_VERSION_PATCH ${PROJECT_VERSION_PATCH}) -@@ -45,6 +43,7 @@ if (BUILD_SHARED_LIBS) - else() - add_library(${PROJECT_NAME} STATIC ${SRC_LIST}) - endif() -+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) - set_target_properties(${PROJECT_NAME} PROPERTIES - DEBUG_POSTFIX "_debug" - CXX_VISIBILITY_PRESET hidden -@@ -79,12 +78,12 @@ target_include_directories(${PROJECT_NAME} INTERFACE - - # Install target - if(WIN32) -- set(${PROJECT_NAME}_LIB_FOLDER Lib) -+ set(${PROJECT_NAME}_LIB_FOLDER lib) - set(${PROJECT_NAME}_BIN_FOLDER bin) - set(${PROJECT_NAME}_INCLUDE_FOLDER include/${PROJECT_NAME}) - else() -- set(${PROJECT_NAME}_LIB_FOLDER lib/${PROJECT_NAME}) -- set(${PROJECT_NAME}_BIN_FOLDER lib/${PROJECT_NAME}) -+ set(${PROJECT_NAME}_LIB_FOLDER lib) -+ set(${PROJECT_NAME}_BIN_FOLDER bin) - set(${PROJECT_NAME}_INCLUDE_FOLDER include/${PROJECT_NAME}) - endif() - install(TARGETS ${PROJECT_NAME} EXPORT ezc3dTargets diff --git a/recipes/ezc3d/all/patches/0001-fix-cmake-1.4.8.patch b/recipes/ezc3d/all/patches/0001-fix-cmake-1.4.8.patch deleted file mode 100644 index 5edaea8bb062b..0000000000000 --- a/recipes/ezc3d/all/patches/0001-fix-cmake-1.4.8.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,8 +3,6 @@ cmake_policy(SET CMP0048 NEW) - project(ezc3d VERSION 1.4.8) - set(EZC3D_NAME ${PROJECT_NAME}) - set(EZC3D_ROOT_FOLDER ${PROJECT_SOURCE_DIR}) --set(CMAKE_CXX_STANDARD 11) --set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(EZC3D_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) - set(EZC3D_VERSION_MINOR ${PROJECT_VERSION_MINOR}) - set(EZC3D_VERSION_PATCH ${PROJECT_VERSION_PATCH}) -@@ -56,6 +54,7 @@ if (BUILD_SHARED_LIBS) - else() - add_library(${PROJECT_NAME} STATIC ${SRC_LIST}) - endif() -+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) - set_target_properties(${PROJECT_NAME} PROPERTIES - DEBUG_POSTFIX "_debug" - CXX_VISIBILITY_PRESET hidden -@@ -91,12 +90,12 @@ target_include_directories(${PROJECT_NAME} INTERFACE - # Install target - if(WIN32) - # NOTE: Maybe use GNUInstallDirs? -- set(${PROJECT_NAME}_LIB_FOLDER Lib CACHE STRING "ARCHIVE/LIBRARY DESTINATION") -+ set(${PROJECT_NAME}_LIB_FOLDER lib CACHE STRING "ARCHIVE/LIBRARY DESTINATION") - set(${PROJECT_NAME}_BIN_FOLDER bin CACHE STRING "RUNTIME DESTINATION") - set(${PROJECT_NAME}_INCLUDE_FOLDER include/${PROJECT_NAME} CACHE STRING "INCLUDE DESTINATION") - else() -- set(${PROJECT_NAME}_LIB_FOLDER lib/${PROJECT_NAME} CACHE STRING "ARCHIVE/LIBRARY DESTINATION") -- set(${PROJECT_NAME}_BIN_FOLDER lib/${PROJECT_NAME} CACHE STRING "RUNTIME DESTINATION") -+ set(${PROJECT_NAME}_LIB_FOLDER lib CACHE STRING "ARCHIVE/LIBRARY DESTINATION") -+ set(${PROJECT_NAME}_BIN_FOLDER bin CACHE STRING "RUNTIME DESTINATION") - set(${PROJECT_NAME}_INCLUDE_FOLDER include/${PROJECT_NAME} CACHE STRING "INCLUDE DESTINATION") - endif() - install(TARGETS ${PROJECT_NAME} EXPORT ezc3dTargets diff --git a/recipes/ezc3d/all/patches/fix-export-symbols.patch b/recipes/ezc3d/all/patches/fix-export-symbols.patch new file mode 100644 index 0000000000000..d5b75eec8da68 --- /dev/null +++ b/recipes/ezc3d/all/patches/fix-export-symbols.patch @@ -0,0 +1,45 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,11 +40,16 @@ set(SRC_LIST + + set(BUILD_SHARED_LIBS TRUE CACHE BOOL "Choose if build should be a dynamic or static library") + if (BUILD_SHARED_LIBS) ++ set(EZC3D_SHARED TRUE) + add_library(${PROJECT_NAME} SHARED ${SRC_LIST}) + else() + add_library(${PROJECT_NAME} STATIC ${SRC_LIST}) + endif() +-set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "_debug") ++set_target_properties(${PROJECT_NAME} PROPERTIES ++ DEBUG_POSTFIX "_debug" ++ CXX_VISIBILITY_PRESET hidden ++ VISIBILITY_INLINES_HIDDEN ON ++) + + # Remember the CMAKE_CURRENT_BINARY_DIR (important if ezc3d is used as submodule) + set(EZC3D_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) +--- a/include/ezc3dConfig.h.in ++++ b/include/ezc3dConfig.h.in +@@ -1,12 +1,18 @@ + #ifndef EZC3D_CONFIG_H + #define EZC3D_CONFIG_H + ++#cmakedefine EZC3D_SHARED ++ + // dllexport/import declaration +-#ifdef _WIN32 +- #ifdef EZC3D_API_EXPORTS +- #define EZC3D_API __declspec(dllexport) ++#ifdef EZC3D_SHARED ++ #ifdef _WIN32 ++ #ifdef EZC3D_API_EXPORTS ++ #define EZC3D_API __declspec(dllexport) ++ #else ++ #define EZC3D_API __declspec(dllimport) ++ #endif + #else +- #define EZC3D_API __declspec(dllimport) ++ #define EZC3D_API __attribute__ ((visibility ("default"))) + #endif + #else + #define EZC3D_API diff --git a/recipes/ezc3d/config.yml b/recipes/ezc3d/config.yml index 3d5d9b1cd1d49..0b324c977d29e 100644 --- a/recipes/ezc3d/config.yml +++ b/recipes/ezc3d/config.yml @@ -1,7 +1,13 @@ versions: - "1.5.0": - folder: all "1.4.8": folder: all + "1.4.7": + folder: all + "1.4.6": + folder: all + "1.4.5": + folder: all "1.3.8": folder: all + "1.3.7": + folder: all diff --git a/recipes/c-blosc2/all/CMakeLists.txt b/recipes/fmt/all/CMakeLists.txt similarity index 76% rename from recipes/c-blosc2/all/CMakeLists.txt rename to recipes/fmt/all/CMakeLists.txt index dd348757f3de8..61f3d3b039e2b 100644 --- a/recipes/c-blosc2/all/CMakeLists.txt +++ b/recipes/fmt/all/CMakeLists.txt @@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 3.1) project(cmake_wrapper) include(conanbuildinfo.cmake) -conan_basic_setup(TARGETS KEEP_RPATHS) +conan_basic_setup(KEEP_RPATHS) add_subdirectory("source_subfolder") diff --git a/recipes/fmt/all/conandata.yml b/recipes/fmt/all/conandata.yml index 0d7001766f8ef..d9b43806d4218 100644 --- a/recipes/fmt/all/conandata.yml +++ b/recipes/fmt/all/conandata.yml @@ -56,6 +56,7 @@ sources: patches: "5.3.0": - patch_file: "patches/fix-install-5.3.0.patch" + base_path: "source_subfolder" # "6.0.0": # - patch_file: "patches/fix-install-6.0.0.patch" # base_path: "source_subfolder" diff --git a/recipes/fmt/all/conanfile.py b/recipes/fmt/all/conanfile.py index 562b7717bb5ea..3a75a531c07d0 100644 --- a/recipes/fmt/all/conanfile.py +++ b/recipes/fmt/all/conanfile.py @@ -1,13 +1,10 @@ import os -import shutil -from conan import ConanFile -from conan.tools.scm import Version -from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout -from conan.tools.files import get, apply_conandata_patches, copy, rmdir +from conan.tools.microsoft import msvc_runtime_flag +from conans import ConanFile, CMake, tools +from conans.errors import ConanInvalidConfiguration - -required_conan_version = ">=1.47.0" +required_conan_version = ">=1.43.0" class FmtConan(ConanFile): @@ -17,7 +14,6 @@ class FmtConan(ConanFile): topics = ("fmt", "format", "iostream", "printf") url = "https://github.com/conan-io/conan-center-index" license = "MIT" - exports_sources = "patches/*" settings = "os", "arch", "compiler", "build_type" options = { @@ -35,17 +31,29 @@ class FmtConan(ConanFile): "with_os_api": True, } + generators = "cmake" + _cmake = None + @property - def _has_with_os_api_option(self): - return Version(str(self.version)) >= "7.0.0" + def _source_subfolder(self): + return "source_subfolder" - def generate(self): - if not self.options.header_only: - tc = CMakeToolchain(self) - tc.generate() + @property + def _build_subfolder(self): + return "build_subfolder" - def layout(self): - cmake_layout(self) + @property + def _is_msvc(self): + return str(self.settings.compiler) in ["Visual Studio", "msvc"] + + @property + def _has_with_os_api_option(self): + return tools.Version(self.version) >= "7.0.0" + + def export_sources(self): + self.copy("CMakeLists.txt") + for patch in self.conan_data.get("patches", {}).get(self.version, []): + self.copy(patch["patch_file"]) def config_options(self): if self.settings.os == "Windows": @@ -63,74 +71,65 @@ def configure(self): elif self.options.shared: del self.options.fPIC + def validate(self): + if self.options.get_safe("shared") and self._is_msvc and "MT" in msvc_runtime_flag(self): + raise ConanInvalidConfiguration( + "Visual Studio build for shared library with MT runtime is not supported" + ) + def package_id(self): - if self.info.options.header_only: # might be changed to self.info.clear() in 1.50 + if self.options.header_only: self.info.header_only() else: del self.info.options.with_fmt_alias def source(self): - get(self, **self.conan_data["sources"][str(self.version)], strip_root=True) + tools.get(**self.conan_data["sources"][self.version], + destination=self._source_subfolder, strip_root=True) + + def _configure_cmake(self): + if self._cmake: + return self._cmake + self._cmake = CMake(self) + self._cmake.definitions["FMT_DOC"] = False + self._cmake.definitions["FMT_TEST"] = False + self._cmake.definitions["FMT_INSTALL"] = True + self._cmake.definitions["FMT_LIB_DIR"] = "lib" + if self._has_with_os_api_option: + self._cmake.definitions["FMT_OS"] = self.options.with_os_api + self._cmake.configure(build_folder=self._build_subfolder) + return self._cmake def build(self): - apply_conandata_patches(self) + for patch in self.conan_data.get("patches", {}).get(self.version, []): + tools.patch(**patch) if not self.options.header_only: - cmake = CMake(self) - # FIXME : https://github.com/conan-io/conan/issues/11476 - # can be replaced by https://docs.conan.io/en/latest/reference/conanfile/tools/cmake/cmaketoolchain.html#cache-variables in 1.50 - cache_entries = { - "FMT_DOC": "False", - "FMT_TEST": "False", - "FMT_INSTALL": "True", - "FMT_LIB_DIR": "lib" - } - if self._has_with_os_api_option: - cache_entries["FMT_OS"] = self.options.with_os_api - cmake.configure(variables=cache_entries) + cmake = self._configure_cmake() cmake.build() def package(self): - copy(self, pattern="*LICENSE.rst", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses")) + self.copy("LICENSE.rst", dst="licenses", src=self._source_subfolder) if self.options.header_only: - copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include")) + self.copy("*.h", dst="include", src=os.path.join(self._source_subfolder, "include")) else: - cmake = CMake(self) + cmake = self._configure_cmake() cmake.install() - rmdir(self, os.path.join(self.package_folder, "lib", "cmake")) - rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) - rmdir(self, os.path.join(self.package_folder, "res")) - rmdir(self, os.path.join(self.package_folder, "share")) + tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) + tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) + tools.rmdir(os.path.join(self.package_folder, "share")) def package_info(self): self.cpp_info.names["cmake_find_package"] = "fmt" self.cpp_info.names["cmake_find_package_multi"] = "fmt" self.cpp_info.names["pkg_config"] = "fmt" - - target = "fmt-header-only" if self.options.header_only else "fmt" - self.cpp_info.set_property("cmake_target_name", "fmt::{}".format(target)) - - # TODO: back to global scope in conan v2 once cmake_find_package* generators removed - self.cpp_info.components["_fmt"].includedirs.extend(["include"]) if self.options.header_only: - self.cpp_info.components["_fmt"].defines.append("FMT_HEADER_ONLY=1") + self.cpp_info.components["fmt-header-only"].defines.append("FMT_HEADER_ONLY=1") if self.options.with_fmt_alias: - self.cpp_info.components["_fmt"].defines.append("FMT_STRING_ALIAS=1") + self.cpp_info.components["fmt-header-only"].defines.append("FMT_STRING_ALIAS=1") else: postfix = "d" if self.settings.build_type == "Debug" else "" - libname = "fmt" + postfix - self.cpp_info.components["_fmt"].libs = [libname] - if self.settings.os == "Linux": - self.cpp_info.components["_fmt"].system_libs.extend(["m"]) - # FIXME: remove when Conan 1.50 is used in c3i and update the Conan required version - # from that version components don't have empty libdirs by default - self.cpp_info.components["_fmt"].libdirs.extend(["lib"]) - self.cpp_info.components["_fmt"].bindirs.extend(["bin"]) + self.cpp_info.libs = ["fmt" + postfix] if self.options.with_fmt_alias: - self.cpp_info.components["_fmt"].defines.append("FMT_STRING_ALIAS=1") + self.cpp_info.defines.append("FMT_STRING_ALIAS=1") if self.options.shared: - self.cpp_info.components["_fmt"].defines.append("FMT_SHARED") - - # TODO: to remove in conan v2 once cmake_find_package* generators removed - self.cpp_info.components["_fmt"].names["cmake_find_package"] = target - self.cpp_info.components["_fmt"].names["cmake_find_package_multi"] = target - self.cpp_info.components["_fmt"].set_property("cmake_target_name", "fmt::{}".format(target)) + self.cpp_info.defines.append("FMT_SHARED") diff --git a/recipes/fmt/all/test_v1_package/CMakeLists.txt b/recipes/fmt/all/test_cmakedeps/CMakeLists.txt similarity index 91% rename from recipes/fmt/all/test_v1_package/CMakeLists.txt rename to recipes/fmt/all/test_cmakedeps/CMakeLists.txt index e4a5b85441935..66300c1349564 100644 --- a/recipes/fmt/all/test_v1_package/CMakeLists.txt +++ b/recipes/fmt/all/test_cmakedeps/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.15) project(test_package CXX) -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - find_package(fmt REQUIRED CONFIG) # TEST_PACKAGE ################################################################# diff --git a/recipes/fmt/all/test_cmakedeps/conanfile.py b/recipes/fmt/all/test_cmakedeps/conanfile.py new file mode 100644 index 0000000000000..c7e485dd61f28 --- /dev/null +++ b/recipes/fmt/all/test_cmakedeps/conanfile.py @@ -0,0 +1,30 @@ +import os + +from conans import ConanFile +from conan.tools.cmake import CMake, CMakeToolchain +from conan.tools.build.cross_building import cross_building as tools_cross_building +from conan.tools.layout import cmake_layout + +required_conan_version = ">=1.43.0" + +class TestPackageConan(ConanFile): + settings = "os", "compiler", "build_type", "arch" + generators = "CMakeDeps" + + def generate(self): + tc = CMakeToolchain(self) + tc.variables["FMT_HEADER_ONLY"] = self.dependencies["fmt"].options.header_only + tc.generate() + + def layout(self): + cmake_layout(self) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if not tools_cross_building(self): + self.run(os.path.join(self.cpp.build.bindirs[0], "test_package"), run_environment=True) + self.run(os.path.join(self.cpp.build.bindirs[0], "test_ranges"), run_environment=True) diff --git a/recipes/fmt/all/test_v1_package/test_package.cpp b/recipes/fmt/all/test_cmakedeps/test_package.cpp similarity index 99% rename from recipes/fmt/all/test_v1_package/test_package.cpp rename to recipes/fmt/all/test_cmakedeps/test_package.cpp index bcd009407212d..8c172fe7cc0ba 100644 --- a/recipes/fmt/all/test_v1_package/test_package.cpp +++ b/recipes/fmt/all/test_cmakedeps/test_package.cpp @@ -5,7 +5,6 @@ #include #include - #include #include #include diff --git a/recipes/fmt/all/test_v1_package/test_ranges.cpp b/recipes/fmt/all/test_cmakedeps/test_ranges.cpp similarity index 100% rename from recipes/fmt/all/test_v1_package/test_ranges.cpp rename to recipes/fmt/all/test_cmakedeps/test_ranges.cpp diff --git a/recipes/fmt/all/test_package/CMakeLists.txt b/recipes/fmt/all/test_package/CMakeLists.txt index 66300c1349564..e4a5b85441935 100644 --- a/recipes/fmt/all/test_package/CMakeLists.txt +++ b/recipes/fmt/all/test_package/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.15) project(test_package CXX) +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup(TARGETS) + find_package(fmt REQUIRED CONFIG) # TEST_PACKAGE ################################################################# diff --git a/recipes/fmt/all/test_package/conanfile.py b/recipes/fmt/all/test_package/conanfile.py index 6a25c20c1f235..188dd66c8f589 100644 --- a/recipes/fmt/all/test_package/conanfile.py +++ b/recipes/fmt/all/test_package/conanfile.py @@ -1,32 +1,19 @@ import os -from conan import ConanFile -from conan.tools.cmake import CMake, CMakeToolchain -from conan.tools.build import can_run -from conan.tools.cmake import cmake_layout -required_conan_version = ">=1.43.0" +from conans import ConanFile, CMake, tools -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "CMakeDeps", "VirtualRunEnv" - - def requirements(self): - self.requires(self.tested_reference_str) - def generate(self): - tc = CMakeToolchain(self) - tc.variables["FMT_HEADER_ONLY"] = self.dependencies["fmt"].options.header_only - tc.generate() - - def layout(self): - cmake_layout(self) +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "cmake", "cmake_find_package_multi" def build(self): cmake = CMake(self) + cmake.definitions["FMT_HEADER_ONLY"] = self.options["fmt"].header_only cmake.configure() cmake.build() def test(self): - if can_run(self): - self.run(os.path.join(self.cpp.build.bindirs[0], "test_package"), env="conanrun") - self.run(os.path.join(self.cpp.build.bindirs[0], "test_ranges"), env="conanrun") + if not tools.cross_building(self): + self.run(os.path.join("bin", "test_package"), run_environment=True) + self.run(os.path.join("bin", "test_ranges"), run_environment=True) diff --git a/recipes/fmt/all/test_v1_package/conanfile.py b/recipes/fmt/all/test_v1_package/conanfile.py deleted file mode 100644 index 65778c702047d..0000000000000 --- a/recipes/fmt/all/test_v1_package/conanfile.py +++ /dev/null @@ -1,19 +0,0 @@ -# pylint: skip-file -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.definitions["FMT_HEADER_ONLY"] = self.options["fmt"].header_only - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - self.run(os.path.join("bin", "test_package"), run_environment=True) - self.run(os.path.join("bin", "test_ranges"), run_environment=True) diff --git a/recipes/glib/all/conandata.yml b/recipes/glib/all/conandata.yml index 56ef056e8d3f5..89b117e0a276b 100644 --- a/recipes/glib/all/conandata.yml +++ b/recipes/glib/all/conandata.yml @@ -86,9 +86,6 @@ sources: "2.73.1": url: "https://download.gnome.org/sources/glib/2.73/glib-2.73.1.tar.xz" sha256: "77b21da5bd195a8e5f751206a2acab477636e3d02fe4f3796ede5788255382ae" - "2.73.2": - url: "https://download.gnome.org/sources/glib/2.73/glib-2.73.2.tar.xz" - sha256: "5f3ee36e34f4aaab393c3e3dc46fb01b32f7ead6c88d41d7f20d88a49cdef1d9" patches: "2.73.1": - patch_file: "patches/f2ea67ae441bc6059b43a1051dd0b750fe5f6301.patch" diff --git a/recipes/glib/all/conanfile.py b/recipes/glib/all/conanfile.py index 3d57d1f3a6af6..4321c51a1f172 100644 --- a/recipes/glib/all/conanfile.py +++ b/recipes/glib/all/conanfile.py @@ -72,10 +72,7 @@ def requirements(self): self.requires("zlib/1.2.12") self.requires("libffi/3.4.2") if self.options.with_pcre: - if tools.Version(self.version) >= "2.73.2": - self.requires("pcre2/10.40") - else: - self.requires("pcre/8.45") + self.requires("pcre/8.45") if self.options.get_safe("with_elf"): self.requires("libelf/0.8.13") if self.options.get_safe("with_mount"): @@ -151,14 +148,13 @@ def _patch_sources(self): "subdir('fuzzing')", "#subdir('fuzzing')", ) # https://gitlab.gnome.org/GNOME/glib/-/issues/2152 - if tools.Version(self.version) < "2.73.2": - for filename in [ - os.path.join(self._source_subfolder, "meson.build"), - os.path.join(self._source_subfolder, "glib", "meson.build"), - os.path.join(self._source_subfolder, "gobject", "meson.build"), - os.path.join(self._source_subfolder, "gio", "meson.build"), - ]: - tools.replace_in_file(filename, "subdir('tests')", "#subdir('tests')") + for filename in [ + os.path.join(self._source_subfolder, "meson.build"), + os.path.join(self._source_subfolder, "glib", "meson.build"), + os.path.join(self._source_subfolder, "gobject", "meson.build"), + os.path.join(self._source_subfolder, "gio", "meson.build"), + ]: + tools.replace_in_file(filename, "subdir('tests')", "#subdir('tests')") if self.settings.os != "Linux": # allow to find gettext tools.replace_in_file( @@ -243,10 +239,7 @@ def package_info(self): os.path.join("lib", "glib-2.0", "include") ) if self.options.with_pcre: - if tools.Version(self.version) >= "2.73.2": - self.cpp_info.components["glib-2.0"].requires.append("pcre2::pcre2") - else: - self.cpp_info.components["glib-2.0"].requires.append("pcre::pcre") + self.cpp_info.components["glib-2.0"].requires.append("pcre::pcre") if self.settings.os != "Linux": self.cpp_info.components["glib-2.0"].requires.append( "libgettext::libgettext" diff --git a/recipes/glib/config.yml b/recipes/glib/config.yml index c46f2fe2cfe74..a6da123da6afe 100644 --- a/recipes/glib/config.yml +++ b/recipes/glib/config.yml @@ -57,5 +57,3 @@ versions: folder: all "2.73.1": folder: all - "2.73.2": - folder: all diff --git a/recipes/glm/all/conandata.yml b/recipes/glm/all/conandata.yml index 125c6b973082e..0422b1bfa587c 100644 --- a/recipes/glm/all/conandata.yml +++ b/recipes/glm/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "cci.20220420": - url: "https://github.com/g-truc/glm/archive/cc98465e3508535ba8c7f6208df934c156a018dc.zip" - sha256: "06d48e336857777d2d1f7da9ccd59e4b9d79720dbd70886d48837d19cda997bb" "0.9.9.8": url: "https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz" sha256: "7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592" diff --git a/recipes/glm/all/conanfile.py b/recipes/glm/all/conanfile.py index ed4c57746f797..97d59c462a81a 100644 --- a/recipes/glm/all/conanfile.py +++ b/recipes/glm/all/conanfile.py @@ -26,7 +26,7 @@ def source(self): destination=self._source_subfolder, strip_root=True) def package(self): - glm_version = self.version if self.version.startswith("cci") else tools.Version(self._get_semver()) + glm_version = tools.Version(self._get_semver()) if glm_version == "0.9.8" or (glm_version == "0.9.9" and self._get_tweak_number() < 6): tools.save(os.path.join(self.package_folder, "licenses", "copying.txt"), self._get_license()) else: diff --git a/recipes/glm/config.yml b/recipes/glm/config.yml index 33c1a13ccdf3d..b7a654869e2d9 100644 --- a/recipes/glm/config.yml +++ b/recipes/glm/config.yml @@ -1,6 +1,4 @@ versions: - "cci.20220420": - folder: all "0.9.9.8": folder: all "0.9.9.7": diff --git a/recipes/godot_headers/all/conandata.yml b/recipes/godot_headers/all/conandata.yml index 68b1d012c8cec..f528caa4349e8 100644 --- a/recipes/godot_headers/all/conandata.yml +++ b/recipes/godot_headers/all/conandata.yml @@ -14,6 +14,3 @@ sources: "3.4": url: "https://github.com/godotengine/godot-headers/archive/refs/tags/godot-3.4-stable.zip" sha256: "584c8fedb9c521e0f21b37aed60a7bf76f417a196bb79205cf41b4e79a866237" - "3.4.4": - url: "https://github.com/godotengine/godot-headers/archive/godot-3.4.4-stable.tar.gz" - sha256: "bb0eac00a4d5b800a4ca2555d11b4a35981bdb730b630e9bd31a0649fa1d6fd7" diff --git a/recipes/godot_headers/config.yml b/recipes/godot_headers/config.yml index bd1be2eb77ddc..3513875fb6fea 100644 --- a/recipes/godot_headers/config.yml +++ b/recipes/godot_headers/config.yml @@ -9,5 +9,3 @@ versions: folder: all "3.4": folder: all - "3.4.4": - folder: all diff --git a/recipes/grpc/all/conandata.yml b/recipes/grpc/all/conandata.yml index 0f2b643503157..0363758f5f82a 100644 --- a/recipes/grpc/all/conandata.yml +++ b/recipes/grpc/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.47.1": - url: "https://github.com/grpc/grpc/archive/v1.47.1.tar.gz" - sha256: "ba7c36989ad8a52c813adeebb0c65869283448f496dbb2868c75f69941dec6a9" "1.47.0": url: "https://github.com/grpc/grpc/archive/refs/tags/v1.47.0.tar.gz" sha256: "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54" @@ -15,9 +12,6 @@ sources: url: "https://github.com/grpc/grpc/archive/refs/tags/v1.44.0.tar.gz" sha256: "8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d" patches: - "1.47.1": - - patch_file: "patches/v1.47.x/001-disable-cppstd-override.patch" - base_path: "source_subfolder" "1.47.0": - patch_file: "patches/v1.47.x/001-disable-cppstd-override.patch" base_path: "source_subfolder" diff --git a/recipes/grpc/config.yml b/recipes/grpc/config.yml index 1ca1ae345aa9f..bc867736da353 100644 --- a/recipes/grpc/config.yml +++ b/recipes/grpc/config.yml @@ -1,6 +1,4 @@ versions: - "1.47.1": - folder: "all" "1.47.0": folder: "all" "1.46.3": diff --git a/recipes/gtest/all/conanfile.py b/recipes/gtest/all/conanfile.py index b537c3f011b32..61bbb3c19e3a8 100644 --- a/recipes/gtest/all/conanfile.py +++ b/recipes/gtest/all/conanfile.py @@ -71,10 +71,6 @@ def _minimum_compilers_version(self): "apple-clang": "9.1" } - @property - def _is_clang_cl(self): - return self.settings.os == "Windows" and self.settings.compiler == "clang" - def export_sources(self): self.copy("CMakeLists.txt") for patch in self.conan_data.get("patches", {}).get(self.version, []): @@ -94,7 +90,7 @@ def package_id(self): del self.info.options.no_main def validate(self): - if self.options.shared and (is_msvc(self) or self._is_clang_cl) and "MT" in msvc_runtime_flag(self): + if self.options.shared and is_msvc(self) and "MT" in msvc_runtime_flag(self): raise ConanInvalidConfiguration( "gtest:shared=True with compiler=\"Visual Studio\" is not " "compatible with compiler.runtime=MT/MTd" @@ -137,7 +133,7 @@ def _configure_cmake(self): cmake = CMake(self) if self.settings.build_type == "Debug": cmake.definitions["CUSTOM_DEBUG_POSTFIX"] = self.options.debug_postfix - if is_msvc(self) or self._is_clang_cl: + if is_msvc(self): cmake.definitions["gtest_force_shared_crt"] = "MD" in msvc_runtime_flag(self) cmake.definitions["BUILD_GMOCK"] = self.options.build_gmock if self.settings.os == "Windows" and self.settings.compiler == "gcc": diff --git a/recipes/hlslpp/all/conandata.yml b/recipes/hlslpp/all/conandata.yml index 9962d3d912437..9ba47855e6284 100644 --- a/recipes/hlslpp/all/conandata.yml +++ b/recipes/hlslpp/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.2": - url: "https://github.com/redorav/hlslpp/archive/3.2.tar.gz" - sha256: "23ab0b7f392c518185157e9b1e099eac0a560f4932cebbdf8ccb4a533a0d0336" "3.1": url: "https://github.com/redorav/hlslpp/archive/refs/tags/3.1.tar.gz" sha256: "6f933e43bf8150a41d76a188377e59007897dc87e96be30608e7f2007605d5c4" diff --git a/recipes/hlslpp/config.yml b/recipes/hlslpp/config.yml index b8a3a571e7b7d..94b58a68c6d32 100644 --- a/recipes/hlslpp/config.yml +++ b/recipes/hlslpp/config.yml @@ -1,6 +1,4 @@ versions: - "3.2": - folder: all "3.1": folder: all "3.0": diff --git a/recipes/iceoryx/all/conandata.yml b/recipes/iceoryx/all/conandata.yml index 638b5224b83e0..4c21c9bc77f0d 100644 --- a/recipes/iceoryx/all/conandata.yml +++ b/recipes/iceoryx/all/conandata.yml @@ -1,10 +1,4 @@ sources: - "2.0.2": - url: "https://github.com/eclipse-iceoryx/iceoryx/archive/v2.0.2.tar.gz" - sha256: "99871BCAA8DA4361D1BAAE9CF1507683058DE8572AC3080EDC41E590FFBA06C0" - "2.0.1": - url: "https://github.com/eclipse-iceoryx/iceoryx/archive/v2.0.1.tar.gz" - sha256: "A6750992EA668786F267E4EDA5588DE4D7585F30E59DCF8512620AF509D6690F" "2.0.0": url: "https://github.com/eclipse-iceoryx/iceoryx/archive/v2.0.0.tar.gz" sha256: "C598DD0630F535D61EA9F8BDE5FE7DA3EF4C595419ECFBCD2384CA6FB4CA804F" @@ -15,15 +9,9 @@ sources: url: "https://github.com/eclipse-iceoryx/iceoryx/archive/refs/tags/v1.0.0.tar.gz" sha256: "3D7BABCF92974F6D22E8A497E31198DE1D88DF8B20C942992DBBEC5DFB06C4BB" patches: - "2.0.2": - - base_path: "source_subfolder" - patch_file: "patches/2.0.X-0001-fix-find-toml.patch" - "2.0.1": - - base_path: "source_subfolder" - patch_file: "patches/2.0.X-0001-fix-find-toml.patch" "2.0.0": - base_path: "source_subfolder" - patch_file: "patches/2.0.X-0001-fix-find-toml.patch" + patch_file: "patches/2.0.0-0001-fix-find-toml.patch" "1.0.1": - base_path: "source_subfolder" patch_file: "patches/1.0.0-0001-fix-find-toml.patch" diff --git a/recipes/iceoryx/all/patches/2.0.X-0001-fix-find-toml.patch b/recipes/iceoryx/all/patches/2.0.0-0001-fix-find-toml.patch similarity index 100% rename from recipes/iceoryx/all/patches/2.0.X-0001-fix-find-toml.patch rename to recipes/iceoryx/all/patches/2.0.0-0001-fix-find-toml.patch diff --git a/recipes/iceoryx/config.yml b/recipes/iceoryx/config.yml index bb084f4416dd3..4365124d6a4f6 100644 --- a/recipes/iceoryx/config.yml +++ b/recipes/iceoryx/config.yml @@ -1,8 +1,4 @@ versions: - "2.0.2": - folder: all - "2.0.1": - folder: all "2.0.0": folder: all "1.0.1": diff --git a/recipes/iir1/all/conandata.yml b/recipes/iir1/all/conandata.yml index e2bfb35acdf25..27b792c65a3e4 100644 --- a/recipes/iir1/all/conandata.yml +++ b/recipes/iir1/all/conandata.yml @@ -9,3 +9,4 @@ patches: "1.9.0": - patch_file: "patches/0002-Add-runtime-export-to-install.patch" base_path: "source_subfolder" + diff --git a/recipes/iir1/all/conanfile.py b/recipes/iir1/all/conanfile.py index a88241de2f409..e4012b200e789 100644 --- a/recipes/iir1/all/conanfile.py +++ b/recipes/iir1/all/conanfile.py @@ -91,7 +91,6 @@ def package(self): cmake = self._configure_cmake() cmake.install() tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) - tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) if self.options.shared: tools.remove_files_by_mask(os.path.join(self.package_folder, "lib"), "libiir_static.*") @@ -106,11 +105,9 @@ def package_info(self): name = "iir" if self.options.shared else "iir_static" self.cpp_info.set_property("cmake_file_name", "iir") self.cpp_info.set_property("cmake_target_name", "iir::{}".format(name)) - self.cpp_info.set_property("pkg_config_name", "iir") self.cpp_info.names["cmake_find_package"] = "iir" self.cpp_info.names["cmake_find_package_multi"] = "iir" - self.cpp_info.names["pkg_config"] = "iir" self.cpp_info.components["iir"].names["cmake_find_package"] = name self.cpp_info.components["iir"].names["cmake_find_package_multi"] = name self.cpp_info.components["iir"].set_property("cmake_target_name", "iir::{}".format(name)) diff --git a/recipes/imagl/all/conanfile.py b/recipes/imagl/all/conanfile.py index a8994d4c2ba67..708d98d6327db 100644 --- a/recipes/imagl/all/conanfile.py +++ b/recipes/imagl/all/conanfile.py @@ -17,12 +17,14 @@ class ImaglConan(ConanFile): "fPIC": [True, False], "with_png": [True, False], "with_jpeg": [True, False], + "allow_clang_11": [None, True, False] } default_options = { "shared": False, "fPIC": True, "with_png": True, "with_jpeg": True, + "allow_clang_11": None } generators = "cmake" exports_sources = ["CMakeLists.txt", "patches/**"] diff --git a/recipes/inih/all/conandata.yml b/recipes/inih/all/conandata.yml index f45a313d7e7e2..681ab2ab76257 100644 --- a/recipes/inih/all/conandata.yml +++ b/recipes/inih/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "56": - url: "https://github.com/benhoyt/inih/archive/r56.tar.gz" - sha256: "4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a" "55": url: "https://github.com/benhoyt/inih/archive/r55.tar.gz" sha256: "ba55f8ae2a8caf0653f30f48567241e14ea916acfc13481f502d8a9c8f507f68" diff --git a/recipes/inih/all/conanfile.py b/recipes/inih/all/conanfile.py index 0da23cbfbd5e7..38c4f2b013c25 100644 --- a/recipes/inih/all/conanfile.py +++ b/recipes/inih/all/conanfile.py @@ -1,6 +1,5 @@ from conans import ConanFile, Meson, tools from conans.errors import ConanInvalidConfiguration -from conan.tools.build import cross_building import os import functools @@ -44,7 +43,7 @@ def configure(self): def validate(self): if self.options.shared and self.settings.os == "Windows": raise ConanInvalidConfiguration("Shared inih is not supported") - if hasattr(self, "settings_build") and cross_building(self): + if hasattr(self, "settings_build") and tools.cross_building(self): raise ConanInvalidConfiguration("Cross-building not implemented") def build_requirements(self): @@ -58,7 +57,6 @@ def source(self): def _configure_meson(self): meson = Meson(self) meson.options["distro_install"] = True - meson.options["with_INIReader"] = True meson.configure(source_folder=self._source_subfolder, build_folder=self._build_subfolder) return meson @@ -76,23 +74,6 @@ def package(self): # https://github.com/mesonbuild/meson/issues/7378 os.rename(os.path.join(self.package_folder, "lib", "libinih.a"), os.path.join(self.package_folder, "lib", "inih.lib")) - os.rename(os.path.join(self.package_folder, "lib", "libINIReader.a"), - os.path.join(self.package_folder, "lib", "INIReader.lib")) def package_info(self): - self.cpp_info.names["cmake_find_package"] = "inih" - self.cpp_info.names["cmake_find_package_multi"] = "inih" - self.cpp_info.set_property("cmake_file_name", "inih") - - self.cpp_info.components["libinih"].libs = ["inih"] - self.cpp_info.components["libinih"].names["cmake_find_package"] = "inih" - self.cpp_info.components["libinih"].names["cmake_find_package_multi"] = "inih" - self.cpp_info.components["libinih"].set_property("cmake_target_name", "inih::inih") - self.cpp_info.components["libinih"].set_property("pkg_config_name", "inih") - - self.cpp_info.components["INIReader"].libs = ["INIReader"] - self.cpp_info.components["INIReader"].names["cmake_find_package"] = "INIReader" - self.cpp_info.components["INIReader"].names["cmake_find_package_multi"] = "INIReader" - self.cpp_info.components["INIReader"].requires = ["libinih"] - self.cpp_info.components["INIReader"].set_property("cmake_target_name", "inih::INIReader") - self.cpp_info.components["INIReader"].set_property("pkg_config_name", "INIReader") + self.cpp_info.libs = ["inih"] diff --git a/recipes/inih/config.yml b/recipes/inih/config.yml index 3746836949531..6d162154b0093 100644 --- a/recipes/inih/config.yml +++ b/recipes/inih/config.yml @@ -1,6 +1,4 @@ versions: - "56": - folder: "all" "55": folder: "all" "52": diff --git a/recipes/isa-l/all/conandata.yml b/recipes/isa-l/all/conandata.yml deleted file mode 100644 index 3f7141d8278ab..0000000000000 --- a/recipes/isa-l/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "2.30.0": - url: "https://github.com/intel/isa-l/archive/refs/tags/v2.30.0.tar.gz" - sha256: "bcf592c04fdfa19e723d2adf53d3e0f4efd5b956bb618fed54a1108d76a6eb56" diff --git a/recipes/isa-l/all/conanfile.py b/recipes/isa-l/all/conanfile.py deleted file mode 100644 index 56f45edf048a4..0000000000000 --- a/recipes/isa-l/all/conanfile.py +++ /dev/null @@ -1,72 +0,0 @@ -from conans import ConanFile, AutoToolsBuildEnvironment, tools -from conans.errors import ConanInvalidConfiguration - -import os - -required_conan_version = ">=1.33.0" - -class LibisalConan(ConanFile): - name = "isa-l" - description = "Intel's Intelligent Storage Acceleration Library" - license = "BSD-3" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/intel/isa-l" - topics = ("isa-l", "compression") - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - } - default_options = { - "shared": False, - "fPIC" :True - } - build_requires = ( - "libtool/2.4.6", - "nasm/2.15.05", - ) - - @property - def _source_subfolder(self): - return "source_subfolder" - - def validate(self): - if self.settings.arch not in [ "x86", "x86_64", "armv8" ]: - raise ConanInvalidConfiguration("CPU Architecture not supported") - if self.settings.os not in ["Linux", "FreeBSD"]: - raise ConanInvalidConfiguration("Only Linux and FreeBSD builds are supported") - - def configure(self): - del self.settings.compiler.libcxx - del self.settings.compiler.cppstd - if self.options.shared: - del self.options.fPIC - - def source(self): - tools.get(**self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True) - - def build(self): - with tools.chdir(self._source_subfolder): - self.run("./autogen.sh") - env_build = AutoToolsBuildEnvironment(self) - extra_args = list() - if self.options.shared: - extra_args.extend(('--enable-static=no',)) - else: - extra_args.extend(('--enable-shared=no',)) - env_build.configure(".", args=extra_args, build=False, host=False, target=False) - env_build.make() - - def package(self): - self.copy("LICENSE", src=self._source_subfolder, dst="licenses") - self.copy("*/isa-l.h", dst="include/isa-l", keep_path=False) - self.copy("*.h", dst="include/isa-l", src="%s/include" % (self._source_subfolder) , keep_path=False) - if self.options.shared: - self.copy("*.dll", dst="bin", keep_path=False) - self.copy("*.so*", dst="lib", keep_path=False, symlinks=True) - self.copy("*.dylib", dst="lib", keep_path=False) - else: - self.copy("*.a", dst="lib", keep_path=False) - - def package_info(self): - self.cpp_info.libs = tools.collect_libs(self) diff --git a/recipes/isa-l/all/test_package/CMakeLists.txt b/recipes/isa-l/all/test_package/CMakeLists.txt deleted file mode 100644 index 196188113685c..0000000000000 --- a/recipes/isa-l/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) diff --git a/recipes/isa-l/all/test_package/conanfile.py b/recipes/isa-l/all/test_package/conanfile.py deleted file mode 100644 index e1f2192537436..0000000000000 --- a/recipes/isa-l/all/test_package/conanfile.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -from conans import ConanFile, CMake, tools, RunEnvironment -from conan.tools.build import cross_building -import os -import subprocess -import re - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/isa-l/all/test_package/test_package.cpp b/recipes/isa-l/all/test_package/test_package.cpp deleted file mode 100644 index 56025fdcff25a..0000000000000 --- a/recipes/isa-l/all/test_package/test_package.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include -#include - -const uint16_t init_crc_16 = 0x8005; - -uint16_t getIsalCrc16 (unsigned char *buf, uint64_t len) { - return crc16_t10dif(init_crc_16, buf, len); -} - -int main(void) { - unsigned char buf[] = "32311E333530"; - if ( getIsalCrc16(buf, 12) != 0xb4c9 ) { - std::cout << "Failed to install ISA-L\n"; - return -1; - } - std::cout << "Success\n"; - return 0; -} diff --git a/recipes/isa-l/config.yml b/recipes/isa-l/config.yml deleted file mode 100644 index ebe8d6f743f65..0000000000000 --- a/recipes/isa-l/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "2.30.0": - folder: all diff --git a/recipes/kmod/all/conandata.yml b/recipes/kmod/all/conandata.yml index adea0f2044a1e..c82a452c9b20a 100644 --- a/recipes/kmod/all/conandata.yml +++ b/recipes/kmod/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "30": - url: "https://github.com/kmod-project/kmod/archive/v30.tar.gz" - sha256: "1fa3974abd80b992d61324bcc04fa65ea96cfe2e9e1150f48394833030c4b583" "29": sha256: "a49aaf9c4914cd1abd9eea43d86b5a2fd07d898935e088965e6d18793610f2e7" url: "https://github.com/kmod-project/kmod/archive/refs/tags/v29.tar.gz" diff --git a/recipes/kmod/config.yml b/recipes/kmod/config.yml index 61353908a11fc..6bbe5b02341f0 100644 --- a/recipes/kmod/config.yml +++ b/recipes/kmod/config.yml @@ -1,5 +1,3 @@ versions: - "30": - folder: all "29": folder: all diff --git a/recipes/kuba-zip/all/conandata.yml b/recipes/kuba-zip/all/conandata.yml index 021dff1a66b54..86f4e73f2ba7d 100644 --- a/recipes/kuba-zip/all/conandata.yml +++ b/recipes/kuba-zip/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "0.2.4": - url: "https://github.com/kuba--/zip/archive/v0.2.4.tar.gz" - sha256: "a3dd762129d58c7ca7a6462f509d29388dbdb25bec559cb4dc03f75523d69cf2" "0.2.3": url: "https://github.com/kuba--/zip/archive/v0.2.3.tar.gz" sha256: "800e9dc2d2834d92ad333dac29b438dfb495c765bc4e97c7b10101f4f22d53d4" diff --git a/recipes/kuba-zip/config.yml b/recipes/kuba-zip/config.yml index 76385b4eb8a75..e5d2dda3de4c9 100644 --- a/recipes/kuba-zip/config.yml +++ b/recipes/kuba-zip/config.yml @@ -1,6 +1,4 @@ versions: - "0.2.4": - folder: "all" "0.2.3": folder: "all" "0.2.2": diff --git a/recipes/libalsa/all/conandata.yml b/recipes/libalsa/all/conandata.yml index 557a8def6ac72..3ebcf9501b91d 100644 --- a/recipes/libalsa/all/conandata.yml +++ b/recipes/libalsa/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.2.7.2": - url: "https://github.com/alsa-project/alsa-lib/archive/v1.2.7.2.tar.gz" - sha256: "2ed6d908120beb4a91c2271b01489181b28dc9f35f32229ef83bcd5ac8817654" "1.2.7": url: "https://github.com/alsa-project/alsa-lib/archive/v1.2.7.tar.gz" sha256: "d76ac42f678b198d754c072fb6d0ce89f880a9bb9fd6a45f97d7be762ac0a384" diff --git a/recipes/libalsa/config.yml b/recipes/libalsa/config.yml index b1fdda2825fa6..f1afe2fda9c1c 100644 --- a/recipes/libalsa/config.yml +++ b/recipes/libalsa/config.yml @@ -1,6 +1,4 @@ versions: - "1.2.7.2": - folder: all "1.2.7": folder: all "1.2.5.1": diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py index 8635f5452d2cb..ec7cd0efc7b83 100644 --- a/recipes/libarchive/all/conanfile.py +++ b/recipes/libarchive/all/conanfile.py @@ -91,17 +91,17 @@ def requirements(self): if self.options.with_bzip2: self.requires("bzip2/1.0.8") if self.options.with_libxml2: - self.requires("libxml2/2.9.14") + self.requires("libxml2/2.9.13") if self.options.with_expat: self.requires("expat/2.4.8") if self.options.with_iconv: - self.requires("libiconv/1.17") + self.requires("libiconv/1.16") if self.options.with_pcreposix: self.requires("pcre/8.45") if self.options.with_nettle: self.requires("nettle/3.6") if self.options.with_openssl: - self.requires("openssl/1.1.1q") + self.requires("openssl/1.1.1n") if self.options.with_libb2: self.requires("libb2/20190723") if self.options.with_lz4: @@ -113,7 +113,7 @@ def requirements(self): if self.options.with_zstd: self.requires("zstd/1.5.2") if self.options.get_safe("with_mbedtls"): - self.requires("mbedtls/3.2.1") + self.requires("mbedtls/3.1.0") def validate(self): if self.settings.os != "Windows" and self.options.with_cng: diff --git a/recipes/libgettext/all/conanfile.py b/recipes/libgettext/all/conanfile.py index b2a6e4d5e5675..1d6e36b274d98 100644 --- a/recipes/libgettext/all/conanfile.py +++ b/recipes/libgettext/all/conanfile.py @@ -62,7 +62,7 @@ def configure(self): self.options.threads = { "Solaris": "solaris", "Windows": "windows" }.get(str(self.settings.os), "posix") def requirements(self): - self.requires("libiconv/1.17") + self.requires("libiconv/1.16") @property def _settings_build(self): @@ -76,7 +76,7 @@ def build_requirements(self): if self._settings_build.os == "Windows" and not tools.get_env("CONAN_BASH_PATH"): self.build_requires("msys2/cci.latest") if self._is_msvc or self._is_clang_cl: - self.build_requires("automake/1.16.5") + self.build_requires("automake/1.16.4") def source(self): tools.get(**self.conan_data["sources"][self.version], diff --git a/recipes/libgit2/all/conandata.yml b/recipes/libgit2/all/conandata.yml index 7725b775b39de..7b11a1300fb21 100644 --- a/recipes/libgit2/all/conandata.yml +++ b/recipes/libgit2/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.5.0": - url: "https://github.com/libgit2/libgit2/archive/v1.5.0.tar.gz" - sha256: "8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e" "1.4.3": url: "https://github.com/libgit2/libgit2/archive/v1.4.3.tar.gz" sha256: "f48b961e463a9e4e7e7e58b21a0fb5a9b2a1d24d9ba4d15870a0c9b8ad965163" @@ -18,9 +15,6 @@ sources: url: "https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz" sha256: "1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2" patches: - "1.5.0": - - patch_file: "patches/1.4.3-0001-fix-cmake.patch" - base_path: "source_subfolder" "1.4.3": - patch_file: "patches/1.4.3-0001-fix-cmake.patch" base_path: "source_subfolder" diff --git a/recipes/libgit2/config.yml b/recipes/libgit2/config.yml index c472349adb3cc..089d1159bbfb7 100644 --- a/recipes/libgit2/config.yml +++ b/recipes/libgit2/config.yml @@ -1,6 +1,4 @@ versions: - "1.5.0": - folder: "all" "1.4.3": folder: "all" "1.3.0": diff --git a/recipes/libmp3lame/all/conanfile.py b/recipes/libmp3lame/all/conanfile.py index 3728a80aeffaf..da994fca26d89 100644 --- a/recipes/libmp3lame/all/conanfile.py +++ b/recipes/libmp3lame/all/conanfile.py @@ -91,7 +91,7 @@ def _build_vs(self): tools.replace_in_file("Makefile.MSVC", " /GL", "") tools.replace_in_file("Makefile.MSVC", " /LTCG", "") tools.replace_in_file("Makefile.MSVC", "ADDL_OBJ = bufferoverflowU.lib", "") - command = "nmake -f Makefile.MSVC comp=msvc" + command = "nmake -f Makefile.MSVC comp=msvc asm=yes" if self._is_clang_cl: cl = os.environ.get('CC', "clang-cl") link = os.environ.get("LD", 'lld-link') @@ -103,12 +103,7 @@ def _build_vs(self): tools.replace_in_file('Makefile.MSVC', '/GAy', '/GA') if self.settings.arch == "x86_64": tools.replace_in_file("Makefile.MSVC", "MACHINE = /machine:I386", "MACHINE =/machine:X64") - command += " MSVCVER=Win64 asm=yes" - elif self.settings.arch == "armv8": - tools.replace_in_file("Makefile.MSVC", "MACHINE = /machine:I386", "MACHINE =/machine:ARM64") command += " MSVCVER=Win64" - else: - command += " asm=yes" command += " libmp3lame.dll" if self.options.shared else " libmp3lame-static.lib" self.run(command) diff --git a/recipes/libmysqlclient/all/conanfile.py b/recipes/libmysqlclient/all/conanfile.py index 70917c76136fb..2d735d7742777 100644 --- a/recipes/libmysqlclient/all/conanfile.py +++ b/recipes/libmysqlclient/all/conanfile.py @@ -1,6 +1,5 @@ from conan.tools.microsoft import is_msvc, msvc_runtime_flag from conan.tools.files import rename -from conan.tools.build import cross_building from conans import ConanFile, CMake, tools from conans.errors import ConanInvalidConfiguration import functools @@ -69,7 +68,7 @@ def configure(self): def requirements(self): if self.options.with_ssl: - self.requires("openssl/1.1.1q") + self.requires("openssl/1.1.1o") if self.options.with_zlib: self.requires("zlib/1.2.12") if self._with_zstd: @@ -92,7 +91,7 @@ def loose_lt_semver(v1, v2): self.name, self.version, self.settings.compiler, minimum_version, )) - if hasattr(self, "settings_build") and cross_building(self, skip_x64_x86=True): + if hasattr(self, "settings_build") and tools.cross_building(self, skip_x64_x86=True): raise ConanInvalidConfiguration("Cross compilation not yet supported by the recipe. contributions are welcome.") # FIXME: patch libmysqlclient 8.0.17 to support apple-clang >= 12? @@ -117,7 +116,7 @@ def loose_lt_semver(v1, v2): def build_requirements(self): if tools.Version(self.version) >= "8.0.25" and tools.is_apple_os(self.settings.os): # CMake 3.18 or higher is required if Apple, but CI of CCI may run CMake 3.15 - self.build_requires("cmake/3.22.5") + self.build_requires("cmake/3.22.0") if self.settings.os == "FreeBSD": self.build_requires("pkgconf/1.7.4") diff --git a/recipes/libmysqlclient/all/test_package/conanfile.py b/recipes/libmysqlclient/all/test_package/conanfile.py index 6cbf041d5d1b8..5c09494bc67c0 100644 --- a/recipes/libmysqlclient/all/test_package/conanfile.py +++ b/recipes/libmysqlclient/all/test_package/conanfile.py @@ -1,5 +1,4 @@ -from conans import ConanFile, CMake -from conan.tools.build import cross_building +from conans import ConanFile, CMake, tools import os @@ -13,6 +12,6 @@ def build(self): cmake.build() def test(self): - if not cross_building(self): + if not tools.cross_building(self): bin_path = os.path.join("bin", "test_package") self.run(bin_path, run_environment=True) diff --git a/recipes/libnfnetlink/all/conandata.yml b/recipes/libnfnetlink/all/conandata.yml index b5ce8a9c9adc1..457c91b844d87 100644 --- a/recipes/libnfnetlink/all/conandata.yml +++ b/recipes/libnfnetlink/all/conandata.yml @@ -2,6 +2,3 @@ sources: "1.0.1": sha256: f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a url: https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.1.tar.bz2 - "1.0.2": - sha256: b064c7c3d426efb4786e60a8e6859b82ee2f2c5e49ffeea640cfe4fe33cbc376 - url: https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.2.tar.bz2 diff --git a/recipes/libnfnetlink/all/conanfile.py b/recipes/libnfnetlink/all/conanfile.py index 10540d39fbf9c..78ea9aac4ff4b 100644 --- a/recipes/libnfnetlink/all/conanfile.py +++ b/recipes/libnfnetlink/all/conanfile.py @@ -1,9 +1,8 @@ import os -import functools from conans import ConanFile, tools, AutoToolsBuildEnvironment from conans.errors import ConanInvalidConfiguration -required_conan_version = ">=1.43.0" +required_conan_version = ">=1.29.1" class LibnfnetlinkConan(ConanFile): name = "libnfnetlink" @@ -15,35 +14,36 @@ class LibnfnetlinkConan(ConanFile): settings = "os", "compiler", "build_type", "arch" options = {"shared": [True, False], "fPIC": [True, False]} default_options = {"shared": False, "fPIC": True} + _autotools = None @property def _source_subfolder(self): return "source_subfolder" def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) + tools.get(**self.conan_data["sources"][self.version]) + extracted_dir = self.name + "-" + self.version + os.rename(extracted_dir, self._source_subfolder) - def validate(self): + def configure(self): if self.settings.os != "Linux": raise ConanInvalidConfiguration("libnfnetlink is only supported on Linux") - - def configure(self): if self.options.shared: del self.options.fPIC del self.settings.compiler.libcxx del self.settings.compiler.cppstd - @functools.lru_cache(1) def _configure_autotools(self): - autotools = AutoToolsBuildEnvironment(self) + if self._autotools: + return self._autotools + self._autotools = AutoToolsBuildEnvironment(self) conf_args = [] if self.options.shared: conf_args.extend(["--enable-shared", "--disable-static"]) else: conf_args.extend(["--disable-shared", "--enable-static"]) - autotools.configure(configure_dir=self._source_subfolder, args=conf_args) - return autotools + self._autotools.configure(configure_dir=self._source_subfolder, args=conf_args) + return self._autotools def build(self): autotools = self._configure_autotools() @@ -61,7 +61,4 @@ def package(self): def package_info(self): self.cpp_info.libs = ["nfnetlink"] - self.cpp_info.set_property("pkg_config_name", "libnfnetlink") - - # TODO: to remove in conan v2 once pkg_config generator is removed self.cpp_info.names["pkg_config"] = "libnfnetlink" diff --git a/recipes/libnfnetlink/config.yml b/recipes/libnfnetlink/config.yml index 94db826314106..395fa2f83ab2a 100644 --- a/recipes/libnfnetlink/config.yml +++ b/recipes/libnfnetlink/config.yml @@ -1,5 +1,3 @@ versions: 1.0.1: folder: all - 1.0.2: - folder: all diff --git a/recipes/libnghttp2/all/conandata.yml b/recipes/libnghttp2/all/conandata.yml index 39d70e2302947..3c49a1b45a7af 100644 --- a/recipes/libnghttp2/all/conandata.yml +++ b/recipes/libnghttp2/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.48.0": - url: "https://github.com/nghttp2/nghttp2/archive/v1.48.0.tar.gz" - sha256: "946a8fa490548b67fc6074553cb225279cc6404bae96cf74551f2ad4453be637" "1.47.0": url: "https://github.com/nghttp2/nghttp2/archive/v1.47.0.tar.gz" sha256: "db98735b30f1586edf3212ada57f85feaceff483a1c0f1c1c8285abcf37e3444" @@ -24,11 +21,6 @@ sources: url: "https://github.com/nghttp2/nghttp2/releases/download/v1.39.2/nghttp2-1.39.2.tar.bz2" sha256: "92a23e4522328c8565028ee0c7270e74add7990614fd1148f2a79d873bc2a1d0" patches: - "1.48.0": - - patch_file: "patches/fix-findJemalloc.cmake" - base_path: "source_subfolder" - - patch_file: "patches/fix-findLibevent.cmake" - base_path: "source_subfolder" "1.47.0": - patch_file: "patches/fix-findJemalloc.cmake" base_path: "source_subfolder" diff --git a/recipes/libnghttp2/config.yml b/recipes/libnghttp2/config.yml index c71f989fb8ec4..66cb02b8ee0af 100644 --- a/recipes/libnghttp2/config.yml +++ b/recipes/libnghttp2/config.yml @@ -1,6 +1,4 @@ versions: - "1.48.0": - folder: all "1.47.0": folder: all "1.46.0": diff --git a/recipes/libsecret/all/conandata.yml b/recipes/libsecret/all/conandata.yml index 55e19d25249c5..fc7d49aa1a517 100644 --- a/recipes/libsecret/all/conandata.yml +++ b/recipes/libsecret/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "0.20.5": - url: "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz" - sha256: "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d" "0.20.4": url: "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.tar.xz" sha256: "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" diff --git a/recipes/libsecret/config.yml b/recipes/libsecret/config.yml index 470f4b110022f..ea127e6d52aec 100644 --- a/recipes/libsecret/config.yml +++ b/recipes/libsecret/config.yml @@ -1,5 +1,3 @@ versions: - "0.20.5": - folder: all "0.20.4": folder: all diff --git a/recipes/libselinux/all/conanfile.py b/recipes/libselinux/all/conanfile.py index c55bc85f7d135..4ae2786395f73 100644 --- a/recipes/libselinux/all/conanfile.py +++ b/recipes/libselinux/all/conanfile.py @@ -38,7 +38,7 @@ def configure(self): del self.settings.compiler.cppstd def requirements(self): - self.requires("pcre2/10.40") + self.requires("pcre2/10.37") def validate(self): if self.settings.os != "Linux": diff --git a/recipes/libwebp/all/conandata.yml b/recipes/libwebp/all/conandata.yml index 34953b369b222..f21c9e9147cfa 100644 --- a/recipes/libwebp/all/conandata.yml +++ b/recipes/libwebp/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.2.3": - url: "https://github.com/webmproject/libwebp/archive/v1.2.3.tar.gz" - sha256: "021169407825d7ad918ff4554c6af885e7cf116d9b641cfd7f04c1173ffb9eb0" "1.2.2": url: "https://github.com/webmproject/libwebp/archive/v1.2.2.tar.gz" sha256: "51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e" @@ -18,9 +15,6 @@ sources: url: "https://github.com/webmproject/libwebp/archive/v1.0.3.tar.gz" sha256: "082d114bcb18a0e2aafc3148d43367c39304f86bf18ba0b2e766447e111a4a91" patches: - "1.2.3": - - patch_file: "patches/0001-fix-dll-export.patch" - base_path: "source_subfolder" "1.2.2": - patch_file: "patches/0001-fix-dll-export.patch" base_path: "source_subfolder" diff --git a/recipes/libwebp/config.yml b/recipes/libwebp/config.yml index 16050df36749f..ba51f6bc1de9b 100644 --- a/recipes/libwebp/config.yml +++ b/recipes/libwebp/config.yml @@ -1,6 +1,4 @@ versions: - "1.2.3": - folder: all "1.2.2": folder: all "1.2.1": diff --git a/recipes/libxft/all/conanfile.py b/recipes/libxft/all/conanfile.py index 55dcb675bc130..d939a09833f5f 100644 --- a/recipes/libxft/all/conanfile.py +++ b/recipes/libxft/all/conanfile.py @@ -23,7 +23,7 @@ def _source_subfolder(self): def requirements(self): self.requires("xorg/system") - self.requires("freetype/2.12.1") + self.requires("freetype/2.11.1") self.requires("fontconfig/2.13.93") def build_requirements(self): diff --git a/recipes/libxml2/all/conanfile.py b/recipes/libxml2/all/conanfile.py index 7e16807397e88..1f3bf6d059981 100644 --- a/recipes/libxml2/all/conanfile.py +++ b/recipes/libxml2/all/conanfile.py @@ -92,7 +92,7 @@ def requirements(self): if self.options.lzma: self.requires("xz_utils/5.2.5") if self.options.iconv: - self.requires("libiconv/1.17") + self.requires("libiconv/1.16") if self.options.icu: self.requires("icu/71.1") diff --git a/recipes/libxmlpp/2.x.x/conandata.yml b/recipes/libxmlpp/2.x.x/conandata.yml index c28f5a99de926..b0c79f2cf5d4d 100644 --- a/recipes/libxmlpp/2.x.x/conandata.yml +++ b/recipes/libxmlpp/2.x.x/conandata.yml @@ -1,15 +1,9 @@ sources: - "5.0.1": - url: "https://github.com/libxmlplusplus/libxmlplusplus/releases/download/5.0.1/libxml++-5.0.1.tar.xz" - sha256: "15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098" "2.42.1": url: "https://github.com/libxmlplusplus/libxmlplusplus/releases/download/2.42.1/libxml++-2.42.1.tar.xz" sha256: "9b59059abe5545d28ceb388a55e341095f197bd219c73e6623aeb6d801e00be8" patches: - "5.0.1": - - patch_file: "patches/5.0.1-0001-enable_static_builds_on_msvc.patch" - base_path: "source_subfolder" "2.42.1": - - patch_file: "patches/2.42.1-0001-enable_static_builds_on_msvc.patch" + - patch_file: "patches/enable_static_builds_on_msvc.patch" base_path: "source_subfolder" diff --git a/recipes/libxmlpp/2.x.x/conanfile.py b/recipes/libxmlpp/2.x.x/conanfile.py index 1297a686c1b40..263833d5c393b 100644 --- a/recipes/libxmlpp/2.x.x/conanfile.py +++ b/recipes/libxmlpp/2.x.x/conanfile.py @@ -4,29 +4,30 @@ from conan.tools.microsoft import is_msvc import shutil import os -import functools -required_conan_version = ">=1.45.0" class LibXMLPlusPlus(ConanFile): # FIXME: naming the library "libxml++" causes conan not to add it to the # environment path on windows name = "libxmlpp" - description = "libxml++ (a.k.a. libxmlplusplus) provides a C++ interface to XML files" + homepage = "https://github.com/libxmlplusplus/libxmlplusplus" license = "LGPL-2.1" url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/libxmlplusplus/libxmlplusplus" + description = "libxml++ (a.k.a. libxmlplusplus) provides a C++ interface to XML files" topics = ["xml", "parser", "wrapper"] - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - } + settings = "os", "compiler", "build_type", "arch" + options = {"shared": [True, False], "fPIC": [True, False]} + default_options = {"shared": False, "fPIC": True} + generators = "pkg_config" + exports_sources = "patches/**" + + def validate(self): + if hasattr(self, "settings_build") and tools.cross_building(self): + raise ConanInvalidConfiguration("Cross-building not implemented") + + if self.settings.compiler.get_safe("cppstd"): + tools.check_min_cppstd(self, 11) @property def _source_subfolder(self): @@ -36,35 +37,17 @@ def _source_subfolder(self): def _build_subfolder(self): return "build_subfolder" - def export_sources(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - self.copy(patch["patch_file"]) - def config_options(self): if self.settings.os == "Windows": del self.options.fPIC - def configure(self): - if self.options.shared: - del self.options.fPIC + def build_requirements(self): + self.build_requires("meson/0.59.1") + self.build_requires("pkgconf/1.7.4") def requirements(self): self.requires("libxml2/2.9.14") - if tools.Version(self.version) <= "2.42.1": - self.requires("glibmm/2.66.4") - else: - self.requires("glibmm/2.72.1") - - def validate(self): - if hasattr(self, "settings_build") and tools.cross_building(self): - raise ConanInvalidConfiguration("Cross-building not implemented") - - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, 11) - - def build_requirements(self): - self.build_requires("meson/0.63.0") - self.build_requires("pkgconf/1.7.4") + self.requires("glibmm/2.66.4") def source(self): tools.get( @@ -74,7 +57,7 @@ def source(self): ) def _patch_sources(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): + for patch in self.conan_data["patches"][self.version]: tools.patch(**patch) if is_msvc(self): @@ -87,7 +70,10 @@ def _patch_sources(self): os.path.join(self._source_subfolder, "meson.build"), "cpp_std=c++", "cpp_std=vc++") - @functools.lru_cache(1) + def configure(self): + if self.options.shared: + del self.options.fPIC + def _configure_meson(self): meson = Meson(self) defs = { @@ -112,18 +98,18 @@ def build(self): meson.build() def package(self): - lib_version = "2.6" if tools.Version(self.version) <= "2.42.1" else "5.0" - self.copy("COPYING", dst="licenses", src=self._source_subfolder) meson = self._configure_meson() meson.install() shutil.move( - os.path.join(self.package_folder, "lib", f"libxml++-{lib_version}", "include", "libxml++config.h"), - os.path.join(self.package_folder, "include", f"libxml++-{lib_version}", "libxml++config.h")) + os.path.join(self.package_folder, "lib", "libxml++-2.6", + "include", "libxml++config.h"), + os.path.join(self.package_folder, "include", "libxml++-2.6", + "libxml++config.h")) tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) - tools.rmdir(os.path.join(self.package_folder, "lib", f"libxml++-{lib_version}")) + tools.rmdir(os.path.join(self.package_folder, "lib", "libxml++-2.6")) if is_msvc(self): tools.remove_files_by_mask( @@ -131,25 +117,20 @@ def package(self): if not self.options.shared: rename( self, - os.path.join(self.package_folder, "lib", f"libxml++-{lib_version}.a"), - os.path.join(self.package_folder, "lib", f"xml++-{lib_version}.lib")) + os.path.join(self.package_folder, "lib", "libxml++-2.6.a"), + os.path.join(self.package_folder, "lib", "xml++-2.6.lib")) def package_info(self): - lib_version = "2.6" if tools.Version(self.version) <= "2.42.1" else "5.0" - - self.cpp_info.set_property("cmake_module_file_name", "libxml++") - self.cpp_info.set_property("cmake_module_target_name", "libxml++::libxml++") - self.cpp_info.set_property("pkg_config_name", "libxml++") - self.cpp_info.components[f"libxml++-{lib_version}"].set_property("pkg_config_name", f"libxml++-{lib_version}") - self.cpp_info.components[f"libxml++-{lib_version}"].libs = [f"xml++-{lib_version}"] - self.cpp_info.components[f"libxml++-{lib_version}"].includedirs = [ - os.path.join("include", f"libxml++-{lib_version}") - ] - self.cpp_info.components[f"libxml++-{lib_version}"].requires = [ - "glibmm::glibmm", "libxml2::libxml2" - ] - self.cpp_info.names["cmake_find_package"] = "libxml++" self.cpp_info.names["cmake_find_package_multi"] = "libxml++" self.cpp_info.names["pkg_config"] = "libxml++" - self.cpp_info.components[f"libxml++-{lib_version}"].names["pkg_config"] = f"libxml++-{lib_version}" + + self.cpp_info.components["libxml++-2.6"].names[ + "pkg_config"] = "libxml++-2.6" + self.cpp_info.components["libxml++-2.6"].libs = ["xml++-2.6"] + self.cpp_info.components["libxml++-2.6"].includedirs = [ + os.path.join("include", "libxml++-2.6") + ] + self.cpp_info.components["libxml++-2.6"].requires = [ + "glibmm::glibmm-2.4", "libxml2::libxml2" + ] diff --git a/recipes/libxmlpp/2.x.x/patches/5.0.1-0001-enable_static_builds_on_msvc.patch b/recipes/libxmlpp/2.x.x/patches/5.0.1-0001-enable_static_builds_on_msvc.patch deleted file mode 100644 index 135415955e944..0000000000000 --- a/recipes/libxmlpp/2.x.x/patches/5.0.1-0001-enable_static_builds_on_msvc.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/libxml++config.h.meson b/libxml++config.h.meson -index 2f0264f..11e0c2c 100755 ---- a/libxml++config.h.meson -+++ b/libxml++config.h.meson -@@ -16,6 +16,9 @@ - /* Micro version number of libxml++. */ - #mesondefine LIBXMLXX_MICRO_VERSION - -+/* Defined if libxml++ is built as a static library. */ -+#mesondefine LIBXMLXX_STATIC -+ - // Enable DLL-specific stuff only when not building a static library - #if !defined(__CYGWIN__) && (defined(__MINGW32__) || defined(_MSC_VER)) && !defined(LIBXMLXX_STATIC) - # define LIBXMLPP_DLL 1 -diff --git a/meson.build b/meson.build -index 6e86ca3..8557846 100644 ---- a/meson.build -+++ b/meson.build -@@ -274,15 +274,13 @@ if cpp_compiler.compiles(files('tools' / 'conf_tests' / 'have_exception_ptr.cc') - pkg_conf_data.set('LIBXMLXX_HAVE_EXCEPTION_PTR', 1) - endif - -+if get_option('default_library') == 'static' -+ pkg_conf_data.set('LIBXMLXX_STATIC', 1) -+endif -+ - # Static library? - library_build_type = get_option('default_library') - --if cpp_compiler.get_argument_syntax() == 'msvc' -- if library_build_type == 'static' or library_build_type == 'both' -- error('Static builds are not supported by MSVC-style builds') -- endif --endif -- - configure_file( - input: 'libxml++.pc.in', - output: xmlxx_pcname + '.pc', diff --git a/recipes/libxmlpp/2.x.x/patches/2.42.1-0001-enable_static_builds_on_msvc.patch b/recipes/libxmlpp/2.x.x/patches/enable_static_builds_on_msvc.patch similarity index 100% rename from recipes/libxmlpp/2.x.x/patches/2.42.1-0001-enable_static_builds_on_msvc.patch rename to recipes/libxmlpp/2.x.x/patches/enable_static_builds_on_msvc.patch diff --git a/recipes/libxmlpp/2.x.x/test_package/CMakeLists.txt b/recipes/libxmlpp/2.x.x/test_package/CMakeLists.txt index acd4c1ac2441b..8946f91b2467c 100644 --- a/recipes/libxmlpp/2.x.x/test_package/CMakeLists.txt +++ b/recipes/libxmlpp/2.x.x/test_package/CMakeLists.txt @@ -1,15 +1,11 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.6) project(test_package) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) +conan_basic_setup(TARGET) find_package(libxml++ REQUIRED CONFIG) add_executable(${PROJECT_NAME} test_package.cpp) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) -if(TARGET libxml++::libxml++-2.6) - target_link_libraries(${PROJECT_NAME} libxml++::libxml++-2.6) -else() - target_link_libraries(${PROJECT_NAME} libxml++::libxml++-5.0) -endif() +set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) +target_link_libraries(${PROJECT_NAME} libxml++::libxml++-2.6) diff --git a/recipes/libxmlpp/config.yml b/recipes/libxmlpp/config.yml index 4976ee096e564..37007196cba28 100644 --- a/recipes/libxmlpp/config.yml +++ b/recipes/libxmlpp/config.yml @@ -1,5 +1,3 @@ versions: - "5.0.1": - folder: "2.x.x" "2.42.1": folder: "2.x.x" diff --git a/recipes/lightgbm/all/conanfile.py b/recipes/lightgbm/all/conanfile.py index d00e21c352364..fa7fd567c7272 100644 --- a/recipes/lightgbm/all/conanfile.py +++ b/recipes/lightgbm/all/conanfile.py @@ -42,7 +42,7 @@ def configure(self): def requirements(self): self.requires("eigen/3.4.0") self.requires("fast_double_parser/0.6.0") - self.requires("fmt/9.0.0") + self.requires("fmt/8.1.1") if self.options.with_openmp and self.settings.compiler in ("clang", "apple-clang"): self.requires("llvm-openmp/11.1.0") diff --git a/recipes/luau/all/CMakeLists.txt b/recipes/luau/all/CMakeLists.txt deleted file mode 100644 index a9e2b43449f18..0000000000000 --- a/recipes/luau/all/CMakeLists.txt +++ /dev/null @@ -1,99 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(conan_wrapper CXX) - -include(conanbuildinfo.cmake) -conan_basic_setup(TARGETS KEEP_RPATHS) - -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - -add_subdirectory(source_subfolder) - -## installer -include(GNUInstallDirs) - -install( - TARGETS Luau.Ast - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -) -install(DIRECTORY "source_subfolder/Ast/include/Luau" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - -install( - TARGETS Luau.Compiler - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) -install(DIRECTORY "source_subfolder/Compiler/include/Luau" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -install(FILES - "source_subfolder/Compiler/include/luacode.h" - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - -install( - TARGETS Luau.CodeGen - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -) -install(DIRECTORY "source_subfolder/CodeGen/include/Luau" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - - -install( - TARGETS Luau.Analysis - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) -install(DIRECTORY "source_subfolder/Analysis/include/Luau" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - -install( - TARGETS Luau.VM - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) -install(FILES - "source_subfolder/VM/include/lua.h" - "source_subfolder/VM/include/luaconf.h" - "source_subfolder/VM/include/lualib.h" - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - -if(LUAU_BUILD_CLI) - install( - TARGETS Luau.Repl.CLI - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) - - install( - TARGETS Luau.Analyze.CLI - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) - - install( - TARGETS Luau.Ast.CLI - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) -endif() - -if(LUAU_BUILD_WEB) - install( - TARGETS Luau.Web - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) -endif() diff --git a/recipes/luau/all/conandata.yml b/recipes/luau/all/conandata.yml deleted file mode 100644 index cc307d3a86eb3..0000000000000 --- a/recipes/luau/all/conandata.yml +++ /dev/null @@ -1,11 +0,0 @@ -sources: - "0.536": - url: "https://github.com/Roblox/luau/archive/refs/tags/0.536.tar.gz" - sha256: "e6de36e83e9c537d92bcc94852ab498e3c15a310fd2c4cc4e21c616d8ae1a84f" - -patches: - "0.536": - - patch_file: "patches/0.536-0001-fix-cmake.patch" - base_path: "source_subfolder" - - patch_file: "patches/0.536-0002-rename-lerp.patch" - base_path: "source_subfolder" diff --git a/recipes/luau/all/conanfile.py b/recipes/luau/all/conanfile.py deleted file mode 100644 index abfe5f337d960..0000000000000 --- a/recipes/luau/all/conanfile.py +++ /dev/null @@ -1,134 +0,0 @@ -from conans import ConanFile, CMake, tools -from conan.tools.microsoft import is_msvc -import os -import functools - -required_conan_version = ">=1.43.0" - -class LuauConan(ConanFile): - name = "luau" - description = "A fast, small, safe, gradually typed embeddable scripting language derived from Lua " - license = "MIT" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://luau-lang.org/" - topics = ("lua", "scripting", "typed", "embed") - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [False, True], - "fPIC": [True, False], - "with_cli": [True, False], - "with_web": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - "with_cli": False, - "with_web": False, - } - generators = "cmake" - - @property - def _source_subfolder(self): - return "source_subfolder" - - def export_sources(self): - self.copy("CMakeLists.txt") - for patch in self.conan_data.get("patches", {}).get(self.version, []): - self.copy(patch["patch_file"]) - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - if self.options.shared: - del self.options.fPIC - - @property - def _compiler_required_cpp17(self): - return { - "Visual Studio": "16", - "gcc": "8", - "clang": "7", - "apple-clang": "12.0", - } - - def validate(self): - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, 17) - - minimum_version = self._compiler_required_cpp17.get(str(self.settings.compiler), False) - if minimum_version: - if tools.Version(self.settings.compiler.version) < minimum_version: - raise tools.ConanInvalidConfiguration("{} requires C++17, which your compiler does not support.".format(self.name)) - else: - self.output.warn("{0} requires C++17. Your compiler is unknown. Assuming it supports C++17.".format(self.name)) - - if is_msvc(self) and self.options.shared: - raise tools.ConanInvalidConfiguration("{} does not support shared build in MSVC".format(self.name)) - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) - - @functools.lru_cache(1) - def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["LUAU_BUILD_CLI"] = self.options.with_cli - cmake.definitions["LUAU_BUILD_TESTS"] = False - cmake.definitions["LUAU_BUILD_WEB"] = self.options.with_web - cmake.definitions["LUAU_WERROR"] = False - cmake.definitions["LUAU_STATIC_CRT"] = False - cmake.configure() - return cmake - - def build(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy(pattern="lua_LICENSE*", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - - def package_info(self): - self.cpp_info.set_property("cmake_file_name", "Luau") - self.cpp_info.set_property("cmake_target_name", "Luau::Luau") - - self.cpp_info.filenames["cmake_find_package"] = "Luau" - self.cpp_info.filenames["cmake_find_package_multi"] = "Luau" - self.cpp_info.names["cmake_find_package_multi"] = "Luau" - self.cpp_info.names["cmake_find_package"] = "Luau" - - self.cpp_info.components["Ast"].libs = ["Luau.Ast"] - self.cpp_info.components["Ast"].set_property("cmake_target_name", "Luau::Ast") - - self.cpp_info.components["VM"].libs = ["Luau.VM"] - self.cpp_info.components["VM"].set_property("cmake_target_name", "Luau::VM") - self.cpp_info.components["VM"].requires = ["Ast"] - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.components["VM"].system_libs = ["m"] - - self.cpp_info.components["Analysis"].libs = ["Luau.Analysis"] - self.cpp_info.components["Analysis"].set_property("cmake_target_name", "Luau::Analysis") - self.cpp_info.components["Analysis"].requires = ["Ast"] - - self.cpp_info.components["Compiler"].libs = ["Luau.Compiler"] - self.cpp_info.components["Compiler"].set_property("cmake_target_name", "Luau::Compiler") - self.cpp_info.components["Compiler"].requires = ["Ast"] - - self.cpp_info.components["CodeGen"].libs = ["Luau.CodeGen"] - self.cpp_info.components["CodeGen"].set_property("cmake_target_name", "Luau::CodeGen") - self.cpp_info.components["CodeGen"].requires = ["Ast"] - - if self.options.with_cli: - bin_path = os.path.join(self.package_folder, "bin") - self.output.info("Appending PATH environment variable: {}".format(bin_path)) - self.env_info.PATH.append(bin_path) - - if self.options.with_web: - self.cpp_info.components["Web"].libs = ["Luau.Web"] - self.cpp_info.components["Web"].set_property("cmake_target_name", "Luau::Web") - self.cpp_info.components["Web"].requires = ["Compiler", "VM"] diff --git a/recipes/luau/all/patches/0.536-0001-fix-cmake.patch b/recipes/luau/all/patches/0.536-0001-fix-cmake.patch deleted file mode 100644 index 00dcf66617205..0000000000000 --- a/recipes/luau/all/patches/0.536-0001-fix-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9200634..c1cca12 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,12 +21,12 @@ endif() - - project(Luau LANGUAGES CXX C) - add_library(Luau.Common INTERFACE) --add_library(Luau.Ast STATIC) --add_library(Luau.Compiler STATIC) --add_library(Luau.Analysis STATIC) --add_library(Luau.CodeGen STATIC) --add_library(Luau.VM STATIC) --add_library(isocline STATIC) -+add_library(Luau.Ast) -+add_library(Luau.Compiler) -+add_library(Luau.Analysis) -+add_library(Luau.CodeGen) -+add_library(Luau.VM) -+add_library(isocline) - - if(LUAU_BUILD_CLI) - add_executable(Luau.Repl.CLI) diff --git a/recipes/luau/all/patches/0.536-0002-rename-lerp.patch b/recipes/luau/all/patches/0.536-0002-rename-lerp.patch deleted file mode 100644 index 324b7d737bf16..0000000000000 --- a/recipes/luau/all/patches/0.536-0002-rename-lerp.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/VM/src/lmathlib.cpp b/VM/src/lmathlib.cpp -index a6e7b49..7c3e3c6 100644 ---- a/VM/src/lmathlib.cpp -+++ b/VM/src/lmathlib.cpp -@@ -300,7 +300,7 @@ static float fade(float t) - return t * t * t * (t * (t * 6 - 15) + 10); - } - --static float lerp(float t, float a, float b) -+static float lerp_l(float t, float a, float b) - { - return a + t * (b - a); - } -@@ -342,10 +342,10 @@ static float perlin(float x, float y, float z) - int ba = p[b] + zi; - int bb = p[b + 1] + zi; - -- return lerp(w, -- lerp(v, lerp(u, grad(p[aa], xf, yf, zf), grad(p[ba], xf - 1, yf, zf)), lerp(u, grad(p[ab], xf, yf - 1, zf), grad(p[bb], xf - 1, yf - 1, zf))), -- lerp(v, lerp(u, grad(p[aa + 1], xf, yf, zf - 1), grad(p[ba + 1], xf - 1, yf, zf - 1)), -- lerp(u, grad(p[ab + 1], xf, yf - 1, zf - 1), grad(p[bb + 1], xf - 1, yf - 1, zf - 1)))); -+ return lerp_l(w, -+ lerp_l(v, lerp_l(u, grad(p[aa], xf, yf, zf), grad(p[ba], xf - 1, yf, zf)), lerp_l(u, grad(p[ab], xf, yf - 1, zf), grad(p[bb], xf - 1, yf - 1, zf))), -+ lerp_l(v, lerp_l(u, grad(p[aa + 1], xf, yf, zf - 1), grad(p[ba + 1], xf - 1, yf, zf - 1)), -+ lerp_l(u, grad(p[ab + 1], xf, yf - 1, zf - 1), grad(p[bb + 1], xf - 1, yf - 1, zf - 1)))); - } - - static int math_noise(lua_State* L) diff --git a/recipes/luau/all/test_package/CMakeLists.txt b/recipes/luau/all/test_package/CMakeLists.txt deleted file mode 100644 index 893cbad04577d..0000000000000 --- a/recipes/luau/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(Luau REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} Luau::Luau) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) diff --git a/recipes/luau/all/test_package/conanfile.py b/recipes/luau/all/test_package/conanfile.py deleted file mode 100644 index 81a08015e01f1..0000000000000 --- a/recipes/luau/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake -from conan.tools.build import cross_building -import os - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/luau/all/test_package/test_package.cpp b/recipes/luau/all/test_package/test_package.cpp deleted file mode 100644 index 7211862f8ded9..0000000000000 --- a/recipes/luau/all/test_package/test_package.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "lua.h" -#include "lualib.h" - -#include - -int main(int argc, char* argv[]) { - lua_State* L = luaL_newstate(); - lua_close(L); - return 0; -} diff --git a/recipes/luau/config.yml b/recipes/luau/config.yml deleted file mode 100644 index 5d0aaf6a86db6..0000000000000 --- a/recipes/luau/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "0.536": - folder: all diff --git a/recipes/mbedtls/all/conandata.yml b/recipes/mbedtls/all/conandata.yml index dc637270ed1d4..a5eda2524335f 100644 --- a/recipes/mbedtls/all/conandata.yml +++ b/recipes/mbedtls/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.2.1": - url: "https://github.com/ARMmbed/mbedtls/archive/mbedtls-3.2.1.tar.gz" - sha256: "5850089672560eeaca03dc36678ee8573bb48ef6e38c94f5ce349af60c16da33" "3.1.0": url: "https://github.com/ARMmbed/mbedtls/archive/mbedtls-3.1.0.tar.gz" sha256: "64d01a3b22b91cf3a25630257f268f11bc7bfa37981ae6d397802dd4ccec4690" diff --git a/recipes/mbedtls/config.yml b/recipes/mbedtls/config.yml index 276042bd4cfdd..40daa3ecfbb04 100644 --- a/recipes/mbedtls/config.yml +++ b/recipes/mbedtls/config.yml @@ -1,6 +1,4 @@ versions: - "3.2.1": - folder: all "3.1.0": folder: all "3.0.0": diff --git a/recipes/mcap/all/conandata.yml b/recipes/mcap/all/conandata.yml index a12e743fc57b2..9cdbbd0b0c5ff 100644 --- a/recipes/mcap/all/conandata.yml +++ b/recipes/mcap/all/conandata.yml @@ -5,6 +5,3 @@ sources: 0.1.1: url: https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v0.1.1/main.tar.gz sha256: a9ea899315851bfacdb234b7acc917b1a9c67593f0d68e1920321a8f6fa2cfbf - 0.1.2: - url: https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v0.1.2/main.tar.gz - sha256: 0f456d6c53730445c3dbf57afd285493cf748c66a02f77d6e48c075128fd0896 diff --git a/recipes/mcap/config.yml b/recipes/mcap/config.yml index 06a637acf5c81..52e7b993e4db5 100644 --- a/recipes/mcap/config.yml +++ b/recipes/mcap/config.yml @@ -3,5 +3,3 @@ versions: folder: all 0.1.1: folder: all - 0.1.2: - folder: all diff --git a/recipes/mdns/all/conandata.yml b/recipes/mdns/all/conandata.yml index ef0896308dfb2..1706d9f796303 100644 --- a/recipes/mdns/all/conandata.yml +++ b/recipes/mdns/all/conandata.yml @@ -1,4 +1,13 @@ sources: + "20200130": + sha256: 5f327b56d932ed5c1a28b7b1b1f528ddfbf69cb45bc4a8d38301ab85116e4b0e + url: https://github.com/mjansson/mdns/archive/0f75def961433102dc4848564c1a865f473dfaed.zip + "20200331": + sha256: 98861150179942cd6975b207048939a491ab4bb6c7291a3a34dedc80082b3ba9 + url: https://github.com/mjansson/mdns/archive/4f7f7942bd10eb3d67af48b5233cb84283d9639c.zip + "20200424": + sha256: 505aac658feb45bea65b2ab00a6abf1b14c2aaaa971456d6e3ba58b75a543d47 + url: https://github.com/mjansson/mdns/archive/0b9a4de6c5132679364e47c0f9a7a37af9d2ce47.zip "1.0": sha256: e06ed954b4705f0e48f3e6bd44b75c115ee03f745c62394ee615f466e44e9373 url: https://github.com/mjansson/mdns/archive/1.0.tar.gz diff --git a/recipes/mdns/all/conanfile.py b/recipes/mdns/all/conanfile.py index aa012f43092fc..4e0727d4186fd 100644 --- a/recipes/mdns/all/conanfile.py +++ b/recipes/mdns/all/conanfile.py @@ -1,7 +1,6 @@ -import os +import os, glob from conans import CMake, ConanFile, tools -required_conan_version = ">=1.43.0" class MdnsConan(ConanFile): name = "mdns" @@ -9,20 +8,18 @@ class MdnsConan(ConanFile): homepage = "https://github.com/mjansson/mdns" url = "https://github.com/conan-io/conan-center-index" description = "Public domain mDNS/DNS-SD library in C" - topics = ("mdns", "dns", "dns-sd", "multicast discovery", "discovery") - settings = "os", "compiler", "build_type", "arch" + topics = ("conan", "mdns", "dns", "dns-sd") + settings = "os" no_copy_source = True @property def _source_subfolder(self): return "source_subfolder" - def package_id(self): - self.info.header_only() - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) + tools.get(**self.conan_data["sources"][self.version]) + extracted_dir = glob.glob('mdns-*/')[0] + os.rename(extracted_dir, self._source_subfolder) def package(self): self.copy("LICENSE", dst="licenses", src=self._source_subfolder) @@ -34,5 +31,5 @@ def package_info(self): if str(self.settings.os) in ["Linux", "Android"]: self.cpp_info.system_libs.append('pthread') - self.cpp_info.set_property("cmake_file_name", "mdns") - self.cpp_info.set_property("cmake_target_name", "mdns::mdns") + def package_id(self): + self.info.header_only() diff --git a/recipes/mdns/config.yml b/recipes/mdns/config.yml index cdb4b7bded43e..24bbe2e8e9581 100644 --- a/recipes/mdns/config.yml +++ b/recipes/mdns/config.yml @@ -1,4 +1,10 @@ versions: + "20200130": + folder: "all" + "20200331": + folder: "all" + "20200424": + folder: "all" "1.0": folder: "all" "1.1": diff --git a/recipes/modern-cpp-kafka/all/conandata.yml b/recipes/modern-cpp-kafka/all/conandata.yml deleted file mode 100644 index 3a94bd663e381..0000000000000 --- a/recipes/modern-cpp-kafka/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "2022.06.15": - url: https://github.com/morganstanley/modern-cpp-kafka/archive/refs/tags/v2022.06.15.tar.gz - sha256: 478fcf560057b7cf7b4be851838ebf0520806d057b172de23261606fce088d27 diff --git a/recipes/modern-cpp-kafka/all/conanfile.py b/recipes/modern-cpp-kafka/all/conanfile.py deleted file mode 100644 index eebf2c5395b60..0000000000000 --- a/recipes/modern-cpp-kafka/all/conanfile.py +++ /dev/null @@ -1,45 +0,0 @@ -from conans import ConanFile, tools -import os - -required_conan_version = ">=1.33.0" - - -class ModernCppKafkaConan(ConanFile): - name = "modern-cpp-kafka" - description = "A C++ API for Kafka clients (i.e. KafkaProducer, KafkaConsumer, AdminClient)" - license = "Apache-2.0" - topics = ("kafka", "librdkafka", "kafkaproducer", "kafkaconsumer") - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/morganstanley/modern-cpp-kafka" - settings = "arch", "build_type", "compiler", "os" - no_copy_source = True - - def requirements(self): - self.requires("librdkafka/1.8.2") - - @property - def _source_subfolder(self): - return "source_subfolder" - - def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) - - def validate(self): - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, 17) - - def package(self): - self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder) - self.copy(pattern="*.h", dst="include", src=os.path.join(self._source_subfolder, "include")) - - def package_id(self): - self.info.header_only() - - def package_info(self): - self.cpp_info.set_property("cmake_target_name", "ModernCppKafka::ModernCppKafka") - - self.cpp_info.names["cmake_find_package"] = "ModernCppKafka" - self.cpp_info.names["cmake_find_package_multi"] = "ModernCppKafka" - - if self.settings.os in ["Linux", "Macos"]: - self.cpp_info.system_libs.append("pthread") diff --git a/recipes/modern-cpp-kafka/all/test_package/CMakeLists.txt b/recipes/modern-cpp-kafka/all/test_package/CMakeLists.txt deleted file mode 100644 index 0d36924d633da..0000000000000 --- a/recipes/modern-cpp-kafka/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -set(CMAKE_CXX_STANDARD 17) - -find_package(ModernCppKafka REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} ModernCppKafka::ModernCppKafka) diff --git a/recipes/modern-cpp-kafka/all/test_package/conanfile.py b/recipes/modern-cpp-kafka/all/test_package/conanfile.py deleted file mode 100644 index 81a08015e01f1..0000000000000 --- a/recipes/modern-cpp-kafka/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake -from conan.tools.build import cross_building -import os - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/modern-cpp-kafka/all/test_package/test_package.cpp b/recipes/modern-cpp-kafka/all/test_package/test_package.cpp deleted file mode 100644 index b9fb4f0bea6d8..0000000000000 --- a/recipes/modern-cpp-kafka/all/test_package/test_package.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "kafka/Utility.h" - -#include - -int main() -{ - std::cout << "librdkafka version: " << kafka::utility::getLibRdKafkaVersion() << std::endl; -} diff --git a/recipes/modern-cpp-kafka/config.yml b/recipes/modern-cpp-kafka/config.yml deleted file mode 100644 index 191f269934ad8..0000000000000 --- a/recipes/modern-cpp-kafka/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "2022.06.15": - folder: all diff --git a/recipes/mongo-c-driver/all/CMakeLists.txt b/recipes/mongo-c-driver/all/CMakeLists.txt index 083fd1875e429..694038520f556 100644 --- a/recipes/mongo-c-driver/all/CMakeLists.txt +++ b/recipes/mongo-c-driver/all/CMakeLists.txt @@ -1,8 +1,8 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 2.8.11) project(cmake_wrapper) include(conanbuildinfo.cmake) -conan_basic_setup(KEEP_RPATHS) +conan_basic_setup() add_subdirectory(source_subfolder) diff --git a/recipes/mongo-c-driver/all/conanfile.py b/recipes/mongo-c-driver/all/conanfile.py index 3e11f583e4a90..e372e0c38f137 100644 --- a/recipes/mongo-c-driver/all/conanfile.py +++ b/recipes/mongo-c-driver/all/conanfile.py @@ -5,7 +5,6 @@ required_conan_version = ">=1.43.0" - class MongoCDriverConan(ConanFile): name = "mongo-c-driver" description = "A Cross Platform MongoDB Client Library for C" @@ -13,7 +12,6 @@ class MongoCDriverConan(ConanFile): url = "https://github.com/conan-io/conan-center-index" homepage = "https://mongoc.org/" topics = ("libbson", "libmongoc", "mongo", "mongodb", "database", "db") - settings = "os", "arch", "compiler", "build_type" options = { "shared": [True, False], @@ -37,7 +35,6 @@ class MongoCDriverConan(ConanFile): "with_icu": True, "srv": True, } - short_paths = True generators = "cmake", "cmake_find_package", "pkg_config" @@ -67,7 +64,7 @@ def configure(self): def requirements(self): if self.options.with_ssl == "openssl": - self.requires("openssl/1.1.1q") + self.requires("openssl/1.1.1o") elif self.options.with_ssl == "libressl": self.requires("libressl/3.5.3") if self.options.with_sasl == "cyrus": @@ -88,6 +85,8 @@ def validate(self): raise ConanInvalidConfiguration("with_ssl=windows only allowed on Windows") if self.options.with_sasl == "sspi" and self.settings.os != "Windows": raise ConanInvalidConfiguration("with_sasl=sspi only allowed on Windows") + if tools.Version(self.version) >= "1.21.0" and self.settings.os == "Windows" and not self.options.shared: + raise ConanInvalidConfiguration("shared build doesn't allow on Windows after 1.21.0") def build_requirements(self): if self.options.with_ssl == "libressl" or self.options.with_zstd: @@ -112,9 +111,6 @@ def _patch_sources(self): for old_new in to_replace_old_new: tools.replace_in_file(os.path.join(self._source_subfolder, "src", "libmongoc", "CMakeLists.txt"), old_new["old"], old_new["new"]) - # cleanup rpath - tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), - "set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)", "") @property def _ssl_cmake_value(self): @@ -165,9 +161,9 @@ def _configure_cmake(self): cmake.definitions["ENABLE_PIC"] = self.options.get_safe("fPIC", True) if self.options.with_ssl == "openssl": cmake.definitions["OPENSSL_ROOT_DIR"] = self.deps_cpp_info["openssl"].rootpath - if tools.Version(self.version) >= "1.20.0": - cmake.definitions["MONGO_USE_CCACHE"] = False + cmake.configure(build_folder=self._build_subfolder) + return cmake def build(self): diff --git a/recipes/mongo-c-driver/all/patches/1.22.0-0001-disable-shared-when-static.patch b/recipes/mongo-c-driver/all/patches/1.22.0-0001-disable-shared-when-static.patch index 23d005b89467b..81548d72d56c7 100644 --- a/recipes/mongo-c-driver/all/patches/1.22.0-0001-disable-shared-when-static.patch +++ b/recipes/mongo-c-driver/all/patches/1.22.0-0001-disable-shared-when-static.patch @@ -1,22 +1,25 @@ +diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt +index d6df66f..72fcf47 100644 --- a/src/libbson/CMakeLists.txt +++ b/src/libbson/CMakeLists.txt -@@ -209,6 +209,7 @@ set (HEADERS_FORWARDING - ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h +@@ -230,6 +230,8 @@ target_include_directories ( + $ + $ ) - ++ +if (NOT MONGOC_ENABLE_STATIC_BUILD) - add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - set (CMAKE_CXX_VISIBILITY_PRESET hidden) - target_compile_definitions (bson_shared -@@ -275,6 +276,7 @@ if (WIN32) + set_target_properties (bson_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) + set_target_properties (bson_shared PROPERTIES OUTPUT_NAME "${BSON_OUTPUT_BASENAME}-${BSON_API_VERSION}") + +@@ -275,6 +277,7 @@ if (WIN32) # must be handled specially since we can't resolve them set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32) endif () -+endif() ++endif () if (MONGOC_ENABLE_STATIC_BUILD) add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) -@@ -349,7 +351,7 @@ set (BSON_HEADER_INSTALL_DIR +@@ -349,7 +352,7 @@ set (BSON_HEADER_INSTALL_DIR ) if (MONGOC_ENABLE_STATIC_INSTALL) @@ -25,6 +28,8 @@ else () set (TARGETS_TO_INSTALL bson_shared) endif () +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index f14ad6b..3a056ce 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt @@ -758,6 +758,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) @@ -55,7 +60,7 @@ PUBLIC_HEADER "${HEADERS}" ) endif () -+endif() ++endif () add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) +if (NOT MONGOC_ENABLE_STATIC_BUILD) diff --git a/recipes/mongo-cxx-driver/all/conandata.yml b/recipes/mongo-cxx-driver/all/conandata.yml index 7f38f964decdb..2e6383a9ed8e4 100644 --- a/recipes/mongo-cxx-driver/all/conandata.yml +++ b/recipes/mongo-cxx-driver/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.6.7": - url: "https://github.com/mongodb/mongo-cxx-driver/archive/debian/3.6.7-1.tar.gz" - sha256: "62a0a16e4a35289e1692f60cf07a7f6957485446b7bc1d82306b731ad6763fb9" "3.6.6": url: "https://github.com/mongodb/mongo-cxx-driver/archive/r3.6.6.tar.gz" sha256: "f989c371800458ae45ef69f6d9566e010f9420435a01bf5eb14db77fc024662e" @@ -12,13 +9,6 @@ sources: url: https://github.com/mongodb/mongo-cxx-driver/archive/r3.6.1.tar.gz sha256: c6d1b307f7b074d178c4a815d8739195fb4d7870701064bdad6f1f2360ae0af9 patches: - "3.6.7": - - patch_file: "patches/dirs_and_tests.patch" - base_path: "source_subfolder" - - patch_file: "patches/link_conan_boost.patch" - base_path: "source_subfolder" - - patch_file: "patches/poly_use_std_define.patch" - base_path: "source_subfolder" "3.6.6": - patch_file: "patches/dirs_and_tests.patch" base_path: "source_subfolder" diff --git a/recipes/mongo-cxx-driver/config.yml b/recipes/mongo-cxx-driver/config.yml index f7b7e026a30f6..c78e1dfc988db 100644 --- a/recipes/mongo-cxx-driver/config.yml +++ b/recipes/mongo-cxx-driver/config.yml @@ -1,6 +1,4 @@ versions: - "3.6.7": - folder: all "3.6.6": folder: all "3.6.2": diff --git a/recipes/nanodbc/all/conandata.yml b/recipes/nanodbc/all/conandata.yml index 60ad84e0835de..e4b802f7aa523 100644 --- a/recipes/nanodbc/all/conandata.yml +++ b/recipes/nanodbc/all/conandata.yml @@ -5,9 +5,6 @@ sources: "2.13.0": url: "https://github.com/nanodbc/nanodbc/archive/v2.13.0.zip" sha256: "1287869b6ca82728cb6cc53c54f836c72cde15370c16f32d81c9ef6c257f7e43" - "2.14.0": - url: "https://github.com/nanodbc/nanodbc/archive/v2.14.0.tar.gz" - sha256: "56228372042b689beccd96b0ac3476643ea85b3f57b3f23fb11ca4314e68b9a5" patches: "cci.20200807": - patch_file: "patches/0001-odbc-from-cci.patch" @@ -19,8 +16,3 @@ patches: base_path: "source_subfolder" - patch_file: "patches/0002-allow-windows-shared.patch" base_path: "source_subfolder" - "2.14.0": - - patch_file: "patches/0001-odbc-from-cci.patch" - base_path: "source_subfolder" - - patch_file: "patches/0002-allow-windows-shared.patch" - base_path: "source_subfolder" diff --git a/recipes/nanodbc/config.yml b/recipes/nanodbc/config.yml index 35d045402c05f..9441a242d3db8 100644 --- a/recipes/nanodbc/config.yml +++ b/recipes/nanodbc/config.yml @@ -3,5 +3,3 @@ versions: folder: "all" "2.13.0": folder: "all" - "2.14.0": - folder: "all" diff --git a/recipes/nfrechette-acl/all/conandata.yml b/recipes/nfrechette-acl/all/conandata.yml index 0c2e8a5978fd0..3609495bd0b31 100644 --- a/recipes/nfrechette-acl/all/conandata.yml +++ b/recipes/nfrechette-acl/all/conandata.yml @@ -17,6 +17,3 @@ sources: "2.0.5": url: "https://github.com/nfrechette/acl/archive/v2.0.5.tar.gz" sha256: "edd255a3ffcdb102b960922069d1ec9ae5fed561bca3bb6ee73224562f76fa36" - "2.0.6": - url: "https://github.com/nfrechette/acl/archive/v2.0.6.tar.gz" - sha256: "595575d3470eb3a4a572f7c5cb986ea2205ea1271ca3b32b864c569659106311" diff --git a/recipes/nfrechette-acl/config.yml b/recipes/nfrechette-acl/config.yml index cf68d13e1c698..c854ce704e866 100644 --- a/recipes/nfrechette-acl/config.yml +++ b/recipes/nfrechette-acl/config.yml @@ -11,5 +11,3 @@ versions: folder: "all" "2.0.5": folder: "all" - "2.0.6": - folder: "all" diff --git a/recipes/nv-codec-headers/all/conandata.yml b/recipes/nv-codec-headers/all/conandata.yml index 708ee808ccc1d..bcaf3143ce320 100644 --- a/recipes/nv-codec-headers/all/conandata.yml +++ b/recipes/nv-codec-headers/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "11.1.5.1": - url: "https://github.com/FFmpeg/nv-codec-headers/archive/n11.1.5.1.tar.gz" - sha256: "d095fbd56aa93772471a323be0ebe65504a0f43f06c76a30b6d25da77b06ae9c" "9.1.23.2": url: https://github.com/FFmpeg/nv-codec-headers/releases/download/n9.1.23.2/nv-codec-headers-9.1.23.2.tar.gz sha256: 34c9d1aedf32dc4b9fb22e94dbb041de666b568ceb4bdb317e414b752a3f9a9a diff --git a/recipes/nv-codec-headers/config.yml b/recipes/nv-codec-headers/config.yml index 993edd5a10422..f7a1280c61468 100644 --- a/recipes/nv-codec-headers/config.yml +++ b/recipes/nv-codec-headers/config.yml @@ -1,5 +1,3 @@ versions: - "11.1.5.1": - folder: all "9.1.23.2": folder: all diff --git a/recipes/odbc/all/conanfile.py b/recipes/odbc/all/conanfile.py index 52f93e639c109..c7d41cc514fac 100644 --- a/recipes/odbc/all/conanfile.py +++ b/recipes/odbc/all/conanfile.py @@ -47,7 +47,7 @@ def configure(self): def requirements(self): if self.options.with_libiconv: - self.requires("libiconv/1.17") + self.requires("libiconv/1.16") def validate(self): if self.settings.os == "Windows": diff --git a/recipes/openal/all/conandata.yml b/recipes/openal/all/conandata.yml index 9f2fddbe352fc..81ef2a5a09b4e 100644 --- a/recipes/openal/all/conandata.yml +++ b/recipes/openal/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.22.2": - url: "https://github.com/kcat/openal-soft/archive/1.22.2.tar.gz" - sha256: "3e58f3d4458f5ee850039b1a6b4dac2343b3a5985a6a2e7ae2d143369c5b8135" "1.21.1": url: "https://github.com/kcat/openal-soft/archive/refs/tags/1.21.1.tar.gz" sha256: "8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f" @@ -15,9 +12,6 @@ sources: url: "https://github.com/kcat/openal-soft/archive/openal-soft-1.19.1.tar.gz" sha256: "9f3536ab2bb7781dbafabc6a61e0b34b17edd16bd6c2eaf2ae71bc63078f98c7" patches: - "1.22.2": - - base_path: "source_subfolder" - patch_file: "patches/1.22.2-fix-al-optional-in-if-compile-error.patch" "1.21.0": - base_path: "source_subfolder" patch_file: "patches/1.21.0-c++14-does-not-have-std-aligned_alloc.patch" diff --git a/recipes/openal/all/patches/1.22.2-fix-al-optional-in-if-compile-error.patch b/recipes/openal/all/patches/1.22.2-fix-al-optional-in-if-compile-error.patch deleted file mode 100644 index 6e0e4aa8641f8..0000000000000 --- a/recipes/openal/all/patches/1.22.2-fix-al-optional-in-if-compile-error.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 650a6d49e9a511d005171940761f6dd6b440ee66 Mon Sep 17 00:00:00 2001 -From: Chris Robinson -Date: Mon, 18 Jul 2022 11:10:27 -0700 -Subject: [PATCH] Declare variables closer to where they're used - ---- - alc/backends/alsa.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp -index 9c78b6c6a..b6efeaba1 100644 ---- a/alc/backends/alsa.cpp -+++ b/alc/backends/alsa.cpp -@@ -623,7 +623,6 @@ int AlsaPlayback::mixerNoMMapProc() - - void AlsaPlayback::open(const char *name) - { -- al::optional driveropt; - const char *driver{"default"}; - if(name) - { -@@ -640,7 +639,7 @@ void AlsaPlayback::open(const char *name) - else - { - name = alsaDevice; -- if(bool{driveropt = ConfigValueStr(nullptr, "alsa", "device")}) -+ if(auto driveropt = ConfigValueStr(nullptr, "alsa", "device")) - driver = driveropt->c_str(); - } - TRACE("Opening device \"%s\"\n", driver); -@@ -896,7 +895,6 @@ AlsaCapture::~AlsaCapture() - - void AlsaCapture::open(const char *name) - { -- al::optional driveropt; - const char *driver{"default"}; - if(name) - { -@@ -913,7 +911,7 @@ void AlsaCapture::open(const char *name) - else - { - name = alsaDevice; -- if(bool{driveropt = ConfigValueStr(nullptr, "alsa", "capture")}) -+ if(auto driveropt = ConfigValueStr(nullptr, "alsa", "capture")) - driver = driveropt->c_str(); - } - diff --git a/recipes/openal/config.yml b/recipes/openal/config.yml index e4eea213adbce..5958720470407 100644 --- a/recipes/openal/config.yml +++ b/recipes/openal/config.yml @@ -1,6 +1,4 @@ versions: - "1.22.2": - folder: all "1.21.1": folder: all "1.21.0": diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py index d5d4f5eaefa64..ecc7971457bb0 100644 --- a/recipes/openssl/3.x.x/conanfile.py +++ b/recipes/openssl/3.x.x/conanfile.py @@ -1,7 +1,6 @@ from conan.tools.files import rename from conan.tools.microsoft import is_msvc, msvc_runtime_flag from conans import ConanFile, AutoToolsBuildEnvironment, tools -from conan.tools.build import cross_building from conans.errors import ConanInvalidConfiguration import contextlib import fnmatch @@ -56,7 +55,6 @@ class OpenSSLConan(ConanFile): "no_md2": [True, False], "no_md4": [True, False], "no_mdc2": [True, False], - "no_module": [True, False], "no_ocsp": [True, False], "no_pinshared": [True, False], "no_rc2": [True, False], @@ -614,7 +612,7 @@ def build(self): def _win_bash(self): return self._settings_build.os == "Windows" and \ not self._use_nmake and \ - (self._is_mingw or cross_building(self, skip_x64_x86=True)) + (self._is_mingw or tools.cross_building(self, skip_x64_x86=True)) @property def _make_program(self): diff --git a/recipes/openssl/3.x.x/test_package/CMakeLists.txt b/recipes/openssl/3.x.x/test_package/CMakeLists.txt index d52c980c930cf..9d3122f52007b 100644 --- a/recipes/openssl/3.x.x/test_package/CMakeLists.txt +++ b/recipes/openssl/3.x.x/test_package/CMakeLists.txt @@ -5,9 +5,6 @@ include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) option(OPENSSL_WITH_ZLIB "OpenSSL with zlib support" ON) -option(OPENSSL_WITH_LEGACY "OpenSSL with support for the legacy provider" ON) -option(OPENSSL_WITH_MD4 "OpenSSL with MD4 support (needs legacy provider)" ON) -option(OPENSSL_WITH_RIPEMD160 "OpenSSL with RIPEMD16 support (needs legacy provider)" ON) set(OpenSSL_DEBUG 1) find_package(OpenSSL REQUIRED) @@ -26,19 +23,3 @@ if(OPENSSL_WITH_ZLIB) target_compile_definitions(digest PRIVATE WITH_ZLIB) endif() target_link_libraries(digest OpenSSL::Crypto) - -if(OPENSSL_WITH_LEGACY) - add_executable(digest_legacy digest_legacy.c) - # do now show deperecation warnings - target_compile_definitions(digest_legacy PRIVATE OPENSSL_SUPPRESS_DEPRECATED) - if(OPENSSL_WITH_MD4) - target_compile_definitions(digest_legacy PRIVATE OPENSSL_WITH_MD4) - endif() - if(OPENSSL_WITH_RIPEMD160) - target_compile_definitions(digest_legacy PRIVATE OPENSSL_WITH_RIPEMD160) - endif() - if(OPENSSL_WITH_ZLIB) - target_compile_definitions(digest_legacy PRIVATE WITH_ZLIB) - endif() - target_link_libraries(digest_legacy OpenSSL::Crypto) -endif() diff --git a/recipes/openssl/3.x.x/test_package/conanfile.py b/recipes/openssl/3.x.x/test_package/conanfile.py index ad509932a9c76..59bbf829b2953 100644 --- a/recipes/openssl/3.x.x/test_package/conanfile.py +++ b/recipes/openssl/3.x.x/test_package/conanfile.py @@ -1,5 +1,4 @@ from conans import CMake, tools, ConanFile -from conan.tools.build import cross_building import os @@ -7,31 +6,19 @@ class TestPackageConan(ConanFile): settings = "os", "compiler", "arch", "build_type" generators = "cmake", "cmake_find_package", "pkg_config" - def _with_legacy(self): - return (not self.options["openssl"].no_legacy and - ((not self.options["openssl"].no_md4) or - (not self.options["openssl"].no_rmd160))) - def build(self): cmake = CMake(self) cmake.definitions["OPENSSL_WITH_ZLIB"] = not self.options["openssl"].no_zlib - cmake.definitions["OPENSSL_WITH_LEGACY"] = self._with_legacy() - cmake.definitions["OPENSSL_WITH_MD4"] = not self.options["openssl"].no_md4 - cmake.definitions["OPENSSL_WITH_RIPEMD160"] = not self.options["openssl"].no_rmd160 if self.settings.os == "Android": cmake.definitions["CONAN_LIBCXX"] = "" cmake.configure() cmake.build() def test(self): - if not cross_building(self): + if not tools.cross_building(self): bin_path = os.path.join("bin", "digest") self.run(bin_path, run_environment=True) - if not self.options["openssl"].no_legacy: - bin_legacy_path = os.path.join("bin", "digest_legacy") - self.run(bin_legacy_path, run_environment=True) - if not self.options["openssl"].no_stdio: self.run("openssl version", run_environment=True) assert os.path.exists(os.path.join(self.deps_cpp_info["openssl"].rootpath, "licenses", "LICENSE.txt")) diff --git a/recipes/openssl/3.x.x/test_package/digest_legacy.c b/recipes/openssl/3.x.x/test_package/digest_legacy.c deleted file mode 100644 index 740f0d2c20914..0000000000000 --- a/recipes/openssl/3.x.x/test_package/digest_legacy.c +++ /dev/null @@ -1,148 +0,0 @@ -#include -#if OPENSSL_WITH_MD4 -#include // MD4 needs legacy provider -#endif -#if OPENSSL_WITH_RIPEMD160 -#include // RIPEMD160 needs legacy provider -#endif -#include -#include -#include -#include -#include -#if defined(WITH_ZLIB) -#include -#endif - -#include -#include -#include - -#if defined(_MSC_VER) && _MSC_VER < 1900 -#define snprintf _snprintf -#endif - -int MDx_hash(const EVP_MD *type, const unsigned char *message, size_t message_len, unsigned char *digest, unsigned int *digest_len) { - EVP_MD_CTX *mdctx; - - if((mdctx = EVP_MD_CTX_create()) == NULL) - { - printf("EVP_MD_CTX_create error!\n"); - return 1; - } - - if(EVP_DigestInit_ex(mdctx, type, NULL) != 1) - { - printf("EVP_DigestInit_ex error!\n"); - return 1; - } - - if(EVP_DigestUpdate(mdctx, message, message_len) != 1) - { - printf("EVP_DigestUpdate error!\n"); - return 1; - } - - if(EVP_DigestFinal_ex(mdctx, digest, digest_len) != 1) - { - printf("EVP_DigestFinal_ex error!\n"); - return 1; - } - - EVP_MD_CTX_destroy(mdctx); - return 0; -} - -int main() -{ - unsigned int digest_len; - unsigned char md5_digest[MD5_DIGEST_LENGTH]; - unsigned char md5_digest2[MD5_DIGEST_LENGTH]; - char md5_string[MD5_DIGEST_LENGTH*2+1] = {0}; - char md5_string2[MD5_DIGEST_LENGTH*2+1] = {0}; - char string[] = "happy"; - - MD5((unsigned char*)&string, strlen(string), (unsigned char*)&md5_digest); - if (MDx_hash(EVP_md5(), (unsigned char*)&string, strlen(string), (unsigned char*)&md5_digest2, &digest_len)) - return 1; - - for(int i = 0; i < MD5_DIGEST_LENGTH; i++) { - snprintf(&md5_string[i*2], sizeof(md5_string)-i*2, "%02x", (unsigned int)md5_digest[i]); - snprintf(&md5_string2[i*2], sizeof(md5_string2)-i*2, "%02x", (unsigned int)md5_digest2[i]); - } - - // MD4 needs the legacy provider - OSSL_LIB_CTX* context = OSSL_LIB_CTX_new(); - // From https://wiki.openssl.org/index.php/OpenSSL_3.0 - /* Load Multiple providers into the default (nullptr) library context */ - OSSL_PROVIDER* legacy = OSSL_PROVIDER_load(context, "legacy"); - if (0 == legacy) { - const char* error_string = ERR_error_string(ERR_get_error(), 0); - fprintf(stderr, "Loading legacy provider failed with this error:\n"); - fprintf(stderr, "\t%s\n", error_string); - return 1; - } - OSSL_LIB_CTX* oldcontex = OSSL_LIB_CTX_set0_default(context); - printf("Legacy provider successfully loaded.\n"); - -#if OPENSSL_WITH_MD4 - unsigned char md4_digest[MD4_DIGEST_LENGTH]; - unsigned char md4_digest2[MD4_DIGEST_LENGTH]; - char md4_string[MD4_DIGEST_LENGTH*2+1] = {0}; - char md4_string2[MD4_DIGEST_LENGTH*2+1] = {0}; - - MD4((unsigned char*)&string, strlen(string), (unsigned char*)&md4_digest); - if (MDx_hash(EVP_md4(), (unsigned char*)&string, strlen(string), (unsigned char*)&md4_digest2, &digest_len)) { - const char* error_string = ERR_error_string(ERR_get_error(), 0); - fprintf(stderr, "MD4 calculation failed with this error:\n"); - fprintf(stderr, "\t%s\n", error_string); - return 1; - } - - for(int i = 0; i < MD4_DIGEST_LENGTH; i++) { - snprintf(&md4_string[i*2], sizeof(md4_string)-i*2, "%02x", (unsigned int)md4_digest[i]); - snprintf(&md4_string2[i*2], sizeof(md4_string2)-i*2, "%02x", (unsigned int)md4_digest2[i]); - } -#endif - -#if OPENSSL_WITH_RIPEMD160 - unsigned char ripemd160_digest[RIPEMD160_DIGEST_LENGTH]; - unsigned char ripemd160_digest2[RIPEMD160_DIGEST_LENGTH]; - char ripemd160_string[RIPEMD160_DIGEST_LENGTH*2+1] = {0}; - char ripemd160_string2[RIPEMD160_DIGEST_LENGTH*2+1] = {0}; - - RIPEMD160((unsigned char*)&string, strlen(string), (unsigned char*)&ripemd160_digest); - if (MDx_hash(EVP_ripemd160(), (unsigned char*)&string, strlen(string), (unsigned char*)&ripemd160_digest2, &digest_len)) { - const char* error_string = ERR_error_string(ERR_get_error(), 0); - fprintf(stderr, "RIPEMD160 calculation failed with this error:\n"); - fprintf(stderr, "\t%s\n", error_string); - return 1; - } - - for(int i = 0; i < RIPEMD160_DIGEST_LENGTH; i++) { - snprintf(&ripemd160_string[i*2], sizeof(ripemd160_string)-i*2, "%02x", (unsigned int)ripemd160_digest[i]); - snprintf(&ripemd160_string2[i*2], sizeof(ripemd160_string2)-i*2, "%02x", (unsigned int)ripemd160_digest2[i]); - } -#endif - - OSSL_LIB_CTX_set0_default(oldcontex); - OSSL_PROVIDER_unload(legacy); - OSSL_LIB_CTX_free(context); - - printf("MD5 digest: %s\n", md5_string); - printf("MD5 digest (variant 2): %s\n", md5_string2); -#if OPENSSL_WITH_MD4 - printf("MD4 digest: %s\n", md4_string); - printf("MD4 digest (variant 2): %s\n", md4_string2); -#endif -#if OPENSSL_WITH_RIPEMD160 - printf("RIPEMD160 digest: %s\n", ripemd160_string); - printf("RIPEMD160 digest (variant 2): %s\n", ripemd160_string2); -#endif - printf("OpenSSL version: %s\n", OpenSSL_version(OPENSSL_VERSION)); -#if defined(WITH_ZLIB) - printf("ZLIB version: %s\n", ZLIB_VERSION); -#endif - - return 0; -} diff --git a/recipes/osmanip/all/CMakeLists.txt b/recipes/osmanip/all/CMakeLists.txt index d2b860e0e9996..0b81cb2cf33cb 100644 --- a/recipes/osmanip/all/CMakeLists.txt +++ b/recipes/osmanip/all/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.8) project(osmanip LANGUAGES CXX) include(conanbuildinfo.cmake) @@ -6,22 +6,25 @@ conan_basic_setup(KEEP_RPATHS) find_package(arsenalgear REQUIRED CONFIG) -add_library(osmanip) -target_sources(osmanip PRIVATE +set(osmanip_src source_subfolder/src/graphics/canvas.cpp source_subfolder/src/graphics/plot_2D.cpp - $<$: - source_subfolder/src/manipulators/csmanip.cpp - > - $<$: - source_subfolder/src/manipulators/printer.cpp - source_subfolder/src/manipulators/cursor.cpp - source_subfolder/src/manipulators/common.cpp - source_subfolder/src/manipulators/colsty.cpp - > + source_subfolder/src/manipulators/csmanip.cpp source_subfolder/src/progressbar/progress_bar.cpp source_subfolder/src/utility/windows.cpp ) + +set(osmanip_inc + source_subfolder/include/graphics/canvas.hpp + source_subfolder/include/graphics/plot_2D.hpp + source_subfolder/include/manipulators/csmanip.hpp + source_subfolder/include/progressbar/multi_progress_bar.hpp + source_subfolder/include/progressbar/progress_bar.hpp + source_subfolder/include/utility/windows.hpp +) + + +add_library(osmanip ${osmanip_src}) target_include_directories(osmanip PUBLIC source_subfolder/include/) target_compile_features(osmanip PUBLIC cxx_std_17) set_target_properties(osmanip PROPERTIES diff --git a/recipes/osmanip/all/conandata.yml b/recipes/osmanip/all/conandata.yml index 0006776795ddd..e8a0a91f5488c 100644 --- a/recipes/osmanip/all/conandata.yml +++ b/recipes/osmanip/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "4.1.0": - url: "https://github.com/JustWhit3/osmanip/archive/refs/tags/v4.1.0.tar.gz" - sha256: "9830316fea29300aeebadb0cd6cddd6f291a8fa04c397bca9666d045815d1d53" "4.0.0": url: "https://github.com/JustWhit3/osmanip/archive/refs/tags/v4.0.0.tar.gz" sha256: "c6848e1d9b15eb409af88efeee7cd1ce87374ea7ac87424f5d2cf30104f098a0" diff --git a/recipes/osmanip/all/conanfile.py b/recipes/osmanip/all/conanfile.py index b15545e08eb49..3ff7003c03850 100644 --- a/recipes/osmanip/all/conanfile.py +++ b/recipes/osmanip/all/conanfile.py @@ -70,7 +70,6 @@ def source(self): @functools.lru_cache(1) def _configure_cmake(self): cmake = CMake(self) - cmake.definitions["OSMANIP_VERSION"] = str(self.version) cmake.configure() return cmake diff --git a/recipes/osmanip/all/test_package/test_package.cpp b/recipes/osmanip/all/test_package/test_package.cpp index 40b8aeea9e04b..d6a03641bfece 100644 --- a/recipes/osmanip/all/test_package/test_package.cpp +++ b/recipes/osmanip/all/test_package/test_package.cpp @@ -8,11 +8,6 @@ #include "osmanip/utility/windows.hpp" #endif -// Since 4.1.0, options.hpp for `osm::OPTION` is added. -#if __has_include("osmanip/utility/options.hpp") -# include "osmanip/utility/options.hpp" -#endif - // STD headers #include #include diff --git a/recipes/osmanip/config.yml b/recipes/osmanip/config.yml index 12265c7300e2e..d2be8f453d7c0 100644 --- a/recipes/osmanip/config.yml +++ b/recipes/osmanip/config.yml @@ -1,5 +1,3 @@ versions: - "4.1.0": - folder: all "4.0.0": folder: all diff --git a/recipes/pdfium/all/CMakeLists.txt b/recipes/pdfium/all/CMakeLists.txt deleted file mode 100644 index f083cc38ef65c..0000000000000 --- a/recipes/pdfium/all/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -add_subdirectory(pdfium-cmake/cmake) diff --git a/recipes/pdfium/all/conandata.yml b/recipes/pdfium/all/conandata.yml deleted file mode 100644 index 06bb1b45201c1..0000000000000 --- a/recipes/pdfium/all/conandata.yml +++ /dev/null @@ -1,15 +0,0 @@ -sources: - "cci.20210730": - pdfium-cmake: - # FIXME: create release + use hash - url: "https://github.com/madebr/pdfium-cmake/archive/0abc6ac8b3ecd2faac45bf46ee79bf381b5b5890.zip" - sha256: "8bcbb1eb6ec171604d669585f289c609d3b6c95045525d0e510c3fee7851d44e" - pdfium: - url: "https://pdfium.googlesource.com/pdfium/+archive/6c8cd905587809a0ff299d1edb34fc85bed4c976.tar.gz" - # sha256 is volatile on googlesource, no up-to-date github fork - trace_event: - url: "https://chromium.googlesource.com/chromium/src/base/trace_event/common/+archive/ad56859ef8c85cc09a3d8e95dcedadb5109a0af8.tar.gz" - # sha256 is volatile on googlesource, no up-to-date github fork - chromium_build: - url: "https://chromium.googlesource.com/chromium/src/build/+archive/95667421554b672f9330df8efb8148b6c2d00594.tar.gz" - # sha256 is volatile on googlesource, no up-to-date github fork diff --git a/recipes/pdfium/all/conanfile.py b/recipes/pdfium/all/conanfile.py deleted file mode 100644 index e8af8fb6f31c4..0000000000000 --- a/recipes/pdfium/all/conanfile.py +++ /dev/null @@ -1,107 +0,0 @@ -from conans import CMake, ConanFile, tools -from conans.errors import ConanInvalidConfiguration -import os - -required_conan_version = ">=1.33.0" - - -class PdfiumConan(ConanFile): - name = "pdfium" - description = "PDF generation and rendering library." - license = "BSD-3-Clause" - topics = ("conan", "pdfium", "generate", "generation", "rendering", "pdf", "document", "print") - homepage = "https://opensource.google/projects/pdfium" - url = "https://github.com/conan-io/conan-center-index" - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "with_libjpeg": ["libjpeg", "libjpeg-turbo"], - } - default_options = { - "shared": False, - "fPIC": True, - "with_libjpeg": "libjpeg", - } - - exports_sources = "CMakeLists.txt" - generators = "cmake", "cmake_find_package", "pkg_config" - short_paths = True - - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - if self.options.shared: - del self.options.fPIC - - def requirements(self): - self.requires("freetype/2.10.4") - self.requires("icu/69.1") - self.requires("lcms/2.11") - self.requires("openjpeg/2.4.0") - if self.options.with_libjpeg == "libjpeg": - self.requires("libjpeg/9d") - elif self.options.with_libjpeg == "libjpeg-turbo": - self.requires("libjpeg-turbo/2.1.0") - - def build_requirements(self): - self.build_requires("pkgconf/1.7.4") - - def validate(self): - if self.settings.compiler.cppstd: - tools.check_min_cppstd(self, 14) - minimum_compiler_versions = { - "gcc": 8, - "Visual Studio": 15, - } - min_compiler_version = minimum_compiler_versions.get(str(self.settings.compiler)) - if min_compiler_version: - if tools.Version(self.settings.compiler.version) < min_compiler_version: - raise ConanInvalidConfiguration("pdfium needs at least compiler version {}".format(min_compiler_version)) - - def source(self): - tools.get(**self.conan_data["sources"][self.version]["pdfium-cmake"], - destination="pdfium-cmake", strip_root=True) - tools.get(**self.conan_data["sources"][self.version]["pdfium"], - destination=self._source_subfolder) - tools.get(**self.conan_data["sources"][self.version]["trace_event"], - destination=os.path.join(self._source_subfolder, "base", "trace_event", "common")) - tools.get(**self.conan_data["sources"][self.version]["chromium_build"], - destination=os.path.join(self._source_subfolder, "build")) - - def _configure_cmake(self): - if self._cmake: - return self._cmake - self._cmake = CMake(self) - self._cmake.definitions["PDFIUM_ROOT"] = os.path.join(self.source_folder, self._source_subfolder).replace("\\", "/") - self._cmake.definitions["PDF_LIBJPEG_TURBO"] = self.options.with_libjpeg == "libjpeg-turbo" - self._cmake.configure() - return self._cmake - - def build(self): - cmake = self._configure_cmake() - cmake.build() - cmake.configure() - cmake.build() - - def package(self): - self.copy("LICENSE", src=self._source_subfolder, dst="licenses") - cmake = self._configure_cmake() - cmake.install() - - def package_info(self): - self.cpp_info.libs = ["pdfium"] - if tools.is_apple_os(self.settings.os): - self.cpp_info.frameworks.extend(["Appkit", "CoreFoundation", "CoreGraphics"]) - - stdcpp_library = tools.stdcpp_library(self) - if stdcpp_library: - self.cpp_info.system_libs.append(stdcpp_library) diff --git a/recipes/pdfium/all/test_package/CMakeLists.txt b/recipes/pdfium/all/test_package/CMakeLists.txt deleted file mode 100644 index 7b9b613cbb24a..0000000000000 --- a/recipes/pdfium/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package C) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) diff --git a/recipes/pdfium/all/test_package/conanfile.py b/recipes/pdfium/all/test_package/conanfile.py deleted file mode 100644 index 32e61b0a20959..0000000000000 --- a/recipes/pdfium/all/test_package/conanfile.py +++ /dev/null @@ -1,18 +0,0 @@ -import os - -from conans import ConanFile, CMake, tools -from conan.tools.build import cross_building - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/pdfium/all/test_package/test_package.c b/recipes/pdfium/all/test_package/test_package.c deleted file mode 100644 index d24c2186091b2..0000000000000 --- a/recipes/pdfium/all/test_package/test_package.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "fpdfview.h" - -int main() { - FPDF_InitLibrary(); - FPDF_DestroyLibrary(); - return 0; -} diff --git a/recipes/pdfium/config.yml b/recipes/pdfium/config.yml deleted file mode 100644 index a851713f93a20..0000000000000 --- a/recipes/pdfium/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "cci.20210730": - folder: all diff --git a/recipes/picobench/all/CMakeLists.txt b/recipes/picobench/all/CMakeLists.txt deleted file mode 100644 index 0a7c18edd3478..0000000000000 --- a/recipes/picobench/all/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(cmake_wrapper CXX) - -include(conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -add_subdirectory(source_subfolder) diff --git a/recipes/picobench/all/conandata.yml b/recipes/picobench/all/conandata.yml deleted file mode 100644 index da3763c90a6bf..0000000000000 --- a/recipes/picobench/all/conandata.yml +++ /dev/null @@ -1,9 +0,0 @@ -sources: - "2.01": - url: "https://github.com/iboB/picobench/archive/refs/tags/v2.01.tar.gz" - sha256: "164cb3b2d72a9b31e7559f6829ae38b6b955840571531117e0d6f53d669d3a2b" - -patches: - "2.01": - - patch_file: "patches/2.01-0001-add-install.patch" - base_path: "source_subfolder" diff --git a/recipes/picobench/all/conanfile.py b/recipes/picobench/all/conanfile.py deleted file mode 100644 index 6b7aa525d33b5..0000000000000 --- a/recipes/picobench/all/conanfile.py +++ /dev/null @@ -1,75 +0,0 @@ -from conans import CMake, ConanFile, tools -import functools -import os - -required_conan_version = ">=1.33.0" - -class PicobenchConan(ConanFile): - name = "picobench" - description = "A micro microbenchmarking library for C++11 in a single header file" - license = "MIT" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/iboB/picobench" - topics = ("benchmark", "header-only") - settings = "os", "arch", "compiler", "build_type" - options = { - "with_cli": [True, False], - } - default_options = { - "with_cli": False, - } - generators = "cmake" - - @property - def _source_subfolder(self): - return "source_subfolder" - - def export_sources(self): - self.copy("CMakeLists.txt") - for patch in self.conan_data.get("patches", {}).get(self.version, []): - self.copy(patch["patch_file"]) - - def validate(self): - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, 11) - - def package_id(self): - if self.options.with_cli: - del self.info.settings.compiler - else: - self.info.header_only() - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) - - def _patch_sources(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) - - @functools.lru_cache(1) - def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["PICOBENCH_BUILD_TOOLS"] = self.options.with_cli - cmake.configure() - return cmake - - def build(self): - self._patch_sources() - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy(pattern="LICENSE.txt", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - - def package_info(self): - if self.options.with_cli: - binpath = os.path.join(self.package_folder, "bin") - self.output.info("Appending PATH env var: {}".format(binpath)) - self.env_info.PATH.append(binpath) - - self.cpp_info.frameworkdirs = [] - self.cpp_info.libdirs = [] - self.cpp_info.resdirs = [] diff --git a/recipes/picobench/all/patches/2.01-0001-add-install.patch b/recipes/picobench/all/patches/2.01-0001-add-install.patch deleted file mode 100644 index 9194bba894eef..0000000000000 --- a/recipes/picobench/all/patches/2.01-0001-add-install.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/a/CMakeLists.txt b/b/CMakeLists.txt -index eae8eaa..5e0e9ee 100644 ---- a/a/CMakeLists.txt -+++ b/b/CMakeLists.txt -@@ -25,6 +25,11 @@ target_compile_features(picobench INTERFACE - cxx_right_angle_brackets - ) - -+include(GNUInstallDirs) -+ -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/picobench -+ DESTINATION include/) -+ - if(PICOBENCH_BUILD_TOOLS) - add_subdirectory(tools) - endif() -diff --git a/a/tools/CMakeLists.txt b/b/tools/CMakeLists.txt -index cb7f584..f03ffa5 100644 ---- a/a/tools/CMakeLists.txt -+++ b/b/tools/CMakeLists.txt -@@ -10,3 +10,9 @@ add_executable(picobench-cli picobench.cpp) - target_link_libraries(picobench-cli picobench) - set_target_properties(picobench-cli PROPERTIES OUTPUT_NAME picobench) - set_target_properties(picobench-cli PROPERTIES FOLDER tools) -+ -+include(GNUInstallDirs) -+ -+install(TARGETS picobench-cli -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+) diff --git a/recipes/picobench/all/test_package/CMakeLists.txt b/recipes/picobench/all/test_package/CMakeLists.txt deleted file mode 100644 index 24afec503cc8e..0000000000000 --- a/recipes/picobench/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 3.8) - -project(test_package CXX) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) - -conan_basic_setup(TARGETS) - -find_package(picobench REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} picobench::picobench) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/recipes/picobench/all/test_package/conanfile.py b/recipes/picobench/all/test_package/conanfile.py deleted file mode 100644 index 38f4483872d47..0000000000000 --- a/recipes/picobench/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/picobench/all/test_package/test_package.cpp b/recipes/picobench/all/test_package/test_package.cpp deleted file mode 100644 index 6fbf9259fc9dc..0000000000000 --- a/recipes/picobench/all/test_package/test_package.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#define PICOBENCH_DEBUG -#define PICOBENCH_IMPLEMENT_WITH_MAIN -#include "picobench/picobench.hpp" - -#include -#include -#include - -void rand_vector(picobench::state& s) -{ - std::vector v; - for (auto _ : s) - { - v.push_back(rand()); - } -} -PICOBENCH(rand_vector); - -void rand_vector_reserve(picobench::state& s) -{ - std::vector v; - v.reserve(s.iterations()); - for (auto _ : s) - { - v.push_back(rand()); - } -} -PICOBENCH(rand_vector_reserve); - -void rand_deque(picobench::state& s) -{ - std::deque v; - for (auto _ : s) - { - v.push_back(rand()); - } -} -PICOBENCH(rand_deque); diff --git a/recipes/picobench/config.yml b/recipes/picobench/config.yml deleted file mode 100644 index bc09c963d7fda..0000000000000 --- a/recipes/picobench/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "2.01": - folder: all diff --git a/recipes/platform.hashing/all/conandata.yml b/recipes/platform.hashing/all/conandata.yml index 2fb29007be33f..8ac93e5368e70 100644 --- a/recipes/platform.hashing/all/conandata.yml +++ b/recipes/platform.hashing/all/conandata.yml @@ -2,7 +2,3 @@ sources: "0.2.0": url: https://github.com/linksplatform/Hashing/archive/refs/tags/0.2.0.zip sha256: 8e34a10d2768d0f2d9ba0cbb88ce193b32245c5a46f14f7ec860c9fddbe8f39f - "0.3.0": - url: https://github.com/linksplatform/Hashing/archive/refs/tags/cpp_0.3.0.zip - sha256: 8f7d6d401eaec1a78d1f10bfa3783b31ac6189a6ea8edf1ef7f300c47c0e5cb1 - diff --git a/recipes/platform.hashing/all/conanfile.py b/recipes/platform.hashing/all/conanfile.py index c0f03a178241a..2768fa0c654c4 100644 --- a/recipes/platform.hashing/all/conanfile.py +++ b/recipes/platform.hashing/all/conanfile.py @@ -1,12 +1,5 @@ -from conan import ConanFile -try: - from conan.tools.build import check_min_cppstd -except ImportError: - from conans.tools import check_min_cppstd # FIXME : not in 1.49 -from conan.tools.files import get -from conan.tools.cmake import CMake -from conan.tools.scm import Version -from conan.errors import ConanInvalidConfiguration +from conans import ConanFile, CMake, tools +from conans.errors import ConanInvalidConfiguration import os required_conan_version = ">=1.33.0" @@ -39,8 +32,8 @@ def _compilers_minimum_version(self): return { "gcc": "10", "Visual Studio": "16", - "clang": "14", - "apple-clang": "14" + "clang": "11", + "apple-clang": "11" } @property @@ -54,14 +47,14 @@ def validate(self): self.output.warn("{} recipe lacks information about the {} compiler support.".format( self.name, self.settings.compiler)) - elif Version(self.settings.compiler.version) < minimum_version: + elif tools.Version(self.settings.compiler.version) < minimum_version: raise ConanInvalidConfiguration("{}/{} requires c++{}, " "which is not supported by {} {}.".format( self.name, self.version, self._minimum_cpp_standard, self.settings.compiler, self.settings.compiler.version)) if self.settings.compiler.get_safe("cppstd"): - check_min_cppstd(self, self._minimum_cpp_standard) + tools.check_min_cppstd(self, self._minimum_cpp_standard) if self.settings.arch in ("x86", ): raise ConanInvalidConfiguration("{} does not support arch={}".format(self.name, self.settings.arch)) @@ -70,7 +63,8 @@ def package_id(self): self.info.header_only() def source(self): - get(self, **self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True) + tools.get(**self.conan_data["sources"][self.version], + destination=self._source_subfolder, strip_root=True) def package(self): self.copy("*.h", dst="include", src=self._internal_cpp_subfolder) @@ -87,6 +81,6 @@ def package_info(self): }.get(str(self.settings.arch), "") self.user_info.suggested_flags = suggested_flags - if "-march" not in "{} {}".format(os.environ.get("CPPFLAGS", ""), os.environ.get("CXXFLAGS", "")): + if "-march" not in "{} {}".format(tools.get_env("CPPFLAGS", ""), tools.get_env("CXXFLAGS", "")): self.output.warn("platform.hashing needs to have `-march=ARCH` added to CPPFLAGS/CXXFLAGS. " "A suggestion is available in deps_user_info[{name}].suggested_flags.".format(name=self.name)) diff --git a/recipes/platform.hashing/config.yml b/recipes/platform.hashing/config.yml index 0906286bf1225..b370fcee5fe7c 100644 --- a/recipes/platform.hashing/config.yml +++ b/recipes/platform.hashing/config.yml @@ -1,5 +1,3 @@ versions: "0.2.0": folder: all - "0.3.0": - folder: all diff --git a/recipes/playrho/all/CMakeLists.txt b/recipes/playrho/all/CMakeLists.txt deleted file mode 100644 index 7d5ba25565b0a..0000000000000 --- a/recipes/playrho/all/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 3.4) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup(KEEP_RPATHS) - -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - -add_subdirectory(source_subfolder) diff --git a/recipes/playrho/all/conandata.yml b/recipes/playrho/all/conandata.yml deleted file mode 100644 index 03bf919319da8..0000000000000 --- a/recipes/playrho/all/conandata.yml +++ /dev/null @@ -1,9 +0,0 @@ -sources: - "1.1.0": - url: "https://github.com/louis-langholtz/PlayRho/archive/refs/tags/v1.1.0.tar.gz" - sha256: "45c0337440387a85a97a4b7907b79f780233bf2062635471b71a32245b0c0158" - -patches: - "1.1.0": - - patch_file: "patches/1.1.0-0001-fix-target-name.patch" - base_path: "source_subfolder" diff --git a/recipes/playrho/all/conanfile.py b/recipes/playrho/all/conanfile.py deleted file mode 100644 index 9aab4b29f12b3..0000000000000 --- a/recipes/playrho/all/conanfile.py +++ /dev/null @@ -1,103 +0,0 @@ -from conans import ConanFile, CMake, tools -from conans.tools import ConanInvalidConfiguration -import os -import functools - -required_conan_version = ">=1.43.0" - -class PlayrhoConan(ConanFile): - name = "playrho" - description = "Real-time oriented physics engine and library that's currently best suited for 2D games. " - license = "Zlib" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/louis-langholtz/PlayRho/" - topics = ("physics-engine", "collision-detection", "box2d") - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - } - generators = "cmake" - - @property - def _source_subfolder(self): - return "source_subfolder" - - def export_sources(self): - self.copy("CMakeLists.txt") - for patch in self.conan_data.get("patches", {}).get(self.version, []): - self.copy(patch["patch_file"]) - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - if self.options.shared: - del self.options.fPIC - - @property - def _compilers_minimum_versions(self): - return { - "gcc": "8", - "Visual Studio": "16", - "clang": "7", - "apple-clang": "12", - } - - def validate(self): - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, 17) - - compilers_minimum_version = self._compilers_minimum_versions - minimum_version = compilers_minimum_version.get(str(self.settings.compiler), False) - if minimum_version: - if tools.Version(self.settings.compiler.version) < minimum_version: - raise ConanInvalidConfiguration("{} requires C++17, which your compiler does not support.".format(self.name)) - else: - self.output.warn("{} requires C++17. Your compiler is unknown. Assuming it supports C++17.".format(self.name)) - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) - - @functools.lru_cache(1) - def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["PLAYRHO_BUILD_SHARED"] = self.options.shared - cmake.definitions["PLAYRHO_BUILD_STATIC"] = not self.options.shared - cmake.definitions["PLAYRHO_INSTALL"] = True - cmake.configure() - return cmake - - def build(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy(pattern="LICENSE.txt", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) - tools.rmdir(os.path.join(self.package_folder, "lib", "PlayRho")) - - def package_info(self): - self.cpp_info.libs = ["PlayRho"] - - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.system_libs.append("m") - - self.cpp_info.set_property("cmake_file_name", "PlayRho") - self.cpp_info.set_property("cmake_target_name", "PlayRho::PlayRho") - - # TODO: to remove in conan v2 once cmake_find_package_* generators removed - self.cpp_info.filenames["cmake_find_package"] = "PlayRho" - self.cpp_info.filenames["cmake_find_package_multi"] = "PlayRho" - self.cpp_info.names["cmake_find_package"] = "PlayRho" - self.cpp_info.names["cmake_find_package_multi"] = "PlayRho" diff --git a/recipes/playrho/all/patches/1.1.0-0001-fix-target-name.patch b/recipes/playrho/all/patches/1.1.0-0001-fix-target-name.patch deleted file mode 100644 index a3fb954096035..0000000000000 --- a/recipes/playrho/all/patches/1.1.0-0001-fix-target-name.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/PlayRho/CMakeLists.txt b/PlayRho/CMakeLists.txt -index 423a8ac..b0528ad 100644 ---- a/PlayRho/CMakeLists.txt -+++ b/PlayRho/CMakeLists.txt -@@ -90,10 +90,9 @@ if(PLAYRHO_BUILD_SHARED) - ${PLAYRHO_Rope_SRCS} - ${PLAYRHO_Rope_HDRS} - ) -- target_compile_features(PlayRho PUBLIC cxx_std_17) -+ target_compile_features(PlayRho_shared PUBLIC cxx_std_17) - set_target_properties(PlayRho_shared PROPERTIES - OUTPUT_NAME "PlayRho" -- CLEAN_DIRECT_OUTPUT 1 - VERSION ${PLAYRHO_VERSION} - ) - endif() -@@ -118,7 +117,6 @@ if(PLAYRHO_BUILD_STATIC) - ) - target_compile_features(PlayRho PUBLIC cxx_std_17) - set_target_properties(PlayRho PROPERTIES -- CLEAN_DIRECT_OUTPUT 1 - VERSION ${PLAYRHO_VERSION} - ) - endif() diff --git a/recipes/playrho/all/test_package/CMakeLists.txt b/recipes/playrho/all/test_package/CMakeLists.txt deleted file mode 100644 index cf755d3555681..0000000000000 --- a/recipes/playrho/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(test_package CXX) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(PlayRho REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} PlayRho::PlayRho) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) diff --git a/recipes/playrho/all/test_package/conanfile.py b/recipes/playrho/all/test_package/conanfile.py deleted file mode 100644 index 61ac8b9318290..0000000000000 --- a/recipes/playrho/all/test_package/conanfile.py +++ /dev/null @@ -1,18 +0,0 @@ -import os - -from conans import ConanFile, CMake, tools -from conan.tools.build import cross_building - -class PlayrhoTestConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/playrho/all/test_package/test_package.cpp b/recipes/playrho/all/test_package/test_package.cpp deleted file mode 100644 index 2537c9e98d01f..0000000000000 --- a/recipes/playrho/all/test_package/test_package.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "PlayRho/PlayRho.hpp" - -int main() { - auto world = playrho::d2::World{}; -} diff --git a/recipes/playrho/config.yml b/recipes/playrho/config.yml deleted file mode 100644 index 11b7aff3a5ac4..0000000000000 --- a/recipes/playrho/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "1.1.0": - folder: "all" diff --git a/recipes/poco/all/conandata.yml b/recipes/poco/all/conandata.yml index b26c9af860350..09b3b9e23424a 100644 --- a/recipes/poco/all/conandata.yml +++ b/recipes/poco/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.12.1": - url: "https://github.com/pocoproject/poco/archive/poco-1.12.1-release.tar.gz" - sha256: "debc6d5d5eb946bb14e47cffc33db4fffb4f11765f34f8db04e71e866d1af8f9" "1.12.0": url: "https://github.com/pocoproject/poco/archive/poco-1.12.0-release.tar.gz" sha256: "33b5acd5a09a9466c2710f6f2e3bd2492dd3372b655ea83f62520ac8fc213631" @@ -33,11 +30,6 @@ sources: url: "https://github.com/pocoproject/poco/archive/poco-1.8.1-release.tar.gz" sha256: "43cc469c01d1f799efc51e2bfde6ffdf467b98a8a0901e6b33db86958619b3af" patches: - "1.12.1": - - patch_file: patches/1.12.1.patch - base_path: src - - patch_file: patches/0002-mysql-include.patch - base_path: src "1.12.0": - patch_file: patches/1.12.0.patch base_path: src diff --git a/recipes/poco/all/conanfile.py b/recipes/poco/all/conanfile.py index f9dbb46f90358..7972330d87127 100644 --- a/recipes/poco/all/conanfile.py +++ b/recipes/poco/all/conanfile.py @@ -65,7 +65,6 @@ class PocoConan(ConanFile): "Zip": _PocoComponent("enable_zip", True, ["Util", "XML"], [], True), "ActiveRecord": _PocoComponent("enable_activerecord", True, ["Foundation", "Data"], [], True), "ActiveRecordCompiler": _PocoComponent("enable_activerecord_compiler", False, ["Util", "XML"], [], False), - "Prometheus": _PocoComponent("enable_prometheus", False, ["Foundation", "Net"], [], True), } for comp in _poco_component_tree.values(): @@ -108,8 +107,6 @@ def config_options(self): if tools.Version(self.version) < "1.11": del self.options.enable_activerecord del self.options.enable_activerecord_compiler - if tools.Version(self.version) < "1.12": - del self.options.enable_prometheus def configure(self): if self.options.enable_active_record != "deprecated": diff --git a/recipes/poco/all/patches/1.12.1.patch b/recipes/poco/all/patches/1.12.1.patch deleted file mode 100644 index 44db78fbbb6ad..0000000000000 --- a/recipes/poco/all/patches/1.12.1.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake ---- a/cmake/PocoMacros.cmake 2022-07-08 18:28:44.000000000 +0200 -+++ b/cmake/PocoMacros.cmake 2022-07-11 17:50:48.547610971 +0200 -@@ -40,7 +40,7 @@ - endforeach() - endif(X64) - endif() -- find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir} -+ find_program(CMAKE_MC_COMPILER NAMES mc.exe windmc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir} - DOC "path to message compiler") - if(NOT CMAKE_MC_COMPILER) - message(FATAL_ERROR "message compiler not found: required to build") -diff -ruN a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt ---- a/Foundation/CMakeLists.txt 2022-07-08 18:28:44.000000000 +0200 -+++ b/Foundation/CMakeLists.txt 2022-07-11 17:54:24.035097782 +0200 -@@ -107,7 +107,7 @@ - ) - - if(POCO_UNBUNDLED) -- target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB) -+ target_link_libraries(Foundation PUBLIC PCRE2::PCRE2 ZLIB::ZLIB) - target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) - endif(POCO_UNBUNDLED) - -diff -ruN a/NetSSL_Win/CMakeLists.txt b/NetSSL_Win/CMakeLists.txt ---- a/NetSSL_Win/CMakeLists.txt 2022-07-08 18:28:44.000000000 +0200 -+++ b/NetSSL_Win/CMakeLists.txt 2022-07-11 17:50:09.841223897 +0200 -@@ -21,7 +21,7 @@ - DEFINE_SYMBOL NetSSL_Win_EXPORTS - ) - --target_link_libraries(NetSSLWin PUBLIC Poco::Net Poco::Util Crypt32.lib) -+target_link_libraries(NetSSLWin PUBLIC Poco::Net Poco::Util crypt32 ws2_32) - target_include_directories(NetSSLWin - PUBLIC - $ diff --git a/recipes/poco/all/test_package/CMakeLists.txt b/recipes/poco/all/test_package/CMakeLists.txt index 076daa24fb2e9..da26963dd66e4 100644 --- a/recipes/poco/all/test_package/CMakeLists.txt +++ b/recipes/poco/all/test_package/CMakeLists.txt @@ -11,7 +11,6 @@ option(TEST_NETSSL "Test NetSSL" ON) option(TEST_SQLITE "Test Sqlite" ON) option(TEST_ENCODINGS "Test Encodings" ON) option(TEST_JWT "Test JWT" ON) -option(TEST_PROMETHEUS "Test Prometheus" ON) set(CMAKE_CXX_STANDARD 11) @@ -37,9 +36,6 @@ endif() if(TEST_JWT) list(APPEND POCO_COMPONENTS JWT) endif() -if(TEST_PROMETHEUS) - list(APPEND POCO_COMPONENTS Prometheus) -endif() find_package(Poco REQUIRED ${POCO_COMPONENTS} CONFIG) @@ -89,8 +85,3 @@ if(TEST_JWT) add_executable(jwt test_jwt.cpp) target_link_libraries(jwt Poco::JWT) endif() - -if(TEST_PROMETHEUS) - add_executable(prometheus test_prometheus.cpp) - target_link_libraries(prometheus Poco::Prometheus) -endif() diff --git a/recipes/poco/all/test_package/conanfile.py b/recipes/poco/all/test_package/conanfile.py index 9956f4c4585b1..068576657e670 100644 --- a/recipes/poco/all/test_package/conanfile.py +++ b/recipes/poco/all/test_package/conanfile.py @@ -1,5 +1,4 @@ from conans import CMake, ConanFile, tools -from conan.tools.build import cross_building import os @@ -22,10 +21,6 @@ def _with_encodings(self): def _with_jwt(self): return "enable_jwt" in self.options["poco"] and self.options["poco"].enable_jwt - @property - def _with_prometheus(self): - return "enable_prometheus" in self.options["poco"] and self.options["poco"].enable_prometheus - def build(self): cmake = CMake(self) cmake.definitions["TEST_CRYPTO"] = self.options["poco"].enable_crypto @@ -35,12 +30,11 @@ def build(self): cmake.definitions["TEST_SQLITE"] = self.options["poco"].enable_data_sqlite cmake.definitions["TEST_ENCODINGS"] = self._with_encodings cmake.definitions["TEST_JWT"] = self._with_jwt - cmake.definitions["TEST_PROMETHEUS"] = self._with_prometheus cmake.configure() cmake.build() def test(self): - if not cross_building(self, skip_x64_x86=True): + if not tools.cross_building(self, skip_x64_x86=True): self.run(os.path.join("bin", "core"), run_environment=True) if self.options["poco"].enable_util: self.run(os.path.join("bin", "util"), run_environment=True) @@ -58,5 +52,3 @@ def test(self): self.run(os.path.join("bin", "encodings"), run_environment=True) if self._with_jwt: self.run(os.path.join("bin", "jwt"), run_environment=True) - if self._with_prometheus: - self.run(os.path.join("bin", "prometheus"), run_environment=True) diff --git a/recipes/poco/all/test_package/test_prometheus.cpp b/recipes/poco/all/test_package/test_prometheus.cpp deleted file mode 100644 index 1b40926009ee7..0000000000000 --- a/recipes/poco/all/test_package/test_prometheus.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Poco/Prometheus/MetricsServer.h" -#include "Poco/Prometheus/ProcessCollector.h" -#include "Poco/Prometheus/ThreadPoolCollector.h" - -using Poco::Prometheus::MetricsServer; -using Poco::Prometheus::ProcessCollector; -using Poco::Prometheus::ThreadPoolCollector; - -int main() { - ProcessCollector pc; - ThreadPoolCollector collectorForDefaultThreadPool(); - - const Poco::UInt16 metricsPort = 9177; // hope this does not clash - MetricsServer server(metricsPort); - server.start(); - - // Don't wait for TerminationRequest and stop immediately (This is a test server) - //waitForTerminationRequest(); - - server.stop(); -} diff --git a/recipes/poco/config.yml b/recipes/poco/config.yml index 049f266efe6a7..f9c38ad6c64eb 100644 --- a/recipes/poco/config.yml +++ b/recipes/poco/config.yml @@ -1,6 +1,4 @@ versions: - "1.12.1": - folder: all "1.12.0": folder: all "1.11.3": diff --git a/recipes/pybind11/all/conandata.yml b/recipes/pybind11/all/conandata.yml index 8fa07bb017f1f..c11471910f058 100644 --- a/recipes/pybind11/all/conandata.yml +++ b/recipes/pybind11/all/conandata.yml @@ -11,6 +11,3 @@ sources: 2.9.2: url: "https://github.com/pybind/pybind11/archive/v2.9.2.tar.gz" sha256: "6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1" - "2.10.0": - url: "https://github.com/pybind/pybind11/archive/v2.10.0.tar.gz" - sha256: "eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec" diff --git a/recipes/pybind11/all/conanfile.py b/recipes/pybind11/all/conanfile.py index b41df84983d95..21d8e823b7e41 100644 --- a/recipes/pybind11/all/conanfile.py +++ b/recipes/pybind11/all/conanfile.py @@ -67,13 +67,10 @@ def package_id(self): def package_info(self): cmake_base_path = os.path.join("lib", "cmake", "pybind11") if tools.Version(self.version) >= "2.6.0": - self.cpp_info.components["main"].set_property("cmake_module_file_name", "pybind11") self.cpp_info.components["main"].names["cmake_find_package"] = "pybind11" self.cpp_info.components["main"].builddirs = [cmake_base_path] - cmake_file = os.path.join(cmake_base_path, "pybind11Common.cmake") - self.cpp_info.components["main"].set_property("cmake_build_modules", [cmake_file]) for generator in ["cmake_find_package", "cmake_find_package_multi"]: - self.cpp_info.components["main"].build_modules[generator].append(cmake_file) + self.cpp_info.components["main"].build_modules[generator].append(os.path.join(cmake_base_path, "pybind11Common.cmake")) self.cpp_info.components["headers"].includedirs = [os.path.join("include", "pybind11")] self.cpp_info.components["headers"].requires = ["main"] self.cpp_info.components["embed"].requires = ["main"] @@ -90,8 +87,6 @@ def package_info(self): self.cpp_info.builddirs = [cmake_base_path] - cmake_files = [os.path.join(cmake_base_path, "FindPythonLibsNew.cmake"), - os.path.join(cmake_base_path, "pybind11Tools.cmake")] - self.cpp_info.set_property("cmake_build_modules", cmake_files) for generator in ["cmake", "cmake_multi", "cmake_find_package", "cmake_find_package_multi"]: - self.cpp_info.build_modules[generator] = cmake_files + self.cpp_info.build_modules[generator] = [os.path.join(cmake_base_path, "FindPythonLibsNew.cmake"), + os.path.join(cmake_base_path, "pybind11Tools.cmake")] diff --git a/recipes/pybind11/config.yml b/recipes/pybind11/config.yml index 4e03e90bbfa2e..5a8923d6d29e8 100644 --- a/recipes/pybind11/config.yml +++ b/recipes/pybind11/config.yml @@ -7,5 +7,3 @@ versions: folder: all "2.9.2": folder: all - "2.10.0": - folder: all diff --git a/recipes/quill/all/conandata.yml b/recipes/quill/all/conandata.yml index be5ac14cbcc40..6b15d828e1f82 100644 --- a/recipes/quill/all/conandata.yml +++ b/recipes/quill/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "2.1.0": - url: "https://github.com/odygrd/quill/archive/v2.1.0.tar.gz" - sha256: "66c59501ad827207e7d4682ccba0f1c33ca215269aa13a388df4d59ca195ee76" "2.0.2": url: "https://github.com/odygrd/quill/archive/v2.0.2.tar.gz" sha256: "d2dc9004886b787f8357e97d2f2d0c74a460259f7f95d65ab49d060fe34a9b5c" @@ -11,9 +8,24 @@ sources: "1.7.3": url: "https://github.com/odygrd/quill/archive/v1.7.3.tar.gz" sha256: "3fff0c5ffb19bbde5429369079741f84a6acce3a781b504cec5e677b05461208" + "1.7.2": + url: "https://github.com/odygrd/quill/archive/v1.7.2.tar.gz" + sha256: "e2153c6e25f3a6cee47c2a9edbabdace418f6d64f62cd701dfdae38d5892bb1b" + "1.7.0": + url: "https://github.com/odygrd/quill/archive/v1.7.0.tar.gz" + sha256: "f6eb9711b949effbd8caf06ee464f66f619b94d3b39f820fa288d0745c620ed1" "1.6.3": url: "https://github.com/odygrd/quill/archive/v1.6.3.tar.gz" sha256: "886120b084db952aafe651c64f459e69fec481b4e189c14daa8c4108afebcba3" "1.5.2": url: "https://github.com/odygrd/quill/archive/v1.5.2.tar.gz" sha256: "e409fda0bd949e997f63de4d422a8f17ccc9cb0d58f11403bd309c7a93aa0d6b" + "1.4.0": + url: "https://github.com/odygrd/quill/archive/v1.4.0.tar.gz" + sha256: "e6e9b603caa32c6693cccda8c547b298f3f73867a45e49b33c006cb17b24fa33" + "1.3.3": + url: "https://github.com/odygrd/quill/archive/v1.3.3.tar.gz" + sha256: "5e185ebe7318fe8ce6e3fd849ec8f7fcb1298ab0302b2268382c7aef1c9542ce" + "1.2.3": + url: "https://github.com/odygrd/quill/archive/v1.2.3.tar.gz" + sha256: "f318fa87a39aea76c66cfe09c686f5ce2cacaf2980678ada310acac8cf42ffd0" diff --git a/recipes/quill/all/conanfile.py b/recipes/quill/all/conanfile.py index 1be0543d1ad3b..4cee2a538a502 100644 --- a/recipes/quill/all/conanfile.py +++ b/recipes/quill/all/conanfile.py @@ -83,9 +83,11 @@ def validate(self): def requirements(self): if tools.Version(self.version) >= "1.6.3": - self.requires("fmt/9.0.0") - else: + self.requires("fmt/8.1.1") + elif tools.Version(self.version) >= "1.3.3": self.requires("fmt/7.1.3") + else: + self.requires("fmt/6.2.1") def source(self): tools.get(**self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True) @@ -102,6 +104,9 @@ def _configure_cmake(self): return cmake def build(self): + if tools.Version(self.version) < "1.3.3" and tools.Version(self.deps_cpp_info["fmt"].version) > "6.2.1": + raise ConanInvalidConfiguration("The project {}/{} requires fmt <= 6.2.1".format(self.name, self.version)) + if tools.Version(self.version) >= "2.0.0": tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), """set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/quill/cmake" CACHE STRING "Modules for CMake" FORCE)""", diff --git a/recipes/quill/all/test_package/CMakeLists.txt b/recipes/quill/all/test_package/CMakeLists.txt index a2b17a0999cc0..19537e0b6f581 100644 --- a/recipes/quill/all/test_package/CMakeLists.txt +++ b/recipes/quill/all/test_package/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.8) project(test_package CXX) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) +conan_basic_setup() -find_package(quill REQUIRED CONFIG) +find_package(quill CONFIG REQUIRED) add_executable(${PROJECT_NAME} test_package.cpp) target_link_libraries(${PROJECT_NAME} quill::quill) diff --git a/recipes/quill/config.yml b/recipes/quill/config.yml index 57285066d2137..374919dd45344 100644 --- a/recipes/quill/config.yml +++ b/recipes/quill/config.yml @@ -1,13 +1,21 @@ versions: - "2.1.0": - folder: "all" "2.0.2": folder: "all" "2.0.1": folder: "all" "1.7.3": folder: "all" + "1.7.2": + folder: "all" + "1.7.0": + folder: "all" "1.6.3": folder: "all" "1.5.2": folder: "all" + "1.4.0": + folder: "all" + "1.3.3": + folder: "all" + "1.2.3": + folder: "all" diff --git a/recipes/re2/all/CMakeLists.txt b/recipes/re2/all/CMakeLists.txt index b71c882d9d33f..a69305eb3971f 100644 --- a/recipes/re2/all/CMakeLists.txt +++ b/recipes/re2/all/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 2.8.12) project(cmake_wrapper) include(conanbuildinfo.cmake) -conan_basic_setup(KEEP_RPATHS) +conan_basic_setup() add_subdirectory(source_subfolder) diff --git a/recipes/re2/all/conandata.yml b/recipes/re2/all/conandata.yml index 15ba52699710a..98df85897a3ee 100644 --- a/recipes/re2/all/conandata.yml +++ b/recipes/re2/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "20220601": - url: "https://github.com/google/re2/archive/refs/tags/2022-06-01.tar.gz" - sha256: "f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f" "20220201": url: "https://github.com/google/re2/archive/refs/tags/2022-02-01.tar.gz" sha256: "9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27" diff --git a/recipes/re2/config.yml b/recipes/re2/config.yml index d4ddea306645e..4db75e4bd09c8 100644 --- a/recipes/re2/config.yml +++ b/recipes/re2/config.yml @@ -1,6 +1,4 @@ versions: - "20220601": - folder: all "20220201": folder: all "20211101": diff --git a/recipes/redboltz-mqtt_cpp/all/conandata.yml b/recipes/redboltz-mqtt_cpp/all/conandata.yml deleted file mode 100644 index ad87340ad9e35..0000000000000 --- a/recipes/redboltz-mqtt_cpp/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "13.0.0": - url: "https://github.com/redboltz/mqtt_cpp/archive/refs/tags/v13.0.0.tar.gz" - sha256: "5d06caa1218feb23d0a63892ced7b0edfd1f686002676175f6e384275a27a1e7" diff --git a/recipes/redboltz-mqtt_cpp/all/conanfile.py b/recipes/redboltz-mqtt_cpp/all/conanfile.py deleted file mode 100644 index 8fdf7f70084cf..0000000000000 --- a/recipes/redboltz-mqtt_cpp/all/conanfile.py +++ /dev/null @@ -1,64 +0,0 @@ -from conans import ConanFile, tools -from conans.errors import ConanInvalidConfiguration -import os - -required_conan_version = ">=1.43.0" - -class MqttCPPConan(ConanFile): - name = "redboltz-mqtt_cpp" - description = "MQTT client/server for C++14 based on Boost.Asio" - license = "BSL-1.0" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/redboltz/mqtt_cpp" - topics = ("mqtt", "boost", "asio") - settings = "os", "arch", "compiler", "build_type" - generators = "cmake" - no_copy_source = True - - @property - def _source_subfolder(self): - return "source_subfolder" - - def requirements(self): - self.requires("boost/1.79.0") - - def package_id(self): - self.info.header_only() - - @property - def _compilers_minimum_version(self): - return { - "gcc": "6", - "Visual Studio": "15.0", - "clang": "5", - "apple-clang": "10", - } - - def validate(self): - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, 14) - - minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) - if minimum_version: - if tools.Version(self.settings.compiler.version) < minimum_version: - raise ConanInvalidConfiguration("{} requires C++14, which your compiler does not support.".format(self.name)) - else: - self.output.warn("{} requires C++14. Your compiler is unknown. Assuming it supports C++14.".format(self.name)) - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) - - def package(self): - self.copy(pattern="LICENSE_1_0.txt", dst="licenses", src=self._source_subfolder) - self.copy(pattern="*.hpp", dst="include", src=os.path.join(self._source_subfolder, "include")) - - def package_info(self): - self.cpp_info.set_property("cmake_file_name", "mqtt_cpp") - self.cpp_info.set_property("cmake_target_name", "mqtt_cpp::mqtt_cpp") - - # TODO: to remove in conan v2 once cmake_find_package_* generators removed - self.cpp_info.filenames["cmake_find_package"] = "mqtt_cpp" - self.cpp_info.filenames["cmake_find_package_multi"] = "mqtt_cpp" - self.cpp_info.names["cmake_find_package"] = "mqtt_cpp" - self.cpp_info.names["cmake_find_package_multi"] = "mqtt_cpp" diff --git a/recipes/redboltz-mqtt_cpp/all/test_package/CMakeLists.txt b/recipes/redboltz-mqtt_cpp/all/test_package/CMakeLists.txt deleted file mode 100644 index d57b3a725b42c..0000000000000 --- a/recipes/redboltz-mqtt_cpp/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.8) - -project(test_package CXX) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(mqtt_cpp REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} mqtt_cpp::mqtt_cpp) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) diff --git a/recipes/redboltz-mqtt_cpp/all/test_package/conanfile.py b/recipes/redboltz-mqtt_cpp/all/test_package/conanfile.py deleted file mode 100644 index 38f4483872d47..0000000000000 --- a/recipes/redboltz-mqtt_cpp/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/redboltz-mqtt_cpp/all/test_package/test_package.cpp b/recipes/redboltz-mqtt_cpp/all/test_package/test_package.cpp deleted file mode 100644 index 65e10348b409b..0000000000000 --- a/recipes/redboltz-mqtt_cpp/all/test_package/test_package.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include - -int main() { - MQTT_NS::setup_log(); - - boost::asio::io_context ioc; - - auto c = MQTT_NS::make_async_client(ioc, "localhost", "40000"); - - c->set_client_id("test_package"); - c->set_clean_session(true); - - return 0; -} diff --git a/recipes/redboltz-mqtt_cpp/config.yml b/recipes/redboltz-mqtt_cpp/config.yml deleted file mode 100644 index ed9e26c6552eb..0000000000000 --- a/recipes/redboltz-mqtt_cpp/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "13.0.0": - folder: all diff --git a/recipes/rmlui/4.x/conandata.yml b/recipes/rmlui/4.x/conandata.yml index f35a5c4a8e8db..5fa24bd51991a 100644 --- a/recipes/rmlui/4.x/conandata.yml +++ b/recipes/rmlui/4.x/conandata.yml @@ -11,6 +11,3 @@ sources: "4.3": sha256: "5b378647137e74b7c89dfebb0ea6f173bc83372f7268104b99c420cfc9652a01" url: "https://github.com/mikke89/RmlUi/archive/refs/tags/4.3.zip" - "4.4": - url: "https://github.com/mikke89/RmlUi/archive/4.4.tar.gz" - sha256: "9e45176e47154616253c4e5c78368f4af4b4379278b73066c3fb5a338f9c655a" diff --git a/recipes/rmlui/config.yml b/recipes/rmlui/config.yml index d749620d53174..79e5172ea3f26 100644 --- a/recipes/rmlui/config.yml +++ b/recipes/rmlui/config.yml @@ -9,5 +9,3 @@ versions: folder: "4.x" "4.3": folder: "4.x" - "4.4": - folder: "4.x" diff --git a/recipes/ruby/all/conanfile.py b/recipes/ruby/all/conanfile.py index ae5f69f7b3f1a..f6c09aeca75a0 100644 --- a/recipes/ruby/all/conanfile.py +++ b/recipes/ruby/all/conanfile.py @@ -97,16 +97,11 @@ def generate(self): td.generate() tc = AutotoolsToolchain(self) - # TODO: removed in conan 1.49 tc.default_configure_install_args = True - - tc.configure_args.append("--disable-install-doc") + tc.configure_args = ["--disable-install-doc"] if self.options.shared and not is_msvc(self): - # Force fPIC + tc.configure_args.append("--enable-shared") tc.fpic = True - if "--enable-shared" not in tc.configure_args: - tc.configure_args.append("--enable-shared") - if cross_building(self) and is_apple_os(self.settings.os): apple_arch = to_apple_arch(self.settings.arch) if apple_arch: @@ -119,7 +114,6 @@ def generate(self): if self.settings.build_type in ["Debug", "RelWithDebInfo"]: tc.ldflags.append("-debug") tc.build_type_flags = [f if f != "-O2" else self._msvc_optflag for f in tc.build_type_flags] - tc.generate() def build(self): diff --git a/recipes/safeint/all/conandata.yml b/recipes/safeint/all/conandata.yml index a813b97cd4e7d..5db8addec6ddf 100644 --- a/recipes/safeint/all/conandata.yml +++ b/recipes/safeint/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.24": - url: "https://github.com/dcleblanc/SafeInt/archive/3.24.tar.gz" - sha256: "af6c7222a8420f6f87e198dc94791c28da75fe7241b605342c333fd03fd9dea6" "3.0.26": url: "https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.26.tar.gz" sha256: "62fef99873ad975ddd8356923b3d51ed316209c1a05ac85814219373a13ae4d5" diff --git a/recipes/safeint/config.yml b/recipes/safeint/config.yml index df1076f0d71c5..ab54db0f32c9f 100644 --- a/recipes/safeint/config.yml +++ b/recipes/safeint/config.yml @@ -1,5 +1,3 @@ versions: - "3.24": - folder: all "3.0.26": folder: all diff --git a/recipes/simple-websocket-server/all/conanfile.py b/recipes/simple-websocket-server/all/conanfile.py index 7af11bfe301d4..6a57dd74a6283 100644 --- a/recipes/simple-websocket-server/all/conanfile.py +++ b/recipes/simple-websocket-server/all/conanfile.py @@ -25,7 +25,7 @@ def _source_subfolder(self): return "source_subfolder" def requirements(self): - self.requires("openssl/1.1.1q") + self.requires("openssl/1.1.1j") # only version 2.0.2 upwards is able to build against asio 1.18.0 or higher if tools.Version(self.version) <= "2.0.1": if self.options.use_asio_standalone: @@ -34,9 +34,9 @@ def requirements(self): self.requires("boost/1.73.0") else: if self.options.use_asio_standalone: - self.requires("asio/1.23.0") + self.requires("asio/1.18.0") else: - self.requires("boost/1.79.0") + self.requires("boost/1.74.0") def configure(self): if self.settings.compiler.cppstd: diff --git a/recipes/skyr-url/all/CMakeLists.txt b/recipes/skyr-url/all/CMakeLists.txt index 16d33ed296f4b..c986d294c7547 100644 --- a/recipes/skyr-url/all/CMakeLists.txt +++ b/recipes/skyr-url/all/CMakeLists.txt @@ -1,9 +1,7 @@ -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.1) project(cmake_wrapper) include(conanbuildinfo.cmake) conan_basic_setup() -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - add_subdirectory("source_subfolder") diff --git a/recipes/skyr-url/all/conandata.yml b/recipes/skyr-url/all/conandata.yml index 25a1fe3b1c9e0..0e99ddda9607d 100644 --- a/recipes/skyr-url/all/conandata.yml +++ b/recipes/skyr-url/all/conandata.yml @@ -3,13 +3,5 @@ sources: url: "https://github.com/cpp-netlib/url/archive/v1.13.0.tar.gz" sha256: "0c9e594f09a9abda5815b07b548ac520b2fc1044fc74b589fc4c5bd18ea4330c" "1.12.0": - url: "https://github.com/cpp-netlib/url/archive/v1.12.0.tar.gz" - sha256: "42ede3666a4c40828aa74e4b35bf43dfc79de9329e6463ff90f9bb727b3a06f0" - -patches: - "1.13.0": - - patch_file: "patches/1.13.0-0001-fix-cmake.patch" - base_path: "source_subfolder" - "1.12.0": - - patch_file: "patches/1.12.0-0001-fix-cmake.patch" - base_path: "source_subfolder" + url: https://github.com/cpp-netlib/url/archive/v1.12.0.tar.gz + sha256: 42ede3666a4c40828aa74e4b35bf43dfc79de9329e6463ff90f9bb727b3a06f0 diff --git a/recipes/skyr-url/all/conanfile.py b/recipes/skyr-url/all/conanfile.py index d73a94e93ebb3..71daf80ebe843 100644 --- a/recipes/skyr-url/all/conanfile.py +++ b/recipes/skyr-url/all/conanfile.py @@ -1,31 +1,20 @@ from conans import ConanFile, tools, CMake from conans.errors import ConanInvalidConfiguration -from conan.tools.microsoft import is_msvc, is_msvc_static_runtime import os -import functools -required_conan_version = ">=1.45.0" +required_conan_version = ">=1.28.0" class SkyrUrlConan(ConanFile): name = "skyr-url" + homepage = "https://cpp-netlib.github.io/url" description = "A C++ library that implements the WhatWG URL specification" - license = "BSL-1.0" + topics = ("conan", "whatwg", "url", "parser") url = "https://github.com/conan-io/conan-center-index" - homepage = "https://cpp-netlib.github.io/url" - topics = ("whatwg", "url", "parser") - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "with_json": [True, False], - "with_fs": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - "with_json": True, - "with_fs": True, - } + license = "BSL-1.0" + settings = "os", "compiler", "build_type", "arch" + options = {"shared": [True, False], "fPIC": [True, False], "with_json": [True, False], "with_fs": [True, False]} + default_options = {"shared": False, "fPIC": True, "with_json": True, "with_fs": True} + exports_sources = "CMakeLists.txt" generators = "cmake", "cmake_find_package_multi" _cmake = None @@ -51,21 +40,12 @@ def _minimum_compilers_version(self): "apple-clang": "10", } - def export_sources(self): - self.copy("CMakeLists.txt") - for patch in self.conan_data.get("patches", {}).get(self.version, []): - self.copy(patch["patch_file"]) - def config_options(self): if self.settings.os == "Windows": del self.options.fPIC def configure(self): - if self.options.shared: - del self.options.fPIC - - def validate(self): - if self.settings.compiler.get_safe("cppstd"): + if self.settings.get_safe("compiler.cppstd"): tools.check_min_cppstd(self, self._minimum_cpp_standard) min_version = self._minimum_compilers_version.get(str(self.settings.compiler)) if not min_version: @@ -78,35 +58,41 @@ def validate(self): if self.options.with_fs and self.settings.compiler == "apple-clang": raise ConanInvalidConfiguration("apple-clang currently does not support with filesystem") - if self.settings.compiler.get_safe("libcxx") == "libstdc++": - raise ConanInvalidConfiguration("{} supports only libstdc++'s new ABI".format(self.name)) + + if self.options.shared: + # https://github.com/cpp-netlib/url/blob/dd345361ed86e4c1cabfe94743a8e769b346840c/src/CMakeLists.txt#L17 + raise ConanInvalidConfiguration("shared is currently not supported by upstream") + + if tools.Version(self.version) >= "1.13.0" and not self.settings.compiler == "Visual Studio": + # There's tedious compilation errors in C3i against ranges-v3 + raise ConanInvalidConfiguration("{}/{} with {} is currently not supported".format(self.name, self.version, self.settings.compiler)) def requirements(self): self.requires("tl-expected/1.0.0") - self.requires("range-v3/0.12.0") + self.requires("range-v3/0.11.0") if self.options.with_json: - self.requires("nlohmann_json/3.10.5") + self.requires("nlohmann_json/3.9.1") def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) + tools.get(**self.conan_data["sources"][self.version]) + extracted_dir = "url-" + self.version + os.rename(extracted_dir, self._source_subfolder) - @functools.lru_cache(1) def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["skyr_BUILD_TESTS"] = False - cmake.definitions["skyr_FULL_WARNINGS"] = False - cmake.definitions["skyr_WARNINGS_AS_ERRORS"] = False - cmake.definitions["skyr_ENABLE_JSON_FUNCTIONS"] = self.options.with_json - cmake.definitions["skyr_ENABLE_FILESYSTEM_FUNCTIONS"] = self.options.with_fs - if is_msvc(self): - cmake.definitions["skyr_USE_STATIC_CRT"] = is_msvc_static_runtime(self) - cmake.configure(build_folder=self._build_subfolder) - return cmake + if self._cmake: + return self._cmake + self._cmake = CMake(self) + self._cmake.definitions["skyr_BUILD_TESTS"] = False + self._cmake.definitions["skyr_FULL_WARNINGS"] = False + self._cmake.definitions["skyr_WARNINGS_AS_ERRORS"] = False + self._cmake.definitions["skyr_ENABLE_JSON_FUNCTIONS"] = self.options.with_json + self._cmake.definitions["skyr_ENABLE_FILESYSTEM_FUNCTIONS"] = self.options.with_fs + if self.settings.compiler == "Visual Studio": + self._cmake.definitions["skyr_USE_STATIC_CRT"] = "MT" in self.settings.compiler.runtime + self._cmake.configure(build_folder=self._build_subfolder) + return self._cmake def build(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) cmake = self._configure_cmake() cmake.build() @@ -117,18 +103,12 @@ def package(self): tools.rmdir(os.path.join(self.package_folder, "share")) def package_info(self): - self.cpp_info.set_property("cmake_file_name", "skyr-url") - self.cpp_info.set_property("cmake_target_name", "skyr::skyr-url") - - self.cpp_info.components["url"].name = "skyr-url" - self.cpp_info.components["url"].libs = tools.collect_libs(self) - self.cpp_info.components["url"].requires = ["tl-expected::tl-expected", "range-v3::range-v3"] - if self.options.with_json: - self.cpp_info.components["url"].requires.append("nlohmann_json::nlohmann_json") - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.components["url"].system_libs.append("m") - self.cpp_info.filenames["cmake_find_package"] = "skyr-url" self.cpp_info.filenames["cmake_find_package_multi"] = "skyr-url" self.cpp_info.names["cmake_find_package"] = "skyr" self.cpp_info.names["cmake_find_package_multi"] = "skyr" + self.cpp_info.components["url"].name = "skyr-url" + self.cpp_info.components["url"].libs = tools.collect_libs(self) + self.cpp_info.components["url"].requires = ["tl-expected::tl-expected", "range-v3::range-v3" ] + if self.options.with_json: + self.cpp_info.components["url"].requires.append("nlohmann_json::nlohmann_json") diff --git a/recipes/skyr-url/all/patches/1.12.0-0001-fix-cmake.patch b/recipes/skyr-url/all/patches/1.12.0-0001-fix-cmake.patch deleted file mode 100644 index 15a628c563e50..0000000000000 --- a/recipes/skyr-url/all/patches/1.12.0-0001-fix-cmake.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 835d112..712a288 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -101,8 +101,9 @@ endif() - install(TARGETS ${skyr_TARGETS} - EXPORT ${PROJECT_NAME}-targets - INCLUDES DESTINATION "${CMAKE_INSTALL_DATADIR}" -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - install(EXPORT ${PROJECT_NAME}-targets - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 887d312..9db70d7 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,7 @@ configure_file( - # skyr-url - ################################################# - --add_library(skyr-url STATIC) -+add_library(skyr-url) - - target_sources(skyr-url - PRIVATE -@@ -138,7 +138,7 @@ target_link_libraries( - skyr-url - PUBLIC - tl::expected -- range-v3 -+ range-v3::range-v3 - PRIVATE - $<${libcxx}:c++> - ) diff --git a/recipes/skyr-url/all/patches/1.13.0-0001-fix-cmake.patch b/recipes/skyr-url/all/patches/1.13.0-0001-fix-cmake.patch deleted file mode 100644 index e56eae0ce1240..0000000000000 --- a/recipes/skyr-url/all/patches/1.13.0-0001-fix-cmake.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b63ddc2..c87ced9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -101,8 +101,9 @@ endif() - install(TARGETS ${skyr_TARGETS} - EXPORT ${PROJECT_NAME}-targets - INCLUDES DESTINATION "${CMAKE_INSTALL_DATADIR}" -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - install(EXPORT ${PROJECT_NAME}-targets - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1bb02fa..f21f2c3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,7 @@ configure_file( - # skyr-url - ################################################# - --add_library(skyr-url STATIC) -+add_library(skyr-url) - - target_sources(skyr-url - PRIVATE -@@ -136,7 +136,7 @@ target_link_libraries( - skyr-url - PUBLIC - tl::expected -- range-v3 -+ range-v3::range-v3 - PRIVATE - $<${libcxx}:c++> - ) diff --git a/recipes/skyr-url/all/test_package/CMakeLists.txt b/recipes/skyr-url/all/test_package/CMakeLists.txt index 96bec18bacbdc..a5e08b20ff1a5 100644 --- a/recipes/skyr-url/all/test_package/CMakeLists.txt +++ b/recipes/skyr-url/all/test_package/CMakeLists.txt @@ -1,11 +1,11 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.1) project(test_package) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) +conan_basic_setup() find_package(skyr-url CONFIG REQUIRED) add_executable(${PROJECT_NAME} test_package.cpp) target_link_libraries(${PROJECT_NAME} skyr::skyr-url) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) +set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17) diff --git a/recipes/skyr-url/all/test_package/conanfile.py b/recipes/skyr-url/all/test_package/conanfile.py index 5120e440ae5fb..7e2dfe859bb27 100644 --- a/recipes/skyr-url/all/test_package/conanfile.py +++ b/recipes/skyr-url/all/test_package/conanfile.py @@ -1,10 +1,9 @@ from conans import ConanFile, CMake, tools -from conan.tools.build import cross_building import os class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" + settings = "os", "compiler", "build_type", "arch" generators = "cmake", "cmake_find_package_multi" def build(self): @@ -13,6 +12,6 @@ def build(self): cmake.build() def test(self): - if not cross_building(self): + if not tools.cross_building(self.settings): bin_path = os.path.join("bin", "test_package") self.run(bin_path, run_environment=True) diff --git a/recipes/sqlite3/all/conandata.yml b/recipes/sqlite3/all/conandata.yml index 9cbaf9de69b55..c4375e071ba97 100644 --- a/recipes/sqlite3/all/conandata.yml +++ b/recipes/sqlite3/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.39.2": - url: "https://sqlite.org/2022/sqlite-amalgamation-3390200.zip" - sha256: "87775784f8b22d0d0f1d7811870d39feaa7896319c7c20b849a4181c5a50609b" "3.39.1": url: "https://sqlite.org/2022/sqlite-amalgamation-3390100.zip" sha256: "f2ce17bca51b376de4fcb9d0dc174c52f472a34c29aa1ccc774f27467cc63ed7" @@ -35,3 +32,6 @@ sources: "3.35.5": url: "https://sqlite.org/2021/sqlite-amalgamation-3350500.zip" sha256: "b49409ef123e193e719e2536f9b795482a69e61a9cc728933739b9024f035061" + "3.32.3": + url: "https://sqlite.org/2020/sqlite-amalgamation-3320300.zip" + sha256: "e9cec01d4519e2d49b3810615237325263fe1feaceae390ee12b4a29bd73dbe2" diff --git a/recipes/sqlite3/config.yml b/recipes/sqlite3/config.yml index cc979959bee0e..1c7eedf4a5c84 100644 --- a/recipes/sqlite3/config.yml +++ b/recipes/sqlite3/config.yml @@ -1,6 +1,4 @@ versions: - "3.39.2": - folder: all "3.39.1": folder: all "3.39.0": @@ -23,3 +21,5 @@ versions: folder: all "3.35.5": folder: all + "3.32.3": + folder: all diff --git a/recipes/srt/all/conanfile.py b/recipes/srt/all/conanfile.py index dfed1538859cc..40d9e043323e9 100644 --- a/recipes/srt/all/conanfile.py +++ b/recipes/srt/all/conanfile.py @@ -46,7 +46,7 @@ def configure(self): del self.options.fPIC def requirements(self): - self.requires("openssl/1.1.1q") + self.requires("openssl/1.1.1k") if not self._has_posix_threads and not self._has_stdcxx_sync: self.requires("pthreads4w/3.0.0") diff --git a/recipes/swig/all/conanfile.py b/recipes/swig/all/conanfile.py index a8493d08a9cb3..50a789da329dd 100644 --- a/recipes/swig/all/conanfile.py +++ b/recipes/swig/all/conanfile.py @@ -146,14 +146,10 @@ def _module_file(self): return "conan-official-{}-targets.cmake".format(self.name) def package_info(self): - self.cpp_info.includedirs=[] self.cpp_info.names["cmake_find_package"] = "SWIG" self.cpp_info.names["cmake_find_package_multi"] = "SWIG" self.cpp_info.builddirs = [self._module_subfolder] - self.cpp_info.build_modules["cmake_find_package"] = \ - [os.path.join(self._module_subfolder, self._module_file)] - self.cpp_info.build_modules["cmake_find_package_multi"] = \ - [os.path.join(self._module_subfolder, self._module_file)] + self.cpp_info.build_modules = [os.path.join(self._module_subfolder, self._module_file)] bindir = os.path.join(self.package_folder, "bin") self.output.info("Appending PATH environment variable: {}".format(bindir)) diff --git a/recipes/taocpp-pegtl/3.x.x/conandata.yml b/recipes/taocpp-pegtl/3.x.x/conandata.yml index 95cbe48c372b0..94d322b237aeb 100644 --- a/recipes/taocpp-pegtl/3.x.x/conandata.yml +++ b/recipes/taocpp-pegtl/3.x.x/conandata.yml @@ -1,7 +1,4 @@ sources: - "3.2.7": - url: "https://github.com/taocpp/PEGTL/archive/3.2.7.tar.gz" - sha256: "d6cd113d8bd14e98bcbe7b7f8fc1e1e33448dc359e8cd4cca30e034ec2f0642d" "3.2.6": url: "https://github.com/taocpp/PEGTL/archive/refs/tags/3.2.6.tar.gz" sha256: "0ad229e47e5e865c90788bb9865447804c72dcb171b7402f6f0fe8c78f3b2035" diff --git a/recipes/taocpp-pegtl/config.yml b/recipes/taocpp-pegtl/config.yml index 768412ab23d94..088fc83db5923 100644 --- a/recipes/taocpp-pegtl/config.yml +++ b/recipes/taocpp-pegtl/config.yml @@ -1,6 +1,4 @@ versions: - "3.2.7": - folder: "3.x.x" "3.2.6": folder: "3.x.x" "3.2.5": diff --git a/recipes/tgbot/all/conanfile.py b/recipes/tgbot/all/conanfile.py index b7db60eafd261..d96dc9cba8035 100644 --- a/recipes/tgbot/all/conanfile.py +++ b/recipes/tgbot/all/conanfile.py @@ -42,9 +42,9 @@ def configure(self): del self.options.fPIC def requirements(self): - self.requires("boost/1.79.0") - self.requires("libcurl/7.84.0") - self.requires("openssl/1.1.1q") + self.requires("boost/1.78.0") + self.requires("libcurl/7.80.0") + self.requires("openssl/1.1.1m") @property def _required_boost_components(self): diff --git a/recipes/thrust/all/conandata.yml b/recipes/thrust/all/conandata.yml index 702d317873355..c4561421bf72a 100644 --- a/recipes/thrust/all/conandata.yml +++ b/recipes/thrust/all/conandata.yml @@ -5,6 +5,3 @@ sources: "1.16.0": url: "https://github.com/thrust/thrust/archive/1.16.0.tar.gz" sha256: "93b9553e3ee544e05395022bea67e6d600f8f3eb680950ec7cf73c0f55162487" - "1.17.0": - url: "https://github.com/thrust/thrust/archive/1.17.0.tar.gz" - sha256: "b02aca5d2325e9128ed9d46785b8e72366f758b873b95001f905f22afcf31bbf" diff --git a/recipes/thrust/config.yml b/recipes/thrust/config.yml index 995f77f066bf1..f3d7bdc4f85bc 100644 --- a/recipes/thrust/config.yml +++ b/recipes/thrust/config.yml @@ -3,5 +3,3 @@ versions: folder: all "1.16.0": folder: all - "1.17.0": - folder: all diff --git a/recipes/tinyply/all/conandata.yml b/recipes/tinyply/all/conandata.yml index 15f3dca4257f5..94a0c7ab123e4 100644 --- a/recipes/tinyply/all/conandata.yml +++ b/recipes/tinyply/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "2.3.4": - url: "https://github.com/ddiakopoulos/tinyply/archive/2.3.4.tar.gz" - sha256: "1bb1462727a363f7b77a10e51cd023095db7b281d2f201167620a83e495513c6" "2.3.2": url: "https://github.com/ddiakopoulos/tinyply/archive/2.3.2.tar.gz" sha256: "4da8744a9cf6810c6cfe015106cb87352e8bb7c125162170eb4e30fa51e8894e" diff --git a/recipes/tinyply/config.yml b/recipes/tinyply/config.yml index d7f66fca815a8..aee8de619ec30 100644 --- a/recipes/tinyply/config.yml +++ b/recipes/tinyply/config.yml @@ -1,5 +1,3 @@ versions: - "2.3.4": - folder: all "2.3.2": folder: all diff --git a/recipes/tinyspline/all/conandata.yml b/recipes/tinyspline/all/conandata.yml index d7933ea3bb3e8..9eb2502abb94e 100644 --- a/recipes/tinyspline/all/conandata.yml +++ b/recipes/tinyspline/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "0.5.0": - url: "https://github.com/msteinbeck/tinyspline/archive/v0.5.0.tar.gz" - sha256: "cf7a6de40a5456b6791bc043d978b134c54e0404129a05846b803ccd45db366b" "0.4.0": url: "https://github.com/msteinbeck/tinyspline/archive/refs/tags/v0.4.0.tar.gz" sha256: "819db7f8b09c68b701b54232f08d35210599353703934c61e03555c3c059a0db" diff --git a/recipes/tinyspline/config.yml b/recipes/tinyspline/config.yml index f552ed1dcb956..8afd20f5689ba 100644 --- a/recipes/tinyspline/config.yml +++ b/recipes/tinyspline/config.yml @@ -1,6 +1,4 @@ versions: - "0.5.0": - folder: all "0.4.0": folder: all "0.3.0": diff --git a/recipes/transwarp/all/conandata.yml b/recipes/transwarp/all/conandata.yml index ecfa9f3160606..36cc840695ad7 100644 --- a/recipes/transwarp/all/conandata.yml +++ b/recipes/transwarp/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "2.2.3": - url: "https://github.com/bloomen/transwarp/archive/2.2.3.tar.gz" - sha256: "258ef6d511390bf813e4c33faed37556812acd273126cc02c3aea51fee359400" "2.2.2": url: "https://github.com/bloomen/transwarp/archive/refs/tags/2.2.2.tar.gz" sha256: "0458aebbcef0d1cf1949cfc1fce6e5aa902226622783f6eb97f7716a711c8b4d" diff --git a/recipes/transwarp/config.yml b/recipes/transwarp/config.yml index 50f7c7bf3ca4e..6d6cfc66eae07 100644 --- a/recipes/transwarp/config.yml +++ b/recipes/transwarp/config.yml @@ -1,5 +1,3 @@ versions: - "2.2.3": - folder: all "2.2.2": folder: all diff --git a/recipes/trantor/all/conandata.yml b/recipes/trantor/all/conandata.yml index 455bbc430bc18..95b050109577c 100644 --- a/recipes/trantor/all/conandata.yml +++ b/recipes/trantor/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.5.6": - url: "https://github.com/an-tao/trantor/archive/v1.5.6.tar.gz" - sha256: "827aca30e120244a8ede9d07446481328d9a3869228f01fc4978b19301d66e65" "1.5.5": url: "https://github.com/an-tao/trantor/archive/refs/tags/v1.5.5.tar.gz" sha256: "5a549c6efebe7ecba73a944cfba4a9713130704d4ccc82af534a2e108b9a0e71" diff --git a/recipes/trantor/all/conanfile.py b/recipes/trantor/all/conanfile.py index 431f2f2574231..64caf61c1d62e 100644 --- a/recipes/trantor/all/conanfile.py +++ b/recipes/trantor/all/conanfile.py @@ -55,7 +55,7 @@ def configure(self): del self.options.fPIC def requirements(self): - self.requires("openssl/1.1.1q") + self.requires("openssl/1.1.1o") if self.options.with_c_ares: self.requires("c-ares/1.18.1") diff --git a/recipes/trantor/config.yml b/recipes/trantor/config.yml index 20f69b756a9a7..7000fe23df406 100644 --- a/recipes/trantor/config.yml +++ b/recipes/trantor/config.yml @@ -1,5 +1,3 @@ versions: - "1.5.6": - folder: "all" "1.5.5": folder: "all" diff --git a/recipes/vulkan-headers/all/conandata.yml b/recipes/vulkan-headers/all/conandata.yml index 45743558294a9..6d25d9992fe18 100644 --- a/recipes/vulkan-headers/all/conandata.yml +++ b/recipes/vulkan-headers/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.3.221": - url: "https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.221.tar.gz" - sha256: "75057d8231bb7a3f6ac091f1b08f50604f07a7e9b4424fd12c035f01787ebf0c" "1.3.219": url: "https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.219.tar.gz" sha256: "3e5d1b727a5e3a5546e6b0709d520d3f522f0a83808277a313357140645be90c" diff --git a/recipes/vulkan-headers/config.yml b/recipes/vulkan-headers/config.yml index bd1988a4e7a5e..e4fa94589994e 100644 --- a/recipes/vulkan-headers/config.yml +++ b/recipes/vulkan-headers/config.yml @@ -1,6 +1,4 @@ versions: - "1.3.221": - folder: all "1.3.219": folder: all "1.3.216.0": diff --git a/recipes/vulkan-loader/all/conandata.yml b/recipes/vulkan-loader/all/conandata.yml index 1a48f516897ed..30a2d774c9070 100644 --- a/recipes/vulkan-loader/all/conandata.yml +++ b/recipes/vulkan-loader/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.3.221": - url: "https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.3.221.tar.gz" - sha256: "ba7042b2b14a11646ba8bd33c041ccb4f1abe5bdfa2758e301a76bf6d31d2748" "1.3.216.0": url: "https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/sdk-1.3.216.0.tar.gz" sha256: "46188d3db019409b82f850628d5c175cc59dcdb3ce146f5c023b97709f67e8f1" diff --git a/recipes/vulkan-loader/config.yml b/recipes/vulkan-loader/config.yml index 30fd518efa2a6..303ac4a95a76d 100644 --- a/recipes/vulkan-loader/config.yml +++ b/recipes/vulkan-loader/config.yml @@ -1,6 +1,4 @@ versions: - "1.3.221": - folder: all "1.3.216.0": folder: all "1.3.211.0": diff --git a/recipes/wayland/all/conanfile.py b/recipes/wayland/all/conanfile.py index 2df1a20d70ae8..940412e9fa84a 100644 --- a/recipes/wayland/all/conanfile.py +++ b/recipes/wayland/all/conanfile.py @@ -107,7 +107,6 @@ def package_info(self): self.cpp_info.components["wayland-scanner"].includedirs = [] self.cpp_info.components["wayland-scanner"].libdirs = [] - self.cpp_info.components["wayland-scanner"].set_property("component_version", self.version) self.cpp_info.components["wayland-scanner"].requires = ["expat::expat"] if self.options.enable_dtd_validation: @@ -135,7 +134,6 @@ def package_info(self): self.cpp_info.components["wayland-server"].resdirs = ["res"] if self.version >= Version("1.21.0") and self.settings.os == "Linux": self.cpp_info.components["wayland-server"].system_libs += ["rt"] - self.cpp_info.components["wayland-server"].set_property("component_version", self.version) # todo Remove in Conan version 1.50.0 where these are set by default for the PkgConfigDeps generator. self.cpp_info.components["wayland-server"].includedirs = ["include"] @@ -157,7 +155,6 @@ def package_info(self): self.cpp_info.components["wayland-client"].resdirs = ["res"] if self.version >= Version("1.21.0") and self.settings.os == "Linux": self.cpp_info.components["wayland-client"].system_libs += ["rt"] - self.cpp_info.components["wayland-client"].set_property("component_version", self.version) # todo Remove in Conan version 1.50.0 where these are set by default for the PkgConfigDeps generator. self.cpp_info.components["wayland-client"].includedirs = ["include"] @@ -175,7 +172,6 @@ def package_info(self): self.cpp_info.components["wayland-cursor"].set_property("pkg_config_name", "wayland-cursor") self.cpp_info.components["wayland-cursor"].names["pkg_config"] = "wayland-cursor" self.cpp_info.components["wayland-cursor"].requires = ["wayland-client"] - self.cpp_info.components["wayland-cursor"].set_property("component_version", self.version) # todo Remove in Conan version 1.50.0 where these are set by default for the PkgConfigDeps generator. self.cpp_info.components["wayland-cursor"].includedirs = ["include"] @@ -185,7 +181,6 @@ def package_info(self): self.cpp_info.components["wayland-egl"].set_property("pkg_config_name", "wayland-egl") self.cpp_info.components["wayland-egl"].names["pkg_config"] = "wayland-egl" self.cpp_info.components["wayland-egl"].requires = ["wayland-client"] - self.cpp_info.components["wayland-egl"].set_property("component_version", "18.1.0") # todo Remove in Conan version 1.50.0 where these are set by default for the PkgConfigDeps generator. self.cpp_info.components["wayland-egl"].includedirs = ["include"] @@ -193,7 +188,7 @@ def package_info(self): self.cpp_info.components["wayland-egl-backend"].names["pkg_config"] = "wayland-egl-backend" self.cpp_info.components["wayland-egl-backend"].set_property("pkg_config_name", "wayland-egl-backend") - self.cpp_info.components["wayland-egl-backend"].set_property("component_version", "3") + self.cpp_info.components["wayland-egl-backend"].version = "3" # todo Remove in Conan version 1.50.0 where these are set by default for the PkgConfigDeps generator. self.cpp_info.components["wayland-egl-backend"].includedirs = ["include"] diff --git a/recipes/wolfssl/all/conandata.yml b/recipes/wolfssl/all/conandata.yml index 18d51db251a4a..1eb5c7ad915e7 100644 --- a/recipes/wolfssl/all/conandata.yml +++ b/recipes/wolfssl/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "5.4.0": - url: "https://github.com/wolfSSL/wolfssl/archive/v5.4.0-stable.tar.gz" - sha256: "dc36cc19dad197253e5c2ecaa490c7eef579ad448706e55d73d79396e814098b" "5.3.0": url: "https://github.com/wolfSSL/wolfssl/archive/v5.3.0-stable.tar.gz" sha256: "1a3bb310dc01d3e73d9ad91b6ea8249d081016f8eef4ae8f21d3421f91ef1de9" diff --git a/recipes/wolfssl/config.yml b/recipes/wolfssl/config.yml index b5e6c7b8e93a2..329e668c027d6 100644 --- a/recipes/wolfssl/config.yml +++ b/recipes/wolfssl/config.yml @@ -1,6 +1,4 @@ versions: - "5.4.0": - folder: all "5.3.0": folder: all "5.2.0": diff --git a/recipes/xbyak/all/conandata.yml b/recipes/xbyak/all/conandata.yml index 7e8a0dab1ef8e..e52b0f42b5336 100644 --- a/recipes/xbyak/all/conandata.yml +++ b/recipes/xbyak/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "6.60.2": - url: "https://github.com/herumi/xbyak/archive/v6.60.2.tar.gz" - sha256: "c7fd461cf8e0e1acec13970681f5e7b073a2e63f59841252fb298c3c3a09a395" "6.60": url: "https://github.com/herumi/xbyak/archive/v6.60.tar.gz" sha256: "fb478da9d66fabe155d54436645ffbbdc44b513027391c4662983d44ea483d59" diff --git a/recipes/xbyak/config.yml b/recipes/xbyak/config.yml index d2d1a5d2fc89d..ad44a94347434 100644 --- a/recipes/xbyak/config.yml +++ b/recipes/xbyak/config.yml @@ -1,6 +1,4 @@ versions: - "6.60.2": - folder: all "6.60": folder: all "6.01": diff --git a/recipes/xorg-proto/all/conanfile.py b/recipes/xorg-proto/all/conanfile.py index ad8e696b97953..d7a5e6d568454 100644 --- a/recipes/xorg-proto/all/conanfile.py +++ b/recipes/xorg-proto/all/conanfile.py @@ -1,6 +1,4 @@ -from conan import ConanFile -from conan.tools.files import rmdir, mkdir, save, load -from conans import AutoToolsBuildEnvironment, tools +from conans import AutoToolsBuildEnvironment, ConanFile, tools import contextlib import glob import os @@ -20,7 +18,7 @@ class XorgProtoConan(ConanFile): url = "https://github.com/conan-io/conan-center-index" settings = "os", "arch", "compiler", "build_type" - generators = "PkgConfigDeps" + generators = "pkg_config" _autotools = None @@ -96,7 +94,7 @@ def package(self): pc_data = {} for fn in glob.glob(os.path.join(self.package_folder, "share", "pkgconfig", "*.pc")): - pc_text = load(self, fn) + pc_text = tools.load(fn) filename = os.path.basename(fn)[:-3] name = next(re.finditer("^Name: ([^\n$]+)[$\n]", pc_text, flags=re.MULTILINE)).group(1) version = next(re.finditer("^Version: ([^\n$]+)[$\n]", pc_text, flags=re.MULTILINE)).group(1) @@ -104,18 +102,18 @@ def package(self): "version": version, "name": name, } - mkdir(self, os.path.dirname(self._pc_data_path)) - save(self, self._pc_data_path, yaml.dump(pc_data)) + tools.mkdir(os.path.dirname(self._pc_data_path)) + tools.save(self._pc_data_path, yaml.dump(pc_data)) - rmdir(self, os.path.join(self.package_folder, "share")) + tools.rmdir(os.path.join(self.package_folder, "share")) def package_info(self): for filename, name_version in yaml.safe_load(open(self._pc_data_path)).items(): + # FIXME: generated .pc files contain `Name: xorg-proto-Xproto`, it should be `Name: Xproto` self.cpp_info.components[filename].filenames["pkg_config"] = filename self.cpp_info.components[filename].libdirs = [] if hasattr(self, "settings_build"): self.cpp_info.components[filename].requires = ["xorg-macros::xorg-macros"] self.cpp_info.components[filename].version = name_version["version"] - self.cpp_info.components[filename].set_property("pkg_config_name", filename) self.cpp_info.components["xproto"].includedirs.append(os.path.join("include", "X11")) diff --git a/recipes/xorg-proto/all/test_package/conanfile.py b/recipes/xorg-proto/all/test_package/conanfile.py index 74a00ca1ef212..5216332f39f5c 100644 --- a/recipes/xorg-proto/all/test_package/conanfile.py +++ b/recipes/xorg-proto/all/test_package/conanfile.py @@ -1,6 +1,4 @@ -from conan import ConanFile -from conan.tools.build import cross_building -from conans import CMake +from conans import ConanFile, CMake, tools import os @@ -14,6 +12,6 @@ def build(self): cmake.build() def test(self): - if not cross_building(self): + if not tools.cross_building(self.settings): bin_path = os.path.join("bin", "test_package") self.run(bin_path, run_environment=True) diff --git a/recipes/zbar/all/conanfile.py b/recipes/zbar/all/conanfile.py index 00bd9d090d748..3912ecd5250a9 100644 --- a/recipes/zbar/all/conanfile.py +++ b/recipes/zbar/all/conanfile.py @@ -1,7 +1,5 @@ -from conans import tools, AutoToolsBuildEnvironment +from conans import ConanFile, tools, AutoToolsBuildEnvironment from conans.errors import ConanInvalidConfiguration -from conan import ConanFile -from conan.tools.build import cross_building import os import shutil @@ -70,16 +68,16 @@ def requirements(self): if self.options.with_imagemagick: self.requires("imagemagick/7.0.11-14") if self.options.with_gtk: - self.requires("gtk/4.7.0") + self.requires("gtk/4.4.0") if self.options.with_qt: - self.requires("qt/5.15.5") + self.requires("qt/5.15.2") if tools.Version(self.version) >= "0.22": - self.requires("libiconv/1.17") + self.requires("libiconv/1.16") def build_requirements(self): self.build_requires("gnu-config/cci.20210814") if tools.Version(self.version) >= "0.22": - self.build_requires("automake/1.16.5") + self.build_requires("automake/1.16.4") self.build_requires("gettext/0.21") self.build_requires("pkgconf/1.7.4") self.build_requires("libtool/2.4.6") @@ -91,7 +89,7 @@ def validate(self): raise ConanInvalidConfiguration("Zbar can't be built static on macOS") if self.options.with_xv: #TODO add when available self.output.warn("There is no Xvideo package available on Conan (yet). This recipe will use the one present on the system (if available).") - if tools.Version(self.version) >= "0.22" and cross_building(self): + if tools.Version(self.version) >= "0.22" and tools.cross_building(self.settings): raise ConanInvalidConfiguration("{} can't be built on cross building environment currently because autopoint(part of gettext) doesn't execute correctly.".format(self.name)) def source(self): diff --git a/recipes/zxing-cpp/all/conandata.yml b/recipes/zxing-cpp/all/conandata.yml index 69d8a5f626180..f0a4d05e975c8 100644 --- a/recipes/zxing-cpp/all/conandata.yml +++ b/recipes/zxing-cpp/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "1.4.0": - url: "https://github.com/nu-book/zxing-cpp/archive/v1.4.0.tar.gz" - sha256: "126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862" "1.3.0": url: "https://github.com/nu-book/zxing-cpp/archive/v1.3.0.tar.gz" sha256: "bfd8fc706def30e34f96088b5a7afdbe0917831e57a774d34e3ee864b01c6891" @@ -9,17 +6,12 @@ sources: url: "https://github.com/nu-book/zxing-cpp/archive/v1.0.8.tar.gz" sha256: "9154b5456904e47bd4c38462d57e4b7897bfb20cb2bc2e8c958453e40e73c8b2" patches: - "1.4.0": - # core/ByteArray checks `__cpp_lib_string_view` for using string_view. - # But some compilers(ex. gcc 7.2) don't support `__cpp_lib_string_view` but support string_view. - - patch_file: "patches/1.4.0-0001-fix-string-view.patch" - base_path: "source_subfolder" "1.0.8": - - patch_file: "patches/1.0.8-0001-Fix-C2327-for-MSVC-2015.patch" + - patch_file: "patches/0001-Fix-C2327-for-MSVC-2015.patch" base_path: "source_subfolder" - - patch_file: "patches/1.0.8-0002-include-limits.patch" + - patch_file: "patches/0002-include-limits.patch" base_path: "source_subfolder" - - patch_file: "patches/1.0.8-0003-include-stdexcept.patch" + - patch_file: "patches/0003-include-stdexcept.patch" base_path: "source_subfolder" - - patch_file: "patches/1.0.8-0004-include-cstddef.patch" + - patch_file: "patches/0004-include-cstddef.patch" base_path: "source_subfolder" diff --git a/recipes/zxing-cpp/all/conanfile.py b/recipes/zxing-cpp/all/conanfile.py index b5e0b276dbb87..0cb28f14c67ca 100644 --- a/recipes/zxing-cpp/all/conanfile.py +++ b/recipes/zxing-cpp/all/conanfile.py @@ -9,7 +9,7 @@ class ZXingCppConan(ConanFile): name = "zxing-cpp" - description = "C++ port of ZXing, a barcode scanning library" + description = "c++14 port of ZXing, a barcode scanning library" license = "Apache-2.0" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/nu-book/zxing-cpp" @@ -40,20 +40,12 @@ def _build_subfolder(self): return "build_subfolder" @property - def _compiler_cpp_support(self): + def _compiler_cpp14_support(self): return { - "14" : { - "gcc": "5", - "Visual Studio": "14", - "clang": "3.4", - "apple-clang": "3.4", - }, - "17" : { - "gcc": "7", - "Visual Studio": "16", - "clang": "5", - "apple-clang": "5", - } + "gcc": "5" if tools.Version(self.version) < "1.2" else "6", + "Visual Studio": "14", + "clang": "3.4", + "apple-clang": "3.4", } def export_sources(self): @@ -70,19 +62,15 @@ def configure(self): del self.options.fPIC def validate(self): - cpp_version = 17 if tools.Version(self.version) >= "1.2.0" else 14 - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, cpp_version) - min_version = self._compiler_cpp_support.get(str(cpp_version)).get(str(self.settings.compiler)) - + tools.check_min_cppstd(self, 14) + min_version = self._compiler_cpp14_support.get(str(self.settings.compiler)) if min_version and tools.Version(self.settings.compiler.version) < min_version: raise ConanInvalidConfiguration( - "This compiler is too old. {} needs a compiler with c++{} support".format(self.name, cpp_version) + "This compiler is too old. {} needs a compiler with c++14 support".format(self.name) ) - # FIXME: This is a workaround for "The system cannot execute the specified program." - if tools.Version(self.version) >= "1.3.0" and is_msvc_static_runtime(self) and self.settings.build_type == "Debug": + if tools.Version(self.version) == "1.3.0" and is_msvc_static_runtime(self) and self.settings.build_type == "Debug": raise ConanInvalidConfiguration("{}/{} doesn't support MT + Debug.".format(self.name, self.version)) def source(self): diff --git a/recipes/zxing-cpp/all/patches/1.0.8-0001-Fix-C2327-for-MSVC-2015.patch b/recipes/zxing-cpp/all/patches/0001-Fix-C2327-for-MSVC-2015.patch similarity index 100% rename from recipes/zxing-cpp/all/patches/1.0.8-0001-Fix-C2327-for-MSVC-2015.patch rename to recipes/zxing-cpp/all/patches/0001-Fix-C2327-for-MSVC-2015.patch diff --git a/recipes/zxing-cpp/all/patches/1.0.8-0002-include-limits.patch b/recipes/zxing-cpp/all/patches/0002-include-limits.patch similarity index 100% rename from recipes/zxing-cpp/all/patches/1.0.8-0002-include-limits.patch rename to recipes/zxing-cpp/all/patches/0002-include-limits.patch diff --git a/recipes/zxing-cpp/all/patches/1.0.8-0003-include-stdexcept.patch b/recipes/zxing-cpp/all/patches/0003-include-stdexcept.patch similarity index 100% rename from recipes/zxing-cpp/all/patches/1.0.8-0003-include-stdexcept.patch rename to recipes/zxing-cpp/all/patches/0003-include-stdexcept.patch diff --git a/recipes/zxing-cpp/all/patches/1.0.8-0004-include-cstddef.patch b/recipes/zxing-cpp/all/patches/0004-include-cstddef.patch similarity index 100% rename from recipes/zxing-cpp/all/patches/1.0.8-0004-include-cstddef.patch rename to recipes/zxing-cpp/all/patches/0004-include-cstddef.patch diff --git a/recipes/zxing-cpp/all/patches/1.4.0-0001-fix-string-view.patch b/recipes/zxing-cpp/all/patches/1.4.0-0001-fix-string-view.patch deleted file mode 100644 index 7535d69361e47..0000000000000 --- a/recipes/zxing-cpp/all/patches/1.4.0-0001-fix-string-view.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/core/src/ByteArray.h b/core/src/ByteArray.h -index a31f42c..d5b102e 100644 ---- a/core/src/ByteArray.h -+++ b/core/src/ByteArray.h -@@ -11,7 +11,7 @@ - #include - #include - --#ifdef __cpp_lib_string_view -+#if 1 - #include - #endif - -@@ -30,7 +30,7 @@ public: - - void append(const ByteArray& other) { insert(end(), other.begin(), other.end()); } - --#ifdef __cpp_lib_string_view -+#if 1 - std::string_view asString(size_t pos = 0, size_t len = std::string_view::npos) const - { - return std::string_view(reinterpret_cast(data()), size()).substr(pos, len); diff --git a/recipes/zxing-cpp/config.yml b/recipes/zxing-cpp/config.yml index 778dac07cb8fa..01de10aef059d 100644 --- a/recipes/zxing-cpp/config.yml +++ b/recipes/zxing-cpp/config.yml @@ -1,6 +1,4 @@ versions: - "1.4.0": - folder: all "1.3.0": folder: all "1.0.8":