Merge branch 'master' into master

.c3i/authorized_users.yml

@@ -1252,3 +1252,8 @@ authorized_users:
 - Subash-Lamichhane
 - rezvee6
 - SpiffGreen
+- hegyizs
+- kkloberdanz
+- martin-olivier
+- lucaskdc
+- fnadeau

.c3i/conan_v2_ready_references.yml

@@ -6,6 +6,7 @@ required_for_references:
 - aaplus
 - abseil
 - absent
+- acado
 - access_private
 - acl
 - ada
@@ -259,6 +260,7 @@ required_for_references:
 - deco
 - di
 - dice-template-library
+- directx-headers
 - dirent
 - discount
 - djinni-generator
@@ -305,13 +307,15 @@ required_for_references:
 - enhex-generic_serialization
 - enhex-strong_type
 - enkits
+- ensmallen
 - entityx
 - entt
 - enum-flags
 - erikzenker-hsm
 - erkir
 - etc2comp
 - eternal
+- ethash
 - etl
 - evmc
 - exiv2
@@ -873,6 +877,7 @@ required_for_references:
 - ode
 - ogdf
 - ogg
+- ohnet
 - ois
 - onedpl
 - onetbb
@@ -912,6 +917,7 @@ required_for_references:
 - opentelemetry-cpp
 - opentelemetry-proto
 - opentracing-cpp
+- openvino
 - openxlsx
 - optional-lite
 - opus
@@ -920,6 +926,7 @@ required_for_references:
 - osqp
 - out_ptr
 - outcome
+- ozz-animation
 - p-ranav-glob
 - paho-mqtt-c
 - paho-mqtt-cpp
@@ -1007,6 +1014,7 @@ required_for_references:
 - qpoases
 - qr-code-generator
 - qt
+- qtawesome
 - quantlib
 - quaternions
 - quazip
@@ -1091,11 +1099,13 @@ required_for_references:
 - seqan3
 - serd
 - serdepp
+- serf
 - serial
 - sfml
 - shapelib
 - shield
 - si
+- signals-light
 - sigslot
 - simde
 - simdjson
@@ -1140,6 +1150,7 @@ required_for_references:
 - status-value-lite
 - stb
 - stc
+- stdgpu
 - stduuid
 - stlab
 - strawberryperl
@@ -1297,6 +1308,7 @@ required_for_references:
 - wglext
 - whereami
 - whisper-cpp
+- wide-integer
 - wil
 - wildmidi
 - winflexbison
@@ -1363,4 +1375,5 @@ required_for_references:
 - zug
 - zulu-openjdk
 - zxing-cpp
+- zyre
 - zziplib

recipes/ada/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "2.7.2":
+    url: "https://github.com/ada-url/ada/archive/v2.7.2.tar.gz"
+    sha256: "4dea9dd6a46695547da2dac3dc7254d32187cd35d3170179c0cdc0900090c025"
   "2.7.0":
     url: "https://github.com/ada-url/ada/archive/v2.7.0.tar.gz"
     sha256: "08646b8a41cd6367b282aab2c87c82e5ce4876078a0cbe0799af7e51e4358591"

recipes/ada/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "2.7.2":
+    folder: all
   "2.7.0":
     folder: all
   "2.6.10":

recipes/asio/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.28.2":
+    url: "https://github.com/chriskohlhoff/asio/archive/asio-1-28-2.tar.gz"
+    sha256: "5705a0e403017eba276625107160498518838064a6dd7fd8b00b2e30c0ffbdee"
   "1.28.1":
     url: "https://github.com/chriskohlhoff/asio/archive/asio-1-28-1.tar.gz"
     sha256: "5ff6111ec8cbe73a168d997c547f562713aa7bd004c5c02326f0e9d579a5f2ce"

recipes/asio/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.28.2":
+    folder: all
   "1.28.1":
     folder: all
   "1.28.0":

recipes/cairo/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.18.0":
+    folder: meson
   "1.17.6":
     folder: meson
   "1.17.4":

