Merge remote-tracking branch 'upstream/master'

Author: bthomee

recipes/abseil/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "20250814.1":
+    url: "https://github.com/abseil/abseil-cpp/archive/20250814.1.tar.gz"
+    sha256: "1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1"
   "20250814.0":
     url: "https://github.com/abseil/abseil-cpp/archive/20250814.0.tar.gz"
     sha256: "9b2b72d4e8367c0b843fa2bcfa2b08debbe3cee34f7aaa27de55a6cbb3e843db"

recipes/abseil/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "20250814.1":
+    folder: all
   "20250814.0":
     folder: all
   "20250512.1":

recipes/arrow/all/conanfile.py

@@ -158,7 +158,7 @@ def _requires_rapidjson(self):
 
     def requirements(self):
         if self.options.with_thrift:
-            self.requires("thrift/0.20.0")
+            self.requires("thrift/[>=0.20.0 <=0.21.0]")
         if self.options.with_grpc:
             self.requires("grpc/[>=1.50.0 <2]")
         if self.options.with_protobuf:
@@ -168,7 +168,7 @@ def requirements(self):
         if self.options.with_mimalloc:
             self.requires("mimalloc/[>=1.7.6 <3]")
         if self.options.with_boost:
-            self.requires("boost/[>=1.85.0 <=1.88.0]")
+            self.requires("boost/[>=1.85.0 <=1.90.0]")
         if self.options.with_gflags:
             self.requires("gflags/2.2.2")
         if self.options.with_glog:

recipes/asmjit/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "cci.20251209":
+    url: "https://github.com/asmjit/asmjit/archive/c87860217e43e2a06060fcaae5b468f6a55b9963.zip"
+    sha256: "9d1fa350c1595ea473667ab68f9921b67ee540b63a7ccdbb320e7565d4177ea9"
   "cci.20241216":
     url: "https://github.com/asmjit/asmjit/archive/cfc9f813cc6ccda63cad872edb32b38e0662bedb.zip"
     sha256: "fc1dd360336e271e915808db513128855c2482d3794e4786757ffc0f31013f80"

recipes/asmjit/all/conanfile.py

@@ -29,7 +29,7 @@ class AsmjitConan(ConanFile):
 
     @property
     def _min_cppstd(self):
-        return 11
+        return 11 if self.version <= "cci.20250524" else 17
 
     @property
     def _compilers_minimum_version(self):
@@ -60,7 +60,10 @@ def validate(self):
                 )
 
     def build_requirements(self):
-        self.tool_requires("cmake/[>=3.19 <4]")
+        if self.version >= "cci.20251005":
+            self.tool_requires("cmake/[>=3.24 <4]")
+        else:
+            self.tool_requires("cmake/[>=3.19 <4]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/asmjit/all/test_package/CMakeLists.txt

@@ -5,4 +5,3 @@ find_package(asmjit REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE asmjit::asmjit)
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

recipes/asmjit/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "cci.20251209":
+    folder: all
   "cci.20241216":
     folder: all
   "cci.20240531":

recipes/atomic_queue/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.7.1":
+    url: "https://github.com/max0x7ba/atomic_queue/archive/refs/tags/v1.7.1.tar.gz"
+    sha256: "6eeff578f8b0499717bf890d90e2c58106ac2b8076084b73f2183a631742b4ab"
   "1.6.3":
     url: "https://github.com/max0x7ba/atomic_queue/archive/refs/tags/v1.6.3.tar.gz"
     sha256: "0ad6e0203d90367f6a4e496449dfd9ad65b80168fadafef4eac08820c6bda79c"

recipes/atomic_queue/config.yml

@@ -1,3 +1,5 @@
 versions:
+  "1.7.1":
+    folder: "all"
   "1.6.3":
     folder: "all"

recipes/barkeep/all/conandata.yml

@@ -0,0 +1,4 @@
+sources:
+  "0.1.5":
+    url: "https://github.com/oir/barkeep/archive/refs/tags/v0.1.5.tar.gz"
+    sha256: "2577B09CFA7E5E117D13B765CFA4792F9E2B50719715786BE275AE32DBF63B7C"