Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into update/vulkan-val…
Browse files Browse the repository at this point in the history
…idationlayers

# Conflicts:
#	recipes/vulkan-validationlayers/all/conanfile.py
  • Loading branch information
valgur committed Sep 18, 2024
2 parents d0b1ba3 + 0586167 commit 7dd4f01
Show file tree
Hide file tree
Showing 1,321 changed files with 18,834 additions and 12,685 deletions.
47 changes: 46 additions & 1 deletion .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ authorized_users:
- kletoz
- agilemapper
- ZXfkSIE
- RubenRBS
- AbrilRBS
- Alex-PLACET
- antekone
- ambroff
Expand Down Expand Up @@ -1377,3 +1377,48 @@ authorized_users:
- glywk
- aniederl
- SvenRoederer
- MridulS
- leemaguire
- RobinQu
- MatthewRasa
- jan-kelemen
- xiadnoring
- FeignClaims
- husitawi
- fpoirotte
- cuppajoeman
- vsbogd
- Nevermore1994
- maciejjablonsky
- luc-c
- willprice
- pasbi
- liuzicheng1987
- guyutongxue
- ciclark
- John-LittleBearLabs
- jasal82
- philipp-m-w
- nine
- OMGtechy
- sabapathi20
- seekstar
- dcoburnMEDITECH
- mattangus
- arnaudmathias
- hankhsu1996
- stephematician
- awest03
- sun-mir
- fhamonic
- simbahebinbo
- alessiosacco
- Blackflame576
- Bakul-Gaur
- itsmejoeeey
- JustCallMeRay
- shun2wang
- czheng-bt
- jorgen
- simshi
- alatarum
43 changes: 43 additions & 0 deletions .c3i/conan_v2_ready_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ required_for_references:
- args-parser
- argtable2
- argtable3
- argz
- armadillo
- arrow
- arsenalgear
Expand All @@ -58,6 +59,7 @@ required_for_references:
- asyncly
- asyncplusplus
- asyncpp
- atomic_queue
- audiofile
- autoconf
- autoconf-archive
Expand All @@ -81,6 +83,8 @@ required_for_references:
- aws-lambda-cpp
- aws-libfabric
- aws-sdk-cpp
- azure-sdk-for-cpp
- azure-storage-cpp
- b2
- b64
- backport-cpp
Expand All @@ -90,6 +94,7 @@ required_for_references:
- bandit
- base64
- basu
- battery-embed
- bazel
- bdwgc
- bear
Expand Down Expand Up @@ -177,6 +182,7 @@ required_for_references:
- chipmunk2d
- choc
- chunkio
- cigi-ccl
- cimg
- circularbuffer
- cista
Expand Down Expand Up @@ -207,6 +213,7 @@ required_for_references:
- coin-osi
- coin-utils
- commata
- compute_library
- concurrencpp
- concurrentqueue
- console_bridge
Expand Down Expand Up @@ -276,6 +283,7 @@ required_for_references:
- cuda-samples
- cunit
- cute_headers
- cutlass
- cvplot
- cwalk
- cxxgraph
Expand Down Expand Up @@ -390,6 +398,7 @@ required_for_references:
- ezc3d
- faac
- fakeit
- faker-cxx
- farmhash
- fast-cdr
- fast-cpp-csv-parser
Expand All @@ -408,6 +417,7 @@ required_for_references:
- fftw
- fire-hpp
- fixed-containers
- fixed_math
- flac
- flann
- flatbuffers
Expand All @@ -423,6 +433,7 @@ required_for_references:
- fmi3
- fmt
- fmtlog
- folly
- fontconfig
- foonathan-lexy
- foonathan-memory
Expand Down Expand Up @@ -450,6 +461,7 @@ required_for_references:
- fusepp
- fxdiv
- g3log
- gaia-ecs
- gainput
- gamenetworkingsockets
- gamma
Expand All @@ -465,6 +477,7 @@ required_for_references:
- geographiclib
- geos
- geotrans
- getdns
- getopt-for-visual-studio
- gettext
- gf-complete
Expand Down Expand Up @@ -495,6 +508,7 @@ required_for_references:
- gnu-config
- gnulib
- gnutls
- gobject-introspection
- godot-cpp
- godot_headers
- googleapis
Expand All @@ -513,6 +527,7 @@ required_for_references:
- gtest
- gtk
- gtk-doc-stub
- gtlab-logging
- gtsam
- guetzli
- gumbo-parser
Expand Down Expand Up @@ -581,6 +596,7 @@ required_for_references:
- inversify-cpp
- iowow
- ipaddress
- iphreeqc
- iqa
- irrxml
- isa-l
Expand Down Expand Up @@ -649,6 +665,7 @@ required_for_references:
- lest
- leveldb
- lexbor
- libaec
- libaesgm
- libaio
- libalsa
Expand All @@ -658,6 +675,7 @@ required_for_references:
- libatomic_ops
- libattr
- libavif
- libavrocpp
- libb2
- libbacktrace
- libbasisu
Expand Down Expand Up @@ -703,6 +721,7 @@ required_for_references:
- libevdev
- libevent
- libexif
- libfabric
- libfdk_aac
- libffi
- libfork
Expand Down Expand Up @@ -736,8 +755,10 @@ required_for_references:
- libipt
- libjpeg
- libjpeg-turbo
- libjxl
- libkml
- libliftoff
- liblqr
- liblsl
- libltc
- liblzf
Expand All @@ -748,6 +769,7 @@ required_for_references:
- libmd
- libmediainfo
- libmemcached
- libmeshb
- libmetalink
- libmicrohttpd
- libmikmod
Expand Down Expand Up @@ -777,7 +799,9 @@ required_for_references:
- libpcap
- libpciaccess
- libpfm4
- libphonenumber
- libpng
- libpointmatcher
- libpq
- libpqxx
- libproperties
Expand Down Expand Up @@ -806,6 +830,7 @@ required_for_references:
- libslz
- libsmacker
- libsndfile
- libsndio
- libsodium
- libsolace
- libspatialindex
Expand Down Expand Up @@ -873,6 +898,7 @@ required_for_references:
- lksctp-tools
- llama-cpp
- llhttp
- llnl-units
- llvm-openmp
- lmdb
- lodepng
Expand Down Expand Up @@ -945,6 +971,7 @@ required_for_references:
- mimalloc
- mingw-builds
- mingw-w64
- minhook
- mini
- miniaudio
- minicoro
Expand All @@ -956,6 +983,7 @@ required_for_references:
- miniz
- minizip
- minizip-ng
- minmea
- mio
- mlpack
- mm_file
Expand Down Expand Up @@ -1003,6 +1031,7 @@ required_for_references:
- nasm
- ncurses
- neargye-semver
- net-snmp
- netcdf
- nettle
- newmat
Expand Down Expand Up @@ -1087,9 +1116,11 @@ required_for_references:
- openjpeg
- openldap
- openmesh
- openmpi
- openmvg
- openpam
- openscenegraph
- openslide
- openssh
- openssl
- opensubdiv
Expand All @@ -1114,6 +1145,7 @@ required_for_references:
- ozz-animation
- p-ranav-glob
- p7zip
- pagmo2
- paho-mqtt-c
- paho-mqtt-cpp
- pango
Expand Down Expand Up @@ -1180,6 +1212,7 @@ required_for_references:
- poppler-data
- popt
- portable-file-dialogs
- poselib
- poshlib
- pprint
- pranav-csv2
Expand Down Expand Up @@ -1221,11 +1254,13 @@ required_for_references:
- quaternions
- quazip
- quickcpplib
- quickfast
- quickfix
- quickjs
- quill
- quirc
- qwt
- qxmpp
- r8brain-free-src
- rabbitmq-c
- ragel
Expand All @@ -1248,6 +1283,7 @@ required_for_references:
- readerwriterqueue
- readline
- readosm
- rebound
- recastnavigation
- reckless
- rectanglebinpack
Expand Down Expand Up @@ -1291,6 +1327,7 @@ required_for_references:
- sassc
- sbepp
- sbp
- scc
- scdoc
- scip
- scippp
Expand All @@ -1302,6 +1339,7 @@ required_for_references:
- sdf
- sdl
- sdl_image
- sdl_mixer
- sdl_net
- sdl_ttf
- seadex-essentials
Expand Down Expand Up @@ -1332,6 +1370,7 @@ required_for_references:
- simfil
- simple-websocket-server
- simple-yaml
- simple_enum
- sioclient
- sjson-cpp
- skyr-url
Expand Down Expand Up @@ -1397,6 +1436,7 @@ required_for_references:
- svector
- svgpp
- svgwrite
- swig
- symengine
- systemc
- systemc-cci
Expand Down Expand Up @@ -1568,6 +1608,7 @@ required_for_references:
- wil
- wildcards
- wildmidi
- wineditline
- winflexbison
- winmd
- winreg
Expand All @@ -1577,6 +1618,7 @@ required_for_references:
- wslay
- wt
- wtl
- wxwidgets
- wyhash
- xapian-core
- xbyak
Expand Down Expand Up @@ -1613,6 +1655,7 @@ required_for_references:
- yandex-ozo
- yas
- yasm
- ydcpp-tcpcat
- yder
- yoga
- yomm2
Expand Down
2 changes: 1 addition & 1 deletion .c3i/config_v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
id: 'conan-io/conan-center-index'

conan:
version: 1.64.1
version: 1.65.0

artifactory:
url: "https://c3i.jfrog.io/c3i"
Expand Down
Loading

0 comments on commit 7dd4f01

Please sign in to comment.