Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into mass-migration
Browse files Browse the repository at this point in the history
# Conflicts:
#	recipes/alembic/all/patches/1.8.5-0001-fix-cmake.patch
#	recipes/armadillo/all/conandata.yml
#	recipes/armadillo/all/conanfile.py
#	recipes/armadillo/config.yml
#	recipes/assimp/5.x/conanfile.py
#	recipes/beauty/all/conanfile.py
#	recipes/binutils/all/conanfile.py
#	recipes/boost/all/conanfile.py
#	recipes/c-blosc/all/conanfile.py
#	recipes/c-blosc2/all/conanfile.py
#	recipes/capnproto/all/conanfile.py
#	recipes/cassandra-cpp-driver/all/conanfile.py
#	recipes/ccfits/all/conanfile.py
#	recipes/ccfits/all/test_v1_package/CMakeLists.txt
#	recipes/cfitsio/all/conanfile.py
#	recipes/cgal/all/conanfile.py
#	recipes/civetweb/all/conanfile.py
#	recipes/cminpack/all/conanfile.py
#	recipes/cminpack/all/test_package/CMakeLists.txt
#	recipes/cminpack/all/test_v1_package/CMakeLists.txt
#	recipes/cnpy/all/conanfile.py
#	recipes/coin-utils/all/conanfile.py
#	recipes/cpp-httplib/all/conanfile.py
#	recipes/cpprestsdk/all/conanfile.py
#	recipes/cprocessing/all/conanfile.py
#	recipes/crc_cpp/all/conanfile.py
#	recipes/crc_cpp/all/test_package/CMakeLists.txt
#	recipes/crc_cpp/all/test_package/conanfile.py
#	recipes/crc_cpp/all/test_v1_package/conanfile.py
#	recipes/crowcpp-crow/all/conanfile.py
#	recipes/ctpg/all/conanfile.py
#	recipes/ctpg/all/test_package/conanfile.py
#	recipes/ctpg/all/test_package/test_package.cpp
#	recipes/ctpg/all/test_v1_package/conanfile.py
#	recipes/dcmtk/all/conandata.yml
#	recipes/dcmtk/all/conanfile.py
#	recipes/dcmtk/all/test_package/CMakeLists.txt
#	recipes/dcmtk/all/test_package/conanfile.py
#	recipes/dcmtk/all/test_v1_package/CMakeLists.txt
#	recipes/dcmtk/all/test_v1_package/conanfile.py
#	recipes/drogon/all/conanfile.py
#	recipes/elfio/all/conanfile.py
#	recipes/exiv2/all/conanfile.py
#	recipes/freeimage/all/conanfile.py
#	recipes/frugally-deep/all/conanfile.py
#	recipes/gdcm/all/conanfile.py
#	recipes/gettext/all/conanfile.py
#	recipes/glib/all/conanfile.py
#	recipes/glib/all/test_package/conanfile.py
#	recipes/gnutls/all/conanfile.py
#	recipes/gzip-hpp/all/conanfile.py
#	recipes/h5pp/all/conanfile.py
#	recipes/hdf5/all/conanfile.py
#	recipes/hdrhistogram-c/all/conanfile.py
#	recipes/hictk/all/conanfile.py
#	recipes/highs/all/conanfile.py
#	recipes/implot/all/conanfile.py
#	recipes/itk/all/conanfile.py
#	recipes/kaitai_struct_cpp_stl_runtime/all/conanfile.py
#	recipes/kitten/all/conanfile.py
#	recipes/kmod/all/conanfile.py
#	recipes/ldns/all/conanfile.py
#	recipes/lely-core/all/conanfile.py
#	recipes/leptonica/all/conanfile.py
#	recipes/libarchive/all/conanfile.py
#	recipes/libbigwig/all/conanfile.py
#	recipes/libbpf/all/conanfile.py
#	recipes/libdrm/all/conanfile.py
#	recipes/libdwarf/all/conanfile.py
#	recipes/libgd/all/conanfile.py
#	recipes/libharu/all/conanfile.py
#	recipes/libinterpolate/all/conanfile.py
#	recipes/libkml/all/conanfile.py
#	recipes/libmediainfo/all/conanfile.py
#	recipes/libmicrohttpd/all/conanfile.py
#	recipes/libmysqlclient/all/conanfile.py
#	recipes/libnghttp2/all/conanfile.py
#	recipes/libnl/all/conanfile.py
#	recipes/libpng/all/conanfile.py
#	recipes/libpq/all/test_v1_package/CMakeLists.txt
#	recipes/librdkafka/all/conanfile.py
#	recipes/libssh2/all/conanfile.py
#	recipes/libtar/all/conanfile.py
#	recipes/libtiff/all/conanfile.py
#	recipes/libunwind/all/conanfile.py
#	recipes/libwebsockets/all/conanfile.py
#	recipes/libxlsxwriter/all/conanfile.py
#	recipes/libxml2/all/conanfile.py
#	recipes/libxshmfence/all/conanfile.py
#	recipes/libzip/all/conanfile.py
#	recipes/libzippp/all/conanfile.py
#	recipes/mariadb-connector-c/all/conanfile.py
#	recipes/mathfu/all/conanfile.py
#	recipes/mbedtls/all/conanfile.py
#	recipes/minisat/all/conanfile.py
#	recipes/minizip-ng/all/conanfile.py
#	recipes/minizip/all/conanfile.py
#	recipes/mold/1.3.1/conanfile.py
#	recipes/mongo-c-driver/all/conanfile.py
#	recipes/namedtype/all/conanfile.py
#	recipes/nas/all/conanfile.py
#	recipes/oboe/all/conanfile.py
#	recipes/octo-wildcardmatching-cpp/all/conanfile.py
#	recipes/octo-wildcardmatching-cpp/all/test_package/CMakeLists.txt
#	recipes/octo-wildcardmatching-cpp/all/test_package/conanfile.py
#	recipes/onetbb/all/conanfile.py
#	recipes/open62541/all/conanfile.py
#	recipes/open62541/all/test_package/conanfile.py
#	recipes/opencv/2.x/conanfile.py
#	recipes/opencv/3.x/conanfile.py
#	recipes/opencv/4.x/conanfile.py
#	recipes/openexr/2.x/conanfile.py
#	recipes/openexr/3.x/conanfile.py
#	recipes/openjpeg/all/conanfile.py
#	recipes/openssl/1.x.x/conanfile.py
#	recipes/openssl/3.x.x/conanfile.py
#	recipes/patchelf/all/conanfile.py
#	recipes/pcl/all/conanfile.py
#	recipes/pcre2/all/conanfile.py
#	recipes/platform.converters/all/conanfile.py
#	recipes/platform.equality/all/conanfile.py
#	recipes/platform.hashing/all/conanfile.py
#	recipes/poco/all/conanfile.py
#	recipes/podofo/all/conanfile.py
#	recipes/poshlib/all/conanfile.py
#	recipes/prometheus-cpp/all/conanfile.py
#	recipes/protobuf/all/conanfile.py
#	recipes/ptex/all/conanfile.py
#	recipes/qpdf/all/conanfile.py
#	recipes/readosm/all/conanfile.py
#	recipes/redboltz-mqtt_cpp/all/conanfile.py
#	recipes/restinio/all/conanfile.py
#	recipes/roaring/all/conanfile.py
#	recipes/rsync/all/conanfile.py
#	recipes/seasocks/all/conanfile.py
#	recipes/sentry-crashpad/all/conanfile.py
#	recipes/serd/all/conanfile.py
#	recipes/shapelib/all/conanfile.py
#	recipes/simdjson/all/conanfile.py
#	recipes/soplex/all/conanfile.py
#	recipes/spectra/all/conanfile.py
#	recipes/symengine/all/conanfile.py
#	recipes/taglib/all/conanfile.py
#	recipes/taocpp-taopq/all/conanfile.py
#	recipes/tcl/all/conanfile.py
#	recipes/tinyexr/all/conanfile.py
#	recipes/tk/all/conanfile.py
#	recipes/tk/all/test_package/CMakeLists.txt
#	recipes/tk/all/test_package/conanfile.py
#	recipes/tk/all/test_v1_package/CMakeLists.txt
#	recipes/tk/all/test_v1_package/conanfile.py
#	recipes/tmx/all/conanfile.py
#	recipes/tng/all/conanfile.py
#	recipes/tscns/all/conanfile.py
#	recipes/tscns/all/test_v1_package/CMakeLists.txt
#	recipes/tsl-array-hash/all/conanfile.py
#	recipes/tsl-array-hash/all/test_v1_package/CMakeLists.txt
#	recipes/tsl-hat-trie/all/conanfile.py
#	recipes/tsl-hat-trie/all/test_v1_package/CMakeLists.txt
#	recipes/tsl-ordered-map/all/conanfile.py
#	recipes/tsl-robin-map/all/conanfile.py
#	recipes/tsl-sparse-map/all/conanfile.py
#	recipes/tsl-sparse-map/all/test_v1_package/CMakeLists.txt
#	recipes/tuplet/all/conanfile.py
#	recipes/uncrustify/all/conanfile.py
#	recipes/units/all/conanfile.py
#	recipes/units/all/test_v1_package/CMakeLists.txt
#	recipes/utf8.h/all/conanfile.py
#	recipes/utf8.h/all/test_v1_package/CMakeLists.txt
#	recipes/uwebsockets/all/conanfile.py
#	recipes/v-hacd/all/conanfile.py
#	recipes/valijson/all/conanfile.py
#	recipes/valijson/all/test_package/conanfile.py
#	recipes/valijson/all/test_v1_package/CMakeLists.txt
#	recipes/valijson/all/test_v1_package/conanfile.py
#	recipes/vc/all/conanfile.py
#	recipes/vc/all/test_v1_package/CMakeLists.txt
#	recipes/vcglib/all/conanfile.py
#	recipes/vcglib/all/test_v1_package/CMakeLists.txt
#	recipes/vectorclass/all/conanfile.py
#	recipes/vectorclass/all/test_v1_package/CMakeLists.txt
#	recipes/vectorial/all/conanfile.py
#	recipes/vectorial/all/test_v1_package/CMakeLists.txt
#	recipes/vir-simd/all/conanfile.py
#	recipes/vtu11/all/conanfile.py
#	recipes/watcher/all/conanfile.py
#	recipes/watcher/all/test_package/CMakeLists.txt
#	recipes/watcher/all/test_package/test_package.cpp
#	recipes/wayland/all/test_package/conanfile.py
#	recipes/websocketpp/all/conanfile.py
#	recipes/wildmidi/all/conanfile.py
#	recipes/winmd/all/conanfile.py
#	recipes/wt/all/conanfile.py
#	recipes/wyhash/all/conanfile.py
#	recipes/xapian-core/all/conanfile.py
#	recipes/xege/all/conanfile.py
#	recipes/xorstr/all/conanfile.py
#	recipes/xpack/all/conanfile.py
#	recipes/xproperty/all/conanfile.py
#	recipes/zint/all/conanfile.py
#	recipes/zint/all/test_package/conanfile.py
#	recipes/zint/all/test_v1_package/CMakeLists.txt
#	recipes/zopfli/all/conanfile.py
#	recipes/zopfli/all/test_v1_package/CMakeLists.txt
#	recipes/zpp_throwing/all/conanfile.py
#	recipes/zstr/all/conanfile.py
#	recipes/zziplib/all/conanfile.py
  • Loading branch information