recipes/cairo/meson/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.18.0":
+    sha256: "abf8fba4d510086a492783c3e0828e90b32734738fd80906595617d229d02bab"
+    url: "https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.18.0/cairo-1.18.0.tar.bz2"
   "1.17.6":
     sha256: "90496d135c9ef7612c98f8ee358390cdec0825534573778a896ea021155599d2"
     url: "https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.6/cairo-1.17.6.tar.bz2"

recipes/cairo/meson/conanfile.py

@@ -80,7 +80,7 @@ def config_options(self):
             del self.options.with_xlib_xrender
             del self.options.with_xcb
             del self.options.with_symbol_lookup
-        if self.settings.os in ["Macos", "Windows"]:
+        if self.settings.os in ["Macos", "Windows"] or Version(self.version) >= "1.18.0":
             del self.options.with_opengl
 
     def configure(self):
@@ -135,7 +135,7 @@ def validate(self):
                 )
 
     def build_requirements(self):
-        self.tool_requires("meson/1.2.2")
+        self.tool_requires("meson/1.2.3")
         if not self.conf.get("tools.gnu:pkg_config", check_type=str):
             self.tool_requires("pkgconf/2.0.3")
 
@@ -164,16 +164,17 @@ def is_enabled(value):
         else:
             options["xcb"] = "disabled"
             options["xlib"] = "disabled"
-        if self.options.get_safe("with_opengl") == "desktop":
-            options["gl-backend"] = "gl"
-        elif self.options.get_safe("with_opengl") == "gles2":
-            options["gl-backend"] = "glesv2"
-        elif self.options.get_safe("with_opengl") == "gles3":
-            options["gl-backend"] = "glesv3"
-        else:
-            options["gl-backend"] = "disabled"
-        options["glesv2"] = is_enabled(self.options.get_safe("with_opengl") == "gles2")
-        options["glesv3"] = is_enabled(self.options.get_safe("with_opengl") == "gles3")
+        if Version(self.version) < "1.18.0":
+            if self.options.get_safe("with_opengl") == "desktop":
+                options["gl-backend"] = "gl"
+            elif self.options.get_safe("with_opengl") == "gles2":
+                options["gl-backend"] = "glesv2"
+            elif self.options.get_safe("with_opengl") == "gles3":
+                options["gl-backend"] = "glesv3"
+            else:
+                options["gl-backend"] = "disabled"
+            options["glesv2"] = is_enabled(self.options.get_safe("with_opengl") == "gles2")
+            options["glesv3"] = is_enabled(self.options.get_safe("with_opengl") == "gles3")
         options["tee"] = is_enabled(self.options.tee)
         options["symbol-lookup"] = is_enabled(self.options.get_safe("with_symbol_lookup"))
 

recipes/cassandra-cpp-driver/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "2.17.1":
+    url: "https://github.com/datastax/cpp-driver/archive/2.17.1.tar.gz"
+    sha256: "53b4123aad59b39f2da0eb0ce7fe0e92559f7bba0770b2e958254f17bffcd7cf"
   "2.17.0":
     url: "https://github.com/datastax/cpp-driver/archive/2.17.0.tar.gz"
     sha256: "075af6a6920b0a8b12e37b8e5aa335b0c7919334aa1b451642668e6e37c5372f"
@@ -9,6 +12,20 @@ sources:
     url: "https://github.com/datastax/cpp-driver/archive/2.15.3.tar.gz"
     sha256: "eccb53c5151621c3b647fc83781a542cfb93e76687b4178ebce418fc4c817293"
 patches:
+  "2.17.1":
+    - patch_file: "patches/2.16.2/fix-cmake.patch"
+      patch_description: "use cci package"
+      patch_type: "conan"
+    - patch_file: "patches/2.15.3/fix-rapidjson.patch"
+      patch_description: "fix include path for cci package"
+      patch_type: "conan"
+    - patch_file: "patches/2.15.3/fix-atomic.patch"
+      patch_description: "Adapt MemoryOrder definition for C++ 20"
+      patch_type: "portability"
+      patch_source: "https://github.com/datastax/cpp-driver/pull/533"
+    - patch_file: "patches/2.15.3/remove-attribute-for-msvc.patch"
+      patch_description: "remove attribute for msvc"
+      patch_type: "portability"
   "2.17.0":
     - patch_file: "patches/2.16.2/fix-cmake.patch"
       patch_description: "use cci package"

