Merge branch 'master' of github.com:conan-io/conan-center-index into …

…cmake-combined-recipe

- Resolved conflicts.

- Updated recipes/cmake/combined/conandata.yml to use CMake 3.26.4
  instead of 3.26.3

* 'master' of github.com:conan-io/conan-center-index: (219 commits)
  (conan-io#17379) zpp_bits: add version 4.4.17, add package_type
  (conan-io#17811) mongo-c-driver: add version 1.23.4
  (conan-io#17824) [bot] Update list of references (prod-v2/ListPackages)
  (conan-io#17827) [bot] Update authorized users list (2023-06-05)
  (conan-io#17791) c4core: update fast_float
  (conan-io#17447) llhttp: conan v2 support
  (conan-io#17821) daw_utf_range: update daw_header_libraries
  (conan-io#17819) add mbits-diags/0.9.5
  (conan-io#17471) Add Boost 1.82.0
  (conan-io#17816) uni-algo: add version 0.8.1
  (conan-io#17815) flatbuffers: add version 23.5.26
  (conan-io#17801) Bring tl-function to conan2
  (conan-io#17802) Bring ring-span-lite to conan2
  (conan-io#16572) ragel: support conan v2
  (conan-io#17244) Z3: Revise the recipe to support Conan v2 and add the latest four minor releases.
  (conan-io#17355) avahi/0.8: Disable the use of the setproctitle function on Linux
  (conan-io#17744) Bumped CMake to 3.26.4
  (conan-io#17763) Libwebsockets support for conan2
  (conan-io#17808) octo-logger-cpp: add version 1.4.0
  (conan-io#17428) Add libmemcached library
  ...

.c3i/authorized_users.yml

@@ -1151,3 +1151,22 @@ authorized_users:
 - JGatley
 - christapley
 - mpimenov
+- ashvardanian
+- 7bitcoder
+- samuaz
+- zajo
+- bruchar1
+- pskoko
+- marcus-sonestedt
+- amrox
+- tristanpenman
+- schmidjo82
+- hiiizxf
+- ftena
+- tkhyn
+- Hagartinger
+- perseoGI
+- krabbstek
+- fcorso2016
+- seboste
+- Sa3eedove

.c3i/conan_v2_ready_references.yml

@@ -1,4 +1,6 @@
 required_for_references:
+- 7bitdi
+- 7zip
 - aaf
 - aaplus
 - abseil
@@ -7,6 +9,7 @@ required_for_references:
 - ada
 - ade
 - aeron
+- aggeom-agg
 - alac
 - alpaca
 - amgcl
@@ -39,8 +42,10 @@ required_for_references:
 - autoconf
 - automake
 - avir
+- aws-c-cal
 - aws-c-common
 - aws-c-compression
+- aws-c-sdkutils
 - aws-checksums
 - b2
 - b64
@@ -73,6 +78,7 @@ required_for_references:
 - brigand
 - brotli
 - brynet
+- bshoshany-thread-pool
 - bullet3
 - butteraugli
 - bvdberg-ctest
@@ -140,6 +146,7 @@ required_for_references:
 - cppcheck
 - cppcodec
 - cppfront
+- cppitertools
 - cpptoml
 - cppunit
 - cpputest
@@ -233,6 +240,7 @@ required_for_references:
 - fxdiv
 - g3log
 - gamma
+- gdbm
 - gdcm
 - gdk-pixbuf
 - gemmlowp
@@ -243,6 +251,7 @@ required_for_references:
 - ghc-filesystem
 - giflib
 - ginkgo
+- gklib
 - glad
 - glfw
 - gli
@@ -256,15 +265,18 @@ required_for_references:
 - gnutls
 - googleapis
 - gperf
+- graphene
 - grpc
 - grpc-proto
 - gsl
 - gsl-lite
 - gsoap
+- gstreamer
 - gtest
 - gtk
 - gurkenlaeufer
 - h3
+- h5pp
 - harfbuzz
 - hdf5
 - hdrhistogram-c
@@ -307,6 +319,7 @@ required_for_references:
 - lexbor
 - libalsa
 - libarchive
+- libassert
 - libatomic_ops
 - libattr
 - libbacktrace
@@ -342,18 +355,24 @@ required_for_references:
 - libkml
 - liblsl
 - libltc
+- liblzf
+- libmad
+- libmikmod
 - libmodbus
 - libmodplug
 - libmorton
 - libmount
 - libmp3lame
 - libmysqlclient
 - libnabo
+- libnfs
+- libnghttp2
 - libnop
 - libnova
 - libnuma
 - libpcap
 - libpciaccess
+- libpfm4
 - libpng
 - libpq
 - libpqxx
@@ -365,6 +384,7 @@ required_for_references:
 - librttopo
 - libsamplerate
 - libselinux
+- libserial
 - libsgp4
 - libsmacker
 - libsndfile
@@ -389,6 +409,7 @@ required_for_references:
 - libvips
 - libvpx
 - libwebp
+- libwebsockets
 - libx264
 - libx265
 - libxls
@@ -403,12 +424,16 @@ required_for_references:
 - lodepng
 - lua
 - luau
+- lunasvg
 - lz4
+- lzma_sdk
+- lzo
 - m4
 - magic_enum
 - make
 - mariadb-connector-c
 - matchit
+- mawk
 - mbedtls
 - md4c
 - md4qt
@@ -417,6 +442,7 @@ required_for_references:
 - mgs
 - mikelankamp-fpm
 - mimalloc
+- miniaudio
 - minisat
 - minizip
 - minizip-ng
@@ -427,6 +453,7 @@ required_for_references:
 - msgpack-c
 - msgpack-cxx
 - msys2
+- naive-tsearch
 - namedtype
 - nameof
 - nanoflann
@@ -451,6 +478,7 @@ required_for_references:
 - openal
 - openal-soft
 - openapi-generator
+- opencl-clhpp-headers
 - opencl-headers
 - opencl-icd-loader
 - openexr
@@ -461,6 +489,8 @@ required_for_references:
 - openjpeg
 - openmesh
 - openssl
+- opensubdiv
+- opentelemetry-proto
 - optional-lite
 - opus
 - opusfile
@@ -470,14 +500,17 @@ required_for_references:
 - paho-mqtt-cpp
 - patchelf
 - pcapplusplus
+- pcg-cpp
 - pcre
 - pcre2
 - pdfgen
 - pfr
 - physx
 - picobench
 - picojson
+- pixman
 - pkgconf
+- plutovg
 - poco
 - popt
 - proj
@@ -490,11 +523,14 @@ required_for_references:
 - pugixml
 - pulseaudio
 - pybind11
+- pystring
 - qhull
 - qpdf
+- quantlib
 - quill
 - quirc
 - rabbitmq-c
+- ragel
 - rang
 - range-v3
 - rapidcheck
@@ -506,27 +542,37 @@ required_for_references:
 - readerwriterqueue
 - readline
 - readosm
+- rectpack2d
+- replxx
 - restbed
 - restinio
+- ring-span-lite
 - roaring
 - robin-hood-hashing
 - rttr
 - ruy
 - s2n
+- samurai
+- sbepp
 - scnlib
 - screen_capture_lite
+- sdbus-cpp
 - sdl
 - sdl_image
 - seadex-essentials
 - semimap
 - sentry-breakpad
 - serd
+- sfml
 - shield
 - sigslot
 - simdjson
 - simdutf
+- skyr-url
+- sml
 - snappy
 - soci
+- sophus
 - soplex
 - soxr
 - span-lite
@@ -553,15 +599,19 @@ required_for_references:
 - termcap
 - threadpool
 - thrift
+- thrust
 - tinycthread
 - tinycthreadpool
 - tinyexif
 - tinymidi
+- tinyxml
 - tinyxml2
 - tl-expected
+- tl-function-ref
 - tlx
 - toml11
 - trantor
+- turtle
 - uni-algo
 - unicorn
 - univalue
@@ -570,19 +620,24 @@ required_for_references:
 - uriparser
 - utf8proc
 - utfcpp
+- uvw
 - vaapi
 - variant-lite
 - vdpau
 - veque
 - vincentlaucsb-csv-parser
+- vir-simd
+- visit_struct
 - volk
 - vorbis
 - vtu11
 - vulkan-headers
 - vulkan-loader
+- vulkan-memory-allocator
 - vulkan-validationlayers
 - wasmtime
 - wasmtime-cpp
+- watcher
 - wayland
 - wayland-protocols
 - websocketpp
@@ -599,6 +654,7 @@ required_for_references:
 - xerces-c
 - xkbcommon
 - xkeyboard-config
+- xlsxio
 - xmlsec
 - xnnpack
 - xorg
@@ -617,6 +673,9 @@ required_for_references:
 - yajl
 - yaml-cpp
 - yasm
+- yyjson
+- z3
+- zbar
 - zeromq
 - zfp
 - zimg

.c3i/config_v1.yml

@@ -162,7 +162,7 @@ node_labels:
   Windows:
     x86_64:
       "Visual Studio":
-        default: "windows20221212"
+        default: "windows20230531"
   Macos:
     x86_64:
       "apple-clang":

.c3i/config_v2.yml

@@ -120,7 +120,7 @@ node_labels:
   Windows:
     x86_64:
       "msvc":
-        default: "windows20221212"
+        default: "windows20230531"
   Macos:
     x86_64:
       "apple-clang":

.gitignore

@@ -3,6 +3,7 @@
 **/test_package/build-*/
 **/test_package/test_output/
 conan.lock
+conanbuildinfo.cmake
 conanbuildinfo.txt
 conaninfo.txt
 graph_info.json

docs/adding_packages/conanfile_attributes.md

@@ -33,6 +33,7 @@ Same as the _recipe folder_ and always lowercase.
 Please see the FAQs for:
 
 * [name collisions](../faqs.md#what-is-the-policy-on-recipe-name-collisions)
+* [naming forks](../faqs.md##what-is-the-policy-for-naming-forks)
 * [space and symbols](../faqs.md#should-reference-names-use---or-_)
 
 ### Version

docs/adding_packages/test_packages.md

@@ -20,7 +20,7 @@ themselves. It's possible to have ConanCenter run `conan test` on more then one
 See the [recipe files and structures](README.md#recipe-files-structure) for a visual.
 
 All ConanCenterIndex recipe should have a two [test_folders](https://docs.conan.io/1/reference/commands/creator/create.html?highlight=test_folder)
-One for the current CMake generator in `test_package/` and on for the deprecated generators in `test_v1_package/`.
+One for the current CMake generator in `test_package/`.
 
 Please refer to the [Package Templates](../package_templates/) for the current practices about which files and what their content should be.
 
@@ -39,11 +39,7 @@ target_link_libraries(test_ranges PRIVATE fmt::fmt)
 
 Refer to the [package template](https://github.com/conan-io/conan-center-index/blob/master/docs/package_templates/cmake_package/all/test_package/CMakeLists.txt) for more examples.
 
-> **Notes** It's still important to test targets provided by `cmake_find_package[_multi]` generators.
-> It should help in the migration (and compatibility) with Conan v2. See [v1 test package template](https://github.com/conan-io/conan-center-index/blob/master/docs/package_templates/cmake_package/all/test_v1_package/CMakeLists.txt) for details.
-> You can see read [this conversation](https://github.com/conan-io/conan-center-index/issues/12888#issuecomment-1290817799) for more context.
-
-In ConanCenter we try to accurately represent the names of the targets and the information provided by CMake's modules and config files that some libraries
+In ConanCenterIndex, we try to accurately represent the names of the targets and the information provided by CMake's modules and config files that some libraries
 provide. If CMake or the library itself don't enforce any target name, the default ones provided by Conan should be recommended. The minimal project
 in the `test_package` folder should serve as an example of the best way to consume the package, and targets are preferred over raw variables.
 
@@ -60,7 +56,7 @@ of them together in the testing logs.
 Sometimes it is useful to test the package using different build systems (CMake, Autotools,...). Instead of adding complex logic to one
 `test_package/conanfile.py` file, it is better to add another `test_<something>/conanfile.py` file with a minimal example for that build system. That
 way the examples will be short and easy to understand and maintain. In some other situations it could be useful to test different Conan generators
-(`cmake_find_package`, `CMakeDeps`,...) using different folders and `conanfile.py` files.
+(e.g. `CMakeDeps`) using different folders and `conanfile.py` files.
 
 When using more than one `test_<something>` folder, create a different project for each of them to keep the content of the `conanfile.py` and the
 project files as simple as possible, without the need of extra logic to handle different scenarios.