valgur committed Oct 4, 2023
2 parents 338a452 + 0f03fba commit 85ac722
Show file tree
Hide file tree
Showing 596 changed files with 7,943 additions and 7,043 deletions.
9 changes: 9 additions & 0 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1228,3 +1228,12 @@ authorized_users:
- temap
- vient
- bryce-cahill
- alfred-sa
- leducp
- mrjoel
- Nerixyz
- irieger
- Slashcash
- CJaccarino
- gagoi
- tux3
62 changes: 62 additions & 0 deletions .c3i/conan_v2_ready_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ required_for_references:
- args-parser
- argtable2
- argtable3
- armadillo
- arrow
- arsenalgear
- artery-font-format
Expand Down Expand Up @@ -81,6 +82,7 @@ required_for_references:
- bazel
- bdwgc
- bear
- beauty
- benchmark
- bertrand
- bgfx
Expand Down Expand Up @@ -133,6 +135,7 @@ required_for_references:
- catch2
- ccache
- cccl
- ccfits
- cctz
- cd3-boost-unit-definitions
- celero
Expand All @@ -148,6 +151,7 @@ required_for_references:
- charls
- chef-fun
- chipmunk2d
- choc
- cimg
- circularbuffer
- cista
Expand All @@ -162,10 +166,12 @@ required_for_references:
- clipper2
- clove-unit
- cmake
- cminpack
- cmocka
- cmp
- cn-cbor
- cnpy
- cocoyaxi
- coin-cgl
- coin-clp
- coin-lemon
Expand All @@ -176,6 +182,7 @@ required_for_references:
- concurrentqueue
- console_bridge
- continuable
- coost
- corrade
- cotila
- cpp-httplib
Expand Down Expand Up @@ -205,15 +212,18 @@ required_for_references:
- cpuinfo
- cqrlib
- crc32c
- crc_cpp
- create-dmg
- croncpp
- crowcpp-crow
- crunch
- cryptopp
- cs_libguarded
- csm
- cspice
- csvmonkey
- ctml
- ctpg
- ctre
- cub
- cubicinterpolation
Expand Down Expand Up @@ -327,6 +337,9 @@ required_for_references:
- flecs
- flex
- fltk
- fmi1
- fmi2
- fmi3
- fmt
- fmtlog
- fontconfig
Expand All @@ -344,6 +357,7 @@ required_for_references:
- freexl
- fribidi
- frozen
- frugally-deep
- fruit
- ftxui
- function2
Expand Down Expand Up @@ -500,6 +514,7 @@ required_for_references:
- ktx
- kuba-zip
- laszip
- lazycsv
- lcms
- ldns
- lefticus-tools
Expand All @@ -510,6 +525,7 @@ required_for_references:
- lest
- leveldb
- lexbor
- libaesgm
- libaio
- libalsa
- libaom-av1
Expand All @@ -521,6 +537,7 @@ required_for_references:
- libb2
- libbacktrace
- libbigwig
- libbpf
- libbsd
- libcap
- libcbor
Expand Down Expand Up @@ -601,6 +618,7 @@ required_for_references:
- libnoise
- libnop
- libnova
- libnpy
- libnuma
- libpcap
- libpciaccess
Expand Down Expand Up @@ -710,6 +728,7 @@ required_for_references:
- mariadb-connector-c
- marisa
- matchit
- mathfu
- mathter
- matio
- mattiasgustavsson-libs
Expand Down Expand Up @@ -790,6 +809,7 @@ required_for_references:
- newmat
- nextsilicon-cpp-subprocess
- nfrechette-acl
- nghttp3
- ninja
- nlohmann_json
- nlopt
Expand All @@ -814,6 +834,7 @@ required_for_references:
- octo-encryption-cpp
- octo-keygen-cpp
- octo-logger-cpp
- octo-wildcardmatching-cpp
- octomap
- odbc
- ode
Expand All @@ -826,6 +847,7 @@ required_for_references:
- onnx
- onnxruntime
- open-dis-cpp
- open62541
- openal
- openal-soft
- openapi-generator
Expand Down Expand Up @@ -894,7 +916,9 @@ required_for_references:
- pipes
- pixman
- pkgconf
- platform.converters
- platform.delegates
- platform.equality
- platform.exceptions
- platform.hashing
- platform.interfaces
Expand Down Expand Up @@ -975,6 +999,7 @@ required_for_references:
- reckless
- rectanglebinpack
- rectpack2d
- redboltz-mqtt_cpp
- redis-plus-plus
- refl-cpp
- replxx
Expand Down Expand Up @@ -1021,6 +1046,7 @@ required_for_references:
- sentry-crashpad
- sentry-native
- seqan
- seqan3
- serd
- serdepp
- sfml
Expand Down Expand Up @@ -1051,6 +1077,7 @@ required_for_references:
- soxr
- span-lite
- spdlog
- spectra
- spirv-cross
- spirv-headers
- spirv-tools
Expand All @@ -1062,6 +1089,7 @@ required_for_references:
- sqlpp11
- squirrel
- ssht
- ssp
- st_tree
- statslib
- status-code
Expand All @@ -1074,6 +1102,7 @@ required_for_references:
- streamvbyte
- string-view-lite
- stringtoolbox
- stringzilla
- strong_type
- structopt
- sundials
Expand All @@ -1089,6 +1118,7 @@ required_for_references:
- taocpp-operators
- taocpp-pegtl
- taocpp-sequences
- taocpp-taopq
- taocpp-tuple
- taskflow
- taywee-args
Expand Down Expand Up @@ -1126,6 +1156,7 @@ required_for_references:
- tinyspline
- tinyxml
- tinyxml2
- tk
- tl
- tl-expected
- tl-function-ref
Expand All @@ -1143,14 +1174,24 @@ required_for_references:
- tree-sitter-c
- troldal-zippy
- trompeloeil
- tscns
- tsil
- tsl-array-hash
- tsl-hat-trie
- tsl-hopscotch-map
- tsl-ordered-map
- tsl-robin-map
- tsl-sparse-map
- tuplet
- turtle
- type_safe
- tz
- ua-nodeset
- uchardet
- uncrustify
- uni-algo
- unicorn
- units
- unity
- univalue
- unordered_dense
Expand All @@ -1160,21 +1201,29 @@ required_for_references:
- uriparser
- usockets
- usrsctp
- utf8.h
- utf8proc
- utfcpp
- util-linux-libuuid
- uvw
- uwebsockets
- v-hacd
- vaapi
- valijson
- variant-lite
- vc
- vcglib
- vdpau
- vectorclass
- vectorial
- veque
- vincentlaucsb-csv-parser
- vir-simd
- visit_struct
- vo-amrwbenc
- volk
- vorbis
- voropp
- vsg
- vtu11
- vulkan-headers
Expand All @@ -1196,18 +1245,22 @@ required_for_references:
- whereami
- whisper-cpp
- wil
- wildmidi
- winflexbison
- winmd
- wiringpi
- wise_enum
- wolfssl
- wslay
- wt
- wtl
- wyhash
- xapian-core
- xbyak
- xerces-c
- xkbcommon
- xkeyboard-config
- xlnt
- xlsxio
- xmlsec
- xnnpack
Expand All @@ -1217,7 +1270,10 @@ required_for_references:
- xorg-macros
- xorg-makedepend
- xorg-proto
- xorstr
- xoshiro-cpp
- xpack
- xproperty
- xsd
- xsimd
- xtensor
Expand All @@ -1231,19 +1287,25 @@ required_for_references:
- yaml-cpp
- yas
- yasm
- yder
- yyjson
- z3
- zbar
- zeromq
- zfp
- zimg
- zint
- zlib
- zlib-ng
- zmarok-semver
- zmqpp
- zookeeper-client-c
- zopfli
- zpp_bits
- zpp_throwing
- zstd
- zstr
- zug
- zulu-openjdk
- zxing-cpp
- zziplib
Loading

0 comments on commit 85ac722

Please sign in to comment.