recipes/cassandra-cpp-driver/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "2.17.1":
+    folder: all
   "2.17.0":
     folder: all
   "2.16.2":

recipes/cglm/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.8.9":
+    url: "https://github.com/recp/cglm/archive/refs/tags/v0.8.9.tar.gz"
+    sha256: "9561c998eb2a86dca5f8596b5cd290d76f56b7735c8a2486c585c43c196ceedd"
   "0.8.5":
     url: "https://github.com/recp/cglm/archive/refs/tags/v0.8.5.tar.gz"
     sha256: "baefa21342d228a83c90708459a745d5aa9b0ebb381555eea42db1f37fdf7a5a"

recipes/cglm/all/conanfile.py

@@ -1,7 +1,9 @@
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps
+from conan.tools.files import get, patch, rmdir, copy
 import os
 
-required_conan_version = ">=1.29.1"
+required_conan_version = ">=1.50.0"
 
 
 class CglmConan(ConanFile):
@@ -13,7 +15,6 @@ class CglmConan(ConanFile):
     url = "https://github.com/conan-io/conan-center-index"
     settings = "os", "arch", "compiler", "build_type"
     exports_sources = ("CMakeLists.txt", )
-    generators = "cmake"
     options = {
         "shared": [True, False],
         "fPIC": [True, False],
@@ -25,65 +26,51 @@ class CglmConan(ConanFile):
         "header_only": False,
     }
 
-    _cmake = None
-
-    @property
-    def _source_subfolder(self):
-        return "source_subfolder"
-
-    @property
-    def _build_subfolder(self):
-        return "build_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
-        del self.settings.compiler.libcxx
-        del self.settings.compiler.cppstd
+        if self.options.get_safe("shared") or self.options.header_only:
+            self.options.rm_safe("fPIC")
         if self.options.header_only:
-            del self.settings.arch
-            del self.settings.build_type
-            del self.settings.compiler
-            del self.settings.os
+            self.options.rm_safe("shared")
+        self.settings.compiler.rm_safe("libcxx")
+        self.settings.compiler.rm_safe("cppstd")
 
-    def source(self):
-        tools.get(**self.conan_data["sources"][self.version],
-                  destination=self._source_subfolder, strip_root=True)
+    def package_id(self):
+        if self.info.options.header_only:
+            self.info.clear()
 
-    def _configure_cmake(self):
-        if self._cmake:
-            return self._cmake
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
-        self._cmake = CMake(self)
-        self._cmake.definitions["CGLM_STATIC"] = not self.options.shared
-        self._cmake.definitions["CGLM_SHARED"] = self.options.shared
-        self._cmake.definitions["CGLM_USE_TEST"] = False
-        self._cmake.configure()
-        return self._cmake
+    def generate(self):
+        if not self.options.header_only:
+            tc = CMakeToolchain(self)
+            tc.cache_variables["CGLM_STATIC"] = not self.options.shared
+            tc.cache_variables["CGLM_SHARED"] = self.options.shared
+            tc.cache_variables["CGLM_USE_TEST"] = False
+            tc.generate()
+            deps = CMakeDeps(self)
+            deps.generate()
 
     def build(self):
-        for patch in self.conan_data.get("patches", {}).get(self.version, []):
-            tools.patch(**patch)
-
         if not self.options.header_only:
-            cmake = self._configure_cmake()
+            cmake = CMake(self)
+            cmake.configure()
             cmake.build()
 
     def package(self):
-        self.copy("LICENSE", src=self._source_subfolder, dst="licenses")
-
+        copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         if self.options.header_only:
-            self.copy("*", src=os.path.join(self._source_subfolder, "include"), dst="include")
+            copy(self, "*", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
         else:
-            cmake = self._configure_cmake()
+            cmake = CMake(self)
             cmake.install()
 
-            tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))
-            tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
+            rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+            rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
 
     def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "cglm")

recipes/cglm/all/test_package/CMakeLists.txt

@@ -1,9 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(test_package C)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
 find_package(cglm REQUIRED)
 
 add_executable(test_package test_package.c)